From acaedfb5c5784d137793eed6bcb8c48ed526c4a5 Mon Sep 17 00:00:00 2001 From: xxl <2532500952@qq.com> Date: Mon, 1 Nov 2021 16:52:37 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=8A=9F=E8=83=BD=E4=B9=8B=E5=90=8E=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/开源软件维护方案及成果.docx | Bin 22662 -> 22711 bytes .../res/color/primary_text_dark.xml | 2 +- .../res/color/secondary_text_dark.xml | 2 +- src/Notes-master/res/layout/note_edit.xml | 45 +++++--- src/Notes-master/res/layout/note_list.xml | 6 +- .../res/values-zh-rTW/strings.xml | 2 +- src/Notes-master/res/values/styles.xml | 4 +- .../src/net/micode/notes/data/Notes.java | 4 + .../notes/data/NotesDatabaseHelper.java | 3 +- .../notes/gtask/remote/GTaskASyncTask.java | 16 ++- .../net/micode/notes/model/WorkingNote.java | 26 ++++- .../micode/notes/ui/DateTimePickerDialog.java | 1 + .../net/micode/notes/ui/NoteEditActivity.java | 104 +++++++++++++++++- .../src/net/micode/notes/ui/NoteItemData.java | 28 +++++ .../micode/notes/ui/NotesListActivity.java | 6 +- 15 files changed, 211 insertions(+), 38 deletions(-) diff --git a/doc/开源软件维护方案及成果.docx b/doc/开源软件维护方案及成果.docx index 1bbf94fe16e68d8c19ca27f7b1b96a50c602ecad..d1502396311bc724396b259512e92b15215518fb 100644 GIT binary patch delta 6477 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 delta 6426 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 diff --git a/src/Notes-master/res/color/primary_text_dark.xml b/src/Notes-master/res/color/primary_text_dark.xml index 7c85459..8ad98e3 100644 --- a/src/Notes-master/res/color/primary_text_dark.xml +++ b/src/Notes-master/res/color/primary_text_dark.xml @@ -1,4 +1,4 @@ - + - + + android:scrollbars="none"> + android:textAppearance="@style/TextAppearancePrimaryItem" /> + + android:id="@+id/m_locker" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="#4CAF50" + android:src="@drawable/bg_color_btn_mask" + tools:src="@android:drawable/ic_lock_idle_lock" /> + + android:layout_width="111dp" + android:layout_height="64dp" + android:layout_gravity="top|right" + android:background="@drawable/bg_color_btn_mask" /> + + diff --git a/src/Notes-master/res/layout/note_list.xml b/src/Notes-master/res/layout/note_list.xml index 6b25d38..962abdf 100644 --- a/src/Notes-master/res/layout/note_list.xml +++ b/src/Notes-master/res/layout/note_list.xml @@ -39,13 +39,13 @@ + android:fadingEdge="@null" + android:listSelector="@android:color/transparent" />