Compare commits

merge into: ppi87fqjy:main

Branches Tags

ppi87fqjy:master

ppi87fqjy:zsy_branch

ppi87fqjy:gpp_branch

ppi87fqjy:main

...

pull from: ppi87fqjy:gpp_branch

Branches Tags

ppi87fqjy:master

ppi87fqjy:zsy_branch

ppi87fqjy:gpp_branch

ppi87fqjy:main

1 Commits

main ... gpp_branch

Author	SHA1	Message	Date
gpp	09ddb0ed7e	v2	3 days ago

1283 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats

0

src/zuoye/.gitignore → src/Minotes/.gitignore vendored

Unescape Escape View File

0

src/zuoye/.idea/.gitignore → src/Minotes/.idea/.gitignore vendored

Unescape Escape View File

0

src/zuoye/.idea/.name → src/Minotes/.idea/.name

Unescape Escape View File

0

src/zuoye/.idea/compiler.xml → src/Minotes/.idea/compiler.xml

Unescape Escape View File

0

src/zuoye/.idea/deploymentTargetSelector.xml → src/Minotes/.idea/deploymentTargetSelector.xml

Unescape Escape View File

0

src/zuoye/.idea/gradle.xml → src/Minotes/.idea/gradle.xml

Unescape Escape View File

0

src/zuoye/.idea/migrations.xml → src/Minotes/.idea/migrations.xml

Unescape Escape View File

0

src/zuoye/.idea/misc.xml → src/Minotes/.idea/misc.xml

Unescape Escape View File

0

src/zuoye/.idea/runConfigurations.xml → src/Minotes/.idea/runConfigurations.xml

Unescape Escape View File

0

src/zuoye/.idea/vcs.xml → src/Minotes/.idea/vcs.xml

Unescape Escape View File

0

src/zuoye/app/.gitignore → src/Minotes/app/.gitignore vendored

Unescape Escape View File

0

src/zuoye/app/build.gradle.kts → src/Minotes/app/build.gradle.kts

Unescape Escape View File

0

src/zuoye/app/lib/commons-codec-1.11.jar → src/Minotes/app/lib/commons-codec-1.11.jar

Unescape Escape View File

0

src/zuoye/app/lib/commons-logging-1.2.jar → src/Minotes/app/lib/commons-logging-1.2.jar

Unescape Escape View File

0

src/zuoye/app/lib/fluent-hc-4.5.14.jar → src/Minotes/app/lib/fluent-hc-4.5.14.jar

Unescape Escape View File

0

src/zuoye/app/lib/httpclient-4.5.14.jar → src/Minotes/app/lib/httpclient-4.5.14.jar

Unescape Escape View File

0

src/zuoye/app/lib/httpclient-cache-4.5.14.jar → src/Minotes/app/lib/httpclient-cache-4.5.14.jar

Unescape Escape View File

0

src/zuoye/app/lib/httpclient-osgi-4.5.14.jar → src/Minotes/app/lib/httpclient-osgi-4.5.14.jar

Unescape Escape View File

0

src/zuoye/app/lib/httpclient-win-4.5.14.jar → src/Minotes/app/lib/httpclient-win-4.5.14.jar

Unescape Escape View File

0

src/zuoye/app/lib/httpcore-4.4.16.jar → src/Minotes/app/lib/httpcore-4.4.16.jar

Unescape Escape View File

0

src/zuoye/app/lib/httpmime-4.5.14.jar → src/Minotes/app/lib/httpmime-4.5.14.jar

Unescape Escape View File

0

src/zuoye/app/lib/jna-4.5.2.jar → src/Minotes/app/lib/jna-4.5.2.jar

Unescape Escape View File

0

src/zuoye/app/lib/jna-platform-4.5.2.jar → src/Minotes/app/lib/jna-platform-4.5.2.jar

Unescape Escape View File

0

src/zuoye/app/proguard-rules.pro → src/Minotes/app/proguard-rules.pro vendored

Unescape Escape View File

0

src/zuoye/app/src/androidTest/java/com/example/notes_master/ExampleInstrumentedTest.java → src/Minotes/app/src/androidTest/java/com/example/notes_master/ExampleInstrumentedTest.java

Unescape Escape View File

0

src/zuoye/app/src/main/AndroidManifest.xml → src/Minotes/app/src/main/AndroidManifest.xml

Unescape Escape View File

0

src/zuoye/app/src/main/java/com/example/notes_master/MainActivity.java → src/Minotes/app/src/main/java/com/example/notes_master/MainActivity.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/data/Contact.java → src/Minotes/app/src/main/java/net/micode/notes/data/Contact.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/data/Notes.java → src/Minotes/app/src/main/java/net/micode/notes/data/Notes.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java → src/Minotes/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/data/NotesProvider.java → src/Minotes/app/src/main/java/net/micode/notes/data/NotesProvider.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/gtask/data/MetaData.java → src/Minotes/app/src/main/java/net/micode/notes/gtask/data/MetaData.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/gtask/data/Node.java → src/Minotes/app/src/main/java/net/micode/notes/gtask/data/Node.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/gtask/data/SqlData.java → src/Minotes/app/src/main/java/net/micode/notes/gtask/data/SqlData.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java → src/Minotes/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/gtask/data/Task.java → src/Minotes/app/src/main/java/net/micode/notes/gtask/data/Task.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/gtask/data/TaskList.java → src/Minotes/app/src/main/java/net/micode/notes/gtask/data/TaskList.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java → src/Minotes/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java → src/Minotes/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java → src/Minotes/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java → src/Minotes/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java → src/Minotes/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java → src/Minotes/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/model/Note.java → src/Minotes/app/src/main/java/net/micode/notes/model/Note.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/model/WorkingNote.java → src/Minotes/app/src/main/java/net/micode/notes/model/WorkingNote.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/tool/BackupUtils.java → src/Minotes/app/src/main/java/net/micode/notes/tool/BackupUtils.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/tool/DataUtils.java → src/Minotes/app/src/main/java/net/micode/notes/tool/DataUtils.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java → src/Minotes/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/tool/ResourceParser.java → src/Minotes/app/src/main/java/net/micode/notes/tool/ResourceParser.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java → src/Minotes/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java → src/Minotes/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java → src/Minotes/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/ui/DateTimePicker.java → src/Minotes/app/src/main/java/net/micode/notes/ui/DateTimePicker.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java → src/Minotes/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/ui/DropdownMenu.java → src/Minotes/app/src/main/java/net/micode/notes/ui/DropdownMenu.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java → src/Minotes/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java → src/Minotes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/ui/NoteEditText.java → src/Minotes/app/src/main/java/net/micode/notes/ui/NoteEditText.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/ui/NoteItemData.java → src/Minotes/app/src/main/java/net/micode/notes/ui/NoteItemData.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/ui/NotesListActivity.java → src/Minotes/app/src/main/java/net/micode/notes/ui/NotesListActivity.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java → src/Minotes/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/ui/NotesListItem.java → src/Minotes/app/src/main/java/net/micode/notes/ui/NotesListItem.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java → src/Minotes/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java → src/Minotes/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java → src/Minotes/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java

Unescape Escape View File

0

src/zuoye/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java → src/Minotes/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java

Unescape Escape View File

0

src/zuoye/app/src/main/res/color/primary_text_dark.xml → src/Minotes/app/src/main/res/color/primary_text_dark.xml

Unescape Escape View File

0

src/zuoye/app/src/main/res/color/secondary_text_dark.xml → src/Minotes/app/src/main/res/color/secondary_text_dark.xml

Unescape Escape View File

0

src/zuoye/app/src/main/res/drawable-hdpi/bg_btn_set_color.png → src/Minotes/app/src/main/res/drawable-hdpi/bg_btn_set_color.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.5 KiB After Width:  |  Height:  |  Size: 3.5 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png → src/Minotes/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 245 B After Width:  |  Height:  |  Size: 245 B

0

src/zuoye/app/src/main/res/drawable-hdpi/call_record.png → src/Minotes/app/src/main/res/drawable-hdpi/call_record.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.5 KiB After Width:  |  Height:  |  Size: 3.5 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/clock.png → src/Minotes/app/src/main/res/drawable-hdpi/clock.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.9 KiB After Width:  |  Height:  |  Size: 3.9 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/delete.png → src/Minotes/app/src/main/res/drawable-hdpi/delete.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.4 KiB After Width:  |  Height:  |  Size: 3.4 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/dropdown_icon.9.png → src/Minotes/app/src/main/res/drawable-hdpi/dropdown_icon.9.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 443 B After Width:  |  Height:  |  Size: 443 B

0

