Changed navigation icons

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

@@ -5,7 +5,6 @@ import android.support.design.widget.BottomNavigationView
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
-import android.view.MenuItem
 import me.vadik.knigopis.model.Book
 import me.vadik.knigopis.model.User
 import retrofit2.Call
@@ -18,21 +17,14 @@ class MainActivity : AppCompatActivity() {
   private val recyclerView by lazy { findViewById(R.id.recycler_view) as RecyclerView }
   private val users = mutableListOf<User>()
 
-  private val onNavigationItemSelectedListener = { item: MenuItem ->
-    supportActionBar!!.setTitle(when (item.itemId) {
-      R.id.navigation_home -> R.string.title_home
-      R.id.navigation_dashboard -> R.string.title_dashboard
-      R.id.navigation_notifications -> R.string.title_notifications
-      else -> throw UnsupportedOperationException()
-    })
-    true
-  }
-
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_main)
     val navigation = findViewById(R.id.navigation) as BottomNavigationView
-    navigation.setOnNavigationItemSelectedListener(onNavigationItemSelectedListener)
+    navigation.setOnNavigationItemSelectedListener { item ->
+      supportActionBar!!.title = item.title
+      true
+    }
     val adapter = UsersAdapter(users)
     recyclerView.adapter = adapter
     recyclerView.layoutManager = LinearLayoutManager(this)

app/src/main/res/drawable/ic_bookmark.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="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"/>
+</vector>

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

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3,13h8L11,3L3,3v10zM3,21h8v-6L3,15v6zM13,21h8L21,11h-8v10zM13,3v6h8L21,3h-8z"/>
-</vector>

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

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0">
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
+        android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
 </vector>

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

@@ -1,5 +1,5 @@
 <vector android:height="24dp" android:viewportHeight="512.0"
     android:viewportWidth="512.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#3B88C3" android:pathData="M512,455.1c0,31.4 -25.5,56.9 -56.9,56.9L56.9,512C25.5,512 0,486.5 0,455.1L0,56.9C0,25.5 25.5,0 56.9,0l398.2,0C486.5,0 512,25.5 512,56.9L512,455.1z"/>
+    <path android:fillColor="#3F51B5" android:pathData="M512,455.1c0,31.4 -25.5,56.9 -56.9,56.9L56.9,512C25.5,512 0,486.5 0,455.1L0,56.9C0,25.5 25.5,0 56.9,0l398.2,0C486.5,0 512,25.5 512,56.9L512,455.1z"/>
     <path android:fillColor="#FFFFFF" android:pathData="M141.2,128.5c0,-18.1 13.2,-32.6 33.1,-32.6c19,0 33.1,12.3 33.1,32.6l0,95.2l108.5,-115.5c4.9,-5.3 13.2,-12.3 25.6,-12.3c16.7,0 32.6,12.8 32.6,31.7c0,11.5 -7.1,20.7 -21.6,35.3l-83.4,82l101.9,106.3c10.6,10.6 18.5,20.3 18.5,33.5c0,20.7 -16.3,30.4 -34.4,30.4c-12.8,0 -21.2,-7.5 -33.5,-20.7l-114.2,-123.5l0,112.4c0,17.2 -13.2,31.7 -33.1,31.7c-19,0 -33.1,-12.3 -33.1,-31.7L141.2,128.5z"/>
 </vector>

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

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
-</vector>

app/src/main/res/drawable/ic_public.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="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_home_black_24dp"
+        android:icon="@drawable/ic_public"
         android:title="@string/title_home"/>
 
     <item
-        android:id="@+id/navigation_dashboard"
-        android:icon="@drawable/ic_dashboard_black_24dp"
-        android:title="@string/title_dashboard"/>
+        android:id="@+id/navigation_done"
+        android:icon="@drawable/ic_done"
+        android:title="@string/title_done"/>
 
     <item
-        android:id="@+id/navigation_notifications"
-        android:icon="@drawable/ic_notifications_black_24dp"
-        android:title="@string/title_notifications"/>
+        android:id="@+id/navigation_todo"
+        android:icon="@drawable/ic_bookmark"
+        android:title="@string/title_todo"/>
 
 </menu>

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

@@ -1,6 +1,8 @@
 <resources>
     <string name="app_name">Книгопись</string>
-    <string name="title_home">Новые</string>
-    <string name="title_dashboard">Dashboard</string>
-    <string name="title_notifications">Notifications</string>
+    <string name="title_home">Читают</string>
+    <string name="title_done">Прочитано</string>
+    <string name="title_todo">Читать</string>
+    <string name="option_login">Войти</string>
+    <string name="option_logout">Выйти</string>
 </resources>

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

@@ -1,6 +1,8 @@
 <resources>
     <string name="app_name">Knigopis</string>
     <string name="title_home">Latest</string>
-    <string name="title_dashboard">Dashboard</string>
-    <string name="title_notifications">Notifications</string>
+    <string name="title_done">Done</string>
+    <string name="title_todo">Todo</string>
+    <string name="option_login">Login</string>
+    <string name="option_logout">Logout</string>
 </resources>