Changed navigation titles and icons

app/src/main/java/me/vadik/knigopis/MainActivity.kt

@@ -67,7 +67,7 @@ class MainActivity : AppCompatActivity() {
   }
 
   private fun initNavigationView(navigation: BottomNavigationView) {
-    setCurrentTab(if (auth.isAuthorized()) DONE_TAB else HOME_TAB)
+    setCurrentTab(HOME_TAB)
     navigation.selectedItemId = currentTab.itemId
     navigation.setOnNavigationItemSelectedListener { item ->
       setCurrentTab(CurrentTab.getByItemId(item.itemId))
@@ -114,8 +114,8 @@ class MainActivity : AppCompatActivity() {
     currentTab = tab
     when (tab) {
       HOME_TAB -> refreshHomeTab()
-      DONE_TAB -> refreshDoneTab()
-      TODO_TAB -> refreshTodoTab()
+      USERS_TAB -> refreshDoneTab()
+      NOTES_TAB -> refreshTodoTab()
     }
   }
 

app/src/main/java/me/vadik/knigopis/model/CurrentTab.kt

@@ -6,8 +6,8 @@ import me.vadik.knigopis.R
 enum class CurrentTab(@IdRes val itemId: Int) {
 
   HOME_TAB(R.id.navigation_home),
-  DONE_TAB(R.id.navigation_done),
-  TODO_TAB(R.id.navigation_todo);
+  USERS_TAB(R.id.navigation_users),
+  NOTES_TAB(R.id.navigation_notes);
 
   companion object {
     fun getByItemId(@IdRes itemId: Int) =

app/src/main/res/drawable/ic_comment.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M21.99,4c0,-1.1 -0.89,-2 -1.99,-2L4,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4 -0.01,-18zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z"/>
+</vector>

app/src/main/res/drawable/ic_done.xml → app/src/main/res/drawable/ic_home.xml

@@ -5,5 +5,5 @@
         android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
+        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
 </vector>

app/src/main/res/drawable/ic_people.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
+</vector>

app/src/main/res/drawable/ic_bookmark.xml → app/src/main/res/drawable/ic_person.xml

@@ -5,5 +5,5 @@
         android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M17,3L7,3c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3L19,5c0,-1.1 -0.9,-2 -2,-2zM17,18l-5,-2.18L7,18L7,5h10v13z"/>
+        android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
 </vector>

app/src/main/res/drawable/ic_public.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z"/>
-</vector>

app/src/main/res/menu/navigation.xml

@@ -3,17 +3,17 @@
 
     <item
         android:id="@+id/navigation_home"
-        android:icon="@drawable/ic_public"
+        android:icon="@drawable/ic_home"
         android:title="@string/title_home"/>
 
     <item
-        android:id="@+id/navigation_done"
-        android:icon="@drawable/ic_done"
-        android:title="@string/title_done"/>
+        android:id="@+id/navigation_users"
+        android:icon="@drawable/ic_people"
+        android:title="@string/title_users"/>
 
     <item
-        android:id="@+id/navigation_todo"
-        android:icon="@drawable/ic_bookmark"
-        android:title="@string/title_todo"/>
+        android:id="@+id/navigation_notes"
+        android:icon="@drawable/ic_comment"
+        android:title="@string/title_notes"/>
 
 </menu>

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

@@ -1,8 +1,8 @@
 <resources>
     <string name="app_name">Книгопись</string>
-    <string name="title_home">Читают</string>
-    <string name="title_done">Прочитано</string>
-    <string name="title_todo">К прочтению</string>
+    <string name="title_home">Мои книги</string>
+    <string name="title_users">Подписки</string>
+    <string name="title_notes">Примечания</string>
     <string name="option_login">Войти</string>
     <string name="option_logout">Выйти</string>
 </resources>

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

@@ -1,8 +1,8 @@
 <resources>
     <string name="app_name">Knigopis</string>
-    <string name="title_home">Latest</string>
-    <string name="title_done">Done</string>
-    <string name="title_todo">Todo</string>
+    <string name="title_home">Books</string>
+    <string name="title_users">Followers</string>
+    <string name="title_notes">Notes</string>
     <string name="option_login">Login</string>
     <string name="option_logout">Logout</string>
 </resources>