src/zuoye/app/src/main/res/drawable-hdpi/edit_blue.9.png → src/Minotes/app/src/main/res/drawable-hdpi/edit_blue.9.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.4 KiB After Width:  |  Height:  |  Size: 3.4 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/edit_green.9.png → src/Minotes/app/src/main/res/drawable-hdpi/edit_green.9.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.5 KiB After Width:  |  Height:  |  Size: 3.5 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/edit_red.9.png → src/Minotes/app/src/main/res/drawable-hdpi/edit_red.9.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.4 KiB After Width:  |  Height:  |  Size: 3.4 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/edit_title_blue.9.png → src/Minotes/app/src/main/res/drawable-hdpi/edit_title_blue.9.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.0 KiB After Width:  |  Height:  |  Size: 5.0 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/edit_title_green.9.png → src/Minotes/app/src/main/res/drawable-hdpi/edit_title_green.9.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.5 KiB After Width:  |  Height:  |  Size: 5.5 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/edit_title_red.9.png → src/Minotes/app/src/main/res/drawable-hdpi/edit_title_red.9.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.9 KiB After Width:  |  Height:  |  Size: 4.9 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/edit_title_white.9.png → src/Minotes/app/src/main/res/drawable-hdpi/edit_title_white.9.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.8 KiB After Width:  |  Height:  |  Size: 3.8 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png → src/Minotes/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.9 KiB After Width:  |  Height:  |  Size: 5.9 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/edit_white.9.png → src/Minotes/app/src/main/res/drawable-hdpi/edit_white.9.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.4 KiB After Width:  |  Height:  |  Size: 3.4 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/edit_yellow.9.png → src/Minotes/app/src/main/res/drawable-hdpi/edit_yellow.9.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.5 KiB After Width:  |  Height:  |  Size: 3.5 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/font_large.png → src/Minotes/app/src/main/res/drawable-hdpi/font_large.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 3.1 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/font_normal.png → src/Minotes/app/src/main/res/drawable-hdpi/font_normal.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.0 KiB After Width:  |  Height:  |  Size: 3.0 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png → src/Minotes/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.0 KiB After Width:  |  Height:  |  Size: 4.0 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/font_small.png → src/Minotes/app/src/main/res/drawable-hdpi/font_small.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.0 KiB After Width:  |  Height:  |  Size: 3.0 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/font_super.png → src/Minotes/app/src/main/res/drawable-hdpi/font_super.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 3.1 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/icon_app.png → src/Minotes/app/src/main/res/drawable-hdpi/icon_app.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.7 KiB After Width:  |  Height:  |  Size: 6.7 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/list_background.png → src/Minotes/app/src/main/res/drawable-hdpi/list_background.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 554 KiB After Width:  |  Height:  |  Size: 554 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/list_blue_down.9.png → src/Minotes/app/src/main/res/drawable-hdpi/list_blue_down.9.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.3 KiB After Width:  |  Height:  |  Size: 4.3 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/list_blue_middle.9.png → src/Minotes/app/src/main/res/drawable-hdpi/list_blue_middle.9.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.0 KiB After Width:  |  Height:  |  Size: 3.0 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/list_blue_single.9.png → src/Minotes/app/src/main/res/drawable-hdpi/list_blue_single.9.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.5 KiB After Width:  |  Height:  |  Size: 4.5 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/list_blue_up.9.png → src/Minotes/app/src/main/res/drawable-hdpi/list_blue_up.9.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 3.2 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/list_folder.9.png → src/Minotes/app/src/main/res/drawable-hdpi/list_folder.9.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.5 KiB After Width:  |  Height:  |  Size: 5.5 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/list_footer_bg.9.png → src/Minotes/app/src/main/res/drawable-hdpi/list_footer_bg.9.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 2.8 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/list_green_down.9.png → src/Minotes/app/src/main/res/drawable-hdpi/list_green_down.9.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.4 KiB After Width:  |  Height:  |  Size: 4.4 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/list_green_middle.9.png → src/Minotes/app/src/main/res/drawable-hdpi/list_green_middle.9.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 3.1 KiB

0

src/zuoye/app/src/main/res/drawable-hdpi/list_green_single.9.png → src/Minotes/app/src/main/res/drawable-hdpi/list_green_single.9.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.6 KiB After Width:  |  Height:  |  Size: 4.6 KiB

Some files were not shown because too many files have changed in this diff Show More

Write Preview

Loading…

Cancel

Save