Merge branch 'master' of bdgit.educoder.net:pnq7jmp26/note

.gitignore

@@ -1,37 +0,0 @@
-*.iml
-
-.DS_Store
-
-# Gradle files
-.gradle/
-build/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Proguard folder generated by Eclipse
-proguard/
-
-# Log Files
-*.log
-
-# Android Studio Navigation editor temp files
-.navigation/
-
-# Android Studio captures folder
-captures/
-
-# Intellij
-*.iml
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/gradle.xml
-.idea/dictionaries
-.idea/libraries
-.idea/
-
-# Keystore files
-*.jks
-
-# External native build folder generated in Android Studio 2.2 and later
-.externalNativeBuild

Notes-master/.gitignore

@@ -0,0 +1,9 @@
+# generated files
+bin/
+gen/
+
+# Local configuration file (sdk path, etc)
+project.properties
+.settings/
+.classpath
+.project

Notes-master/.idea/Notes-master.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

Notes-master/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/Notes-master.iml" filepath="$PROJECT_DIR$/.idea/Notes-master.iml" />
+    </modules>
+  </component>
+</project>

Notes-master/.idea/workspace.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="NONE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="da0340b3-f7de-4062-99e6-bee7bc881776" name="Default Changelist" comment="" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
+  <component name="ProblemsViewState">
+    <option name="selectedTabId" value="CurrentFile" />
+  </component>
+  <component name="ProjectId" id="2M591aRiSTrlymFzGGgFUB7bjIl" />
+  <component name="ProjectViewState">
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.cidr.known.project.marker": "true",
+    "cidr.known.project.marker": "true",
+    "last_opened_file_path": "E:/小米便签/Notes-master"
+  }
+}]]></component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="da0340b3-f7de-4062-99e6-bee7bc881776" name="Default Changelist" comment="" />
+      <created>1677046361453</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1677046361453</updated>
+      <workItem from="1677046362780" duration="257000" />
+      <workItem from="1677054230402" duration="33000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="2" />
+  </component>
+</project>

Notes-master/AndroidManifest.xml

@@ -16,13 +16,11 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="net.micode.notes"
     android:versionCode="1"
     android:versionName="0.1" >
 
-    <uses-sdk android:minSdkVersion="14"
-        tools:ignore="GradleOverrides" />
+    <uses-sdk android:minSdkVersion="14" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />

Notes-master/NOTICE

@@ -1,3 +1,16 @@
+
+   Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -175,27 +188,3 @@
 
    END OF TERMS AND CONDITIONS
 
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

Notes-master/README

@@ -0,0 +1,23 @@
+[中文]
+
+1. MiCode便签是小米便签的社区开源版，由MIUI团队(www.miui.com) 发起并贡献第一批代码，遵循NOTICE文件所描述的开源协议，
+   今后为MiCode社区(www.micode.net) 拥有，并由社区发布和维护。
+
+2. Bug反馈和跟踪，请访问Github,
+   https://github.com/MiCode/Notes/issues?sort=created&direction=desc&state=open
+
+3. 功能建议和综合讨论，请访问MiCode,
+   http://micode.net/forum.php?mod=forumdisplay&fid=38
+
+
+[English]
+
+1. MiCode Notes is open source edition of XM notepad, it's first initiated and sponsored by MIUI team (www.miui.com).
+   It's opened under license described by NOTICE file. It's owned by the MiCode community (www.micode.net). In future,
+   the MiCode community will release and maintain this project.
+
+2. Regarding issue tracking, please visit Github,
+   https://github.com/MiCode/Notes/issues?sort=created&direction=desc&state=open
+
+3. Regarding feature request and general discussion, please visit Micode forum,
+   http://micode.net/forum.php?mod=forumdisplay&fid=38

Notes-master/res/color/primary_text_dark.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
 

Notes-master/res/color/secondary_text_dark.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
 

Notes-master/res/layout/note_edit.xml

@@ -55,30 +55,10 @@
                 android:layout_marginLeft="2dip"
                 android:layout_marginRight="8dip"
                 android:textAppearance="@style/TextAppearanceSecondaryItem" />
-            
-            <ImageButton
-                android:id="@+id/menu_more"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:onClick="OnOpenMenu"
-                android:background="@drawable/ic_menu_more_dark" />
 
