leamonaxN

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;
+                   }
                 }
             }
         }

app/src/main/res/layout/activity_signin.xml

@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#212121"
+    android:background="#1d89b7"
     android:orientation="vertical">
 
 
@@ -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"

app/src/main/res/values-zh/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Leamonax</string>
+    <string name="app_name">蚂蚁笔记</string>
     <string name="add_notebook">添加笔记本</string>
     <string name="apply">应用</string>
     <string name="are_you_sure_to_delete_all_data_in_this_account">你确定要删除该账户所有的数据吗？</string>

app/src/main/res/values/colors.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#9E9E9E</color>
+    <color name="colorPrimary">#1d89b7</color>
     <color name="colorPrimaryDark">#616161</color>
     <color name="colorAccent">#03A9F4</color>
 
-    <color name="toolbar">#9E9E9E</color>
+    <color name="toolbar">#1d89b7</color>
     <color name="menu_text">#FAFAFA</color>
     <color name="drawer_divider">#BDBDBD</color>
     <color name="drawer_divider_light">#E0E0E0</color>

app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">Leamonax</string>
+    <string name="app_name">Leanote</string>
     <string name="network_is_unavailable">Network is unavailable</string>
     <string name="save_note_failed">Save note failed</string>
     <string name="sync_notes_failed">Sync notes failed</string>

app/src/main/res/values/styles.xml

@@ -4,7 +4,7 @@
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorPrimaryDark">@color/menu_text</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:actionMenuTextColor">@color/menu_text</item>
 
@@ -41,12 +41,13 @@
     </style>
 
     <style name="SignInEditText">
+        <item name="android:theme">@android:style/Theme.Holo</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:padding">8dp</item>
         <item name="android:layout_marginEnd">16dp</item>
         <item name="android:layout_marginStart">16dp</item>
-        <item name="android:background">#fff</item>
+        <!--<item name="android:background">#fff</item>-->
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textSize">18sp</item>
         <item name="android:textColorHint">@color/hint_text_light</item>