diff --git a/app/app-release.apk b/app/app-release.apk new file mode 100644 index 0000000..5f2a51c Binary files /dev/null and b/app/app-release.apk differ diff --git a/app/src/main/java/org/houxg/leamonax/database/AppDataBase.java b/app/src/main/java/org/houxg/leamonax/database/AppDataBase.java index 6cc700b..6992b30 100644 --- a/app/src/main/java/org/houxg/leamonax/database/AppDataBase.java +++ b/app/src/main/java/org/houxg/leamonax/database/AppDataBase.java @@ -206,8 +206,10 @@ public class AppDataBase { if (CollectionUtils.isNotEmpty(recentNotes)) { for (Note note : recentNotes) { Notebook notebook = getNotebookByServerId(note.getNoteBookId()); - if (!notebook.isDeleted()) { - return notebook; + if (notebook != null) { + if (!notebook.isDeleted()) { + return notebook; + } } } } diff --git a/app/src/main/res/drawable-xxhdpi/logo.png b/app/src/main/res/drawable-xxhdpi/logo.png index 03f389e..aa5d3fd 100644 Binary files a/app/src/main/res/drawable-xxhdpi/logo.png and b/app/src/main/res/drawable-xxhdpi/logo.png differ diff --git a/app/src/main/res/drawable-xxhdpi/logo1.png b/app/src/main/res/drawable-xxhdpi/logo1.png new file mode 100644 index 0000000..bd0ccec Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/logo1.png differ diff --git a/app/src/main/res/layout/activity_signin.xml b/app/src/main/res/layout/activity_signin.xml index 1af4266..99076f6 100644 --- a/app/src/main/res/layout/activity_signin.xml +++ b/app/src/main/res/layout/activity_signin.xml @@ -2,7 +2,7 @@ @@ -61,7 +61,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerInParent="true" - android:background="@color/colorAccent" + android:background="#1582b0" android:gravity="center" android:padding="8dp" android:text="@string/sign_up" @@ -88,7 +88,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerInParent="true" - android:background="#757575" + android:background="#1582b0" android:gravity="center" android:padding="8dp" android:text="@string/sign_in" diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index d43d532..8fcfc6d 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 82a71dc..9cc2486 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index fc02a38..86c4a8a 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 9bc51f4..5d413d3 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index b291b49..167c32b 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -1,6 +1,6 @@ - Leamonax + 蚂蚁笔记 添加笔记本 应用 你确定要删除该账户所有的数据吗? diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 81f9470..85ecdc7 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,10 +1,10 @@ - #9E9E9E + #1d89b7 #616161 #03A9F4 - #9E9E9E + #1d89b7 #FAFAFA #BDBDBD #E0E0E0 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3f056ba..3fa82f6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - Leamonax + Leanote Network is unavailable Save note failed Sync notes failed diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 4cc6b8c..f5c436c 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -4,7 +4,7 @@