 zephyr
|
ad530f9d29
|
Merge branch 'develop'
# Conflicts:
# Notesmaster/.idea/deploymentTargetSelector.xml
# Notesmaster/.idea/gradle.xml
# Notesmaster/app/build.gradle.kts
# Notesmaster/app/src/main/AndroidManifest.xml
# Notesmaster/app/src/main/java/net/micode/notes/data/Notes.java
# Notesmaster/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
# Notesmaster/app/src/main/java/net/micode/notes/data/NotesProvider.java
# Notesmaster/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
# Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
# Notesmaster/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
# Notesmaster/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
# Notesmaster/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
# Notesmaster/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
# Notesmaster/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
# Notesmaster/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
# Notesmaster/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
# Notesmaster/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
# Notesmaster/app/src/main/java/net/micode/notes/ui/NotesListItem.java
# Notesmaster/app/src/main/res/layout/note_edit.xml
# Notesmaster/app/src/main/res/values/colors.xml
# Notesmaster/app/src/main/res/values/strings.xml
# Notesmaster/gradle/wrapper/gradle-wrapper.properties
|
9 months ago |
|
pevl7hxk5
|
da1f9be35e
|
最终合并
最终合并成果
|
9 months ago |
|
zephyr
|
010251d8f1
|
小米便签阅读报告
|
9 months ago |
|
zephyr
|
0b3ddbe246
|
Merge remote-tracking branch 'origin/a_branch' into a_branch
|
9 months ago |
|
zephyr
|
8d92b86009
|
解决小米便签闹钟提醒功能失效的问题
|
9 months ago |
 ZoeyVirgin
|
d7a4be9598
|
解决功能显示不完全问题
|
9 months ago |
 po7h4qw6k
|
7f3230a5bf
|
Merge pull request '增加NotesListltem注释' (#23) from c_branch into a_branch
|
9 months ago |
|
sethakk
|
092368769c
|
增加NotesListltem注释
|
9 months ago |
|
po7h4qw6k
|
b1990e0425
|
Merge pull request '增加DropdownMenu注释' (#22) from c_branch into a_branch
|
9 months ago |
|
sethakk
|
6872cb897e
|
增加DropdownMenu注释
|
9 months ago |
|
zephyr
|
865c399a6a
|
Merge remote-tracking branch 'origin/a_branch' into a_branch
|
9 months ago |
|
zephyr
|
7f64663934
|
Revert "源码注释"
This reverts commit 09d2a4c3e7.
|
9 months ago |
|
zephyr
|
fe2ebb541d
|
解决小米便签功能不完全的问题
|
9 months ago |
|
sethakk
|
b948ae6900
|
增加AlarmInitReceiver注释
|
9 months ago |
|
sethakk
|
4569f56f3f
|
增加FoldersListAdapter注释
|
9 months ago |
|
sethakk
|
0ffc7ee238
|
增加DateTimePickerDialog注释
|
9 months ago |
|
sethakk
|
9dc3a9041f
|
增加AlarmAlertActivity注释
|
9 months ago |
|
sethakk
|
f32539c5a3
|
test
|
9 months ago |
|
zephyr
|
cac40c8d5f
|
增加MetaData注释
|
9 months ago |
|
zephyr
|
520a87f7ed
|
Merge remote-tracking branch 'origin/a_branch' into a_branch
|
9 months ago |
|
zephyr
|
09d2a4c3e7
|
源码注释
|
9 months ago |
|
sethakk
|
ede641fa8d
|
增加AlarmInitReceiver注释
|
9 months ago |
|
sethakk
|
1e8e62d6f3
|
增加FoldersListAdapter注释
|
9 months ago |
|
sethakk
|
ccc78391c8
|
增加DateTimePickerDialog注释
|
9 months ago |
|
sethakk
|
cea81eb52a
|
增加AlarmAlertActivity注释
|
9 months ago |
|
sethakk
|
8dadba33ed
|
test
|
9 months ago |
|
zephyr
|
27e3b21e74
|
merge a_branch into develop
|
10 months ago |
|
zephyr
|
4368d3f8c5
|
源码注释
|
10 months ago |
|
zephyr
|
33e9f4e1ca
|
源码注释
|
10 months ago |
|
ZoeyVirgin
|
e3dc5e47d9
|
解决报错3 files found with path ‘META-INF/DEPENDENCIES’ ...
|
10 months ago |
|
ZoeyVirgin
|
01c5e0ebcc
|
解决报错jar包冲突
|
10 months ago |
|
ZoeyVirgin
|
668e6ae47f
|
解决报错switch语句报错Constant expression required
|
10 months ago |
|
ZoeyVirgin
|
4578848d01
|
解决报错找不到符号 notification.setLatestEventInfo...
|
10 months ago |
|
ZoeyVirgin
|
b2e62f32f3
|
导入依赖
|
10 months ago |
|
ZoeyVirgin
|
cfa23d8625
|
将源码对应的文件复制到 Android 项目的对应目录及文件下
|
10 months ago |
|
ZoeyVirgin
|
19bd693ed4
|
添加报告
|
10 months ago |
|
ZoeyVirgin
|
6cfae4e706
|
Initial commit
|
10 months ago |
|
ZoeyVirgin
|
a59f720109
|
Initial commit
|
10 months ago |
|
zephyr
|
134ef5e0b7
|
【已解决】switch语句报错Constant expression required
|
10 months ago |
|
zephyr
|
5eb3d24666
|
解决找不到符号 notification.setLatestEventInfo...
|
10 months ago |
|
zephyr
|
c1ed1d553d
|
解决文件冲突three files found with path ‘META-INF/DEPENDENCIES’
|
10 months ago |
|
zephyr
|
982ae70988
|
解决jar包冲突
|
10 months ago |
|
zephyr
|
72a768f4ef
|
在 Android Studio 中导入依赖：
|
10 months ago |
|
zephyr
|
8726a2b758
|
解决依赖问题
|
10 months ago |
|
zephyr
|
d047f5f246
|
解决依赖问题
|
10 months ago |
|
zephyr
|
14afc0840e
|
导入清单文件
|
10 months ago |
|
zephyr
|
cedfa5b1f9
|
添加源文件
|
10 months ago |
|
zephyr
|
4f2388cbb2
|
添加源文件
|
10 months ago |
|
zephyr
|
96b161ba07
|
添加源文件
|
10 months ago |
|
ZoeyVirgin
|
c503e6427b
|
添加报告文件夹
|
10 months ago |