-<!--            <ImageButton-->
-<!--                android:id="@+id/add_img_btn"-->
-<!--                android:layout_width="wrap_content"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:layout_marginLeft="7dp"-->
-<!--                android:layout_marginTop="600dp"-->
-<!--                android:layout_marginBottom="7dp"-->
-<!--                android:src="@android:drawable/ic_menu_gallery" />-->
-
-
-            <ImageView
-        		android:id="@+id/btn_set_bg_color"
+            <ImageButton
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="10dp"
                 android:layout_gravity="center"
                 android:background="@drawable/bg_btn_set_color" />
         </LinearLayout>
@@ -105,8 +85,7 @@
 
                 <LinearLayout
                     android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"
-                    android:orientation="vertical">
+                    android:layout_height="fill_parent">
 
                     <net.micode.notes.ui.NoteEditText
                         android:id="@+id/note_edit_view"
@@ -138,6 +117,7 @@
     </LinearLayout>
 
     <ImageView
+        android:id="@+id/btn_set_bg_color"
         android:layout_height="43dip"
         android:layout_width="wrap_content"
         android:background="@drawable/bg_color_btn_mask"

Notes-master/res/layout/note_list.xml

@@ -18,8 +18,8 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-<!--    android:background="@drawable/list_background"-->
+    android:layout_height="fill_parent"
+    android:background="@drawable/list_background">
 
     <LinearLayout
         android:layout_width="fill_parent"
@@ -55,15 +55,4 @@
         android:layout_height="wrap_content"
         android:focusable="false"
         android:layout_gravity="bottom" />
-    
-    <Button
-        android:id="@+id/btn_set"
-        android:background="@drawable/ic_menu_more"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:focusable="false"
-        android:padding="10dp"
-        android:layout_margin="10dp"
-        android:onClick="OnOpenMenu"
-        android:layout_gravity="bottom|right" />
 </FrameLayout>

Notes-master/res/layout/widget_2x.xml

@@ -17,8 +17,8 @@
 
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="146dip"
+    android:layout_height="146dip">
     <ImageView
         android:id="@+id/widget_bg_image"
         android:layout_width="fill_parent"
@@ -27,9 +27,9 @@
         android:id="@+id/widget_text"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:paddingTop="30dip"
-        android:paddingLeft="8dip"
-        android:paddingRight="8dip"
+        android:paddingTop="20dip"
+        android:paddingLeft="15dip"
+        android:paddingRight="15dip"
         android:textSize="14sp"
         android:textColor="#FF663300"
         android:maxLines="6"

Notes-master/res/layout/widget_4x.xml

@@ -17,8 +17,8 @@
 
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="294dip"
+    android:layout_height="294dip">
 
     <ImageView
         android:id="@+id/widget_bg_image"
@@ -29,11 +29,11 @@
         android:id="@+id/widget_text"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:paddingTop="33dip"
-        android:paddingLeft="10dip"
-        android:paddingRight="10dip"
+        android:paddingTop="40dip"
+        android:paddingLeft="15dip"
+        android:paddingRight="15dip"
         android:textSize="14sp"
         android:textColor="#FF663300"
-        android:maxLines="14"
+        android:maxLines="12"
         android:lineSpacingMultiplier="1.2" />
 </FrameLayout>

Notes-master/res/menu/note_list.xml

@@ -36,19 +36,4 @@
     <item
         android:id="@+id/menu_search"
         android:title="@string/menu_search"/>
-
-<!--  Background iamge switching  -->
-    <item
-        android:id="@+id/menu_background1"
-        android:title="@string/menu_background"/>
-
-    <item
-        android:id="@+id/menu_background2"
-        android:title="@string/menu_background2"/>
-
-    <item
-        android:id="@+id/menu_background3"
-        android:title="@string/menu_background3"/>
-
-
 </menu>

Notes-master/res/raw-zh-rCN/introduction

@@ -4,3 +4,4 @@
 
       除了调整文字大小、便签背景、文件夹等基础功能外，你会发现MIUI便签也提供了清单模式、便签提醒、软件加密、导出到SD卡、同步google task的高级功能，让你的生活记录更加美好和安全；
 
+      来分享你的使用体验吧：http://www.miui.com/index.php