From 6a16f3c4d12f891144cc69690f960536771a128b Mon Sep 17 00:00:00 2001 From: Aoi <916327053@qq.com> Date: Wed, 22 Dec 2021 16:03:52 +0800 Subject: [PATCH] 11 --- src/Notes-master/AndroidManifest.xml | 37 +- src/Notes-master/res/AndroidManifest.xml | 160 ------ .../res/layout/activity_password.xml | 21 - src/Notes-master/res/layout/begin_view.xml | 34 ++ .../res/layout/dialog_edit_text.xml | 65 ++- .../res/layout/dialog_is_to_pull.xml | 34 ++ src/Notes-master/res/layout/login_edit.xml | 58 +++ src/Notes-master/res/layout/note_item.xml | 7 + src/Notes-master/res/layout/register_edit.xml | 72 +++ src/Notes-master/res/menu/note_edit.xml | 1 - src/Notes-master/res/menu/note_list.xml | 6 + src/Notes-master/res/values/strings.xml | 2 + .../notes/account/BeginViewActivity.java | 48 ++ .../micode/notes/account/DBConnection.java | 493 ++++++++++++++++++ .../micode/notes/account/LoginActivity.java | 72 +++ .../notes/account/RegisterActivity.java | 127 +++++ .../net/micode/notes/assets/font/SIMYOU.TTF | Bin 0 -> 6700204 bytes .../net/micode/notes/assets/font/STLITI.TTF | Bin 0 -> 4111960 bytes .../src/net/micode/notes/data/Notes.java | 4 + .../notes/data/NotesDatabaseHelper.java | 18 +- .../net/micode/notes/data/NotesProvider.java | 55 +- .../net/micode/notes/gtask/data/SqlNote.java | 19 +- .../net/micode/notes/model/WorkingNote.java | 49 ++ .../src/net/micode/notes/tool/DataUtils.java | 12 + .../net/micode/notes/ui/NoteEditActivity.java | 199 ++++--- .../src/net/micode/notes/ui/NoteItemData.java | 18 + .../micode/notes/ui/NotesListActivity.java | 115 +++- .../net/micode/notes/ui/NotesListAdapter.java | 2 + .../net/micode/notes/ui/NotesListItem.java | 22 +- 29 files changed, 1465 insertions(+), 285 deletions(-) delete mode 100644 src/Notes-master/res/AndroidManifest.xml create mode 100644 src/Notes-master/res/layout/begin_view.xml create mode 100644 src/Notes-master/res/layout/dialog_is_to_pull.xml create mode 100644 src/Notes-master/res/layout/login_edit.xml create mode 100644 src/Notes-master/res/layout/register_edit.xml create mode 100644 src/Notes-master/src/net/micode/notes/account/BeginViewActivity.java create mode 100644 src/Notes-master/src/net/micode/notes/account/DBConnection.java create mode 100644 src/Notes-master/src/net/micode/notes/account/LoginActivity.java create mode 100644 src/Notes-master/src/net/micode/notes/account/RegisterActivity.java create mode 100644 src/Notes-master/src/net/micode/notes/assets/font/SIMYOU.TTF create mode 100644 src/Notes-master/src/net/micode/notes/assets/font/STLITI.TTF diff --git a/src/Notes-master/AndroidManifest.xml b/src/Notes-master/AndroidManifest.xml index 7dc68a9..dc78c4d 100644 --- a/src/Notes-master/AndroidManifest.xml +++ b/src/Notes-master/AndroidManifest.xml @@ -33,6 +33,7 @@ + @@ -47,8 +48,8 @@ - - + + @@ -82,21 +83,35 @@ android:resource="@xml/searchable" /> - - - - -======= android:name=".ui.PassWordEditActivity" android:theme="@style/NoteActionBarStyle"> ->>>>>>> d01c3b5117a761c71533cfaeda365327c587bd93:src/Notes-master/AndroidManifest.xml + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Notes-master/res/layout/activity_password.xml b/src/Notes-master/res/layout/activity_password.xml index 3428daa..13f9a26 100644 --- a/src/Notes-master/res/layout/activity_password.xml +++ b/src/Notes-master/res/layout/activity_password.xml @@ -5,22 +5,6 @@ android:layout_height="match_parent" android:orientation="vertical" android:gravity="center_vertical"> - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master/res/layout/begin_view.xml b/src/Notes-master/res/layout/begin_view.xml new file mode 100644 index 0000000..58dfaf1 --- /dev/null +++ b/src/Notes-master/res/layout/begin_view.xml @@ -0,0 +1,34 @@ + + + + + + +