diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index a818314..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index ef17f64..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/MiNote/.gitignore b/MiNote/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/MiNote/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/MiNote/.idea/.gitignore b/MiNote/.idea/.gitignore new file mode 100644 index 0000000..359bb53 --- /dev/null +++ b/MiNote/.idea/.gitignore @@ -0,0 +1,3 @@ +# 默认忽略的文件 +/shelf/ +/workspace.xml diff --git a/MiNote/.idea/compiler.xml b/MiNote/.idea/compiler.xml new file mode 100644 index 0000000..b86273d --- /dev/null +++ b/MiNote/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/MiNote/.idea/deploymentTargetSelector.xml b/MiNote/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..b268ef3 --- /dev/null +++ b/MiNote/.idea/deploymentTargetSelector.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/MiNote/.idea/gradle.xml b/MiNote/.idea/gradle.xml new file mode 100644 index 0000000..7b3006b --- /dev/null +++ b/MiNote/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/MiNote/.idea/migrations.xml b/MiNote/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/MiNote/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/MiNote/.idea/misc.xml b/MiNote/.idea/misc.xml new file mode 100644 index 0000000..74dd639 --- /dev/null +++ b/MiNote/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/MiNote/.idea/runConfigurations.xml b/MiNote/.idea/runConfigurations.xml new file mode 100644 index 0000000..16660f1 --- /dev/null +++ b/MiNote/.idea/runConfigurations.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/MiNote/app/.gitignore b/MiNote/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/MiNote/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/MiNote/app/build.gradle.kts b/MiNote/app/build.gradle.kts new file mode 100644 index 0000000..d17e783 --- /dev/null +++ b/MiNote/app/build.gradle.kts @@ -0,0 +1,59 @@ +plugins { + alias(libs.plugins.android.application) +} + +android { + namespace = "net.micode.notes" + compileSdk = 35 + + defaultConfig { + applicationId = "net.micode.notes" + minSdk = 24 + targetSdk = 35 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + packaging { + resources.excludes.add("META-INF/DEPENDENCIES"); + resources.excludes.add("META-INF/NOTICE"); + resources.excludes.add("META-INF/LICENSE"); + resources.excludes.add("META-INF/LICENSE.txt"); + resources.excludes.add("META-INF/NOTICE.txt"); + } +} + +dependencies { + + implementation(libs.appcompat) + implementation(libs.material) + implementation(libs.activity) + implementation(libs.constraintlayout) + testImplementation(libs.junit) + androidTestImplementation(libs.ext.junit) + androidTestImplementation(libs.espresso.core) + + // implementation(fileTree(mapOf( +// "dir" to "libs", +// "include" to listOf("*.aar", "*.jar"), +// "exclude" to emptyList() +// ))) + implementation(files("libs/httpclient-osgi-4.5.14.jar")) + implementation(files("libs/httpclient-win-4.5.14.jar")) + implementation(files("libs/httpcore-4.4.16.jar")) +} \ No newline at end of file diff --git a/MiNote/app/libs/commons-codec-1.11.jar b/MiNote/app/libs/commons-codec-1.11.jar new file mode 100644 index 0000000..2245120 Binary files /dev/null and b/MiNote/app/libs/commons-codec-1.11.jar differ diff --git a/MiNote/app/libs/commons-logging-1.2.jar b/MiNote/app/libs/commons-logging-1.2.jar new file mode 100644 index 0000000..93a3b9f Binary files /dev/null and b/MiNote/app/libs/commons-logging-1.2.jar differ diff --git a/MiNote/app/libs/fluent-hc-4.5.14.jar b/MiNote/app/libs/fluent-hc-4.5.14.jar new file mode 100644 index 0000000..e89f593 Binary files /dev/null and b/MiNote/app/libs/fluent-hc-4.5.14.jar differ diff --git a/MiNote/app/libs/httpclient-4.5.14.jar b/MiNote/app/libs/httpclient-4.5.14.jar new file mode 100644 index 0000000..2bb7c07 Binary files /dev/null and b/MiNote/app/libs/httpclient-4.5.14.jar differ diff --git a/MiNote/app/libs/httpclient-cache-4.5.14.jar b/MiNote/app/libs/httpclient-cache-4.5.14.jar new file mode 100644 index 0000000..9a8ac70 Binary files /dev/null and b/MiNote/app/libs/httpclient-cache-4.5.14.jar differ diff --git a/MiNote/app/libs/httpclient-osgi-4.5.14.jar b/MiNote/app/libs/httpclient-osgi-4.5.14.jar new file mode 100644 index 0000000..270124f Binary files /dev/null and b/MiNote/app/libs/httpclient-osgi-4.5.14.jar differ diff --git a/MiNote/app/libs/httpclient-win-4.5.14.jar b/MiNote/app/libs/httpclient-win-4.5.14.jar new file mode 100644 index 0000000..66c75aa Binary files /dev/null and b/MiNote/app/libs/httpclient-win-4.5.14.jar differ diff --git a/MiNote/app/libs/httpcore-4.4.16.jar b/MiNote/app/libs/httpcore-4.4.16.jar new file mode 100644 index 0000000..aed581e Binary files /dev/null and b/MiNote/app/libs/httpcore-4.4.16.jar differ diff --git a/MiNote/app/libs/httpmime-4.5.14.jar b/MiNote/app/libs/httpmime-4.5.14.jar new file mode 100644 index 0000000..331e95c Binary files /dev/null and b/MiNote/app/libs/httpmime-4.5.14.jar differ diff --git a/MiNote/app/libs/jna-4.5.2.jar b/MiNote/app/libs/jna-4.5.2.jar new file mode 100644 index 0000000..78e2058 Binary files /dev/null and b/MiNote/app/libs/jna-4.5.2.jar differ diff --git a/MiNote/app/libs/jna-platform-4.5.2.jar b/MiNote/app/libs/jna-platform-4.5.2.jar new file mode 100644 index 0000000..aa34419 Binary files /dev/null and b/MiNote/app/libs/jna-platform-4.5.2.jar differ diff --git a/MiNote/app/proguard-rules.pro b/MiNote/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/MiNote/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/MiNote/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java b/MiNote/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java new file mode 100644 index 0000000..a889a75 --- /dev/null +++ b/MiNote/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package net.micode.notes; + +import android.content.Context; + +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + assertEquals("net.micode.notes", appContext.getPackageName()); + } +} \ No newline at end of file diff --git a/src/AndroidManifest.xml b/MiNote/app/src/main/AndroidManifest.xml similarity index 78% rename from src/AndroidManifest.xml rename to MiNote/app/src/main/AndroidManifest.xml index e5c7d47..b002b6e 100644 --- a/src/AndroidManifest.xml +++ b/MiNote/app/src/main/AndroidManifest.xml @@ -1,26 +1,6 @@ - - - - - + xmlns:tools="http://schemas.android.com/tools"> @@ -33,8 +13,16 @@ + android:allowBackup="true" + android:dataExtractionRules="@xml/data_extraction_rules" + android:fullBackupContent="@xml/backup_rules" + android:icon="@mipmap/ic_launcher" + android:label="@string/app_name" + android:roundIcon="@mipmap/ic_launcher_round" + android:supportsRtl="true" + android:theme="@style/Theme.MiNote" + tools:targetApi="31"> + + android:windowSoftInputMode="adjustPan" + android:exported="true"> @@ -54,7 +43,8 @@ android:name=".ui.NoteEditActivity" android:configChanges="keyboardHidden|orientation|screenSize" android:launchMode="singleTop" - android:theme="@style/NoteTheme" > + android:theme="@style/NoteTheme" + android:exported="true"> @@ -80,6 +70,7 @@ android:resource="@xml/searchable" /> + + android:label="@string/app_widget2x2" + android:exported="true"> @@ -100,7 +92,8 @@ + android:label="@string/app_widget4x4" + android:exported="true"> @@ -113,7 +106,8 @@ android:resource="@xml/widget_4x_info" /> - + @@ -146,5 +140,17 @@ + + + + + + + + + + + - + + \ No newline at end of file diff --git a/MiNote/app/src/main/java/net/micode/notes/MainActivity.java b/MiNote/app/src/main/java/net/micode/notes/MainActivity.java new file mode 100644 index 0000000..8091753 --- /dev/null +++ b/MiNote/app/src/main/java/net/micode/notes/MainActivity.java @@ -0,0 +1,24 @@ +package net.micode.notes; + +import android.os.Bundle; + +import androidx.activity.EdgeToEdge; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; + +public class MainActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + EdgeToEdge.enable(this); + setContentView(R.layout.activity_main); + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> { + Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom); + return insets; + }); + } +} \ No newline at end of file diff --git a/src/src/net/micode/notes/data/Contact.java b/MiNote/app/src/main/java/net/micode/notes/data/Contact.java similarity index 100% rename from src/src/net/micode/notes/data/Contact.java rename to MiNote/app/src/main/java/net/micode/notes/data/Contact.java diff --git a/src/src/net/micode/notes/data/Notes.java b/MiNote/app/src/main/java/net/micode/notes/data/Notes.java similarity index 100% rename from src/src/net/micode/notes/data/Notes.java rename to MiNote/app/src/main/java/net/micode/notes/data/Notes.java diff --git a/src/src/net/micode/notes/data/NotesDatabaseHelper.java b/MiNote/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java similarity index 62% rename from src/src/net/micode/notes/data/NotesDatabaseHelper.java rename to MiNote/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java index 58d0ff2..ffe5d57 100644 --- a/src/src/net/micode/notes/data/NotesDatabaseHelper.java +++ b/MiNote/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java @@ -1,16 +1,17 @@ /* - * 版权所有 (c) 2010-2011，MiCode开源社区（www.micode.net） + * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) * - * 根据Apache许可证2.0版（“许可证”）获得许可; - * 除非符合许可证的规定，否则您不得使用此文件。 - * 您可以在以下网址获得许可证的副本： + * 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. */ package net.micode.notes.data; @@ -25,96 +26,124 @@ import net.micode.notes.data.Notes.DataColumns; import net.micode.notes.data.Notes.DataConstants; import net.micode.notes.data.Notes.NoteColumns; + public class NotesDatabaseHelper extends SQLiteOpenHelper { private static final String DB_NAME = "note.db"; private static final int DB_VERSION = 4; public interface TABLE { - public static final String NOTE = "note"; // 笔记表名称 + public static final String NOTE = "note"; - public static final String DATA = "data"; // 数据表名称 + public static final String DATA = "data"; } - private static final String TAG = "NotesDatabaseHelper"; // 日志标签 + private static final String TAG = "NotesDatabaseHelper"; - private static NotesDatabaseHelper mInstance; // 单例实例 + private static NotesDatabaseHelper mInstance; private static final String CREATE_NOTE_TABLE_SQL = - "CREATE TABLE " + TABLE.NOTE + "(" + - NoteColumns.ID + " INTEGER PRIMARY KEY," + // 笔记ID - NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + // 父文件夹ID - NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," + // 提醒日期 - NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," + // 背景颜色ID - NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + // 创建日期 - NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," + // 是否有附件 - NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + // 修改日期 - NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," + // 笔记数量 - NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," + // 摘要 - NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," + // 类型 - NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," + // 小部件ID - NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," + // 小部件类型 - NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," + // 同步ID - NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," + // 本地修改标志 - NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + // 原始父文件夹ID - NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," + // Google任务ID - NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" + // 版本号 - ")"; + "CREATE TABLE " + TABLE.NOTE + "(" + + NoteColumns.ID + " INTEGER PRIMARY KEY," + + NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + + NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + + NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," + + NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," + + NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," + + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" + + ")"; private static final String CREATE_DATA_TABLE_SQL = - "CREATE TABLE " + TABLE.DATA + "(" + - DataColumns.ID + " INTEGER PRIMARY KEY," + // 数据ID - DataColumns.MIME_TYPE + " TEXT NOT NULL," + // MIME类型 - DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," + // 笔记ID - NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + // 创建日期 - NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + // 修改日期 - DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," + // 内容 - DataColumns.DATA1 + " INTEGER," + // 数据1 - DataColumns.DATA2 + " INTEGER," + // 数据2 - DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," + // 数据3 - DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," + // 数据4 - DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" + // 数据5 - ")"; + "CREATE TABLE " + TABLE.DATA + "(" + + DataColumns.ID + " INTEGER PRIMARY KEY," + + DataColumns.MIME_TYPE + " TEXT NOT NULL," + + DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + + NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + + DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," + + DataColumns.DATA1 + " INTEGER," + + DataColumns.DATA2 + " INTEGER," + + DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," + + DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," + + DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" + + ")"; private static final String CREATE_DATA_NOTE_ID_INDEX_SQL = - "CREATE INDEX IF NOT EXISTS note_id_index ON " + - TABLE.DATA + "(" + DataColumns.NOTE_ID + ");"; // 创建笔记ID索引 + "CREATE INDEX IF NOT EXISTS note_id_index ON " + + TABLE.DATA + "(" + DataColumns.NOTE_ID + ");"; /** - * 将笔记移动到文件夹时增加文件夹的笔记计数 + * Increase folder's note count when move note to the folder */ private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = - "CREATE TRIGGER increase_folder_count_on_update "+ - " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + - " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + - " END"; + "CREATE TRIGGER increase_folder_count_on_update "+ + " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + + " BEGIN " + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + + " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + + " END"; /** - * 从文件夹中移除笔记时减少文件夹的笔记计数 + * Decrease folder's note count when move note from folder */ private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = - "CREATE TRIGGER decrease_folder_count_on_update " + - " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + - " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + - " AND " + NoteColumns.NOTES_COUNT + ">0" + ";" + - " END"; + "CREATE TRIGGER decrease_folder_count_on_update " + + " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + + " BEGIN " + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + + " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + + " AND " + NoteColumns.NOTES_COUNT + ">0" + ";" + + " END"; /** - * 将新笔记插入文件夹时增加文件夹的笔记计数 + * Increase folder's note count when insert new note to the folder */ private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER = - "CREATE TRIGGER increase_folder_count_on_insert " + - " AFTER INSERT ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + + "CREATE TRIGGER increase_folder_count_on_insert " + + " AFTER INSERT ON " + TABLE.NOTE + + " BEGIN " + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + + " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + + " END"; + /** + * Decrease folder's note count when delete note from the folder + */ + private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER = + "CREATE TRIGGER decrease_folder_count_on_delete " + + " AFTER DELETE ON " + TABLE.NOTE + + " BEGIN " + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + + " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + + " AND " + NoteColumns.NOTES_COUNT + ">0;" + + " END"; + /** + * Update note's content when insert data with type {@link DataConstants#NOTE} + */ + private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER = + "CREATE TRIGGER update_note_content_on_insert " + + " AFTER INSERT ON " + TABLE.DATA + + " WHEN new." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + + " BEGIN" + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + + " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + + " END"; /** * Update note's content when data with {@link DataConstants#NOTE} type has changed diff --git a/src/src/net/micode/notes/data/NotesProvider.java b/MiNote/app/src/main/java/net/micode/notes/data/NotesProvider.java similarity index 100% rename from src/src/net/micode/notes/data/NotesProvider.java rename to MiNote/app/src/main/java/net/micode/notes/data/NotesProvider.java diff --git a/src/src/net/micode/notes/gtask/data/MetaData.java b/MiNote/app/src/main/java/net/micode/notes/gtask/data/MetaData.java similarity index 100% rename from src/src/net/micode/notes/gtask/data/MetaData.java rename to MiNote/app/src/main/java/net/micode/notes/gtask/data/MetaData.java diff --git a/src/src/net/micode/notes/gtask/data/Node.java b/MiNote/app/src/main/java/net/micode/notes/gtask/data/Node.java similarity index 100% rename from src/src/net/micode/notes/gtask/data/Node.java rename to MiNote/app/src/main/java/net/micode/notes/gtask/data/Node.java diff --git a/src/src/net/micode/notes/gtask/data/SqlData.java b/MiNote/app/src/main/java/net/micode/notes/gtask/data/SqlData.java similarity index 100% rename from src/src/net/micode/notes/gtask/data/SqlData.java rename to MiNote/app/src/main/java/net/micode/notes/gtask/data/SqlData.java diff --git a/src/src/net/micode/notes/gtask/data/SqlNote.java b/MiNote/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java similarity index 100% rename from src/src/net/micode/notes/gtask/data/SqlNote.java rename to MiNote/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java diff --git a/src/src/net/micode/notes/gtask/data/Task.java b/MiNote/app/src/main/java/net/micode/notes/gtask/data/Task.java similarity index 100% rename from src/src/net/micode/notes/gtask/data/Task.java rename to MiNote/app/src/main/java/net/micode/notes/gtask/data/Task.java diff --git a/src/src/net/micode/notes/gtask/data/TaskList.java b/MiNote/app/src/main/java/net/micode/notes/gtask/data/TaskList.java similarity index 100% rename from src/src/net/micode/notes/gtask/data/TaskList.java rename to MiNote/app/src/main/java/net/micode/notes/gtask/data/TaskList.java diff --git a/src/src/net/micode/notes/gtask/exception/ActionFailureException.java b/MiNote/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java similarity index 100% rename from src/src/net/micode/notes/gtask/exception/ActionFailureException.java rename to MiNote/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java diff --git a/src/src/net/micode/notes/gtask/exception/NetworkFailureException.java b/MiNote/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java similarity index 100% rename from src/src/net/micode/notes/gtask/exception/NetworkFailureException.java rename to MiNote/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java diff --git a/src/src/net/micode/notes/gtask/remote/GTaskASyncTask.java b/MiNote/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java similarity index 87% rename from src/src/net/micode/notes/gtask/remote/GTaskASyncTask.java rename to MiNote/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java index b3b61e7..a1deb99 100644 --- a/src/src/net/micode/notes/gtask/remote/GTaskASyncTask.java +++ b/MiNote/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java @@ -64,21 +64,22 @@ public class GTaskASyncTask extends AsyncTask { } private void showNotification(int tickerId, String content) { - Notification notification = new Notification(R.drawable.notification, mContext - .getString(tickerId), System.currentTimeMillis()); - notification.defaults = Notification.DEFAULT_LIGHTS; - notification.flags = Notification.FLAG_AUTO_CANCEL; PendingIntent pendingIntent; if (tickerId != R.string.ticker_success) { pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, - NotesPreferenceActivity.class), 0); - + NotesPreferenceActivity.class), PendingIntent.FLAG_IMMUTABLE); } else { pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, - NotesListActivity.class), 0); + NotesListActivity.class), PendingIntent.FLAG_IMMUTABLE); } - notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content, - pendingIntent); + Notification.Builder builder = new Notification.Builder(mContext) + .setAutoCancel(true) + .setContentTitle(mContext.getString(R.string.app_name)) + .setContentText(content) + .setContentIntent(pendingIntent) + .setWhen(System.currentTimeMillis()) + .setOngoing(true); + Notification notification=builder.getNotification(); mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification); } diff --git a/src/src/net/micode/notes/gtask/remote/GTaskClient.java b/MiNote/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java similarity index 100% rename from src/src/net/micode/notes/gtask/remote/GTaskClient.java rename to MiNote/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java diff --git a/src/src/net/micode/notes/gtask/remote/GTaskManager.java b/MiNote/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java similarity index 100% rename from src/src/net/micode/notes/gtask/remote/GTaskManager.java rename to MiNote/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java diff --git a/src/src/net/micode/notes/gtask/remote/GTaskSyncService.java b/MiNote/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java similarity index 100% rename from src/src/net/micode/notes/gtask/remote/GTaskSyncService.java rename to MiNote/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java diff --git a/src/src/net/micode/notes/model/Note.java b/MiNote/app/src/main/java/net/micode/notes/model/Note.java similarity index 100% rename from src/src/net/micode/notes/model/Note.java rename to MiNote/app/src/main/java/net/micode/notes/model/Note.java diff --git a/src/src/net/micode/notes/model/WorkingNote.java b/MiNote/app/src/main/java/net/micode/notes/model/WorkingNote.java similarity index 100% rename from src/src/net/micode/notes/model/WorkingNote.java rename to MiNote/app/src/main/java/net/micode/notes/model/WorkingNote.java diff --git a/src/src/net/micode/notes/tool/BackupUtils.java b/MiNote/app/src/main/java/net/micode/notes/tool/BackupUtils.java similarity index 100% rename from src/src/net/micode/notes/tool/BackupUtils.java rename to MiNote/app/src/main/java/net/micode/notes/tool/BackupUtils.java diff --git a/src/src/net/micode/notes/tool/DataUtils.java b/MiNote/app/src/main/java/net/micode/notes/tool/DataUtils.java similarity index 100% rename from src/src/net/micode/notes/tool/DataUtils.java rename to MiNote/app/src/main/java/net/micode/notes/tool/DataUtils.java diff --git a/src/src/net/micode/notes/tool/GTaskStringUtils.java b/MiNote/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java similarity index 100% rename from src/src/net/micode/notes/tool/GTaskStringUtils.java rename to MiNote/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java diff --git a/src/src/net/micode/notes/tool/ResourceParser.java b/MiNote/app/src/main/java/net/micode/notes/tool/ResourceParser.java similarity index 100% rename from src/src/net/micode/notes/tool/ResourceParser.java rename to MiNote/app/src/main/java/net/micode/notes/tool/ResourceParser.java diff --git a/src/src/net/micode/notes/ui/AlarmAlertActivity.java b/MiNote/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java similarity index 100% rename from src/src/net/micode/notes/ui/AlarmAlertActivity.java rename to MiNote/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java diff --git a/src/src/net/micode/notes/ui/AlarmInitReceiver.java b/MiNote/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java similarity index 100% rename from src/src/net/micode/notes/ui/AlarmInitReceiver.java rename to MiNote/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java diff --git a/src/src/net/micode/notes/ui/AlarmReceiver.java b/MiNote/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java similarity index 100% rename from src/src/net/micode/notes/ui/AlarmReceiver.java rename to MiNote/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java diff --git a/src/src/net/micode/notes/ui/DateTimePicker.java b/MiNote/app/src/main/java/net/micode/notes/ui/DateTimePicker.java similarity index 100% rename from src/src/net/micode/notes/ui/DateTimePicker.java rename to MiNote/app/src/main/java/net/micode/notes/ui/DateTimePicker.java diff --git a/src/src/net/micode/notes/ui/DateTimePickerDialog.java b/MiNote/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java similarity index 100% rename from src/src/net/micode/notes/ui/DateTimePickerDialog.java rename to MiNote/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java diff --git a/src/src/net/micode/notes/ui/DropdownMenu.java b/MiNote/app/src/main/java/net/micode/notes/ui/DropdownMenu.java similarity index 100% rename from src/src/net/micode/notes/ui/DropdownMenu.java rename to MiNote/app/src/main/java/net/micode/notes/ui/DropdownMenu.java diff --git a/src/src/net/micode/notes/ui/FoldersListAdapter.java b/MiNote/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java similarity index 100% rename from src/src/net/micode/notes/ui/FoldersListAdapter.java rename to MiNote/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java diff --git a/src/src/net/micode/notes/ui/NoteEditActivity.java b/MiNote/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java similarity index 94% rename from src/src/net/micode/notes/ui/NoteEditActivity.java rename to MiNote/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index 96a9ff8..862883b 100644 --- a/src/src/net/micode/notes/ui/NoteEditActivity.java +++ b/MiNote/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -507,48 +507,38 @@ public class NoteEditActivity extends Activity implements OnClickListener, @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_new_note: - createNewNote(); - break; - case R.id.menu_delete: - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle(getString(R.string.alert_title_delete)); - builder.setIcon(android.R.drawable.ic_dialog_alert); - builder.setMessage(getString(R.string.alert_message_delete_note)); - builder.setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - deleteCurrentNote(); - finish(); - } - }); - builder.setNegativeButton(android.R.string.cancel, null); - builder.show(); - break; - case R.id.menu_font_size: - mFontSizeSelector.setVisibility(View.VISIBLE); - findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); - break; - case R.id.menu_list_mode: - mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ? - TextNote.MODE_CHECK_LIST : 0); - break; - case R.id.menu_share: - getWorkingText(); - sendTo(this, mWorkingNote.getContent()); - break; - case R.id.menu_send_to_desktop: - sendToDesktop(); - break; - case R.id.menu_alert: - setReminder(); - break; - case R.id.menu_delete_remind: - mWorkingNote.setAlertDate(0, false); - break; - default: - break; + int itemId = item.getItemId(); + if (itemId == R.id.menu_new_note) { + createNewNote(); + } else if (itemId == R.id.menu_delete) { + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle(getString(R.string.alert_title_delete)); + builder.setIcon(android.R.drawable.ic_dialog_alert); + builder.setMessage(getString(R.string.alert_message_delete_note)); + builder.setPositiveButton(android.R.string.ok, + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + deleteCurrentNote(); + finish(); + } + }); + builder.setNegativeButton(android.R.string.cancel, null); + builder.show(); + } else if (itemId == R.id.menu_font_size) { + mFontSizeSelector.setVisibility(View.VISIBLE); + findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); + } else if (itemId == R.id.menu_list_mode) { + mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ? + TextNote.MODE_CHECK_LIST : 0); + } else if (itemId == R.id.menu_share) { + getWorkingText(); + sendTo(this, mWorkingNote.getContent()); + } else if (itemId == R.id.menu_send_to_desktop) { + sendToDesktop(); + } else if (itemId == R.id.menu_alert) { + setReminder(); + } else if (itemId == R.id.menu_delete_remind) { + mWorkingNote.setAlertDate(0, false); } return true; } diff --git a/src/src/net/micode/notes/ui/NoteEditText.java b/MiNote/app/src/main/java/net/micode/notes/ui/NoteEditText.java similarity index 100% rename from src/src/net/micode/notes/ui/NoteEditText.java rename to MiNote/app/src/main/java/net/micode/notes/ui/NoteEditText.java diff --git a/src/src/net/micode/notes/ui/NoteItemData.java b/MiNote/app/src/main/java/net/micode/notes/ui/NoteItemData.java similarity index 100% rename from src/src/net/micode/notes/ui/NoteItemData.java rename to MiNote/app/src/main/java/net/micode/notes/ui/NoteItemData.java diff --git a/src/src/net/micode/notes/ui/NotesListActivity.java b/MiNote/app/src/main/java/net/micode/notes/ui/NotesListActivity.java similarity index 93% rename from src/src/net/micode/notes/ui/NotesListActivity.java rename to MiNote/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index e843aec..6db3761 100644 --- a/src/src/net/micode/notes/ui/NotesListActivity.java +++ b/MiNote/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -319,28 +319,26 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt return true; } - switch (item.getItemId()) { - case R.id.delete: - AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); - builder.setTitle(getString(R.string.alert_title_delete)); - builder.setIcon(android.R.drawable.ic_dialog_alert); - builder.setMessage(getString(R.string.alert_message_delete_notes, - mNotesListAdapter.getSelectedCount())); - builder.setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, - int which) { - batchDelete(); - } - }); - builder.setNegativeButton(android.R.string.cancel, null); - builder.show(); - break; - case R.id.move: - startQueryDestinationFolders(); - break; - default: - return false; + int itemId = item.getItemId(); + if (itemId == R.id.delete) { + AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); + builder.setTitle(getString(R.string.alert_title_delete)); + builder.setIcon(android.R.drawable.ic_dialog_alert); + builder.setMessage(getString(R.string.alert_message_delete_notes, + mNotesListAdapter.getSelectedCount())); + builder.setPositiveButton(android.R.string.ok, + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, + int which) { + batchDelete(); + } + }); + builder.setNegativeButton(android.R.string.cancel, null); + builder.show(); + } else if (itemId == R.id.move) { + startQueryDestinationFolders(); + } else { + return false; } return true; } @@ -558,12 +556,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } public void onClick(View v) { - switch (v.getId()) { - case R.id.btn_new_note: - createNewNote(); - break; - default: - break; + if (v.getId() == R.id.btn_new_note) { + createNewNote(); } } @@ -780,40 +774,27 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_new_folder: { - showCreateOrModifyFolderDialog(true); - break; - } - case R.id.menu_export_text: { - exportNoteToText(); - break; - } - case R.id.menu_sync: { - if (isSyncMode()) { - if (TextUtils.equals(item.getTitle(), getString(R.string.menu_sync))) { - GTaskSyncService.startSync(this); - } else { - GTaskSyncService.cancelSync(this); - } + int itemId = item.getItemId(); + if (itemId == R.id.menu_new_folder) { + showCreateOrModifyFolderDialog(true); + } else if (itemId == R.id.menu_export_text) { + exportNoteToText(); + } else if (itemId == R.id.menu_sync) { + if (isSyncMode()) { + if (TextUtils.equals(item.getTitle(), getString(R.string.menu_sync))) { + GTaskSyncService.startSync(this); } else { - startPreferenceActivity(); + GTaskSyncService.cancelSync(this); } - break; - } - case R.id.menu_setting: { + } else { startPreferenceActivity(); - break; - } - case R.id.menu_new_note: { - createNewNote(); - break; } - case R.id.menu_search: - onSearchRequested(); - break; - default: - break; + } else if (itemId == R.id.menu_setting) { + startPreferenceActivity(); + } else if (itemId == R.id.menu_new_note) { + createNewNote(); + } else if (itemId == R.id.menu_search) { + onSearchRequested(); } return true; } diff --git a/src/src/net/micode/notes/ui/NotesListAdapter.java b/MiNote/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java similarity index 100% rename from src/src/net/micode/notes/ui/NotesListAdapter.java rename to MiNote/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java diff --git a/src/src/net/micode/notes/ui/NotesListItem.java b/MiNote/app/src/main/java/net/micode/notes/ui/NotesListItem.java similarity index 100% rename from src/src/net/micode/notes/ui/NotesListItem.java rename to MiNote/app/src/main/java/net/micode/notes/ui/NotesListItem.java diff --git a/src/src/net/micode/notes/ui/NotesPreferenceActivity.java b/MiNote/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java similarity index 100% rename from src/src/net/micode/notes/ui/NotesPreferenceActivity.java rename to MiNote/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java diff --git a/src/src/net/micode/notes/widget/NoteWidgetProvider.java b/MiNote/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java similarity index 100% rename from src/src/net/micode/notes/widget/NoteWidgetProvider.java rename to MiNote/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java diff --git a/src/src/net/micode/notes/widget/NoteWidgetProvider_2x.java b/MiNote/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java similarity index 100% rename from src/src/net/micode/notes/widget/NoteWidgetProvider_2x.java rename to MiNote/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java diff --git a/src/src/net/micode/notes/widget/NoteWidgetProvider_4x.java b/MiNote/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java similarity index 100% rename from src/src/net/micode/notes/widget/NoteWidgetProvider_4x.java rename to MiNote/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java diff --git a/src/res/color/primary_text_dark.xml b/MiNote/app/src/main/res/color/primary_text_dark.xml similarity index 100% rename from src/res/color/primary_text_dark.xml rename to MiNote/app/src/main/res/color/primary_text_dark.xml diff --git a/src/res/color/secondary_text_dark.xml b/MiNote/app/src/main/res/color/secondary_text_dark.xml similarity index 100% rename from src/res/color/secondary_text_dark.xml rename to MiNote/app/src/main/res/color/secondary_text_dark.xml diff --git a/src/res/drawable-hdpi/bg_btn_set_color.png b/MiNote/app/src/main/res/drawable-hdpi/bg_btn_set_color.png similarity index 100% rename from src/res/drawable-hdpi/bg_btn_set_color.png rename to MiNote/app/src/main/res/drawable-hdpi/bg_btn_set_color.png diff --git a/src/res/drawable-hdpi/bg_color_btn_mask.png b/MiNote/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png similarity index 100% rename from src/res/drawable-hdpi/bg_color_btn_mask.png rename to MiNote/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png diff --git a/src/res/drawable-hdpi/call_record.png b/MiNote/app/src/main/res/drawable-hdpi/call_record.png similarity index 100% rename from src/res/drawable-hdpi/call_record.png rename to MiNote/app/src/main/res/drawable-hdpi/call_record.png diff --git a/src/res/drawable-hdpi/clock.png b/MiNote/app/src/main/res/drawable-hdpi/clock.png similarity index 100% rename from src/res/drawable-hdpi/clock.png rename to MiNote/app/src/main/res/drawable-hdpi/clock.png diff --git a/src/res/drawable-hdpi/delete.png b/MiNote/app/src/main/res/drawable-hdpi/delete.png similarity index 100% rename from src/res/drawable-hdpi/delete.png rename to MiNote/app/src/main/res/drawable-hdpi/delete.png diff --git a/src/res/drawable-hdpi/dropdown_icon.9.png b/MiNote/app/src/main/res/drawable-hdpi/dropdown_icon.9.png similarity index 100% rename from src/res/drawable-hdpi/dropdown_icon.9.png rename to MiNote/app/src/main/res/drawable-hdpi/dropdown_icon.9.png diff --git a/src/res/drawable-hdpi/edit_blue.9.png b/MiNote/app/src/main/res/drawable-hdpi/edit_blue.9.png similarity index 100% rename from src/res/drawable-hdpi/edit_blue.9.png rename to MiNote/app/src/main/res/drawable-hdpi/edit_blue.9.png diff --git a/src/res/drawable-hdpi/edit_green.9.png b/MiNote/app/src/main/res/drawable-hdpi/edit_green.9.png similarity index 100% rename from src/res/drawable-hdpi/edit_green.9.png rename to MiNote/app/src/main/res/drawable-hdpi/edit_green.9.png diff --git a/src/res/drawable-hdpi/edit_red.9.png b/MiNote/app/src/main/res/drawable-hdpi/edit_red.9.png similarity index 100% rename from src/res/drawable-hdpi/edit_red.9.png rename to MiNote/app/src/main/res/drawable-hdpi/edit_red.9.png diff --git a/src/res/drawable-hdpi/edit_title_blue.9.png b/MiNote/app/src/main/res/drawable-hdpi/edit_title_blue.9.png similarity index 100% rename from src/res/drawable-hdpi/edit_title_blue.9.png rename to MiNote/app/src/main/res/drawable-hdpi/edit_title_blue.9.png diff --git a/src/res/drawable-hdpi/edit_title_green.9.png b/MiNote/app/src/main/res/drawable-hdpi/edit_title_green.9.png similarity index 100% rename from src/res/drawable-hdpi/edit_title_green.9.png rename to MiNote/app/src/main/res/drawable-hdpi/edit_title_green.9.png diff --git a/src/res/drawable-hdpi/edit_title_red.9.png b/MiNote/app/src/main/res/drawable-hdpi/edit_title_red.9.png similarity index 100% rename from src/res/drawable-hdpi/edit_title_red.9.png rename to MiNote/app/src/main/res/drawable-hdpi/edit_title_red.9.png diff --git a/src/res/drawable-hdpi/edit_title_white.9.png b/MiNote/app/src/main/res/drawable-hdpi/edit_title_white.9.png similarity index 100% rename from src/res/drawable-hdpi/edit_title_white.9.png rename to MiNote/app/src/main/res/drawable-hdpi/edit_title_white.9.png diff --git a/src/res/drawable-hdpi/edit_title_yellow.9.png b/MiNote/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png similarity index 100% rename from src/res/drawable-hdpi/edit_title_yellow.9.png rename to MiNote/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png diff --git a/src/res/drawable-hdpi/edit_white.9.png b/MiNote/app/src/main/res/drawable-hdpi/edit_white.9.png similarity index 100% rename from src/res/drawable-hdpi/edit_white.9.png rename to MiNote/app/src/main/res/drawable-hdpi/edit_white.9.png diff --git a/src/res/drawable-hdpi/edit_yellow.9.png b/MiNote/app/src/main/res/drawable-hdpi/edit_yellow.9.png similarity index 100% rename from src/res/drawable-hdpi/edit_yellow.9.png rename to MiNote/app/src/main/res/drawable-hdpi/edit_yellow.9.png diff --git a/src/res/drawable-hdpi/font_large.png b/MiNote/app/src/main/res/drawable-hdpi/font_large.png similarity index 100% rename from src/res/drawable-hdpi/font_large.png rename to MiNote/app/src/main/res/drawable-hdpi/font_large.png diff --git a/src/res/drawable-hdpi/font_normal.png b/MiNote/app/src/main/res/drawable-hdpi/font_normal.png similarity index 100% rename from src/res/drawable-hdpi/font_normal.png rename to MiNote/app/src/main/res/drawable-hdpi/font_normal.png diff --git a/src/res/drawable-hdpi/font_size_selector_bg.9.png b/MiNote/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png similarity index 100% rename from src/res/drawable-hdpi/font_size_selector_bg.9.png rename to MiNote/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png diff --git a/src/res/drawable-hdpi/font_small.png b/MiNote/app/src/main/res/drawable-hdpi/font_small.png similarity index 100% rename from src/res/drawable-hdpi/font_small.png rename to MiNote/app/src/main/res/drawable-hdpi/font_small.png diff --git a/src/res/drawable-hdpi/font_super.png b/MiNote/app/src/main/res/drawable-hdpi/font_super.png similarity index 100% rename from src/res/drawable-hdpi/font_super.png rename to MiNote/app/src/main/res/drawable-hdpi/font_super.png diff --git a/src/res/drawable-hdpi/icon_app.png b/MiNote/app/src/main/res/drawable-hdpi/icon_app.png similarity index 100% rename from src/res/drawable-hdpi/icon_app.png rename to MiNote/app/src/main/res/drawable-hdpi/icon_app.png diff --git a/src/res/drawable-hdpi/list_background.png b/MiNote/app/src/main/res/drawable-hdpi/list_background.png similarity index 100% rename from src/res/drawable-hdpi/list_background.png rename to MiNote/app/src/main/res/drawable-hdpi/list_background.png diff --git a/src/res/drawable-hdpi/list_blue_down.9.png b/MiNote/app/src/main/res/drawable-hdpi/list_blue_down.9.png similarity index 100% rename from src/res/drawable-hdpi/list_blue_down.9.png rename to MiNote/app/src/main/res/drawable-hdpi/list_blue_down.9.png diff --git a/src/res/drawable-hdpi/list_blue_middle.9.png b/MiNote/app/src/main/res/drawable-hdpi/list_blue_middle.9.png similarity index 100% rename from src/res/drawable-hdpi/list_blue_middle.9.png rename to MiNote/app/src/main/res/drawable-hdpi/list_blue_middle.9.png diff --git a/src/res/drawable-hdpi/list_blue_single.9.png b/MiNote/app/src/main/res/drawable-hdpi/list_blue_single.9.png similarity index 100% rename from src/res/drawable-hdpi/list_blue_single.9.png rename to MiNote/app/src/main/res/drawable-hdpi/list_blue_single.9.png diff --git a/src/res/drawable-hdpi/list_blue_up.9.png b/MiNote/app/src/main/res/drawable-hdpi/list_blue_up.9.png similarity index 100% rename from src/res/drawable-hdpi/list_blue_up.9.png rename to MiNote/app/src/main/res/drawable-hdpi/list_blue_up.9.png diff --git a/src/res/drawable-hdpi/list_folder.9.png b/MiNote/app/src/main/res/drawable-hdpi/list_folder.9.png similarity index 100% rename from src/res/drawable-hdpi/list_folder.9.png rename to MiNote/app/src/main/res/drawable-hdpi/list_folder.9.png diff --git a/src/res/drawable-hdpi/list_footer_bg.9.png b/MiNote/app/src/main/res/drawable-hdpi/list_footer_bg.9.png similarity index 100% rename from src/res/drawable-hdpi/list_footer_bg.9.png rename to MiNote/app/src/main/res/drawable-hdpi/list_footer_bg.9.png diff --git a/src/res/drawable-hdpi/list_green_down.9.png b/MiNote/app/src/main/res/drawable-hdpi/list_green_down.9.png similarity index 100% rename from src/res/drawable-hdpi/list_green_down.9.png rename to MiNote/app/src/main/res/drawable-hdpi/list_green_down.9.png diff --git a/src/res/drawable-hdpi/list_green_middle.9.png b/MiNote/app/src/main/res/drawable-hdpi/list_green_middle.9.png similarity index 100% rename from src/res/drawable-hdpi/list_green_middle.9.png rename to MiNote/app/src/main/res/drawable-hdpi/list_green_middle.9.png diff --git a/src/res/drawable-hdpi/list_green_single.9.png b/MiNote/app/src/main/res/drawable-hdpi/list_green_single.9.png similarity index 100% rename from src/res/drawable-hdpi/list_green_single.9.png rename to MiNote/app/src/main/res/drawable-hdpi/list_green_single.9.png diff --git a/src/res/drawable-hdpi/list_green_up.9.png b/MiNote/app/src/main/res/drawable-hdpi/list_green_up.9.png similarity index 100% rename from src/res/drawable-hdpi/list_green_up.9.png rename to MiNote/app/src/main/res/drawable-hdpi/list_green_up.9.png diff --git a/src/res/drawable-hdpi/list_red_down.9.png b/MiNote/app/src/main/res/drawable-hdpi/list_red_down.9.png similarity index 100% rename from src/res/drawable-hdpi/list_red_down.9.png rename to MiNote/app/src/main/res/drawable-hdpi/list_red_down.9.png diff --git a/src/res/drawable-hdpi/list_red_middle.9.png b/MiNote/app/src/main/res/drawable-hdpi/list_red_middle.9.png similarity index 100% rename from src/res/drawable-hdpi/list_red_middle.9.png rename to MiNote/app/src/main/res/drawable-hdpi/list_red_middle.9.png diff --git a/src/res/drawable-hdpi/list_red_single.9.png b/MiNote/app/src/main/res/drawable-hdpi/list_red_single.9.png similarity index 100% rename from src/res/drawable-hdpi/list_red_single.9.png rename to MiNote/app/src/main/res/drawable-hdpi/list_red_single.9.png diff --git a/src/res/drawable-hdpi/list_red_up.9.png b/MiNote/app/src/main/res/drawable-hdpi/list_red_up.9.png similarity index 100% rename from src/res/drawable-hdpi/list_red_up.9.png rename to MiNote/app/src/main/res/drawable-hdpi/list_red_up.9.png diff --git a/src/res/drawable-hdpi/list_white_down.9.png b/MiNote/app/src/main/res/drawable-hdpi/list_white_down.9.png similarity index 100% rename from src/res/drawable-hdpi/list_white_down.9.png rename to MiNote/app/src/main/res/drawable-hdpi/list_white_down.9.png diff --git a/src/res/drawable-hdpi/list_white_middle.9.png b/MiNote/app/src/main/res/drawable-hdpi/list_white_middle.9.png similarity index 100% rename from src/res/drawable-hdpi/list_white_middle.9.png rename to MiNote/app/src/main/res/drawable-hdpi/list_white_middle.9.png diff --git a/src/res/drawable-hdpi/list_white_single.9.png b/MiNote/app/src/main/res/drawable-hdpi/list_white_single.9.png similarity index 100% rename from src/res/drawable-hdpi/list_white_single.9.png rename to MiNote/app/src/main/res/drawable-hdpi/list_white_single.9.png diff --git a/src/res/drawable-hdpi/list_white_up.9.png b/MiNote/app/src/main/res/drawable-hdpi/list_white_up.9.png similarity index 100% rename from src/res/drawable-hdpi/list_white_up.9.png rename to MiNote/app/src/main/res/drawable-hdpi/list_white_up.9.png diff --git a/src/res/drawable-hdpi/list_yellow_down.9.png b/MiNote/app/src/main/res/drawable-hdpi/list_yellow_down.9.png similarity index 100% rename from src/res/drawable-hdpi/list_yellow_down.9.png rename to MiNote/app/src/main/res/drawable-hdpi/list_yellow_down.9.png diff --git a/src/res/drawable-hdpi/list_yellow_middle.9.png b/MiNote/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png similarity index 100% rename from src/res/drawable-hdpi/list_yellow_middle.9.png rename to MiNote/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png diff --git a/src/res/drawable-hdpi/list_yellow_single.9.png b/MiNote/app/src/main/res/drawable-hdpi/list_yellow_single.9.png similarity index 100% rename from src/res/drawable-hdpi/list_yellow_single.9.png rename to MiNote/app/src/main/res/drawable-hdpi/list_yellow_single.9.png diff --git a/src/res/drawable-hdpi/list_yellow_up.9.png b/MiNote/app/src/main/res/drawable-hdpi/list_yellow_up.9.png similarity index 100% rename from src/res/drawable-hdpi/list_yellow_up.9.png rename to MiNote/app/src/main/res/drawable-hdpi/list_yellow_up.9.png diff --git a/src/res/drawable-hdpi/menu_delete.png b/MiNote/app/src/main/res/drawable-hdpi/menu_delete.png similarity index 100% rename from src/res/drawable-hdpi/menu_delete.png rename to MiNote/app/src/main/res/drawable-hdpi/menu_delete.png diff --git a/src/res/drawable-hdpi/menu_move.png b/MiNote/app/src/main/res/drawable-hdpi/menu_move.png similarity index 100% rename from src/res/drawable-hdpi/menu_move.png rename to MiNote/app/src/main/res/drawable-hdpi/menu_move.png diff --git a/src/res/drawable-hdpi/new_note_normal.png b/MiNote/app/src/main/res/drawable-hdpi/new_note_normal.png similarity index 100% rename from src/res/drawable-hdpi/new_note_normal.png rename to MiNote/app/src/main/res/drawable-hdpi/new_note_normal.png diff --git a/src/res/drawable-hdpi/new_note_pressed.png b/MiNote/app/src/main/res/drawable-hdpi/new_note_pressed.png similarity index 100% rename from src/res/drawable-hdpi/new_note_pressed.png rename to MiNote/app/src/main/res/drawable-hdpi/new_note_pressed.png diff --git a/src/res/drawable-hdpi/note_edit_color_selector_panel.png b/MiNote/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png similarity index 100% rename from src/res/drawable-hdpi/note_edit_color_selector_panel.png rename to MiNote/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png diff --git a/src/res/drawable-hdpi/notification.png b/MiNote/app/src/main/res/drawable-hdpi/notification.png similarity index 100% rename from src/res/drawable-hdpi/notification.png rename to MiNote/app/src/main/res/drawable-hdpi/notification.png diff --git a/src/res/drawable-hdpi/search_result.png b/MiNote/app/src/main/res/drawable-hdpi/search_result.png similarity index 100% rename from src/res/drawable-hdpi/search_result.png rename to MiNote/app/src/main/res/drawable-hdpi/search_result.png diff --git a/src/res/drawable-hdpi/selected.png b/MiNote/app/src/main/res/drawable-hdpi/selected.png similarity index 100% rename from src/res/drawable-hdpi/selected.png rename to MiNote/app/src/main/res/drawable-hdpi/selected.png diff --git a/src/res/drawable-hdpi/title_alert.png b/MiNote/app/src/main/res/drawable-hdpi/title_alert.png similarity index 100% rename from src/res/drawable-hdpi/title_alert.png rename to MiNote/app/src/main/res/drawable-hdpi/title_alert.png diff --git a/src/res/drawable-hdpi/title_bar_bg.9.png b/MiNote/app/src/main/res/drawable-hdpi/title_bar_bg.9.png similarity index 100% rename from src/res/drawable-hdpi/title_bar_bg.9.png rename to MiNote/app/src/main/res/drawable-hdpi/title_bar_bg.9.png diff --git a/src/res/drawable-hdpi/widget_2x_blue.png b/MiNote/app/src/main/res/drawable-hdpi/widget_2x_blue.png similarity index 100% rename from src/res/drawable-hdpi/widget_2x_blue.png rename to MiNote/app/src/main/res/drawable-hdpi/widget_2x_blue.png diff --git a/src/res/drawable-hdpi/widget_2x_green.png b/MiNote/app/src/main/res/drawable-hdpi/widget_2x_green.png similarity index 100% rename from src/res/drawable-hdpi/widget_2x_green.png rename to MiNote/app/src/main/res/drawable-hdpi/widget_2x_green.png diff --git a/src/res/drawable-hdpi/widget_2x_red.png b/MiNote/app/src/main/res/drawable-hdpi/widget_2x_red.png similarity index 100% rename from src/res/drawable-hdpi/widget_2x_red.png rename to MiNote/app/src/main/res/drawable-hdpi/widget_2x_red.png diff --git a/src/res/drawable-hdpi/widget_2x_white.png b/MiNote/app/src/main/res/drawable-hdpi/widget_2x_white.png similarity index 100% rename from src/res/drawable-hdpi/widget_2x_white.png rename to MiNote/app/src/main/res/drawable-hdpi/widget_2x_white.png diff --git a/src/res/drawable-hdpi/widget_2x_yellow.png b/MiNote/app/src/main/res/drawable-hdpi/widget_2x_yellow.png similarity index 100% rename from src/res/drawable-hdpi/widget_2x_yellow.png rename to MiNote/app/src/main/res/drawable-hdpi/widget_2x_yellow.png diff --git a/src/res/drawable-hdpi/widget_4x_blue.png b/MiNote/app/src/main/res/drawable-hdpi/widget_4x_blue.png similarity index 100% rename from src/res/drawable-hdpi/widget_4x_blue.png rename to MiNote/app/src/main/res/drawable-hdpi/widget_4x_blue.png diff --git a/src/res/drawable-hdpi/widget_4x_green.png b/MiNote/app/src/main/res/drawable-hdpi/widget_4x_green.png similarity index 100% rename from src/res/drawable-hdpi/widget_4x_green.png rename to MiNote/app/src/main/res/drawable-hdpi/widget_4x_green.png diff --git a/src/res/drawable-hdpi/widget_4x_red.png b/MiNote/app/src/main/res/drawable-hdpi/widget_4x_red.png similarity index 100% rename from src/res/drawable-hdpi/widget_4x_red.png rename to MiNote/app/src/main/res/drawable-hdpi/widget_4x_red.png diff --git a/src/res/drawable-hdpi/widget_4x_white.png b/MiNote/app/src/main/res/drawable-hdpi/widget_4x_white.png similarity index 100% rename from src/res/drawable-hdpi/widget_4x_white.png rename to MiNote/app/src/main/res/drawable-hdpi/widget_4x_white.png diff --git a/src/res/drawable-hdpi/widget_4x_yellow.png b/MiNote/app/src/main/res/drawable-hdpi/widget_4x_yellow.png similarity index 100% rename from src/res/drawable-hdpi/widget_4x_yellow.png rename to MiNote/app/src/main/res/drawable-hdpi/widget_4x_yellow.png diff --git a/MiNote/app/src/main/res/drawable/ic_launcher_background.xml b/MiNote/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/MiNote/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MiNote/app/src/main/res/drawable/ic_launcher_foreground.xml b/MiNote/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/MiNote/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/res/drawable/new_note.xml b/MiNote/app/src/main/res/drawable/new_note.xml similarity index 91% rename from src/res/drawable/new_note.xml rename to MiNote/app/src/main/res/drawable/new_note.xml index f4105ed..2154ebc 100644 --- a/src/res/drawable/new_note.xml +++ b/MiNote/app/src/main/res/drawable/new_note.xml @@ -18,3 +18,6 @@ + + diff --git a/src/res/layout/account_dialog_title.xml b/MiNote/app/src/main/res/layout/account_dialog_title.xml similarity index 100% rename from src/res/layout/account_dialog_title.xml rename to MiNote/app/src/main/res/layout/account_dialog_title.xml diff --git a/MiNote/app/src/main/res/layout/activity_main.xml b/MiNote/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..86a5d97 --- /dev/null +++ b/MiNote/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/src/res/layout/add_account_text.xml b/MiNote/app/src/main/res/layout/add_account_text.xml similarity index 100% rename from src/res/layout/add_account_text.xml rename to MiNote/app/src/main/res/layout/add_account_text.xml diff --git a/src/res/layout/datetime_picker.xml b/MiNote/app/src/main/res/layout/datetime_picker.xml similarity index 100% rename from src/res/layout/datetime_picker.xml rename to MiNote/app/src/main/res/layout/datetime_picker.xml diff --git a/src/res/layout/dialog_edit_text.xml b/MiNote/app/src/main/res/layout/dialog_edit_text.xml similarity index 100% rename from src/res/layout/dialog_edit_text.xml rename to MiNote/app/src/main/res/layout/dialog_edit_text.xml diff --git a/src/res/layout/folder_list_item.xml b/MiNote/app/src/main/res/layout/folder_list_item.xml similarity index 100% rename from src/res/layout/folder_list_item.xml rename to MiNote/app/src/main/res/layout/folder_list_item.xml diff --git a/src/res/layout/note_edit.xml b/MiNote/app/src/main/res/layout/note_edit.xml similarity index 100% rename from src/res/layout/note_edit.xml rename to MiNote/app/src/main/res/layout/note_edit.xml diff --git a/src/res/layout/note_edit_list_item.xml b/MiNote/app/src/main/res/layout/note_edit_list_item.xml similarity index 100% rename from src/res/layout/note_edit_list_item.xml rename to MiNote/app/src/main/res/layout/note_edit_list_item.xml diff --git a/src/res/layout/note_item.xml b/MiNote/app/src/main/res/layout/note_item.xml similarity index 100% rename from src/res/layout/note_item.xml rename to MiNote/app/src/main/res/layout/note_item.xml diff --git a/src/res/layout/note_list.xml b/MiNote/app/src/main/res/layout/note_list.xml similarity index 100% rename from src/res/layout/note_list.xml rename to MiNote/app/src/main/res/layout/note_list.xml diff --git a/src/res/layout/note_list_dropdown_menu.xml b/MiNote/app/src/main/res/layout/note_list_dropdown_menu.xml similarity index 100% rename from src/res/layout/note_list_dropdown_menu.xml rename to MiNote/app/src/main/res/layout/note_list_dropdown_menu.xml diff --git a/src/res/layout/note_list_footer.xml b/MiNote/app/src/main/res/layout/note_list_footer.xml similarity index 100% rename from src/res/layout/note_list_footer.xml rename to MiNote/app/src/main/res/layout/note_list_footer.xml diff --git a/src/res/layout/settings_header.xml b/MiNote/app/src/main/res/layout/settings_header.xml similarity index 100% rename from src/res/layout/settings_header.xml rename to MiNote/app/src/main/res/layout/settings_header.xml diff --git a/src/res/layout/widget_2x.xml b/MiNote/app/src/main/res/layout/widget_2x.xml similarity index 100% rename from src/res/layout/widget_2x.xml rename to MiNote/app/src/main/res/layout/widget_2x.xml diff --git a/src/res/layout/widget_4x.xml b/MiNote/app/src/main/res/layout/widget_4x.xml similarity index 100% rename from src/res/layout/widget_4x.xml rename to MiNote/app/src/main/res/layout/widget_4x.xml diff --git a/src/res/menu/call_note_edit.xml b/MiNote/app/src/main/res/menu/call_note_edit.xml similarity index 100% rename from src/res/menu/call_note_edit.xml rename to MiNote/app/src/main/res/menu/call_note_edit.xml diff --git a/src/res/menu/call_record_folder.xml b/MiNote/app/src/main/res/menu/call_record_folder.xml similarity index 100% rename from src/res/menu/call_record_folder.xml rename to MiNote/app/src/main/res/menu/call_record_folder.xml diff --git a/src/res/menu/note_edit.xml b/MiNote/app/src/main/res/menu/note_edit.xml similarity index 100% rename from src/res/menu/note_edit.xml rename to MiNote/app/src/main/res/menu/note_edit.xml diff --git a/src/res/menu/note_list.xml b/MiNote/app/src/main/res/menu/note_list.xml similarity index 100% rename from src/res/menu/note_list.xml rename to MiNote/app/src/main/res/menu/note_list.xml diff --git a/src/res/menu/note_list_dropdown.xml b/MiNote/app/src/main/res/menu/note_list_dropdown.xml similarity index 100% rename from src/res/menu/note_list_dropdown.xml rename to MiNote/app/src/main/res/menu/note_list_dropdown.xml diff --git a/src/res/menu/note_list_options.xml b/MiNote/app/src/main/res/menu/note_list_options.xml similarity index 100% rename from src/res/menu/note_list_options.xml rename to MiNote/app/src/main/res/menu/note_list_options.xml diff --git a/src/res/menu/sub_folder.xml b/MiNote/app/src/main/res/menu/sub_folder.xml similarity index 100% rename from src/res/menu/sub_folder.xml rename to MiNote/app/src/main/res/menu/sub_folder.xml diff --git a/MiNote/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/MiNote/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/MiNote/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/MiNote/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/MiNote/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/MiNote/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/MiNote/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/MiNote/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 Binary files /dev/null and b/MiNote/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/MiNote/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/MiNote/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d Binary files /dev/null and b/MiNote/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/MiNote/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/MiNote/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 Binary files /dev/null and b/MiNote/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/MiNote/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/MiNote/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/MiNote/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/MiNote/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/MiNote/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 Binary files /dev/null and b/MiNote/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/MiNote/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/MiNote/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 Binary files /dev/null and b/MiNote/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/MiNote/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/MiNote/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/MiNote/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/MiNote/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/MiNote/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/MiNote/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/MiNote/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/MiNote/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/MiNote/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/MiNote/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/MiNote/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/MiNote/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/src/res/raw-zh-rCN/introduction b/MiNote/app/src/main/res/raw-zh-rCN/introduction similarity index 100% rename from src/res/raw-zh-rCN/introduction rename to MiNote/app/src/main/res/raw-zh-rCN/introduction diff --git a/src/res/raw/introduction b/MiNote/app/src/main/res/raw/introduction similarity index 100% rename from src/res/raw/introduction rename to MiNote/app/src/main/res/raw/introduction diff --git a/MiNote/app/src/main/res/values-night/themes.xml b/MiNote/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..1b59d6e --- /dev/null +++ b/MiNote/app/src/main/res/values-night/themes.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/src/res/values-zh-rCN/arrays.xml b/MiNote/app/src/main/res/values-zh-rCN/arrays.xml similarity index 100% rename from src/res/values-zh-rCN/arrays.xml rename to MiNote/app/src/main/res/values-zh-rCN/arrays.xml diff --git a/src/res/values-zh-rCN/strings.xml b/MiNote/app/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from src/res/values-zh-rCN/strings.xml rename to MiNote/app/src/main/res/values-zh-rCN/strings.xml diff --git a/src/res/values-zh-rTW/arrays.xml b/MiNote/app/src/main/res/values-zh-rTW/arrays.xml similarity index 100% rename from src/res/values-zh-rTW/arrays.xml rename to MiNote/app/src/main/res/values-zh-rTW/arrays.xml diff --git a/src/res/values-zh-rTW/strings.xml b/MiNote/app/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from src/res/values-zh-rTW/strings.xml rename to MiNote/app/src/main/res/values-zh-rTW/strings.xml diff --git a/src/res/values/arrays.xml b/MiNote/app/src/main/res/values/arrays.xml similarity index 100% rename from src/res/values/arrays.xml rename to MiNote/app/src/main/res/values/arrays.xml diff --git a/src/res/values/colors.xml b/MiNote/app/src/main/res/values/colors.xml similarity index 100% rename from src/res/values/colors.xml rename to MiNote/app/src/main/res/values/colors.xml diff --git a/src/res/values/dimens.xml b/MiNote/app/src/main/res/values/dimens.xml similarity index 100% rename from src/res/values/dimens.xml rename to MiNote/app/src/main/res/values/dimens.xml diff --git a/src/res/values/strings.xml b/MiNote/app/src/main/res/values/strings.xml similarity index 100% rename from src/res/values/strings.xml rename to MiNote/app/src/main/res/values/strings.xml diff --git a/src/res/values/styles.xml b/MiNote/app/src/main/res/values/styles.xml similarity index 100% rename from src/res/values/styles.xml rename to MiNote/app/src/main/res/values/styles.xml diff --git a/MiNote/app/src/main/res/values/themes.xml b/MiNote/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..ad12c4f --- /dev/null +++ b/MiNote/app/src/main/res/values/themes.xml @@ -0,0 +1,9 @@ + + + + +