Squashed commit of the following:
commit 587fd4fe84
Author: huige <2231639463@qq.com>
Date: Wed Dec 20 23:23:25 2023 +0800
更新
commit c18d19e360
Author: huige <2231639463@qq.com>
Date: Mon Dec 18 23:32:20 2023 +0800
辉哥把一半ui包也标了
commit 469349bc8b
Author: huige <2231639463@qq.com>
Date: Mon Dec 18 20:49:33 2023 +0800
辉哥标记了tool包和model包，不影响使用
commit 50808f3830
Author: huige <2231639463@qq.com>
Date: Tue Dec 12 20:52:54 2023 +0800
更一下
commit ac1e4bf13c
Merge: fb0589e 6c9e3c2
Author: huige <2231639463@qq.com>
Date: Tue Dec 12 20:42:04 2023 +0800
dasdas
# Conflicts:
# src/.gradle/8.0/executionHistory/executionHistory.bin
# src/.gradle/8.0/executionHistory/executionHistory.lock
# src/.gradle/8.0/fileHashes/fileHashes.bin
# src/.gradle/8.0/fileHashes/fileHashes.lock
# src/.gradle/8.0/fileHashes/resourceHashesCache.bin
# src/.gradle/buildOutputCleanup/buildOutputCleanup.lock
# src/.gradle/file-system.probe
# src/app/build/intermediates/apk/debug/app-debug.apk
# src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
# src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex
# src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
# src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
# src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
|
huige