You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
高源
0482dd77fc
Merge branch 'CHENHELIN_BRANCH' of https://bdgit.educoder.net/pycalf7qb/MINOTES into GAOYUAN_BRANCH
# Conflicts:
# app/src/main/java/net/micode/notes/data/Notes.java
# app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
# app/src/main/java/net/micode/notes/data/NotesProvider.java
# app/src/main/java/net/micode/notes/gtask/data/MetaData.java
# app/src/main/java/net/micode/notes/gtask/data/Node.java
# app/src/main/java/net/micode/notes/gtask/data/SqlData.java
# app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
# app/src/main/java/net/micode/notes/gtask/data/Task.java
# app/src/main/java/net/micode/notes/gtask/data/TaskList.java
# app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
# app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
# app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
# app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
# app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
# app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
# app/src/main/java/net/micode/notes/model/Note.java
# app/src/main/java/net/micode/notes/model/WorkingNote.java
# app/src/main/java/net/micode/notes/tool/BackupUtils.java
# app/src/main/java/net/micode/notes/tool/DataUtils.java
# app/src/main/java/net/micode/notes/tool/ResourceParser.java
# app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
# app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
# app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
# app/src/main/java/net/micode/notes/ui/DateTimePicker.java
# app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
# app/src/main/java/net/micode/notes/ui/DropdownMenu.java
# app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
# app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
# app/src/main/java/net/micode/notes/ui/NoteEditText.java
# app/src/main/java/net/micode/notes/ui/NoteItemData.java
# app/src/main/java/net/micode/notes/ui/NotesListActivity.java
# app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
# app/src/main/java/net/micode/notes/ui/NotesListItem.java
# app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
# app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
# app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
# app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
Signed-off-by: 高源 <3056440880@qq.com>
|
2 years ago |
|
.gradle
|
1
|
2 years ago |
|
.idea
|
1
|
2 years ago |
|
app
|
删除了无用文件desu🥳
|
2 years ago |
|
gradle/wrapper
|
1
|
2 years ago |
|
build.gradle
|
1
|
2 years ago |
|
gradlew
|
1
|
2 years ago |
|
gradlew.bat
|
1
|
2 years ago |
|
import-summary.txt
|
1
|
2 years ago |
|
local.properties
|
1
|
2 years ago |
|
settings.gradle
|
1
|
2 years ago |
