From 1688b28abd60e939b3c9cc480393eca55b9d6737 Mon Sep 17 00:00:00 2001 From: JasenonE <1921157395@qq.com> Date: Thu, 24 Apr 2025 11:56:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=B1=B3=E4=BE=BF=E7=AD=BEandriod?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=80=82=E9=85=8D=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/src/main/AndroidManifest.xml | 26 --- .../app/src/main/res/values/colors.xml | 5 - .../app/src/main/res/values/strings.xml | 3 - {MyApplication => MyApplication2}/.gitignore | 0 .../.idea/.gitignore | 0 {MyApplication => MyApplication2}/.idea/.name | 0 .../.idea/AndroidProjectSystem.xml | 0 MyApplication2/.idea/compiler.xml | 6 + .../.idea/deploymentTargetSelector.xml | 10 + .../.idea/gradle.xml | 9 + .../.idea/migrations.xml | 0 .../.idea/misc.xml | 2 +- .../.idea/runConfigurations.xml | 0 .../.idea/vcs.xml | 0 .../app/.gitignore | 0 .../app/build.gradle.kts | 14 +- .../micode/notes/ExampleInstrumentedTest.java | 0 .../app/src/main}/AndroidManifest.xml | 44 +++- .../java/net/micode/notes/MainActivity.java | 0 .../java}/net/micode/notes/data/Contact.java | 0 .../java}/net/micode/notes/data/Notes.java | 0 .../notes/data/NotesDatabaseHelper.java | 0 .../net/micode/notes/data/NotesProvider.java | 0 .../net/micode/notes/gtask/data/MetaData.java | 0 .../net/micode/notes/gtask/data/Node.java | 0 .../net/micode/notes/gtask/data/SqlData.java | 0 .../net/micode/notes/gtask/data/SqlNote.java | 0 .../net/micode/notes/gtask/data/Task.java | 0 .../net/micode/notes/gtask/data/TaskList.java | 0 .../exception/ActionFailureException.java | 0 .../exception/NetworkFailureException.java | 0 .../notes/gtask/remote/GTaskASyncTask.java | 4 +- .../notes/gtask/remote/GTaskClient.java | 3 +- .../notes/gtask/remote/GTaskManager.java | 0 .../notes/gtask/remote/GTaskSyncService.java | 0 .../java}/net/micode/notes/model/Note.java | 0 .../net/micode/notes/model/WorkingNote.java | 0 .../net/micode/notes/tool/BackupUtils.java | 0 .../net/micode/notes/tool/DataUtils.java | 0 .../micode/notes/tool/GTaskStringUtils.java | 0 .../net/micode/notes/tool/ResourceParser.java | 0 .../micode/notes/ui/AlarmAlertActivity.java | 0 .../micode/notes/ui/AlarmInitReceiver.java | 0 .../net/micode/notes/ui/AlarmReceiver.java | 0 .../net/micode/notes/ui/DateTimePicker.java | 0 .../micode/notes/ui/DateTimePickerDialog.java | 0 .../net/micode/notes/ui/DropdownMenu.java | 0 .../micode/notes/ui/FoldersListAdapter.java | 0 .../net/micode/notes/ui/NoteEditActivity.java | 0 .../net/micode/notes/ui/NoteEditText.java | 0 .../net/micode/notes/ui/NoteItemData.java | 0 .../micode/notes/ui/NotePreviewActivity.java | 72 +++++++ .../micode/notes/ui/NotesListActivity.java | 0 .../net/micode/notes/ui/NotesListAdapter.java | 0 .../net/micode/notes/ui/NotesListItem.java | 0 .../notes/ui/NotesPreferenceActivity.java | 0 .../notes/widget/NoteWidgetProvider.java | 3 + .../notes/widget/NoteWidgetProvider_2x.java | 0 .../notes/widget/NoteWidgetProvider_4x.java | 0 .../src/main}/res/color/primary_text_dark.xml | 0 .../main}/res/color/secondary_text_dark.xml | 0 .../res/drawable-hdpi/bg_btn_set_color.png | Bin .../res/drawable-hdpi/bg_color_btn_mask.png | Bin .../main}/res/drawable-hdpi/call_record.png | Bin .../app/src/main}/res/drawable-hdpi/clock.png | Bin .../src/main}/res/drawable-hdpi/delete.png | Bin .../res/drawable-hdpi/dropdown_icon.9.png | Bin .../main}/res/drawable-hdpi/edit_blue.9.png | Bin .../main}/res/drawable-hdpi/edit_green.9.png | Bin .../main}/res/drawable-hdpi/edit_red.9.png | Bin .../res/drawable-hdpi/edit_title_blue.9.png | Bin .../res/drawable-hdpi/edit_title_green.9.png | Bin .../res/drawable-hdpi/edit_title_red.9.png | Bin .../res/drawable-hdpi/edit_title_white.9.png | Bin .../res/drawable-hdpi/edit_title_yellow.9.png | Bin .../main}/res/drawable-hdpi/edit_white.9.png | Bin .../main}/res/drawable-hdpi/edit_yellow.9.png | Bin .../main}/res/drawable-hdpi/font_large.png | Bin .../main}/res/drawable-hdpi/font_normal.png | Bin .../drawable-hdpi/font_size_selector_bg.9.png | Bin .../main}/res/drawable-hdpi/font_small.png | Bin .../main}/res/drawable-hdpi/font_super.png | Bin .../src/main}/res/drawable-hdpi/icon_app.png | Bin .../res/drawable-hdpi/list_background.png | Bin .../res/drawable-hdpi/list_blue_down.9.png | Bin .../res/drawable-hdpi/list_blue_middle.9.png | Bin .../res/drawable-hdpi/list_blue_single.9.png | Bin .../res/drawable-hdpi/list_blue_up.9.png | Bin .../main}/res/drawable-hdpi/list_folder.9.png | Bin .../res/drawable-hdpi/list_footer_bg.9.png | Bin .../res/drawable-hdpi/list_green_down.9.png | Bin .../res/drawable-hdpi/list_green_middle.9.png | Bin .../res/drawable-hdpi/list_green_single.9.png | Bin .../res/drawable-hdpi/list_green_up.9.png | Bin .../res/drawable-hdpi/list_red_down.9.png | Bin .../res/drawable-hdpi/list_red_middle.9.png | Bin .../res/drawable-hdpi/list_red_single.9.png | Bin .../main}/res/drawable-hdpi/list_red_up.9.png | Bin .../res/drawable-hdpi/list_white_down.9.png | Bin .../res/drawable-hdpi/list_white_middle.9.png | Bin .../res/drawable-hdpi/list_white_single.9.png | Bin .../res/drawable-hdpi/list_white_up.9.png | Bin .../res/drawable-hdpi/list_yellow_down.9.png | Bin .../drawable-hdpi/list_yellow_middle.9.png | Bin .../drawable-hdpi/list_yellow_single.9.png | Bin .../res/drawable-hdpi/list_yellow_up.9.png | Bin .../main}/res/drawable-hdpi/menu_delete.png | Bin .../src/main}/res/drawable-hdpi/menu_move.png | Bin .../res/drawable-hdpi/new_note_normal.png | Bin .../res/drawable-hdpi/new_note_pressed.png | Bin .../note_edit_color_selector_panel.png | Bin .../main}/res/drawable-hdpi/notification.png | Bin .../main}/res/drawable-hdpi/search_result.png | Bin .../src/main}/res/drawable-hdpi/selected.png | Bin .../main}/res/drawable-hdpi/title_alert.png | Bin .../res/drawable-hdpi/title_bar_bg.9.png | Bin .../res/drawable-hdpi/widget_2x_blue.png | Bin .../res/drawable-hdpi/widget_2x_green.png | Bin .../main}/res/drawable-hdpi/widget_2x_red.png | Bin .../res/drawable-hdpi/widget_2x_white.png | Bin .../res/drawable-hdpi/widget_2x_yellow.png | Bin .../res/drawable-hdpi/widget_4x_blue.png | Bin .../res/drawable-hdpi/widget_4x_green.png | Bin .../main}/res/drawable-hdpi/widget_4x_red.png | Bin .../res/drawable-hdpi/widget_4x_white.png | Bin .../res/drawable-hdpi/widget_4x_yellow.png | Bin .../res/drawable/ic_launcher_background.xml | 0 .../res/drawable/ic_launcher_foreground.xml | 0 .../app/src/main}/res/drawable/new_note.xml | 0 .../main}/res/layout/account_dialog_title.xml | 0 .../app/src/main/res/layout/activity_main.xml | 0 .../src/main}/res/layout/add_account_text.xml | 0 .../src/main}/res/layout/datetime_picker.xml | 0 .../src/main}/res/layout/dialog_edit_text.xml | 0 .../src/main}/res/layout/folder_list_item.xml | 0 .../app/src/main}/res/layout/note_edit.xml | 0 .../main}/res/layout/note_edit_list_item.xml | 0 .../app/src/main}/res/layout/note_item.xml | 0 .../app/src/main}/res/layout/note_list.xml | 0 .../res/layout/note_list_dropdown_menu.xml | 0 .../src/main}/res/layout/note_list_footer.xml | 0 .../app/src/main/res/layout/note_preview.xml | 93 +++++++++ .../src/main}/res/layout/settings_header.xml | 0 .../app/src/main}/res/layout/widget_2x.xml | 0 .../app/src/main}/res/layout/widget_4x.xml | 0 .../app/src/main}/res/menu/call_note_edit.xml | 0 .../src/main}/res/menu/call_record_folder.xml | 0 .../app/src/main}/res/menu/note_edit.xml | 0 .../app/src/main}/res/menu/note_list.xml | 0 .../src/main}/res/menu/note_list_dropdown.xml | 0 .../src/main}/res/menu/note_list_options.xml | 0 .../app/src/main}/res/menu/sub_folder.xml | 0 .../main/res/mipmap-anydpi}/ic_launcher.xml | 0 .../res/mipmap-anydpi}/ic_launcher_round.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin .../res/mipmap-hdpi/ic_launcher_round.webp | Bin .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin .../res/mipmap-mdpi/ic_launcher_round.webp | Bin .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin .../app/src/main}/res/raw-zh-rCN/introduction | 0 .../app/src/main}/res/raw/introduction | 0 .../app/src/main/res/values-night/themes.xml | 0 .../src/main}/res/values-zh-rCN/arrays.xml | 0 .../src/main}/res/values-zh-rCN/strings.xml | 0 .../src/main}/res/values-zh-rTW/arrays.xml | 0 .../src/main}/res/values-zh-rTW/strings.xml | 0 .../src/main/res/values/action_font_color.xml | 13 ++ .../app/src/main}/res/values/arrays.xml | 0 .../app/src/main}/res/values/colors.xml | 0 .../app/src/main}/res/values/dimens.xml | 0 .../app/src/main}/res/values/strings.xml | 22 ++ .../app/src/main}/res/values/styles.xml | 0 .../app/src/main/res/values/themes.xml | 0 .../app/src/main/res/xml/backup_rules.xml | 0 .../main/res/xml/data_extraction_rules.xml | 0 .../app/src/main}/res/xml/preferences.xml | 0 .../app/src/main}/res/xml/searchable.xml | 0 .../app/src/main}/res/xml/widget_2x_info.xml | 0 .../app/src/main}/res/xml/widget_4x_info.xml | 0 .../net/micode/notes/ExampleUnitTest.java | 0 .../build.gradle.kts | 0 .../gradle.properties | 3 +- .../gradle/libs.versions.toml | 16 +- .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 2 +- {MyApplication => MyApplication2}/gradlew | 0 {MyApplication => MyApplication2}/gradlew.bat | 0 .../settings.gradle.kts | 0 Notes-master/.gitignore | 9 - Notes-master/.idea/misc.xml | 7 - Notes-master/.idea/vcs.xml | 6 - Notes-master/NOTICE | 190 ------------------ Notes-master/README | 23 --- 198 files changed, 294 insertions(+), 291 deletions(-) delete mode 100644 MyApplication/app/src/main/AndroidManifest.xml delete mode 100644 MyApplication/app/src/main/res/values/colors.xml delete mode 100644 MyApplication/app/src/main/res/values/strings.xml rename {MyApplication => MyApplication2}/.gitignore (100%) rename {MyApplication => MyApplication2}/.idea/.gitignore (100%) rename {MyApplication => MyApplication2}/.idea/.name (100%) rename {MyApplication => MyApplication2}/.idea/AndroidProjectSystem.xml (100%) create mode 100644 MyApplication2/.idea/compiler.xml create mode 100644 MyApplication2/.idea/deploymentTargetSelector.xml rename {MyApplication => MyApplication2}/.idea/gradle.xml (51%) rename {MyApplication => MyApplication2}/.idea/migrations.xml (100%) rename {MyApplication => MyApplication2}/.idea/misc.xml (80%) rename {MyApplication => MyApplication2}/.idea/runConfigurations.xml (100%) rename {MyApplication => MyApplication2}/.idea/vcs.xml (100%) rename {MyApplication => MyApplication2}/app/.gitignore (100%) rename {MyApplication => MyApplication2}/app/build.gradle.kts (71%) rename {MyApplication => MyApplication2}/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java (100%) rename {Notes-master => MyApplication2/app/src/main}/AndroidManifest.xml (76%) rename {MyApplication => MyApplication2}/app/src/main/java/net/micode/notes/MainActivity.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/data/Contact.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/data/Notes.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/data/NotesDatabaseHelper.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/data/NotesProvider.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/gtask/data/MetaData.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/gtask/data/Node.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/gtask/data/SqlData.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/gtask/data/SqlNote.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/gtask/data/Task.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/gtask/data/TaskList.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/gtask/exception/ActionFailureException.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/gtask/exception/NetworkFailureException.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/gtask/remote/GTaskASyncTask.java (97%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/gtask/remote/GTaskClient.java (99%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/gtask/remote/GTaskManager.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/gtask/remote/GTaskSyncService.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/model/Note.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/model/WorkingNote.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/tool/BackupUtils.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/tool/DataUtils.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/tool/GTaskStringUtils.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/tool/ResourceParser.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/ui/AlarmAlertActivity.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/ui/AlarmInitReceiver.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/ui/AlarmReceiver.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/ui/DateTimePicker.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/ui/DateTimePickerDialog.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/ui/DropdownMenu.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/ui/FoldersListAdapter.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/ui/NoteEditActivity.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/ui/NoteEditText.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/ui/NoteItemData.java (100%) create mode 100644 MyApplication2/app/src/main/java/net/micode/notes/ui/NotePreviewActivity.java rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/ui/NotesListActivity.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/ui/NotesListAdapter.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/ui/NotesListItem.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/ui/NotesPreferenceActivity.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/widget/NoteWidgetProvider.java (99%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/widget/NoteWidgetProvider_2x.java (100%) rename {Notes-master/src => MyApplication2/app/src/main/java}/net/micode/notes/widget/NoteWidgetProvider_4x.java (100%) rename {Notes-master => MyApplication2/app/src/main}/res/color/primary_text_dark.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/color/secondary_text_dark.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/bg_btn_set_color.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/bg_color_btn_mask.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/call_record.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/clock.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/delete.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/dropdown_icon.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/edit_blue.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/edit_green.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/edit_red.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/edit_title_blue.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/edit_title_green.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/edit_title_red.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/edit_title_white.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/edit_title_yellow.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/edit_white.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/edit_yellow.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/font_large.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/font_normal.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/font_size_selector_bg.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/font_small.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/font_super.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/icon_app.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/list_background.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/list_blue_down.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/list_blue_middle.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/list_blue_single.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/list_blue_up.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/list_folder.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/list_footer_bg.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/list_green_down.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/list_green_middle.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/list_green_single.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/list_green_up.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/list_red_down.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/list_red_middle.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/list_red_single.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/list_red_up.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/list_white_down.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/list_white_middle.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/list_white_single.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/list_white_up.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/list_yellow_down.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/list_yellow_middle.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/list_yellow_single.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/list_yellow_up.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/menu_delete.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/menu_move.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/new_note_normal.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/new_note_pressed.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/note_edit_color_selector_panel.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/notification.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/search_result.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/selected.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/title_alert.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/title_bar_bg.9.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/widget_2x_blue.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/widget_2x_green.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/widget_2x_red.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/widget_2x_white.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/widget_2x_yellow.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/widget_4x_blue.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/widget_4x_green.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/widget_4x_red.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/widget_4x_white.png (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable-hdpi/widget_4x_yellow.png (100%) rename {MyApplication => MyApplication2}/app/src/main/res/drawable/ic_launcher_background.xml (100%) rename {MyApplication => MyApplication2}/app/src/main/res/drawable/ic_launcher_foreground.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/drawable/new_note.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/layout/account_dialog_title.xml (100%) rename {MyApplication => MyApplication2}/app/src/main/res/layout/activity_main.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/layout/add_account_text.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/layout/datetime_picker.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/layout/dialog_edit_text.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/layout/folder_list_item.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/layout/note_edit.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/layout/note_edit_list_item.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/layout/note_item.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/layout/note_list.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/layout/note_list_dropdown_menu.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/layout/note_list_footer.xml (100%) create mode 100644 MyApplication2/app/src/main/res/layout/note_preview.xml rename {Notes-master => MyApplication2/app/src/main}/res/layout/settings_header.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/layout/widget_2x.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/layout/widget_4x.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/menu/call_note_edit.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/menu/call_record_folder.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/menu/note_edit.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/menu/note_list.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/menu/note_list_dropdown.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/menu/note_list_options.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/menu/sub_folder.xml (100%) rename {MyApplication/app/src/main/res/mipmap-anydpi-v26 => MyApplication2/app/src/main/res/mipmap-anydpi}/ic_launcher.xml (100%) rename {MyApplication/app/src/main/res/mipmap-anydpi-v26 => MyApplication2/app/src/main/res/mipmap-anydpi}/ic_launcher_round.xml (100%) rename {MyApplication => MyApplication2}/app/src/main/res/mipmap-hdpi/ic_launcher.webp (100%) rename {MyApplication => MyApplication2}/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp (100%) rename {MyApplication => MyApplication2}/app/src/main/res/mipmap-mdpi/ic_launcher.webp (100%) rename {MyApplication => MyApplication2}/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp (100%) rename {MyApplication => MyApplication2}/app/src/main/res/mipmap-xhdpi/ic_launcher.webp (100%) rename {MyApplication => MyApplication2}/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp (100%) rename {MyApplication => MyApplication2}/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp (100%) rename {MyApplication => MyApplication2}/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp (100%) rename {MyApplication => MyApplication2}/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp (100%) rename {MyApplication => MyApplication2}/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp (100%) rename {Notes-master => MyApplication2/app/src/main}/res/raw-zh-rCN/introduction (100%) rename {Notes-master => MyApplication2/app/src/main}/res/raw/introduction (100%) rename {MyApplication => MyApplication2}/app/src/main/res/values-night/themes.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/values-zh-rCN/arrays.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/values-zh-rCN/strings.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/values-zh-rTW/arrays.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/values-zh-rTW/strings.xml (100%) create mode 100644 MyApplication2/app/src/main/res/values/action_font_color.xml rename {Notes-master => MyApplication2/app/src/main}/res/values/arrays.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/values/colors.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/values/dimens.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/values/strings.xml (83%) rename {Notes-master => MyApplication2/app/src/main}/res/values/styles.xml (100%) rename {MyApplication => MyApplication2}/app/src/main/res/values/themes.xml (100%) rename {MyApplication => MyApplication2}/app/src/main/res/xml/backup_rules.xml (100%) rename {MyApplication => MyApplication2}/app/src/main/res/xml/data_extraction_rules.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/xml/preferences.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/xml/searchable.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/xml/widget_2x_info.xml (100%) rename {Notes-master => MyApplication2/app/src/main}/res/xml/widget_4x_info.xml (100%) rename {MyApplication => MyApplication2}/app/src/test/java/net/micode/notes/ExampleUnitTest.java (100%) rename {MyApplication => MyApplication2}/build.gradle.kts (100%) rename {MyApplication => MyApplication2}/gradle.properties (95%) rename {MyApplication => MyApplication2}/gradle/libs.versions.toml (60%) rename {MyApplication => MyApplication2}/gradle/wrapper/gradle-wrapper.jar (100%) rename {MyApplication => MyApplication2}/gradle/wrapper/gradle-wrapper.properties (87%) rename {MyApplication => MyApplication2}/gradlew (100%) rename {MyApplication => MyApplication2}/gradlew.bat (100%) rename {MyApplication => MyApplication2}/settings.gradle.kts (100%) delete mode 100644 Notes-master/.gitignore delete mode 100644 Notes-master/.idea/misc.xml delete mode 100644 Notes-master/.idea/vcs.xml delete mode 100644 Notes-master/NOTICE delete mode 100644 Notes-master/README diff --git a/MyApplication/app/src/main/AndroidManifest.xml b/MyApplication/app/src/main/AndroidManifest.xml deleted file mode 100644 index eb47d4a..0000000 --- a/MyApplication/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MyApplication/app/src/main/res/values/colors.xml b/MyApplication/app/src/main/res/values/colors.xml deleted file mode 100644 index c8524cd..0000000 --- a/MyApplication/app/src/main/res/values/colors.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - #FF000000 - #FFFFFFFF - \ No newline at end of file diff --git a/MyApplication/app/src/main/res/values/strings.xml b/MyApplication/app/src/main/res/values/strings.xml deleted file mode 100644 index 3de1a39..0000000 --- a/MyApplication/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - My Application - \ No newline at end of file diff --git a/MyApplication/.gitignore b/MyApplication2/.gitignore similarity index 100% rename from MyApplication/.gitignore rename to MyApplication2/.gitignore diff --git a/MyApplication/.idea/.gitignore b/MyApplication2/.idea/.gitignore similarity index 100% rename from MyApplication/.idea/.gitignore rename to MyApplication2/.idea/.gitignore diff --git a/MyApplication/.idea/.name b/MyApplication2/.idea/.name similarity index 100% rename from MyApplication/.idea/.name rename to MyApplication2/.idea/.name diff --git a/MyApplication/.idea/AndroidProjectSystem.xml b/MyApplication2/.idea/AndroidProjectSystem.xml similarity index 100% rename from MyApplication/.idea/AndroidProjectSystem.xml rename to MyApplication2/.idea/AndroidProjectSystem.xml diff --git a/MyApplication2/.idea/compiler.xml b/MyApplication2/.idea/compiler.xml new file mode 100644 index 0000000..b86273d --- /dev/null +++ b/MyApplication2/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/MyApplication2/.idea/deploymentTargetSelector.xml b/MyApplication2/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..b268ef3 --- /dev/null +++ b/MyApplication2/.idea/deploymentTargetSelector.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/MyApplication/.idea/gradle.xml b/MyApplication2/.idea/gradle.xml similarity index 51% rename from MyApplication/.idea/gradle.xml rename to MyApplication2/.idea/gradle.xml index b838237..0426ba7 100644 --- a/MyApplication/.idea/gradle.xml +++ b/MyApplication2/.idea/gradle.xml @@ -1,11 +1,20 @@ + diff --git a/MyApplication/.idea/migrations.xml b/MyApplication2/.idea/migrations.xml similarity index 100% rename from MyApplication/.idea/migrations.xml rename to MyApplication2/.idea/migrations.xml diff --git a/MyApplication/.idea/misc.xml b/MyApplication2/.idea/misc.xml similarity index 80% rename from MyApplication/.idea/misc.xml rename to MyApplication2/.idea/misc.xml index c2b3ddc..74dd639 100644 --- a/MyApplication/.idea/misc.xml +++ b/MyApplication2/.idea/misc.xml @@ -1,7 +1,7 @@ - + diff --git a/MyApplication/.idea/runConfigurations.xml b/MyApplication2/.idea/runConfigurations.xml similarity index 100% rename from MyApplication/.idea/runConfigurations.xml rename to MyApplication2/.idea/runConfigurations.xml diff --git a/MyApplication/.idea/vcs.xml b/MyApplication2/.idea/vcs.xml similarity index 100% rename from MyApplication/.idea/vcs.xml rename to MyApplication2/.idea/vcs.xml diff --git a/MyApplication/app/.gitignore b/MyApplication2/app/.gitignore similarity index 100% rename from MyApplication/app/.gitignore rename to MyApplication2/app/.gitignore diff --git a/MyApplication/app/build.gradle.kts b/MyApplication2/app/build.gradle.kts similarity index 71% rename from MyApplication/app/build.gradle.kts rename to MyApplication2/app/build.gradle.kts index 2723617..d18a71b 100644 --- a/MyApplication/app/build.gradle.kts +++ b/MyApplication2/app/build.gradle.kts @@ -1,3 +1,5 @@ +import com.android.build.api.dsl.Packaging + plugins { alias(libs.plugins.android.application) } @@ -6,9 +8,13 @@ android { namespace = "net.micode.notes" compileSdk = 35 + packagingOptions{ + exclude("META-INF/DEPENDENCIES") + } + defaultConfig { applicationId = "net.micode.notes" - minSdk = 24 + minSdk = 32 targetSdk = 35 versionCode = 1 versionName = "1.0" @@ -37,7 +43,13 @@ dependencies { implementation(libs.material) implementation(libs.activity) implementation(libs.constraintlayout) +// implementation(libs.firebase.crashlytics.buildtools) testImplementation(libs.junit) androidTestImplementation(libs.ext.junit) androidTestImplementation(libs.espresso.core) +// https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient + + //noinspection DuplicatePlatformClasses + implementation(libs.httpclient) + implementation(libs.richeditor.android) } \ No newline at end of file diff --git a/MyApplication/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java b/MyApplication2/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java similarity index 100% rename from MyApplication/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java rename to MyApplication2/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java diff --git a/Notes-master/AndroidManifest.xml b/MyApplication2/app/src/main/AndroidManifest.xml similarity index 76% rename from Notes-master/AndroidManifest.xml rename to MyApplication2/app/src/main/AndroidManifest.xml index e5c7d47..b4d2858 100644 --- a/Notes-master/AndroidManifest.xml +++ b/MyApplication2/app/src/main/AndroidManifest.xml @@ -16,7 +16,6 @@ --> @@ -35,14 +34,25 @@ + + + + + + android:windowSoftInputMode="adjustPan" + android:exported="true"> @@ -54,7 +64,8 @@ android:name=".ui.NoteEditActivity" android:configChanges="keyboardHidden|orientation|screenSize" android:launchMode="singleTop" - android:theme="@style/NoteTheme" > + android:theme="@style/NoteTheme" + android:exported="true"> @@ -80,14 +91,24 @@ android:resource="@xml/searchable" /> + + + android:multiprocess="true" + android:exported="true"/> + android:label="@string/app_widget2x2" + android:exported="true"> @@ -96,11 +117,13 @@ + android:label="@string/app_widget4x4" + android:exported="true"> @@ -110,10 +133,11 @@ + android:resource="@xml/widget_4x_info" + android:exported="true"/> - + @@ -147,4 +171,4 @@ android:name="android.app.default_searchable" android:value=".ui.NoteEditActivity" /> - + \ No newline at end of file diff --git a/MyApplication/app/src/main/java/net/micode/notes/MainActivity.java b/MyApplication2/app/src/main/java/net/micode/notes/MainActivity.java similarity index 100% rename from MyApplication/app/src/main/java/net/micode/notes/MainActivity.java rename to MyApplication2/app/src/main/java/net/micode/notes/MainActivity.java diff --git a/Notes-master/src/net/micode/notes/data/Contact.java b/MyApplication2/app/src/main/java/net/micode/notes/data/Contact.java similarity index 100% rename from Notes-master/src/net/micode/notes/data/Contact.java rename to MyApplication2/app/src/main/java/net/micode/notes/data/Contact.java diff --git a/Notes-master/src/net/micode/notes/data/Notes.java b/MyApplication2/app/src/main/java/net/micode/notes/data/Notes.java similarity index 100% rename from Notes-master/src/net/micode/notes/data/Notes.java rename to MyApplication2/app/src/main/java/net/micode/notes/data/Notes.java diff --git a/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java b/MyApplication2/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java similarity index 100% rename from Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java rename to MyApplication2/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java diff --git a/Notes-master/src/net/micode/notes/data/NotesProvider.java b/MyApplication2/app/src/main/java/net/micode/notes/data/NotesProvider.java similarity index 100% rename from Notes-master/src/net/micode/notes/data/NotesProvider.java rename to MyApplication2/app/src/main/java/net/micode/notes/data/NotesProvider.java diff --git a/Notes-master/src/net/micode/notes/gtask/data/MetaData.java b/MyApplication2/app/src/main/java/net/micode/notes/gtask/data/MetaData.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/data/MetaData.java rename to MyApplication2/app/src/main/java/net/micode/notes/gtask/data/MetaData.java diff --git a/Notes-master/src/net/micode/notes/gtask/data/Node.java b/MyApplication2/app/src/main/java/net/micode/notes/gtask/data/Node.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/data/Node.java rename to MyApplication2/app/src/main/java/net/micode/notes/gtask/data/Node.java diff --git a/Notes-master/src/net/micode/notes/gtask/data/SqlData.java b/MyApplication2/app/src/main/java/net/micode/notes/gtask/data/SqlData.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/data/SqlData.java rename to MyApplication2/app/src/main/java/net/micode/notes/gtask/data/SqlData.java diff --git a/Notes-master/src/net/micode/notes/gtask/data/SqlNote.java b/MyApplication2/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/data/SqlNote.java rename to MyApplication2/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java diff --git a/Notes-master/src/net/micode/notes/gtask/data/Task.java b/MyApplication2/app/src/main/java/net/micode/notes/gtask/data/Task.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/data/Task.java rename to MyApplication2/app/src/main/java/net/micode/notes/gtask/data/Task.java diff --git a/Notes-master/src/net/micode/notes/gtask/data/TaskList.java b/MyApplication2/app/src/main/java/net/micode/notes/gtask/data/TaskList.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/data/TaskList.java rename to MyApplication2/app/src/main/java/net/micode/notes/gtask/data/TaskList.java diff --git a/Notes-master/src/net/micode/notes/gtask/exception/ActionFailureException.java b/MyApplication2/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/exception/ActionFailureException.java rename to MyApplication2/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java diff --git a/Notes-master/src/net/micode/notes/gtask/exception/NetworkFailureException.java b/MyApplication2/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/exception/NetworkFailureException.java rename to MyApplication2/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java diff --git a/Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java b/MyApplication2/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java similarity index 97% rename from Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java rename to MyApplication2/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java index b3b61e7..b1e7d67 100644 --- a/Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java +++ b/MyApplication2/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java @@ -77,8 +77,8 @@ public class GTaskASyncTask extends AsyncTask { pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, NotesListActivity.class), 0); } - notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content, - pendingIntent); +// notification.getLargeIcon(mContext, mContext.getString(R.string.app_name), content, +// pendingIntent); mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification); } diff --git a/Notes-master/src/net/micode/notes/gtask/remote/GTaskClient.java b/MyApplication2/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java similarity index 99% rename from Notes-master/src/net/micode/notes/gtask/remote/GTaskClient.java rename to MyApplication2/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java index c67dfdf..9456ac5 100644 --- a/Notes-master/src/net/micode/notes/gtask/remote/GTaskClient.java +++ b/MyApplication2/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java @@ -24,6 +24,7 @@ import android.os.Bundle; import android.text.TextUtils; import android.util.Log; + import net.micode.notes.gtask.data.Node; import net.micode.notes.gtask.data.Task; import net.micode.notes.gtask.data.TaskList; @@ -338,7 +339,7 @@ public class GTaskClient { // execute the post HttpResponse response = mHttpClient.execute(httpPost); - String jsString = getResponseContent(response.getEntity()); + String jsString = getResponseContent((HttpEntity) response.getEntity()); return new JSONObject(jsString); } catch (ClientProtocolException e) { diff --git a/Notes-master/src/net/micode/notes/gtask/remote/GTaskManager.java b/MyApplication2/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/remote/GTaskManager.java rename to MyApplication2/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java diff --git a/Notes-master/src/net/micode/notes/gtask/remote/GTaskSyncService.java b/MyApplication2/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/remote/GTaskSyncService.java rename to MyApplication2/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java diff --git a/Notes-master/src/net/micode/notes/model/Note.java b/MyApplication2/app/src/main/java/net/micode/notes/model/Note.java similarity index 100% rename from Notes-master/src/net/micode/notes/model/Note.java rename to MyApplication2/app/src/main/java/net/micode/notes/model/Note.java diff --git a/Notes-master/src/net/micode/notes/model/WorkingNote.java b/MyApplication2/app/src/main/java/net/micode/notes/model/WorkingNote.java similarity index 100% rename from Notes-master/src/net/micode/notes/model/WorkingNote.java rename to MyApplication2/app/src/main/java/net/micode/notes/model/WorkingNote.java diff --git a/Notes-master/src/net/micode/notes/tool/BackupUtils.java b/MyApplication2/app/src/main/java/net/micode/notes/tool/BackupUtils.java similarity index 100% rename from Notes-master/src/net/micode/notes/tool/BackupUtils.java rename to MyApplication2/app/src/main/java/net/micode/notes/tool/BackupUtils.java diff --git a/Notes-master/src/net/micode/notes/tool/DataUtils.java b/MyApplication2/app/src/main/java/net/micode/notes/tool/DataUtils.java similarity index 100% rename from Notes-master/src/net/micode/notes/tool/DataUtils.java rename to MyApplication2/app/src/main/java/net/micode/notes/tool/DataUtils.java diff --git a/Notes-master/src/net/micode/notes/tool/GTaskStringUtils.java b/MyApplication2/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java similarity index 100% rename from Notes-master/src/net/micode/notes/tool/GTaskStringUtils.java rename to MyApplication2/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java diff --git a/Notes-master/src/net/micode/notes/tool/ResourceParser.java b/MyApplication2/app/src/main/java/net/micode/notes/tool/ResourceParser.java similarity index 100% rename from Notes-master/src/net/micode/notes/tool/ResourceParser.java rename to MyApplication2/app/src/main/java/net/micode/notes/tool/ResourceParser.java diff --git a/Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java b/MyApplication2/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java rename to MyApplication2/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java diff --git a/Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java b/MyApplication2/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java rename to MyApplication2/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java diff --git a/Notes-master/src/net/micode/notes/ui/AlarmReceiver.java b/MyApplication2/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/AlarmReceiver.java rename to MyApplication2/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java diff --git a/Notes-master/src/net/micode/notes/ui/DateTimePicker.java b/MyApplication2/app/src/main/java/net/micode/notes/ui/DateTimePicker.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/DateTimePicker.java rename to MyApplication2/app/src/main/java/net/micode/notes/ui/DateTimePicker.java diff --git a/Notes-master/src/net/micode/notes/ui/DateTimePickerDialog.java b/MyApplication2/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/DateTimePickerDialog.java rename to MyApplication2/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java diff --git a/Notes-master/src/net/micode/notes/ui/DropdownMenu.java b/MyApplication2/app/src/main/java/net/micode/notes/ui/DropdownMenu.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/DropdownMenu.java rename to MyApplication2/app/src/main/java/net/micode/notes/ui/DropdownMenu.java diff --git a/Notes-master/src/net/micode/notes/ui/FoldersListAdapter.java b/MyApplication2/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/FoldersListAdapter.java rename to MyApplication2/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java diff --git a/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java b/MyApplication2/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/NoteEditActivity.java rename to MyApplication2/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java diff --git a/Notes-master/src/net/micode/notes/ui/NoteEditText.java b/MyApplication2/app/src/main/java/net/micode/notes/ui/NoteEditText.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/NoteEditText.java rename to MyApplication2/app/src/main/java/net/micode/notes/ui/NoteEditText.java diff --git a/Notes-master/src/net/micode/notes/ui/NoteItemData.java b/MyApplication2/app/src/main/java/net/micode/notes/ui/NoteItemData.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/NoteItemData.java rename to MyApplication2/app/src/main/java/net/micode/notes/ui/NoteItemData.java diff --git a/MyApplication2/app/src/main/java/net/micode/notes/ui/NotePreviewActivity.java b/MyApplication2/app/src/main/java/net/micode/notes/ui/NotePreviewActivity.java new file mode 100644 index 0000000..2f9943f --- /dev/null +++ b/MyApplication2/app/src/main/java/net/micode/notes/ui/NotePreviewActivity.java @@ -0,0 +1,72 @@ +package net.micode.notes.ui; + +import android.content.DialogInterface; +import android.content.Intent; +import android.graphics.Color; +import android.os.Bundle; +import android.app.Activity; +import android.util.Log; +import android.view.View; +import android.widget.Button; +import android.widget.LinearLayout; + +import net.micode.notes.R; +import jp.wasabeef.richeditor.RichEditor; + +public class NotePreviewActivity extends Activity implements View.OnClickListener { + private RichEditor mNotePreviewView; + + private static String mNoteText; + + private static int mNoteBgColorResId; + + private static int mNotePreviewFontSize; + + private Button confirmButton; + private Button cancelButton; + + private View mNotePreviewPanel; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + // Set View + setContentView(R.layout.note_preview); + + // Set Components + mNoteText = getIntent().getStringExtra("note_text"); + mNoteBgColorResId = getIntent().getIntExtra("bg_color_res_id", 0); + mNotePreviewFontSize = getIntent().getIntExtra("font_size", 16); + + mNotePreviewView = (RichEditor) findViewById(R.id.note_preview_view); + mNotePreviewView.setEditorHeight(500); + mNotePreviewView.setEditorFontColor(Color.BLACK); + mNotePreviewView.setInputEnabled(false); + mNotePreviewView.setEditorWidth(LinearLayout.LayoutParams.MATCH_PARENT); + mNotePreviewView.setBackgroundResource(mNoteBgColorResId); + mNotePreviewView.setHtml(mNoteText); + mNotePreviewView.setEditorFontSize(mNotePreviewFontSize); + + mNotePreviewPanel = findViewById(R.id.sv_note_preview); + mNotePreviewPanel.setBackgroundResource(mNoteBgColorResId); + + confirmButton = (Button) findViewById(R.id.confirm_button); + cancelButton = (Button) findViewById(R.id.cancel_button); + confirmButton.setOnClickListener(this); + cancelButton.setOnClickListener(this); + } + + @Override + public void onClick(View v) { + switch(v.getId()) { + case R.id.confirm_button: + Intent resultIntent = new Intent(); + resultIntent.putExtra("note_text", mNoteText); + setResult(RESULT_OK, resultIntent); + default: + // Once button is click then finish() + finish(); + } + } +} diff --git a/Notes-master/src/net/micode/notes/ui/NotesListActivity.java b/MyApplication2/app/src/main/java/net/micode/notes/ui/NotesListActivity.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/NotesListActivity.java rename to MyApplication2/app/src/main/java/net/micode/notes/ui/NotesListActivity.java diff --git a/Notes-master/src/net/micode/notes/ui/NotesListAdapter.java b/MyApplication2/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/NotesListAdapter.java rename to MyApplication2/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java diff --git a/Notes-master/src/net/micode/notes/ui/NotesListItem.java b/MyApplication2/app/src/main/java/net/micode/notes/ui/NotesListItem.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/NotesListItem.java rename to MyApplication2/app/src/main/java/net/micode/notes/ui/NotesListItem.java diff --git a/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java b/MyApplication2/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java rename to MyApplication2/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java diff --git a/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider.java b/MyApplication2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java similarity index 99% rename from Notes-master/src/net/micode/notes/widget/NoteWidgetProvider.java rename to MyApplication2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java index ec6f819..4da15d1 100644 --- a/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider.java +++ b/MyApplication2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java @@ -15,6 +15,9 @@ */ package net.micode.notes.widget; + + + import android.app.PendingIntent; import android.appwidget.AppWidgetManager; import android.appwidget.AppWidgetProvider; diff --git a/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_2x.java b/MyApplication2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java similarity index 100% rename from Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_2x.java rename to MyApplication2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java diff --git a/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_4x.java b/MyApplication2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java similarity index 100% rename from Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_4x.java rename to MyApplication2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java diff --git a/Notes-master/res/color/primary_text_dark.xml b/MyApplication2/app/src/main/res/color/primary_text_dark.xml similarity index 100% rename from Notes-master/res/color/primary_text_dark.xml rename to MyApplication2/app/src/main/res/color/primary_text_dark.xml diff --git a/Notes-master/res/color/secondary_text_dark.xml b/MyApplication2/app/src/main/res/color/secondary_text_dark.xml similarity index 100% rename from Notes-master/res/color/secondary_text_dark.xml rename to MyApplication2/app/src/main/res/color/secondary_text_dark.xml diff --git a/Notes-master/res/drawable-hdpi/bg_btn_set_color.png b/MyApplication2/app/src/main/res/drawable-hdpi/bg_btn_set_color.png similarity index 100% rename from Notes-master/res/drawable-hdpi/bg_btn_set_color.png rename to MyApplication2/app/src/main/res/drawable-hdpi/bg_btn_set_color.png diff --git a/Notes-master/res/drawable-hdpi/bg_color_btn_mask.png b/MyApplication2/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png similarity index 100% rename from Notes-master/res/drawable-hdpi/bg_color_btn_mask.png rename to MyApplication2/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png diff --git a/Notes-master/res/drawable-hdpi/call_record.png b/MyApplication2/app/src/main/res/drawable-hdpi/call_record.png similarity index 100% rename from Notes-master/res/drawable-hdpi/call_record.png rename to MyApplication2/app/src/main/res/drawable-hdpi/call_record.png diff --git a/Notes-master/res/drawable-hdpi/clock.png b/MyApplication2/app/src/main/res/drawable-hdpi/clock.png similarity index 100% rename from Notes-master/res/drawable-hdpi/clock.png rename to MyApplication2/app/src/main/res/drawable-hdpi/clock.png diff --git a/Notes-master/res/drawable-hdpi/delete.png b/MyApplication2/app/src/main/res/drawable-hdpi/delete.png similarity index 100% rename from Notes-master/res/drawable-hdpi/delete.png rename to MyApplication2/app/src/main/res/drawable-hdpi/delete.png diff --git a/Notes-master/res/drawable-hdpi/dropdown_icon.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/dropdown_icon.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/dropdown_icon.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/dropdown_icon.9.png diff --git a/Notes-master/res/drawable-hdpi/edit_blue.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/edit_blue.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/edit_blue.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/edit_blue.9.png diff --git a/Notes-master/res/drawable-hdpi/edit_green.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/edit_green.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/edit_green.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/edit_green.9.png diff --git a/Notes-master/res/drawable-hdpi/edit_red.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/edit_red.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/edit_red.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/edit_red.9.png diff --git a/Notes-master/res/drawable-hdpi/edit_title_blue.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/edit_title_blue.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/edit_title_blue.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/edit_title_blue.9.png diff --git a/Notes-master/res/drawable-hdpi/edit_title_green.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/edit_title_green.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/edit_title_green.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/edit_title_green.9.png diff --git a/Notes-master/res/drawable-hdpi/edit_title_red.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/edit_title_red.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/edit_title_red.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/edit_title_red.9.png diff --git a/Notes-master/res/drawable-hdpi/edit_title_white.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/edit_title_white.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/edit_title_white.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/edit_title_white.9.png diff --git a/Notes-master/res/drawable-hdpi/edit_title_yellow.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/edit_title_yellow.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png diff --git a/Notes-master/res/drawable-hdpi/edit_white.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/edit_white.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/edit_white.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/edit_white.9.png diff --git a/Notes-master/res/drawable-hdpi/edit_yellow.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/edit_yellow.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/edit_yellow.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/edit_yellow.9.png diff --git a/Notes-master/res/drawable-hdpi/font_large.png b/MyApplication2/app/src/main/res/drawable-hdpi/font_large.png similarity index 100% rename from Notes-master/res/drawable-hdpi/font_large.png rename to MyApplication2/app/src/main/res/drawable-hdpi/font_large.png diff --git a/Notes-master/res/drawable-hdpi/font_normal.png b/MyApplication2/app/src/main/res/drawable-hdpi/font_normal.png similarity index 100% rename from Notes-master/res/drawable-hdpi/font_normal.png rename to MyApplication2/app/src/main/res/drawable-hdpi/font_normal.png diff --git a/Notes-master/res/drawable-hdpi/font_size_selector_bg.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/font_size_selector_bg.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png diff --git a/Notes-master/res/drawable-hdpi/font_small.png b/MyApplication2/app/src/main/res/drawable-hdpi/font_small.png similarity index 100% rename from Notes-master/res/drawable-hdpi/font_small.png rename to MyApplication2/app/src/main/res/drawable-hdpi/font_small.png diff --git a/Notes-master/res/drawable-hdpi/font_super.png b/MyApplication2/app/src/main/res/drawable-hdpi/font_super.png similarity index 100% rename from Notes-master/res/drawable-hdpi/font_super.png rename to MyApplication2/app/src/main/res/drawable-hdpi/font_super.png diff --git a/Notes-master/res/drawable-hdpi/icon_app.png b/MyApplication2/app/src/main/res/drawable-hdpi/icon_app.png similarity index 100% rename from Notes-master/res/drawable-hdpi/icon_app.png rename to MyApplication2/app/src/main/res/drawable-hdpi/icon_app.png diff --git a/Notes-master/res/drawable-hdpi/list_background.png b/MyApplication2/app/src/main/res/drawable-hdpi/list_background.png similarity index 100% rename from Notes-master/res/drawable-hdpi/list_background.png rename to MyApplication2/app/src/main/res/drawable-hdpi/list_background.png diff --git a/Notes-master/res/drawable-hdpi/list_blue_down.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/list_blue_down.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/list_blue_down.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/list_blue_down.9.png diff --git a/Notes-master/res/drawable-hdpi/list_blue_middle.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/list_blue_middle.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/list_blue_middle.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/list_blue_middle.9.png diff --git a/Notes-master/res/drawable-hdpi/list_blue_single.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/list_blue_single.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/list_blue_single.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/list_blue_single.9.png diff --git a/Notes-master/res/drawable-hdpi/list_blue_up.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/list_blue_up.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/list_blue_up.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/list_blue_up.9.png diff --git a/Notes-master/res/drawable-hdpi/list_folder.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/list_folder.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/list_folder.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/list_folder.9.png diff --git a/Notes-master/res/drawable-hdpi/list_footer_bg.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/list_footer_bg.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/list_footer_bg.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/list_footer_bg.9.png diff --git a/Notes-master/res/drawable-hdpi/list_green_down.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/list_green_down.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/list_green_down.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/list_green_down.9.png diff --git a/Notes-master/res/drawable-hdpi/list_green_middle.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/list_green_middle.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/list_green_middle.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/list_green_middle.9.png diff --git a/Notes-master/res/drawable-hdpi/list_green_single.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/list_green_single.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/list_green_single.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/list_green_single.9.png diff --git a/Notes-master/res/drawable-hdpi/list_green_up.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/list_green_up.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/list_green_up.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/list_green_up.9.png diff --git a/Notes-master/res/drawable-hdpi/list_red_down.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/list_red_down.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/list_red_down.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/list_red_down.9.png diff --git a/Notes-master/res/drawable-hdpi/list_red_middle.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/list_red_middle.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/list_red_middle.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/list_red_middle.9.png diff --git a/Notes-master/res/drawable-hdpi/list_red_single.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/list_red_single.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/list_red_single.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/list_red_single.9.png diff --git a/Notes-master/res/drawable-hdpi/list_red_up.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/list_red_up.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/list_red_up.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/list_red_up.9.png diff --git a/Notes-master/res/drawable-hdpi/list_white_down.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/list_white_down.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/list_white_down.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/list_white_down.9.png diff --git a/Notes-master/res/drawable-hdpi/list_white_middle.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/list_white_middle.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/list_white_middle.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/list_white_middle.9.png diff --git a/Notes-master/res/drawable-hdpi/list_white_single.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/list_white_single.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/list_white_single.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/list_white_single.9.png diff --git a/Notes-master/res/drawable-hdpi/list_white_up.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/list_white_up.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/list_white_up.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/list_white_up.9.png diff --git a/Notes-master/res/drawable-hdpi/list_yellow_down.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/list_yellow_down.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/list_yellow_down.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/list_yellow_down.9.png diff --git a/Notes-master/res/drawable-hdpi/list_yellow_middle.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/list_yellow_middle.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png diff --git a/Notes-master/res/drawable-hdpi/list_yellow_single.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/list_yellow_single.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/list_yellow_single.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/list_yellow_single.9.png diff --git a/Notes-master/res/drawable-hdpi/list_yellow_up.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/list_yellow_up.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/list_yellow_up.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/list_yellow_up.9.png diff --git a/Notes-master/res/drawable-hdpi/menu_delete.png b/MyApplication2/app/src/main/res/drawable-hdpi/menu_delete.png similarity index 100% rename from Notes-master/res/drawable-hdpi/menu_delete.png rename to MyApplication2/app/src/main/res/drawable-hdpi/menu_delete.png diff --git a/Notes-master/res/drawable-hdpi/menu_move.png b/MyApplication2/app/src/main/res/drawable-hdpi/menu_move.png similarity index 100% rename from Notes-master/res/drawable-hdpi/menu_move.png rename to MyApplication2/app/src/main/res/drawable-hdpi/menu_move.png diff --git a/Notes-master/res/drawable-hdpi/new_note_normal.png b/MyApplication2/app/src/main/res/drawable-hdpi/new_note_normal.png similarity index 100% rename from Notes-master/res/drawable-hdpi/new_note_normal.png rename to MyApplication2/app/src/main/res/drawable-hdpi/new_note_normal.png diff --git a/Notes-master/res/drawable-hdpi/new_note_pressed.png b/MyApplication2/app/src/main/res/drawable-hdpi/new_note_pressed.png similarity index 100% rename from Notes-master/res/drawable-hdpi/new_note_pressed.png rename to MyApplication2/app/src/main/res/drawable-hdpi/new_note_pressed.png diff --git a/Notes-master/res/drawable-hdpi/note_edit_color_selector_panel.png b/MyApplication2/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png similarity index 100% rename from Notes-master/res/drawable-hdpi/note_edit_color_selector_panel.png rename to MyApplication2/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png diff --git a/Notes-master/res/drawable-hdpi/notification.png b/MyApplication2/app/src/main/res/drawable-hdpi/notification.png similarity index 100% rename from Notes-master/res/drawable-hdpi/notification.png rename to MyApplication2/app/src/main/res/drawable-hdpi/notification.png diff --git a/Notes-master/res/drawable-hdpi/search_result.png b/MyApplication2/app/src/main/res/drawable-hdpi/search_result.png similarity index 100% rename from Notes-master/res/drawable-hdpi/search_result.png rename to MyApplication2/app/src/main/res/drawable-hdpi/search_result.png diff --git a/Notes-master/res/drawable-hdpi/selected.png b/MyApplication2/app/src/main/res/drawable-hdpi/selected.png similarity index 100% rename from Notes-master/res/drawable-hdpi/selected.png rename to MyApplication2/app/src/main/res/drawable-hdpi/selected.png diff --git a/Notes-master/res/drawable-hdpi/title_alert.png b/MyApplication2/app/src/main/res/drawable-hdpi/title_alert.png similarity index 100% rename from Notes-master/res/drawable-hdpi/title_alert.png rename to MyApplication2/app/src/main/res/drawable-hdpi/title_alert.png diff --git a/Notes-master/res/drawable-hdpi/title_bar_bg.9.png b/MyApplication2/app/src/main/res/drawable-hdpi/title_bar_bg.9.png similarity index 100% rename from Notes-master/res/drawable-hdpi/title_bar_bg.9.png rename to MyApplication2/app/src/main/res/drawable-hdpi/title_bar_bg.9.png diff --git a/Notes-master/res/drawable-hdpi/widget_2x_blue.png b/MyApplication2/app/src/main/res/drawable-hdpi/widget_2x_blue.png similarity index 100% rename from Notes-master/res/drawable-hdpi/widget_2x_blue.png rename to MyApplication2/app/src/main/res/drawable-hdpi/widget_2x_blue.png diff --git a/Notes-master/res/drawable-hdpi/widget_2x_green.png b/MyApplication2/app/src/main/res/drawable-hdpi/widget_2x_green.png similarity index 100% rename from Notes-master/res/drawable-hdpi/widget_2x_green.png rename to MyApplication2/app/src/main/res/drawable-hdpi/widget_2x_green.png diff --git a/Notes-master/res/drawable-hdpi/widget_2x_red.png b/MyApplication2/app/src/main/res/drawable-hdpi/widget_2x_red.png similarity index 100% rename from Notes-master/res/drawable-hdpi/widget_2x_red.png rename to MyApplication2/app/src/main/res/drawable-hdpi/widget_2x_red.png diff --git a/Notes-master/res/drawable-hdpi/widget_2x_white.png b/MyApplication2/app/src/main/res/drawable-hdpi/widget_2x_white.png similarity index 100% rename from Notes-master/res/drawable-hdpi/widget_2x_white.png rename to MyApplication2/app/src/main/res/drawable-hdpi/widget_2x_white.png diff --git a/Notes-master/res/drawable-hdpi/widget_2x_yellow.png b/MyApplication2/app/src/main/res/drawable-hdpi/widget_2x_yellow.png similarity index 100% rename from Notes-master/res/drawable-hdpi/widget_2x_yellow.png rename to MyApplication2/app/src/main/res/drawable-hdpi/widget_2x_yellow.png diff --git a/Notes-master/res/drawable-hdpi/widget_4x_blue.png b/MyApplication2/app/src/main/res/drawable-hdpi/widget_4x_blue.png similarity index 100% rename from Notes-master/res/drawable-hdpi/widget_4x_blue.png rename to MyApplication2/app/src/main/res/drawable-hdpi/widget_4x_blue.png diff --git a/Notes-master/res/drawable-hdpi/widget_4x_green.png b/MyApplication2/app/src/main/res/drawable-hdpi/widget_4x_green.png similarity index 100% rename from Notes-master/res/drawable-hdpi/widget_4x_green.png rename to MyApplication2/app/src/main/res/drawable-hdpi/widget_4x_green.png diff --git a/Notes-master/res/drawable-hdpi/widget_4x_red.png b/MyApplication2/app/src/main/res/drawable-hdpi/widget_4x_red.png similarity index 100% rename from Notes-master/res/drawable-hdpi/widget_4x_red.png rename to MyApplication2/app/src/main/res/drawable-hdpi/widget_4x_red.png diff --git a/Notes-master/res/drawable-hdpi/widget_4x_white.png b/MyApplication2/app/src/main/res/drawable-hdpi/widget_4x_white.png similarity index 100% rename from Notes-master/res/drawable-hdpi/widget_4x_white.png rename to MyApplication2/app/src/main/res/drawable-hdpi/widget_4x_white.png diff --git a/Notes-master/res/drawable-hdpi/widget_4x_yellow.png b/MyApplication2/app/src/main/res/drawable-hdpi/widget_4x_yellow.png similarity index 100% rename from Notes-master/res/drawable-hdpi/widget_4x_yellow.png rename to MyApplication2/app/src/main/res/drawable-hdpi/widget_4x_yellow.png diff --git a/MyApplication/app/src/main/res/drawable/ic_launcher_background.xml b/MyApplication2/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from MyApplication/app/src/main/res/drawable/ic_launcher_background.xml rename to MyApplication2/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/MyApplication/app/src/main/res/drawable/ic_launcher_foreground.xml b/MyApplication2/app/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from MyApplication/app/src/main/res/drawable/ic_launcher_foreground.xml rename to MyApplication2/app/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/Notes-master/res/drawable/new_note.xml b/MyApplication2/app/src/main/res/drawable/new_note.xml similarity index 100% rename from Notes-master/res/drawable/new_note.xml rename to MyApplication2/app/src/main/res/drawable/new_note.xml diff --git a/Notes-master/res/layout/account_dialog_title.xml b/MyApplication2/app/src/main/res/layout/account_dialog_title.xml similarity index 100% rename from Notes-master/res/layout/account_dialog_title.xml rename to MyApplication2/app/src/main/res/layout/account_dialog_title.xml diff --git a/MyApplication/app/src/main/res/layout/activity_main.xml b/MyApplication2/app/src/main/res/layout/activity_main.xml similarity index 100% rename from MyApplication/app/src/main/res/layout/activity_main.xml rename to MyApplication2/app/src/main/res/layout/activity_main.xml diff --git a/Notes-master/res/layout/add_account_text.xml b/MyApplication2/app/src/main/res/layout/add_account_text.xml similarity index 100% rename from Notes-master/res/layout/add_account_text.xml rename to MyApplication2/app/src/main/res/layout/add_account_text.xml diff --git a/Notes-master/res/layout/datetime_picker.xml b/MyApplication2/app/src/main/res/layout/datetime_picker.xml similarity index 100% rename from Notes-master/res/layout/datetime_picker.xml rename to MyApplication2/app/src/main/res/layout/datetime_picker.xml diff --git a/Notes-master/res/layout/dialog_edit_text.xml b/MyApplication2/app/src/main/res/layout/dialog_edit_text.xml similarity index 100% rename from Notes-master/res/layout/dialog_edit_text.xml rename to MyApplication2/app/src/main/res/layout/dialog_edit_text.xml diff --git a/Notes-master/res/layout/folder_list_item.xml b/MyApplication2/app/src/main/res/layout/folder_list_item.xml similarity index 100% rename from Notes-master/res/layout/folder_list_item.xml rename to MyApplication2/app/src/main/res/layout/folder_list_item.xml diff --git a/Notes-master/res/layout/note_edit.xml b/MyApplication2/app/src/main/res/layout/note_edit.xml similarity index 100% rename from Notes-master/res/layout/note_edit.xml rename to MyApplication2/app/src/main/res/layout/note_edit.xml diff --git a/Notes-master/res/layout/note_edit_list_item.xml b/MyApplication2/app/src/main/res/layout/note_edit_list_item.xml similarity index 100% rename from Notes-master/res/layout/note_edit_list_item.xml rename to MyApplication2/app/src/main/res/layout/note_edit_list_item.xml diff --git a/Notes-master/res/layout/note_item.xml b/MyApplication2/app/src/main/res/layout/note_item.xml similarity index 100% rename from Notes-master/res/layout/note_item.xml rename to MyApplication2/app/src/main/res/layout/note_item.xml diff --git a/Notes-master/res/layout/note_list.xml b/MyApplication2/app/src/main/res/layout/note_list.xml similarity index 100% rename from Notes-master/res/layout/note_list.xml rename to MyApplication2/app/src/main/res/layout/note_list.xml diff --git a/Notes-master/res/layout/note_list_dropdown_menu.xml b/MyApplication2/app/src/main/res/layout/note_list_dropdown_menu.xml similarity index 100% rename from Notes-master/res/layout/note_list_dropdown_menu.xml rename to MyApplication2/app/src/main/res/layout/note_list_dropdown_menu.xml diff --git a/Notes-master/res/layout/note_list_footer.xml b/MyApplication2/app/src/main/res/layout/note_list_footer.xml similarity index 100% rename from Notes-master/res/layout/note_list_footer.xml rename to MyApplication2/app/src/main/res/layout/note_list_footer.xml diff --git a/MyApplication2/app/src/main/res/layout/note_preview.xml b/MyApplication2/app/src/main/res/layout/note_preview.xml new file mode 100644 index 0000000..4f7a7ea --- /dev/null +++ b/MyApplication2/app/src/main/res/layout/note_preview.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +