diff --git a/Notes-master/Notes-master/.gitignore b/Notes-master/Notes-master/.gitignore deleted file mode 100644 index 7df8dff..0000000 --- a/Notes-master/Notes-master/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -# generated files -bin/ -gen/ - -# Local configuration file (sdk path, etc) -project.properties -.settings/ -.classpath -.project diff --git a/Notes-master/Notes-master/NOTICE b/Notes-master/Notes-master/NOTICE deleted file mode 100644 index 9a54521..0000000 --- a/Notes-master/Notes-master/NOTICE +++ /dev/null @@ -1,190 +0,0 @@ - - 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/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - diff --git a/Notes-master/Notes-master/README b/Notes-master/Notes-master/README deleted file mode 100644 index fc0d824..0000000 --- a/Notes-master/Notes-master/README +++ /dev/null @@ -1,23 +0,0 @@ -[中文] - -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 diff --git a/doc/模型模板-软件设计模型.vsdx b/doc/模型模板-软件设计模型.vsdx new file mode 100644 index 0000000..c93266f Binary files /dev/null and b/doc/模型模板-软件设计模型.vsdx differ diff --git a/doc/模型模板-软件需求模型.vsdx b/doc/模型模板-软件需求模型.vsdx new file mode 100644 index 0000000..c5acba6 Binary files /dev/null and b/doc/模型模板-软件需求模型.vsdx differ diff --git a/doc/选c的都对-封面.docx b/doc/选c的都对-封面.docx new file mode 100644 index 0000000..c55f43e Binary files /dev/null and b/doc/选c的都对-封面.docx differ diff --git a/doc/选c的都对-开源代码质量分析报告.docx b/doc/选c的都对-开源代码质量分析报告.docx new file mode 100644 index 0000000..866c8d0 Binary files /dev/null and b/doc/选c的都对-开源代码质量分析报告.docx differ diff --git a/doc/选c的都对-开源软件维护方案及成果.docx b/doc/选c的都对-开源软件维护方案及成果.docx new file mode 100644 index 0000000..9695f36 Binary files /dev/null and b/doc/选c的都对-开源软件维护方案及成果.docx differ diff --git a/doc/选c的都对-软件设计规格说明书.doc b/doc/选c的都对-软件设计规格说明书.doc new file mode 100644 index 0000000..5e3ec36 Binary files /dev/null and b/doc/选c的都对-软件设计规格说明书.doc differ diff --git a/doc/选c的都对-软件需求构思及描述.docx b/doc/选c的都对-软件需求构思及描述.docx new file mode 100644 index 0000000..aaa2812 Binary files /dev/null and b/doc/选c的都对-软件需求构思及描述.docx differ diff --git a/doc/选c的都对-软件需求规格说明书.docx b/doc/选c的都对-软件需求规格说明书.docx new file mode 100644 index 0000000..aa78d5e Binary files /dev/null and b/doc/选c的都对-软件需求规格说明书.docx differ diff --git a/rec/.gitignore b/rec/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/rec/.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/rec/.idea/.gitignore b/rec/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/rec/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/rec/.idea/.name b/rec/.idea/.name new file mode 100644 index 0000000..7efc0ae --- /dev/null +++ b/rec/.idea/.name @@ -0,0 +1 @@ +Notes-master \ No newline at end of file diff --git a/rec/.idea/AndroidProjectSystem.xml b/rec/.idea/AndroidProjectSystem.xml new file mode 100644 index 0000000..4a53bee --- /dev/null +++ b/rec/.idea/AndroidProjectSystem.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/rec/.idea/compiler.xml b/rec/.idea/compiler.xml new file mode 100644 index 0000000..b86273d --- /dev/null +++ b/rec/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/rec/.idea/deploymentTargetSelector.xml b/rec/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..3c52fbc --- /dev/null +++ b/rec/.idea/deploymentTargetSelector.xml @@ -0,0 +1,18 @@ + + + + + + + + + \ No newline at end of file diff --git a/rec/.idea/gradle.xml b/rec/.idea/gradle.xml new file mode 100644 index 0000000..639c779 --- /dev/null +++ b/rec/.idea/gradle.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/rec/.idea/migrations.xml b/rec/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/rec/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/rec/.idea/misc.xml b/rec/.idea/misc.xml new file mode 100644 index 0000000..b2c751a --- /dev/null +++ b/rec/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/rec/.idea/runConfigurations.xml b/rec/.idea/runConfigurations.xml new file mode 100644 index 0000000..16660f1 --- /dev/null +++ b/rec/.idea/runConfigurations.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/rec/app/.gitignore b/rec/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/rec/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/rec/app/build.gradle.kts b/rec/app/build.gradle.kts new file mode 100644 index 0000000..f73ffc0 --- /dev/null +++ b/rec/app/build.gradle.kts @@ -0,0 +1,58 @@ +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) +// implementation(fileTree(mapOf( +// "dir" to "D:\\project\\android\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib", +// "include" to listOf("*.aar", "*.jar"), +// "exclude" to listOf("") +// ))) + implementation(files("D:\\project\\android\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-osgi-4.5.14.jar")) +// implementation(files("D:\\project\\android\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\nt-win-4.5.14.jar")) + implementation(files("D:\\project\\android\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpcore-4.4.16.jar")) + testImplementation(libs.junit) + androidTestImplementation(libs.ext.junit) + androidTestImplementation(libs.espresso.core) +} \ No newline at end of file diff --git a/rec/app/proguard-rules.pro b/rec/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/rec/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/rec/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java b/rec/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java new file mode 100644 index 0000000..a889a75 --- /dev/null +++ b/rec/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/Notes-master/Notes-master/AndroidManifest.xml b/rec/app/src/main/AndroidManifest.xml similarity index 68% rename from Notes-master/Notes-master/AndroidManifest.xml rename to rec/app/src/main/AndroidManifest.xml index e5c7d47..5ece804 100644 --- a/Notes-master/Notes-master/AndroidManifest.xml +++ b/rec/app/src/main/AndroidManifest.xml @@ -1,40 +1,17 @@ - - - - - - - - - - - - - - - + xmlns:tools="http://schemas.android.com/tools"> + 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.Notesmaster" + tools:targetApi="31"> + android:windowSoftInputMode="adjustPan" + android:exported="true"> @@ -54,16 +32,17 @@ 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 +59,7 @@ android:resource="@xml/searchable" /> + + android:label="@string/app_widget2x2" + android:exported="true"> @@ -100,7 +81,8 @@ + android:label="@string/app_widget4x4" + android:exported="true"> @@ -113,7 +95,8 @@ android:resource="@xml/widget_4x_info" /> - + @@ -146,5 +129,16 @@ + + + + + + + + + + - + + \ No newline at end of file diff --git a/rec/app/src/main/java/net/micode/notes/MainActivity.java b/rec/app/src/main/java/net/micode/notes/MainActivity.java new file mode 100644 index 0000000..8091753 --- /dev/null +++ b/rec/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/Notes-master/Notes-master/src/net/micode/notes/data/Contact.java b/rec/app/src/main/java/net/micode/notes/data/Contact.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/data/Contact.java rename to rec/app/src/main/java/net/micode/notes/data/Contact.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/data/Notes.java b/rec/app/src/main/java/net/micode/notes/data/Notes.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/data/Notes.java rename to rec/app/src/main/java/net/micode/notes/data/Notes.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java b/rec/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java rename to rec/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/data/NotesProvider.java b/rec/app/src/main/java/net/micode/notes/data/NotesProvider.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/data/NotesProvider.java rename to rec/app/src/main/java/net/micode/notes/data/NotesProvider.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/gtask/data/MetaData.java b/rec/app/src/main/java/net/micode/notes/gtask/data/MetaData.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/gtask/data/MetaData.java rename to rec/app/src/main/java/net/micode/notes/gtask/data/MetaData.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/gtask/data/Node.java b/rec/app/src/main/java/net/micode/notes/gtask/data/Node.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/gtask/data/Node.java rename to rec/app/src/main/java/net/micode/notes/gtask/data/Node.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/gtask/data/SqlData.java b/rec/app/src/main/java/net/micode/notes/gtask/data/SqlData.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/gtask/data/SqlData.java rename to rec/app/src/main/java/net/micode/notes/gtask/data/SqlData.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/gtask/data/SqlNote.java b/rec/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/gtask/data/SqlNote.java rename to rec/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/gtask/data/Task.java b/rec/app/src/main/java/net/micode/notes/gtask/data/Task.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/gtask/data/Task.java rename to rec/app/src/main/java/net/micode/notes/gtask/data/Task.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/gtask/data/TaskList.java b/rec/app/src/main/java/net/micode/notes/gtask/data/TaskList.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/gtask/data/TaskList.java rename to rec/app/src/main/java/net/micode/notes/gtask/data/TaskList.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/gtask/exception/ActionFailureException.java b/rec/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/gtask/exception/ActionFailureException.java rename to rec/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/gtask/exception/NetworkFailureException.java b/rec/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/gtask/exception/NetworkFailureException.java rename to rec/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java b/rec/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java similarity index 64% rename from Notes-master/Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java rename to rec/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java index b3b61e7..defab8f 100644 --- a/Notes-master/Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java +++ b/rec/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java @@ -17,6 +17,7 @@ package net.micode.notes.gtask.remote; +import android.annotation.SuppressLint; import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; @@ -63,24 +64,44 @@ 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); - - } else { - pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, - NotesListActivity.class), 0); - } - notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content, - pendingIntent); - mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification); +// 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); +// +// } else { +// pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, +// NotesListActivity.class), 0); +// } +// notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content, +// pendingIntent); +// mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification); +// } +@SuppressLint("NotificationPermission") +private void showNotification(int tickerId, String content) { + PendingIntent pendingIntent; + if (tickerId != R.string.ticker_success) { + pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, + NotesPreferenceActivity.class), PendingIntent.FLAG_IMMUTABLE); + } else { + pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, + NotesListActivity.class), PendingIntent.FLAG_IMMUTABLE); } + 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); +} @Override protected Integer doInBackground(Void... unused) { diff --git a/Notes-master/Notes-master/src/net/micode/notes/gtask/remote/GTaskClient.java b/rec/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/gtask/remote/GTaskClient.java rename to rec/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/gtask/remote/GTaskManager.java b/rec/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/gtask/remote/GTaskManager.java rename to rec/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/gtask/remote/GTaskSyncService.java b/rec/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/gtask/remote/GTaskSyncService.java rename to rec/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/model/Note.java b/rec/app/src/main/java/net/micode/notes/model/Note.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/model/Note.java rename to rec/app/src/main/java/net/micode/notes/model/Note.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/model/WorkingNote.java b/rec/app/src/main/java/net/micode/notes/model/WorkingNote.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/model/WorkingNote.java rename to rec/app/src/main/java/net/micode/notes/model/WorkingNote.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/tool/BackupUtils.java b/rec/app/src/main/java/net/micode/notes/tool/BackupUtils.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/tool/BackupUtils.java rename to rec/app/src/main/java/net/micode/notes/tool/BackupUtils.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/tool/DataUtils.java b/rec/app/src/main/java/net/micode/notes/tool/DataUtils.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/tool/DataUtils.java rename to rec/app/src/main/java/net/micode/notes/tool/DataUtils.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/tool/GTaskStringUtils.java b/rec/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/tool/GTaskStringUtils.java rename to rec/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/tool/ResourceParser.java b/rec/app/src/main/java/net/micode/notes/tool/ResourceParser.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/tool/ResourceParser.java rename to rec/app/src/main/java/net/micode/notes/tool/ResourceParser.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java b/rec/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java rename to rec/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java b/rec/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java rename to rec/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/ui/AlarmReceiver.java b/rec/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/ui/AlarmReceiver.java rename to rec/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/ui/DateTimePicker.java b/rec/app/src/main/java/net/micode/notes/ui/DateTimePicker.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/ui/DateTimePicker.java rename to rec/app/src/main/java/net/micode/notes/ui/DateTimePicker.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/ui/DateTimePickerDialog.java b/rec/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/ui/DateTimePickerDialog.java rename to rec/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/ui/DropdownMenu.java b/rec/app/src/main/java/net/micode/notes/ui/DropdownMenu.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/ui/DropdownMenu.java rename to rec/app/src/main/java/net/micode/notes/ui/DropdownMenu.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/ui/FoldersListAdapter.java b/rec/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/ui/FoldersListAdapter.java rename to rec/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java b/rec/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java rename to rec/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/ui/NoteEditText.java b/rec/app/src/main/java/net/micode/notes/ui/NoteEditText.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/ui/NoteEditText.java rename to rec/app/src/main/java/net/micode/notes/ui/NoteEditText.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/ui/NoteItemData.java b/rec/app/src/main/java/net/micode/notes/ui/NoteItemData.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/ui/NoteItemData.java rename to rec/app/src/main/java/net/micode/notes/ui/NoteItemData.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/ui/NotesListActivity.java b/rec/app/src/main/java/net/micode/notes/ui/NotesListActivity.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/ui/NotesListActivity.java rename to rec/app/src/main/java/net/micode/notes/ui/NotesListActivity.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/ui/NotesListAdapter.java b/rec/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/ui/NotesListAdapter.java rename to rec/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/ui/NotesListItem.java b/rec/app/src/main/java/net/micode/notes/ui/NotesListItem.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/ui/NotesListItem.java rename to rec/app/src/main/java/net/micode/notes/ui/NotesListItem.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java b/rec/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java rename to rec/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider.java b/rec/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider.java rename to rec/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_2x.java b/rec/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_2x.java rename to rec/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java diff --git a/Notes-master/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_4x.java b/rec/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java similarity index 100% rename from Notes-master/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_4x.java rename to rec/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java diff --git a/Notes-master/Notes-master/res/color/primary_text_dark.xml b/rec/app/src/main/res/color/primary_text_dark.xml similarity index 100% rename from Notes-master/Notes-master/res/color/primary_text_dark.xml rename to rec/app/src/main/res/color/primary_text_dark.xml diff --git a/Notes-master/Notes-master/res/color/secondary_text_dark.xml b/rec/app/src/main/res/color/secondary_text_dark.xml similarity index 100% rename from Notes-master/Notes-master/res/color/secondary_text_dark.xml rename to rec/app/src/main/res/color/secondary_text_dark.xml diff --git a/Notes-master/Notes-master/res/drawable-hdpi/bg_btn_set_color.png b/rec/app/src/main/res/drawable-hdpi/bg_btn_set_color.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/bg_btn_set_color.png rename to rec/app/src/main/res/drawable-hdpi/bg_btn_set_color.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/bg_color_btn_mask.png b/rec/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/bg_color_btn_mask.png rename to rec/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/call_record.png b/rec/app/src/main/res/drawable-hdpi/call_record.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/call_record.png rename to rec/app/src/main/res/drawable-hdpi/call_record.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/clock.png b/rec/app/src/main/res/drawable-hdpi/clock.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/clock.png rename to rec/app/src/main/res/drawable-hdpi/clock.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/delete.png b/rec/app/src/main/res/drawable-hdpi/delete.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/delete.png rename to rec/app/src/main/res/drawable-hdpi/delete.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/dropdown_icon.9.png b/rec/app/src/main/res/drawable-hdpi/dropdown_icon.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/dropdown_icon.9.png rename to rec/app/src/main/res/drawable-hdpi/dropdown_icon.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/edit_blue.9.png b/rec/app/src/main/res/drawable-hdpi/edit_blue.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/edit_blue.9.png rename to rec/app/src/main/res/drawable-hdpi/edit_blue.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/edit_green.9.png b/rec/app/src/main/res/drawable-hdpi/edit_green.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/edit_green.9.png rename to rec/app/src/main/res/drawable-hdpi/edit_green.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/edit_red.9.png b/rec/app/src/main/res/drawable-hdpi/edit_red.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/edit_red.9.png rename to rec/app/src/main/res/drawable-hdpi/edit_red.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/edit_title_blue.9.png b/rec/app/src/main/res/drawable-hdpi/edit_title_blue.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/edit_title_blue.9.png rename to rec/app/src/main/res/drawable-hdpi/edit_title_blue.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/edit_title_green.9.png b/rec/app/src/main/res/drawable-hdpi/edit_title_green.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/edit_title_green.9.png rename to rec/app/src/main/res/drawable-hdpi/edit_title_green.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/edit_title_red.9.png b/rec/app/src/main/res/drawable-hdpi/edit_title_red.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/edit_title_red.9.png rename to rec/app/src/main/res/drawable-hdpi/edit_title_red.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/edit_title_white.9.png b/rec/app/src/main/res/drawable-hdpi/edit_title_white.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/edit_title_white.9.png rename to rec/app/src/main/res/drawable-hdpi/edit_title_white.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/edit_title_yellow.9.png b/rec/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/edit_title_yellow.9.png rename to rec/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/edit_white.9.png b/rec/app/src/main/res/drawable-hdpi/edit_white.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/edit_white.9.png rename to rec/app/src/main/res/drawable-hdpi/edit_white.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/edit_yellow.9.png b/rec/app/src/main/res/drawable-hdpi/edit_yellow.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/edit_yellow.9.png rename to rec/app/src/main/res/drawable-hdpi/edit_yellow.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/font_large.png b/rec/app/src/main/res/drawable-hdpi/font_large.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/font_large.png rename to rec/app/src/main/res/drawable-hdpi/font_large.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/font_normal.png b/rec/app/src/main/res/drawable-hdpi/font_normal.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/font_normal.png rename to rec/app/src/main/res/drawable-hdpi/font_normal.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/font_size_selector_bg.9.png b/rec/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/font_size_selector_bg.9.png rename to rec/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/font_small.png b/rec/app/src/main/res/drawable-hdpi/font_small.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/font_small.png rename to rec/app/src/main/res/drawable-hdpi/font_small.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/font_super.png b/rec/app/src/main/res/drawable-hdpi/font_super.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/font_super.png rename to rec/app/src/main/res/drawable-hdpi/font_super.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/icon_app.png b/rec/app/src/main/res/drawable-hdpi/icon_app.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/icon_app.png rename to rec/app/src/main/res/drawable-hdpi/icon_app.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/list_background.png b/rec/app/src/main/res/drawable-hdpi/list_background.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/list_background.png rename to rec/app/src/main/res/drawable-hdpi/list_background.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/list_blue_down.9.png b/rec/app/src/main/res/drawable-hdpi/list_blue_down.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/list_blue_down.9.png rename to rec/app/src/main/res/drawable-hdpi/list_blue_down.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/list_blue_middle.9.png b/rec/app/src/main/res/drawable-hdpi/list_blue_middle.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/list_blue_middle.9.png rename to rec/app/src/main/res/drawable-hdpi/list_blue_middle.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/list_blue_single.9.png b/rec/app/src/main/res/drawable-hdpi/list_blue_single.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/list_blue_single.9.png rename to rec/app/src/main/res/drawable-hdpi/list_blue_single.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/list_blue_up.9.png b/rec/app/src/main/res/drawable-hdpi/list_blue_up.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/list_blue_up.9.png rename to rec/app/src/main/res/drawable-hdpi/list_blue_up.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/list_folder.9.png b/rec/app/src/main/res/drawable-hdpi/list_folder.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/list_folder.9.png rename to rec/app/src/main/res/drawable-hdpi/list_folder.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/list_footer_bg.9.png b/rec/app/src/main/res/drawable-hdpi/list_footer_bg.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/list_footer_bg.9.png rename to rec/app/src/main/res/drawable-hdpi/list_footer_bg.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/list_green_down.9.png b/rec/app/src/main/res/drawable-hdpi/list_green_down.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/list_green_down.9.png rename to rec/app/src/main/res/drawable-hdpi/list_green_down.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/list_green_middle.9.png b/rec/app/src/main/res/drawable-hdpi/list_green_middle.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/list_green_middle.9.png rename to rec/app/src/main/res/drawable-hdpi/list_green_middle.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/list_green_single.9.png b/rec/app/src/main/res/drawable-hdpi/list_green_single.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/list_green_single.9.png rename to rec/app/src/main/res/drawable-hdpi/list_green_single.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/list_green_up.9.png b/rec/app/src/main/res/drawable-hdpi/list_green_up.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/list_green_up.9.png rename to rec/app/src/main/res/drawable-hdpi/list_green_up.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/list_red_down.9.png b/rec/app/src/main/res/drawable-hdpi/list_red_down.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/list_red_down.9.png rename to rec/app/src/main/res/drawable-hdpi/list_red_down.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/list_red_middle.9.png b/rec/app/src/main/res/drawable-hdpi/list_red_middle.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/list_red_middle.9.png rename to rec/app/src/main/res/drawable-hdpi/list_red_middle.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/list_red_single.9.png b/rec/app/src/main/res/drawable-hdpi/list_red_single.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/list_red_single.9.png rename to rec/app/src/main/res/drawable-hdpi/list_red_single.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/list_red_up.9.png b/rec/app/src/main/res/drawable-hdpi/list_red_up.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/list_red_up.9.png rename to rec/app/src/main/res/drawable-hdpi/list_red_up.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/list_white_down.9.png b/rec/app/src/main/res/drawable-hdpi/list_white_down.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/list_white_down.9.png rename to rec/app/src/main/res/drawable-hdpi/list_white_down.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/list_white_middle.9.png b/rec/app/src/main/res/drawable-hdpi/list_white_middle.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/list_white_middle.9.png rename to rec/app/src/main/res/drawable-hdpi/list_white_middle.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/list_white_single.9.png b/rec/app/src/main/res/drawable-hdpi/list_white_single.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/list_white_single.9.png rename to rec/app/src/main/res/drawable-hdpi/list_white_single.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/list_white_up.9.png b/rec/app/src/main/res/drawable-hdpi/list_white_up.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/list_white_up.9.png rename to rec/app/src/main/res/drawable-hdpi/list_white_up.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/list_yellow_down.9.png b/rec/app/src/main/res/drawable-hdpi/list_yellow_down.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/list_yellow_down.9.png rename to rec/app/src/main/res/drawable-hdpi/list_yellow_down.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/list_yellow_middle.9.png b/rec/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/list_yellow_middle.9.png rename to rec/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/list_yellow_single.9.png b/rec/app/src/main/res/drawable-hdpi/list_yellow_single.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/list_yellow_single.9.png rename to rec/app/src/main/res/drawable-hdpi/list_yellow_single.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/list_yellow_up.9.png b/rec/app/src/main/res/drawable-hdpi/list_yellow_up.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/list_yellow_up.9.png rename to rec/app/src/main/res/drawable-hdpi/list_yellow_up.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/menu_delete.png b/rec/app/src/main/res/drawable-hdpi/menu_delete.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/menu_delete.png rename to rec/app/src/main/res/drawable-hdpi/menu_delete.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/menu_move.png b/rec/app/src/main/res/drawable-hdpi/menu_move.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/menu_move.png rename to rec/app/src/main/res/drawable-hdpi/menu_move.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/new_note_normal.png b/rec/app/src/main/res/drawable-hdpi/new_note_normal.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/new_note_normal.png rename to rec/app/src/main/res/drawable-hdpi/new_note_normal.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/new_note_pressed.png b/rec/app/src/main/res/drawable-hdpi/new_note_pressed.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/new_note_pressed.png rename to rec/app/src/main/res/drawable-hdpi/new_note_pressed.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/note_edit_color_selector_panel.png b/rec/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/note_edit_color_selector_panel.png rename to rec/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/notification.png b/rec/app/src/main/res/drawable-hdpi/notification.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/notification.png rename to rec/app/src/main/res/drawable-hdpi/notification.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/search_result.png b/rec/app/src/main/res/drawable-hdpi/search_result.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/search_result.png rename to rec/app/src/main/res/drawable-hdpi/search_result.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/selected.png b/rec/app/src/main/res/drawable-hdpi/selected.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/selected.png rename to rec/app/src/main/res/drawable-hdpi/selected.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/title_alert.png b/rec/app/src/main/res/drawable-hdpi/title_alert.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/title_alert.png rename to rec/app/src/main/res/drawable-hdpi/title_alert.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/title_bar_bg.9.png b/rec/app/src/main/res/drawable-hdpi/title_bar_bg.9.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/title_bar_bg.9.png rename to rec/app/src/main/res/drawable-hdpi/title_bar_bg.9.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/widget_2x_blue.png b/rec/app/src/main/res/drawable-hdpi/widget_2x_blue.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/widget_2x_blue.png rename to rec/app/src/main/res/drawable-hdpi/widget_2x_blue.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/widget_2x_green.png b/rec/app/src/main/res/drawable-hdpi/widget_2x_green.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/widget_2x_green.png rename to rec/app/src/main/res/drawable-hdpi/widget_2x_green.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/widget_2x_red.png b/rec/app/src/main/res/drawable-hdpi/widget_2x_red.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/widget_2x_red.png rename to rec/app/src/main/res/drawable-hdpi/widget_2x_red.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/widget_2x_white.png b/rec/app/src/main/res/drawable-hdpi/widget_2x_white.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/widget_2x_white.png rename to rec/app/src/main/res/drawable-hdpi/widget_2x_white.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/widget_2x_yellow.png b/rec/app/src/main/res/drawable-hdpi/widget_2x_yellow.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/widget_2x_yellow.png rename to rec/app/src/main/res/drawable-hdpi/widget_2x_yellow.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/widget_4x_blue.png b/rec/app/src/main/res/drawable-hdpi/widget_4x_blue.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/widget_4x_blue.png rename to rec/app/src/main/res/drawable-hdpi/widget_4x_blue.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/widget_4x_green.png b/rec/app/src/main/res/drawable-hdpi/widget_4x_green.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/widget_4x_green.png rename to rec/app/src/main/res/drawable-hdpi/widget_4x_green.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/widget_4x_red.png b/rec/app/src/main/res/drawable-hdpi/widget_4x_red.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/widget_4x_red.png rename to rec/app/src/main/res/drawable-hdpi/widget_4x_red.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/widget_4x_white.png b/rec/app/src/main/res/drawable-hdpi/widget_4x_white.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/widget_4x_white.png rename to rec/app/src/main/res/drawable-hdpi/widget_4x_white.png diff --git a/Notes-master/Notes-master/res/drawable-hdpi/widget_4x_yellow.png b/rec/app/src/main/res/drawable-hdpi/widget_4x_yellow.png similarity index 100% rename from Notes-master/Notes-master/res/drawable-hdpi/widget_4x_yellow.png rename to rec/app/src/main/res/drawable-hdpi/widget_4x_yellow.png diff --git a/rec/app/src/main/res/drawable/ic_launcher_background.xml b/rec/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/rec/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rec/app/src/main/res/drawable/ic_launcher_foreground.xml b/rec/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/rec/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Notes-master/Notes-master/res/drawable/new_note.xml b/rec/app/src/main/res/drawable/new_note.xml similarity index 100% rename from Notes-master/Notes-master/res/drawable/new_note.xml rename to rec/app/src/main/res/drawable/new_note.xml diff --git a/Notes-master/Notes-master/res/layout/account_dialog_title.xml b/rec/app/src/main/res/layout/account_dialog_title.xml similarity index 100% rename from Notes-master/Notes-master/res/layout/account_dialog_title.xml rename to rec/app/src/main/res/layout/account_dialog_title.xml diff --git a/rec/app/src/main/res/layout/activity_main.xml b/rec/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..86a5d97 --- /dev/null +++ b/rec/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/Notes-master/Notes-master/res/layout/add_account_text.xml b/rec/app/src/main/res/layout/add_account_text.xml similarity index 100% rename from Notes-master/Notes-master/res/layout/add_account_text.xml rename to rec/app/src/main/res/layout/add_account_text.xml diff --git a/Notes-master/Notes-master/res/layout/datetime_picker.xml b/rec/app/src/main/res/layout/datetime_picker.xml similarity index 100% rename from Notes-master/Notes-master/res/layout/datetime_picker.xml rename to rec/app/src/main/res/layout/datetime_picker.xml diff --git a/Notes-master/Notes-master/res/layout/dialog_edit_text.xml b/rec/app/src/main/res/layout/dialog_edit_text.xml similarity index 100% rename from Notes-master/Notes-master/res/layout/dialog_edit_text.xml rename to rec/app/src/main/res/layout/dialog_edit_text.xml diff --git a/Notes-master/Notes-master/res/layout/folder_list_item.xml b/rec/app/src/main/res/layout/folder_list_item.xml similarity index 100% rename from Notes-master/Notes-master/res/layout/folder_list_item.xml rename to rec/app/src/main/res/layout/folder_list_item.xml diff --git a/Notes-master/Notes-master/res/layout/note_edit.xml b/rec/app/src/main/res/layout/note_edit.xml similarity index 100% rename from Notes-master/Notes-master/res/layout/note_edit.xml rename to rec/app/src/main/res/layout/note_edit.xml diff --git a/Notes-master/Notes-master/res/layout/note_edit_list_item.xml b/rec/app/src/main/res/layout/note_edit_list_item.xml similarity index 100% rename from Notes-master/Notes-master/res/layout/note_edit_list_item.xml rename to rec/app/src/main/res/layout/note_edit_list_item.xml diff --git a/Notes-master/Notes-master/res/layout/note_item.xml b/rec/app/src/main/res/layout/note_item.xml similarity index 100% rename from Notes-master/Notes-master/res/layout/note_item.xml rename to rec/app/src/main/res/layout/note_item.xml diff --git a/Notes-master/Notes-master/res/layout/note_list.xml b/rec/app/src/main/res/layout/note_list.xml similarity index 100% rename from Notes-master/Notes-master/res/layout/note_list.xml rename to rec/app/src/main/res/layout/note_list.xml diff --git a/Notes-master/Notes-master/res/layout/note_list_dropdown_menu.xml b/rec/app/src/main/res/layout/note_list_dropdown_menu.xml similarity index 100% rename from Notes-master/Notes-master/res/layout/note_list_dropdown_menu.xml rename to rec/app/src/main/res/layout/note_list_dropdown_menu.xml diff --git a/Notes-master/Notes-master/res/layout/note_list_footer.xml b/rec/app/src/main/res/layout/note_list_footer.xml similarity index 100% rename from Notes-master/Notes-master/res/layout/note_list_footer.xml rename to rec/app/src/main/res/layout/note_list_footer.xml diff --git a/Notes-master/Notes-master/res/layout/settings_header.xml b/rec/app/src/main/res/layout/settings_header.xml similarity index 100% rename from Notes-master/Notes-master/res/layout/settings_header.xml rename to rec/app/src/main/res/layout/settings_header.xml diff --git a/Notes-master/Notes-master/res/layout/widget_2x.xml b/rec/app/src/main/res/layout/widget_2x.xml similarity index 100% rename from Notes-master/Notes-master/res/layout/widget_2x.xml rename to rec/app/src/main/res/layout/widget_2x.xml diff --git a/Notes-master/Notes-master/res/layout/widget_4x.xml b/rec/app/src/main/res/layout/widget_4x.xml similarity index 100% rename from Notes-master/Notes-master/res/layout/widget_4x.xml rename to rec/app/src/main/res/layout/widget_4x.xml diff --git a/Notes-master/Notes-master/res/menu/call_note_edit.xml b/rec/app/src/main/res/menu/call_note_edit.xml similarity index 100% rename from Notes-master/Notes-master/res/menu/call_note_edit.xml rename to rec/app/src/main/res/menu/call_note_edit.xml diff --git a/Notes-master/Notes-master/res/menu/call_record_folder.xml b/rec/app/src/main/res/menu/call_record_folder.xml similarity index 100% rename from Notes-master/Notes-master/res/menu/call_record_folder.xml rename to rec/app/src/main/res/menu/call_record_folder.xml diff --git a/Notes-master/Notes-master/res/menu/note_edit.xml b/rec/app/src/main/res/menu/note_edit.xml similarity index 100% rename from Notes-master/Notes-master/res/menu/note_edit.xml rename to rec/app/src/main/res/menu/note_edit.xml diff --git a/Notes-master/Notes-master/res/menu/note_list.xml b/rec/app/src/main/res/menu/note_list.xml similarity index 100% rename from Notes-master/Notes-master/res/menu/note_list.xml rename to rec/app/src/main/res/menu/note_list.xml diff --git a/Notes-master/Notes-master/res/menu/note_list_dropdown.xml b/rec/app/src/main/res/menu/note_list_dropdown.xml similarity index 100% rename from Notes-master/Notes-master/res/menu/note_list_dropdown.xml rename to rec/app/src/main/res/menu/note_list_dropdown.xml diff --git a/Notes-master/Notes-master/res/menu/note_list_options.xml b/rec/app/src/main/res/menu/note_list_options.xml similarity index 100% rename from Notes-master/Notes-master/res/menu/note_list_options.xml rename to rec/app/src/main/res/menu/note_list_options.xml diff --git a/Notes-master/Notes-master/res/menu/sub_folder.xml b/rec/app/src/main/res/menu/sub_folder.xml similarity index 100% rename from Notes-master/Notes-master/res/menu/sub_folder.xml rename to rec/app/src/main/res/menu/sub_folder.xml diff --git a/rec/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/rec/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/rec/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/rec/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/rec/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/rec/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/rec/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/rec/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 Binary files /dev/null and b/rec/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/rec/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/rec/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d Binary files /dev/null and b/rec/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/rec/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/rec/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 Binary files /dev/null and b/rec/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/rec/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/rec/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/rec/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/rec/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/rec/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 Binary files /dev/null and b/rec/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/rec/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/rec/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 Binary files /dev/null and b/rec/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/rec/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/rec/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/rec/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/rec/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/rec/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/rec/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/rec/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/rec/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/rec/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/rec/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/rec/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/rec/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/Notes-master/Notes-master/res/raw-zh-rCN/introduction b/rec/app/src/main/res/raw-zh-rCN/introduction similarity index 100% rename from Notes-master/Notes-master/res/raw-zh-rCN/introduction rename to rec/app/src/main/res/raw-zh-rCN/introduction diff --git a/Notes-master/Notes-master/res/raw/introduction b/rec/app/src/main/res/raw/introduction similarity index 100% rename from Notes-master/Notes-master/res/raw/introduction rename to rec/app/src/main/res/raw/introduction diff --git a/rec/app/src/main/res/values-night/themes.xml b/rec/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..d2c68d1 --- /dev/null +++ b/rec/app/src/main/res/values-night/themes.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/Notes-master/Notes-master/res/values-zh-rCN/arrays.xml b/rec/app/src/main/res/values-zh-rCN/arrays.xml similarity index 100% rename from Notes-master/Notes-master/res/values-zh-rCN/arrays.xml rename to rec/app/src/main/res/values-zh-rCN/arrays.xml diff --git a/Notes-master/Notes-master/res/values-zh-rCN/strings.xml b/rec/app/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from Notes-master/Notes-master/res/values-zh-rCN/strings.xml rename to rec/app/src/main/res/values-zh-rCN/strings.xml diff --git a/Notes-master/Notes-master/res/values-zh-rTW/arrays.xml b/rec/app/src/main/res/values-zh-rTW/arrays.xml similarity index 100% rename from Notes-master/Notes-master/res/values-zh-rTW/arrays.xml rename to rec/app/src/main/res/values-zh-rTW/arrays.xml diff --git a/Notes-master/Notes-master/res/values-zh-rTW/strings.xml b/rec/app/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from Notes-master/Notes-master/res/values-zh-rTW/strings.xml rename to rec/app/src/main/res/values-zh-rTW/strings.xml diff --git a/Notes-master/Notes-master/res/values/arrays.xml b/rec/app/src/main/res/values/arrays.xml similarity index 100% rename from Notes-master/Notes-master/res/values/arrays.xml rename to rec/app/src/main/res/values/arrays.xml diff --git a/Notes-master/Notes-master/res/values/colors.xml b/rec/app/src/main/res/values/colors.xml similarity index 100% rename from Notes-master/Notes-master/res/values/colors.xml rename to rec/app/src/main/res/values/colors.xml diff --git a/Notes-master/Notes-master/res/values/dimens.xml b/rec/app/src/main/res/values/dimens.xml similarity index 100% rename from Notes-master/Notes-master/res/values/dimens.xml rename to rec/app/src/main/res/values/dimens.xml diff --git a/Notes-master/Notes-master/res/values/strings.xml b/rec/app/src/main/res/values/strings.xml similarity index 100% rename from Notes-master/Notes-master/res/values/strings.xml rename to rec/app/src/main/res/values/strings.xml diff --git a/Notes-master/Notes-master/res/values/styles.xml b/rec/app/src/main/res/values/styles.xml similarity index 90% rename from Notes-master/Notes-master/res/values/styles.xml rename to rec/app/src/main/res/values/styles.xml index d750e65..ccda5ee 100644 --- a/Notes-master/Notes-master/res/values/styles.xml +++ b/rec/app/src/main/res/values/styles.xml @@ -43,6 +43,8 @@ @color/secondary_text_dark + + - + + + + \ No newline at end of file diff --git a/rec/app/src/main/res/values/themes.xml b/rec/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..7c616ff --- /dev/null +++ b/rec/app/src/main/res/values/themes.xml @@ -0,0 +1,9 @@ + + + + +