diff --git a/src/Notes/.gitignore b/Notemaster/.gitignore similarity index 100% rename from src/Notes/.gitignore rename to Notemaster/.gitignore diff --git a/Notemaster/.idea/.gitignore b/Notemaster/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/Notemaster/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/Notemaster/.idea/.name b/Notemaster/.idea/.name new file mode 100644 index 0000000..7efc0ae --- /dev/null +++ b/Notemaster/.idea/.name @@ -0,0 +1 @@ +Notes-master \ No newline at end of file diff --git a/src/Notes/.idea/compiler.xml b/Notemaster/.idea/compiler.xml similarity index 70% rename from src/Notes/.idea/compiler.xml rename to Notemaster/.idea/compiler.xml index b86273d..b589d56 100644 --- a/src/Notes/.idea/compiler.xml +++ b/Notemaster/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/src/Notes/.idea/deploymentTargetSelector.xml b/Notemaster/.idea/deploymentTargetSelector.xml similarity index 100% rename from src/Notes/.idea/deploymentTargetSelector.xml rename to Notemaster/.idea/deploymentTargetSelector.xml diff --git a/src/Notes/.idea/gradle.xml b/Notemaster/.idea/gradle.xml similarity index 79% rename from src/Notes/.idea/gradle.xml rename to Notemaster/.idea/gradle.xml index 97f0a8e..0897082 100644 --- a/src/Notes/.idea/gradle.xml +++ b/Notemaster/.idea/gradle.xml @@ -1,9 +1,9 @@ + diff --git a/src/Notes/.idea/migrations.xml b/Notemaster/.idea/migrations.xml similarity index 100% rename from src/Notes/.idea/migrations.xml rename to Notemaster/.idea/migrations.xml diff --git a/src/Notes/.idea/misc.xml b/Notemaster/.idea/misc.xml similarity index 60% rename from src/Notes/.idea/misc.xml rename to Notemaster/.idea/misc.xml index f988785..d7916a5 100644 --- a/src/Notes/.idea/misc.xml +++ b/Notemaster/.idea/misc.xml @@ -1,6 +1,6 @@ - - + + diff --git a/src/Notes/app/.gitignore b/Notemaster/app/.gitignore similarity index 100% rename from src/Notes/app/.gitignore rename to Notemaster/app/.gitignore diff --git a/Notemaster/app/build.gradle.kts b/Notemaster/app/build.gradle.kts new file mode 100644 index 0000000..ee0322b --- /dev/null +++ b/Notemaster/app/build.gradle.kts @@ -0,0 +1,59 @@ +plugins { + alias(libs.plugins.android.application) +} + +android { + namespace = "net.micode.notes" + compileSdk = 34 + + defaultConfig { + applicationId = "net.micode.notes" + minSdk = 30 + targetSdk = 34 + 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_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + 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:\\Code\\AndroidCode\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib", +// "include" to listOf("*.aar", "*.jar"), +// "exclude" to listOf("") +// ))) + //修改为如下代码： + implementation(files("D:\\code\\android\\Notemaster\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-osgi-4.5.14.jar")) + implementation(files("D:\\code\\android\\Notemaster\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-win-4.5.14.jar")) + implementation(files("D:\\code\\android\\Notemaster\\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/src/Notes/app/proguard-rules.pro b/Notemaster/app/proguard-rules.pro similarity index 100% rename from src/Notes/app/proguard-rules.pro rename to Notemaster/app/proguard-rules.pro diff --git a/src/Notes/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java b/Notemaster/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java similarity index 100% rename from src/Notes/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java rename to Notemaster/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java diff --git a/src/Notes/app/src/main/AndroidManifest.xml b/Notemaster/app/src/main/AndroidManifest.xml similarity index 91% rename from src/Notes/app/src/main/AndroidManifest.xml rename to Notemaster/app/src/main/AndroidManifest.xml index f6258f8..6c7a375 100644 --- a/src/Notes/app/src/main/AndroidManifest.xml +++ b/Notemaster/app/src/main/AndroidManifest.xml @@ -2,7 +2,6 @@ - @@ -12,6 +11,8 @@ + + - + - - + > - + - @@ -109,8 +109,7 @@ android:resource="@xml/widget_4x_info" /> - @@ -119,23 +118,27 @@ + android:process=":remote" > + + android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > + + android:theme="@android:style/Theme.Holo.Light" > + + android:exported="false" > + { - + private static int GTASK_SYNC_NOTIFICATION_ID = 5234235; - + public interface OnCompleteListener { void onComplete(); } - + private Context mContext; - + private NotificationManager mNotifiManager; - + private GTaskManager mTaskManager; - + private OnCompleteListener mOnCompleteListener; - + public GTaskASyncTask(Context context, OnCompleteListener listener) { mContext = context; mOnCompleteListener = listener; @@ -52,17 +52,36 @@ public class GTaskASyncTask extends AsyncTask { .getSystemService(Context.NOTIFICATION_SERVICE); mTaskManager = GTaskManager.getInstance(); } - + public void cancelSync() { mTaskManager.cancelSync(); } - + public void publishProgess(String message) { - publishProgress(new String[]{ - message + publishProgress(new String[] { + message }); } - + +// 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) { PendingIntent pendingIntent; if (tickerId != R.string.ticker_success) { @@ -79,17 +98,16 @@ public class GTaskASyncTask extends AsyncTask { .setContentIntent(pendingIntent) .setWhen(System.currentTimeMillis()) .setOngoing(true); - Notification notification = builder.getNotification(); + Notification notification=builder.getNotification(); mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification); } - @Override protected Integer doInBackground(Void... unused) { publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity .getSyncAccountName(mContext))); return mTaskManager.sync(mContext, this); } - + @Override protected void onProgressUpdate(String... progress) { showNotification(R.string.ticker_syncing, progress[0]); @@ -97,7 +115,7 @@ public class GTaskASyncTask extends AsyncTask { ((GTaskSyncService) mContext).sendBroadcast(progress[0]); } } - + @Override protected void onPostExecute(Integer result) { if (result == GTaskManager.STATE_SUCCESS) { @@ -114,7 +132,7 @@ public class GTaskASyncTask extends AsyncTask { } if (mOnCompleteListener != null) { new Thread(new Runnable() { - + public void run() { mOnCompleteListener.onComplete(); } diff --git a/src/Notes/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/Notemaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java similarity index 100% rename from src/Notes/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java rename to Notemaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java diff --git a/src/Notes/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/Notemaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java similarity index 100% rename from src/Notes/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java rename to Notemaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java diff --git a/src/Notes/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/Notemaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java similarity index 100% rename from src/Notes/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java rename to Notemaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java diff --git a/src/Notes/app/src/main/java/net/micode/notes/model/Note.java b/Notemaster/app/src/main/java/net/micode/notes/model/Note.java similarity index 100% rename from src/Notes/app/src/main/java/net/micode/notes/model/Note.java rename to Notemaster/app/src/main/java/net/micode/notes/model/Note.java diff --git a/src/Notes/app/src/main/java/net/micode/notes/model/WorkingNote.java b/Notemaster/app/src/main/java/net/micode/notes/model/WorkingNote.java similarity index 100% rename from src/Notes/app/src/main/java/net/micode/notes/model/WorkingNote.java rename to Notemaster/app/src/main/java/net/micode/notes/model/WorkingNote.java diff --git a/src/Notes/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/Notemaster/app/src/main/java/net/micode/notes/tool/BackupUtils.java similarity index 100% rename from src/Notes/app/src/main/java/net/micode/notes/tool/BackupUtils.java rename to Notemaster/app/src/main/java/net/micode/notes/tool/BackupUtils.java diff --git a/src/Notes/app/src/main/java/net/micode/notes/tool/DataUtils.java b/Notemaster/app/src/main/java/net/micode/notes/tool/DataUtils.java similarity index 100% rename from src/Notes/app/src/main/java/net/micode/notes/tool/DataUtils.java rename to Notemaster/app/src/main/java/net/micode/notes/tool/DataUtils.java diff --git a/src/Notes/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java b/Notemaster/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java similarity index 100% rename from src/Notes/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java rename to Notemaster/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java diff --git a/src/Notes/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/Notemaster/app/src/main/java/net/micode/notes/tool/ResourceParser.java similarity index 100% rename from src/Notes/app/src/main/java/net/micode/notes/tool/ResourceParser.java rename to Notemaster/app/src/main/java/net/micode/notes/tool/ResourceParser.java diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/Notemaster/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java similarity index 100% rename from src/Notes/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java rename to Notemaster/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/Notemaster/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java similarity index 84% rename from src/Notes/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java rename to Notemaster/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java index f221202..ab9851f 100644 --- a/src/Notes/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java +++ b/Notemaster/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java @@ -53,10 +53,14 @@ public class AlarmInitReceiver extends BroadcastReceiver { long alertDate = c.getLong(COLUMN_ALERTED_DATE); Intent sender = new Intent(context, AlarmReceiver.class); sender.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, c.getLong(COLUMN_ID))); - PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, sender, 0); + PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, sender, PendingIntent.FLAG_IMMUTABLE); AlarmManager alermManager = (AlarmManager) context .getSystemService(Context.ALARM_SERVICE); - alermManager.set(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent); + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) { + alermManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent); + } else { + alermManager.set(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent); + } } while (c.moveToNext()); } c.close(); diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/Notemaster/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java similarity index 100% rename from src/Notes/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java rename to Notemaster/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/Notemaster/app/src/main/java/net/micode/notes/ui/DateTimePicker.java similarity index 100% rename from src/Notes/app/src/main/java/net/micode/notes/ui/DateTimePicker.java rename to Notemaster/app/src/main/java/net/micode/notes/ui/DateTimePicker.java diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/Notemaster/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java similarity index 100% rename from src/Notes/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java rename to Notemaster/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/Notemaster/app/src/main/java/net/micode/notes/ui/DropdownMenu.java similarity index 100% rename from src/Notes/app/src/main/java/net/micode/notes/ui/DropdownMenu.java rename to Notemaster/app/src/main/java/net/micode/notes/ui/DropdownMenu.java diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/Notemaster/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java similarity index 100% rename from src/Notes/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java rename to Notemaster/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/Notemaster/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java similarity index 97% rename from src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java rename to Notemaster/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index 96a9ff8..bf1521c 100644 --- a/src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/Notemaster/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -159,6 +159,14 @@ public class NoteEditActivity extends Activity implements OnClickListener, return; } initResources(); + + // 检查并请求闹钟和通知权限 + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) { + requestPermissions(new String[]{android.Manifest.permission.POST_NOTIFICATIONS}, 1); + } + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) { + requestPermissions(new String[]{android.Manifest.permission.SCHEDULE_EXACT_ALARM}, 2); + } } /** @@ -623,13 +631,17 @@ public class NoteEditActivity extends Activity implements OnClickListener, if (mWorkingNote.getNoteId() > 0) { Intent intent = new Intent(this, AlarmReceiver.class); intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mWorkingNote.getNoteId())); - PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0); + PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, PendingIntent.FLAG_IMMUTABLE); AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE)); showAlertHeader(); if(!set) { alarmManager.cancel(pendingIntent); } else { - alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent); + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) { + alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, date, pendingIntent); + } else { + alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent); + } } } else { /** diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/Notemaster/app/src/main/java/net/micode/notes/ui/NoteEditText.java similarity index 100% rename from src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditText.java rename to Notemaster/app/src/main/java/net/micode/notes/ui/NoteEditText.java diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/Notemaster/app/src/main/java/net/micode/notes/ui/NoteItemData.java similarity index 100% rename from src/Notes/app/src/main/java/net/micode/notes/ui/NoteItemData.java rename to Notemaster/app/src/main/java/net/micode/notes/ui/NoteItemData.java diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/Notemaster/app/src/main/java/net/micode/notes/ui/NotesListActivity.java similarity index 100% rename from src/Notes/app/src/main/java/net/micode/notes/ui/NotesListActivity.java rename to Notemaster/app/src/main/java/net/micode/notes/ui/NotesListActivity.java diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/Notemaster/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java similarity index 100% rename from src/Notes/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java rename to Notemaster/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/Notemaster/app/src/main/java/net/micode/notes/ui/NotesListItem.java similarity index 100% rename from src/Notes/app/src/main/java/net/micode/notes/ui/NotesListItem.java rename to Notemaster/app/src/main/java/net/micode/notes/ui/NotesListItem.java diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/Notemaster/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java similarity index 100% rename from src/Notes/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java rename to Notemaster/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java diff --git a/src/Notes/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/Notemaster/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java similarity index 100% rename from src/Notes/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java rename to Notemaster/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java diff --git a/src/Notes/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java b/Notemaster/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java similarity index 100% rename from src/Notes/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java rename to Notemaster/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java diff --git a/src/Notes/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java b/Notemaster/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java similarity index 100% rename from src/Notes/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java rename to Notemaster/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java diff --git a/src/Notes/app/src/main/res/color/primary_text_dark.xml b/Notemaster/app/src/main/res/color/primary_text_dark.xml similarity index 100% rename from src/Notes/app/src/main/res/color/primary_text_dark.xml rename to Notemaster/app/src/main/res/color/primary_text_dark.xml diff --git a/src/Notes/app/src/main/res/color/secondary_text_dark.xml b/Notemaster/app/src/main/res/color/secondary_text_dark.xml similarity index 100% rename from src/Notes/app/src/main/res/color/secondary_text_dark.xml rename to Notemaster/app/src/main/res/color/secondary_text_dark.xml diff --git a/src/Notes/app/src/main/res/drawable-hdpi/bg_btn_set_color.png b/Notemaster/app/src/main/res/drawable-hdpi/bg_btn_set_color.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/bg_btn_set_color.png rename to Notemaster/app/src/main/res/drawable-hdpi/bg_btn_set_color.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png b/Notemaster/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png rename to Notemaster/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/call_record.png b/Notemaster/app/src/main/res/drawable-hdpi/call_record.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/call_record.png rename to Notemaster/app/src/main/res/drawable-hdpi/call_record.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/clock.png b/Notemaster/app/src/main/res/drawable-hdpi/clock.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/clock.png rename to Notemaster/app/src/main/res/drawable-hdpi/clock.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/delete.png b/Notemaster/app/src/main/res/drawable-hdpi/delete.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/delete.png rename to Notemaster/app/src/main/res/drawable-hdpi/delete.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/dropdown_icon.9.png b/Notemaster/app/src/main/res/drawable-hdpi/dropdown_icon.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/dropdown_icon.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/dropdown_icon.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/edit_blue.9.png b/Notemaster/app/src/main/res/drawable-hdpi/edit_blue.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/edit_blue.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/edit_blue.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/edit_green.9.png b/Notemaster/app/src/main/res/drawable-hdpi/edit_green.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/edit_green.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/edit_green.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/edit_red.9.png b/Notemaster/app/src/main/res/drawable-hdpi/edit_red.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/edit_red.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/edit_red.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/edit_title_blue.9.png b/Notemaster/app/src/main/res/drawable-hdpi/edit_title_blue.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/edit_title_blue.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/edit_title_blue.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/edit_title_green.9.png b/Notemaster/app/src/main/res/drawable-hdpi/edit_title_green.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/edit_title_green.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/edit_title_green.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/edit_title_red.9.png b/Notemaster/app/src/main/res/drawable-hdpi/edit_title_red.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/edit_title_red.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/edit_title_red.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/edit_title_white.9.png b/Notemaster/app/src/main/res/drawable-hdpi/edit_title_white.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/edit_title_white.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/edit_title_white.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png b/Notemaster/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/edit_white.9.png b/Notemaster/app/src/main/res/drawable-hdpi/edit_white.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/edit_white.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/edit_white.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/edit_yellow.9.png b/Notemaster/app/src/main/res/drawable-hdpi/edit_yellow.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/edit_yellow.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/edit_yellow.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/font_large.png b/Notemaster/app/src/main/res/drawable-hdpi/font_large.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/font_large.png rename to Notemaster/app/src/main/res/drawable-hdpi/font_large.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/font_normal.png b/Notemaster/app/src/main/res/drawable-hdpi/font_normal.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/font_normal.png rename to Notemaster/app/src/main/res/drawable-hdpi/font_normal.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png b/Notemaster/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/font_small.png b/Notemaster/app/src/main/res/drawable-hdpi/font_small.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/font_small.png rename to Notemaster/app/src/main/res/drawable-hdpi/font_small.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/font_super.png b/Notemaster/app/src/main/res/drawable-hdpi/font_super.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/font_super.png rename to Notemaster/app/src/main/res/drawable-hdpi/font_super.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/icon_app.png b/Notemaster/app/src/main/res/drawable-hdpi/icon_app.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/icon_app.png rename to Notemaster/app/src/main/res/drawable-hdpi/icon_app.png diff --git a/Notemaster/app/src/main/res/drawable-hdpi/list_background.png b/Notemaster/app/src/main/res/drawable-hdpi/list_background.png new file mode 100644 index 0000000..aee5751 Binary files /dev/null and b/Notemaster/app/src/main/res/drawable-hdpi/list_background.png differ diff --git a/src/Notes/app/src/main/res/drawable-hdpi/list_blue_down.9.png b/Notemaster/app/src/main/res/drawable-hdpi/list_blue_down.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/list_blue_down.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/list_blue_down.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/list_blue_middle.9.png b/Notemaster/app/src/main/res/drawable-hdpi/list_blue_middle.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/list_blue_middle.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/list_blue_middle.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/list_blue_single.9.png b/Notemaster/app/src/main/res/drawable-hdpi/list_blue_single.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/list_blue_single.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/list_blue_single.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/list_blue_up.9.png b/Notemaster/app/src/main/res/drawable-hdpi/list_blue_up.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/list_blue_up.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/list_blue_up.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/list_folder.9.png b/Notemaster/app/src/main/res/drawable-hdpi/list_folder.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/list_folder.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/list_folder.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/list_footer_bg.9.png b/Notemaster/app/src/main/res/drawable-hdpi/list_footer_bg.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/list_footer_bg.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/list_footer_bg.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/list_green_down.9.png b/Notemaster/app/src/main/res/drawable-hdpi/list_green_down.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/list_green_down.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/list_green_down.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/list_green_middle.9.png b/Notemaster/app/src/main/res/drawable-hdpi/list_green_middle.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/list_green_middle.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/list_green_middle.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/list_green_single.9.png b/Notemaster/app/src/main/res/drawable-hdpi/list_green_single.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/list_green_single.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/list_green_single.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/list_green_up.9.png b/Notemaster/app/src/main/res/drawable-hdpi/list_green_up.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/list_green_up.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/list_green_up.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/list_red_down.9.png b/Notemaster/app/src/main/res/drawable-hdpi/list_red_down.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/list_red_down.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/list_red_down.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/list_red_middle.9.png b/Notemaster/app/src/main/res/drawable-hdpi/list_red_middle.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/list_red_middle.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/list_red_middle.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/list_red_single.9.png b/Notemaster/app/src/main/res/drawable-hdpi/list_red_single.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/list_red_single.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/list_red_single.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/list_red_up.9.png b/Notemaster/app/src/main/res/drawable-hdpi/list_red_up.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/list_red_up.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/list_red_up.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/list_white_down.9.png b/Notemaster/app/src/main/res/drawable-hdpi/list_white_down.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/list_white_down.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/list_white_down.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/list_white_middle.9.png b/Notemaster/app/src/main/res/drawable-hdpi/list_white_middle.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/list_white_middle.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/list_white_middle.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/list_white_single.9.png b/Notemaster/app/src/main/res/drawable-hdpi/list_white_single.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/list_white_single.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/list_white_single.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/list_white_up.9.png b/Notemaster/app/src/main/res/drawable-hdpi/list_white_up.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/list_white_up.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/list_white_up.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/list_yellow_down.9.png b/Notemaster/app/src/main/res/drawable-hdpi/list_yellow_down.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/list_yellow_down.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/list_yellow_down.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png b/Notemaster/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/list_yellow_single.9.png b/Notemaster/app/src/main/res/drawable-hdpi/list_yellow_single.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/list_yellow_single.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/list_yellow_single.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/list_yellow_up.9.png b/Notemaster/app/src/main/res/drawable-hdpi/list_yellow_up.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/list_yellow_up.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/list_yellow_up.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/menu_delete.png b/Notemaster/app/src/main/res/drawable-hdpi/menu_delete.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/menu_delete.png rename to Notemaster/app/src/main/res/drawable-hdpi/menu_delete.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/menu_move.png b/Notemaster/app/src/main/res/drawable-hdpi/menu_move.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/menu_move.png rename to Notemaster/app/src/main/res/drawable-hdpi/menu_move.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/new_note_normal.png b/Notemaster/app/src/main/res/drawable-hdpi/new_note_normal.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/new_note_normal.png rename to Notemaster/app/src/main/res/drawable-hdpi/new_note_normal.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/new_note_pressed.png b/Notemaster/app/src/main/res/drawable-hdpi/new_note_pressed.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/new_note_pressed.png rename to Notemaster/app/src/main/res/drawable-hdpi/new_note_pressed.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png b/Notemaster/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png rename to Notemaster/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/notification.png b/Notemaster/app/src/main/res/drawable-hdpi/notification.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/notification.png rename to Notemaster/app/src/main/res/drawable-hdpi/notification.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/search_result.png b/Notemaster/app/src/main/res/drawable-hdpi/search_result.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/search_result.png rename to Notemaster/app/src/main/res/drawable-hdpi/search_result.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/selected.png b/Notemaster/app/src/main/res/drawable-hdpi/selected.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/selected.png rename to Notemaster/app/src/main/res/drawable-hdpi/selected.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/title_alert.png b/Notemaster/app/src/main/res/drawable-hdpi/title_alert.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/title_alert.png rename to Notemaster/app/src/main/res/drawable-hdpi/title_alert.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/title_bar_bg.9.png b/Notemaster/app/src/main/res/drawable-hdpi/title_bar_bg.9.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/title_bar_bg.9.png rename to Notemaster/app/src/main/res/drawable-hdpi/title_bar_bg.9.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/widget_2x_blue.png b/Notemaster/app/src/main/res/drawable-hdpi/widget_2x_blue.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/widget_2x_blue.png rename to Notemaster/app/src/main/res/drawable-hdpi/widget_2x_blue.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/widget_2x_green.png b/Notemaster/app/src/main/res/drawable-hdpi/widget_2x_green.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/widget_2x_green.png rename to Notemaster/app/src/main/res/drawable-hdpi/widget_2x_green.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/widget_2x_red.png b/Notemaster/app/src/main/res/drawable-hdpi/widget_2x_red.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/widget_2x_red.png rename to Notemaster/app/src/main/res/drawable-hdpi/widget_2x_red.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/widget_2x_white.png b/Notemaster/app/src/main/res/drawable-hdpi/widget_2x_white.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/widget_2x_white.png rename to Notemaster/app/src/main/res/drawable-hdpi/widget_2x_white.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/widget_2x_yellow.png b/Notemaster/app/src/main/res/drawable-hdpi/widget_2x_yellow.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/widget_2x_yellow.png rename to Notemaster/app/src/main/res/drawable-hdpi/widget_2x_yellow.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/widget_4x_blue.png b/Notemaster/app/src/main/res/drawable-hdpi/widget_4x_blue.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/widget_4x_blue.png rename to Notemaster/app/src/main/res/drawable-hdpi/widget_4x_blue.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/widget_4x_green.png b/Notemaster/app/src/main/res/drawable-hdpi/widget_4x_green.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/widget_4x_green.png rename to Notemaster/app/src/main/res/drawable-hdpi/widget_4x_green.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/widget_4x_red.png b/Notemaster/app/src/main/res/drawable-hdpi/widget_4x_red.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/widget_4x_red.png rename to Notemaster/app/src/main/res/drawable-hdpi/widget_4x_red.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/widget_4x_white.png b/Notemaster/app/src/main/res/drawable-hdpi/widget_4x_white.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/widget_4x_white.png rename to Notemaster/app/src/main/res/drawable-hdpi/widget_4x_white.png diff --git a/src/Notes/app/src/main/res/drawable-hdpi/widget_4x_yellow.png b/Notemaster/app/src/main/res/drawable-hdpi/widget_4x_yellow.png similarity index 100% rename from src/Notes/app/src/main/res/drawable-hdpi/widget_4x_yellow.png rename to Notemaster/app/src/main/res/drawable-hdpi/widget_4x_yellow.png diff --git a/src/Notes/app/src/main/res/drawable/ic_launcher_background.xml b/Notemaster/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from src/Notes/app/src/main/res/drawable/ic_launcher_background.xml rename to Notemaster/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/src/Notes/app/src/main/res/drawable/ic_launcher_foreground.xml b/Notemaster/app/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from src/Notes/app/src/main/res/drawable/ic_launcher_foreground.xml rename to Notemaster/app/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/src/Notes/app/src/main/res/drawable/new_note.xml b/Notemaster/app/src/main/res/drawable/new_note.xml similarity index 100% rename from src/Notes/app/src/main/res/drawable/new_note.xml rename to Notemaster/app/src/main/res/drawable/new_note.xml diff --git a/src/Notes/app/src/main/res/layout/account_dialog_title.xml b/Notemaster/app/src/main/res/layout/account_dialog_title.xml similarity index 100% rename from src/Notes/app/src/main/res/layout/account_dialog_title.xml rename to Notemaster/app/src/main/res/layout/account_dialog_title.xml diff --git a/src/Notes/app/src/main/res/layout/activity_main.xml b/Notemaster/app/src/main/res/layout/activity_main.xml similarity index 100% rename from src/Notes/app/src/main/res/layout/activity_main.xml rename to Notemaster/app/src/main/res/layout/activity_main.xml diff --git a/src/Notes/app/src/main/res/layout/add_account_text.xml b/Notemaster/app/src/main/res/layout/add_account_text.xml similarity index 100% rename from src/Notes/app/src/main/res/layout/add_account_text.xml rename to Notemaster/app/src/main/res/layout/add_account_text.xml diff --git a/src/Notes/app/src/main/res/layout/datetime_picker.xml b/Notemaster/app/src/main/res/layout/datetime_picker.xml similarity index 100% rename from src/Notes/app/src/main/res/layout/datetime_picker.xml rename to Notemaster/app/src/main/res/layout/datetime_picker.xml diff --git a/src/Notes/app/src/main/res/layout/dialog_edit_text.xml b/Notemaster/app/src/main/res/layout/dialog_edit_text.xml similarity index 100% rename from src/Notes/app/src/main/res/layout/dialog_edit_text.xml rename to Notemaster/app/src/main/res/layout/dialog_edit_text.xml diff --git a/src/Notes/app/src/main/res/layout/folder_list_item.xml b/Notemaster/app/src/main/res/layout/folder_list_item.xml similarity index 100% rename from src/Notes/app/src/main/res/layout/folder_list_item.xml rename to Notemaster/app/src/main/res/layout/folder_list_item.xml diff --git a/src/Notes/app/src/main/res/layout/note_edit.xml b/Notemaster/app/src/main/res/layout/note_edit.xml similarity index 100% rename from src/Notes/app/src/main/res/layout/note_edit.xml rename to Notemaster/app/src/main/res/layout/note_edit.xml diff --git a/src/Notes/app/src/main/res/layout/note_edit_list_item.xml b/Notemaster/app/src/main/res/layout/note_edit_list_item.xml similarity index 100% rename from src/Notes/app/src/main/res/layout/note_edit_list_item.xml rename to Notemaster/app/src/main/res/layout/note_edit_list_item.xml diff --git a/src/Notes/app/src/main/res/layout/note_item.xml b/Notemaster/app/src/main/res/layout/note_item.xml similarity index 100% rename from src/Notes/app/src/main/res/layout/note_item.xml rename to Notemaster/app/src/main/res/layout/note_item.xml diff --git a/src/Notes/app/src/main/res/layout/note_list.xml b/Notemaster/app/src/main/res/layout/note_list.xml similarity index 100% rename from src/Notes/app/src/main/res/layout/note_list.xml rename to Notemaster/app/src/main/res/layout/note_list.xml diff --git a/src/Notes/app/src/main/res/layout/note_list_dropdown_menu.xml b/Notemaster/app/src/main/res/layout/note_list_dropdown_menu.xml similarity index 100% rename from src/Notes/app/src/main/res/layout/note_list_dropdown_menu.xml rename to Notemaster/app/src/main/res/layout/note_list_dropdown_menu.xml diff --git a/src/Notes/app/src/main/res/layout/note_list_footer.xml b/Notemaster/app/src/main/res/layout/note_list_footer.xml similarity index 100% rename from src/Notes/app/src/main/res/layout/note_list_footer.xml rename to Notemaster/app/src/main/res/layout/note_list_footer.xml diff --git a/src/Notes/app/src/main/res/layout/settings_header.xml b/Notemaster/app/src/main/res/layout/settings_header.xml similarity index 100% rename from src/Notes/app/src/main/res/layout/settings_header.xml rename to Notemaster/app/src/main/res/layout/settings_header.xml diff --git a/src/Notes/app/src/main/res/layout/widget_2x.xml b/Notemaster/app/src/main/res/layout/widget_2x.xml similarity index 100% rename from src/Notes/app/src/main/res/layout/widget_2x.xml rename to Notemaster/app/src/main/res/layout/widget_2x.xml diff --git a/src/Notes/app/src/main/res/layout/widget_4x.xml b/Notemaster/app/src/main/res/layout/widget_4x.xml similarity index 100% rename from src/Notes/app/src/main/res/layout/widget_4x.xml rename to Notemaster/app/src/main/res/layout/widget_4x.xml diff --git a/src/Notes/app/src/main/res/menu/call_note_edit.xml b/Notemaster/app/src/main/res/menu/call_note_edit.xml similarity index 100% rename from src/Notes/app/src/main/res/menu/call_note_edit.xml rename to Notemaster/app/src/main/res/menu/call_note_edit.xml diff --git a/src/Notes/app/src/main/res/menu/call_record_folder.xml b/Notemaster/app/src/main/res/menu/call_record_folder.xml similarity index 100% rename from src/Notes/app/src/main/res/menu/call_record_folder.xml rename to Notemaster/app/src/main/res/menu/call_record_folder.xml diff --git a/src/Notes/app/src/main/res/menu/note_edit.xml b/Notemaster/app/src/main/res/menu/note_edit.xml similarity index 100% rename from src/Notes/app/src/main/res/menu/note_edit.xml rename to Notemaster/app/src/main/res/menu/note_edit.xml diff --git a/src/Notes/app/src/main/res/menu/note_list.xml b/Notemaster/app/src/main/res/menu/note_list.xml similarity index 100% rename from src/Notes/app/src/main/res/menu/note_list.xml rename to Notemaster/app/src/main/res/menu/note_list.xml diff --git a/src/Notes/app/src/main/res/menu/note_list_dropdown.xml b/Notemaster/app/src/main/res/menu/note_list_dropdown.xml similarity index 100% rename from src/Notes/app/src/main/res/menu/note_list_dropdown.xml rename to Notemaster/app/src/main/res/menu/note_list_dropdown.xml diff --git a/src/Notes/app/src/main/res/menu/note_list_options.xml b/Notemaster/app/src/main/res/menu/note_list_options.xml similarity index 100% rename from src/Notes/app/src/main/res/menu/note_list_options.xml rename to Notemaster/app/src/main/res/menu/note_list_options.xml diff --git a/src/Notes/app/src/main/res/menu/sub_folder.xml b/Notemaster/app/src/main/res/menu/sub_folder.xml similarity index 100% rename from src/Notes/app/src/main/res/menu/sub_folder.xml rename to Notemaster/app/src/main/res/menu/sub_folder.xml diff --git a/src/Notes/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/Notemaster/app/src/main/res/mipmap-anydpi/ic_launcher.xml similarity index 100% rename from src/Notes/app/src/main/res/mipmap-anydpi/ic_launcher.xml rename to Notemaster/app/src/main/res/mipmap-anydpi/ic_launcher.xml diff --git a/src/Notes/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/Notemaster/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml similarity index 100% rename from src/Notes/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml rename to Notemaster/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml diff --git a/src/Notes/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/Notemaster/app/src/main/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from src/Notes/app/src/main/res/mipmap-hdpi/ic_launcher.webp rename to Notemaster/app/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/src/Notes/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/Notemaster/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from src/Notes/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to Notemaster/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/src/Notes/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/Notemaster/app/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from src/Notes/app/src/main/res/mipmap-mdpi/ic_launcher.webp rename to Notemaster/app/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/src/Notes/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/Notemaster/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from src/Notes/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to Notemaster/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/src/Notes/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/Notemaster/app/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from src/Notes/app/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to Notemaster/app/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/src/Notes/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/Notemaster/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from src/Notes/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to Notemaster/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/src/Notes/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/Notemaster/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from src/Notes/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to Notemaster/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/src/Notes/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/Notemaster/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from src/Notes/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to Notemaster/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/src/Notes/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/Notemaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from src/Notes/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to Notemaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/src/Notes/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/Notemaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from src/Notes/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to Notemaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/src/Notes/app/src/main/res/raw-zh-rCN/introduction b/Notemaster/app/src/main/res/raw-zh-rCN/introduction similarity index 100% rename from src/Notes/app/src/main/res/raw-zh-rCN/introduction rename to Notemaster/app/src/main/res/raw-zh-rCN/introduction diff --git a/src/Notes/app/src/main/res/raw/introduction b/Notemaster/app/src/main/res/raw/introduction similarity index 100% rename from src/Notes/app/src/main/res/raw/introduction rename to Notemaster/app/src/main/res/raw/introduction diff --git a/src/Notes/app/src/main/res/values-night/themes.xml b/Notemaster/app/src/main/res/values-night/themes.xml similarity index 69% rename from src/Notes/app/src/main/res/values-night/themes.xml rename to Notemaster/app/src/main/res/values-night/themes.xml index d25b0f2..d2c68d1 100644 --- a/src/Notes/app/src/main/res/values-night/themes.xml +++ b/Notemaster/app/src/main/res/values-night/themes.xml @@ -1,6 +1,6 @@ - diff --git a/src/Notes/app/src/main/res/values-zh-rCN/arrays.xml b/Notemaster/app/src/main/res/values-zh-rCN/arrays.xml similarity index 100% rename from src/Notes/app/src/main/res/values-zh-rCN/arrays.xml rename to Notemaster/app/src/main/res/values-zh-rCN/arrays.xml diff --git a/src/Notes/app/src/main/res/values-zh-rCN/strings.xml b/Notemaster/app/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from src/Notes/app/src/main/res/values-zh-rCN/strings.xml rename to Notemaster/app/src/main/res/values-zh-rCN/strings.xml diff --git a/src/Notes/app/src/main/res/values-zh-rTW/arrays.xml b/Notemaster/app/src/main/res/values-zh-rTW/arrays.xml similarity index 100% rename from src/Notes/app/src/main/res/values-zh-rTW/arrays.xml rename to Notemaster/app/src/main/res/values-zh-rTW/arrays.xml diff --git a/src/Notes/app/src/main/res/values-zh-rTW/strings.xml b/Notemaster/app/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from src/Notes/app/src/main/res/values-zh-rTW/strings.xml rename to Notemaster/app/src/main/res/values-zh-rTW/strings.xml diff --git a/src/Notes/app/src/main/res/values/arrays.xml b/Notemaster/app/src/main/res/values/arrays.xml similarity index 100% rename from src/Notes/app/src/main/res/values/arrays.xml rename to Notemaster/app/src/main/res/values/arrays.xml diff --git a/src/Notes/app/src/main/res/values/colors.xml b/Notemaster/app/src/main/res/values/colors.xml similarity index 100% rename from src/Notes/app/src/main/res/values/colors.xml rename to Notemaster/app/src/main/res/values/colors.xml diff --git a/src/Notes/app/src/main/res/values/dimens.xml b/Notemaster/app/src/main/res/values/dimens.xml similarity index 100% rename from src/Notes/app/src/main/res/values/dimens.xml rename to Notemaster/app/src/main/res/values/dimens.xml diff --git a/src/Notes/app/src/main/res/values/strings.xml b/Notemaster/app/src/main/res/values/strings.xml similarity index 100% rename from src/Notes/app/src/main/res/values/strings.xml rename to Notemaster/app/src/main/res/values/strings.xml diff --git a/src/Notes/app/src/main/res/values/styles.xml b/Notemaster/app/src/main/res/values/styles.xml similarity index 90% rename from src/Notes/app/src/main/res/values/styles.xml rename to Notemaster/app/src/main/res/values/styles.xml index d750e65..2276951 100644 --- a/src/Notes/app/src/main/res/values/styles.xml +++ b/Notemaster/app/src/main/res/values/styles.xml @@ -62,8 +62,11 @@ @style/NoteActionBarStyle + + + + \ No newline at end of file diff --git a/src/Notes/app/src/main/res/values/themes.xml b/Notemaster/app/src/main/res/values/themes.xml similarity index 56% rename from src/Notes/app/src/main/res/values/themes.xml rename to Notemaster/app/src/main/res/values/themes.xml index d66ac09..7c616ff 100644 --- a/src/Notes/app/src/main/res/values/themes.xml +++ b/Notemaster/app/src/main/res/values/themes.xml @@ -1,9 +1,9 @@ - -