Ver código fonte

Added refresh item to toolbar menu

sirekanyan 8 anos atrás
pai
commit
eef2fe3863

+ 4 - 6
app/src/main/java/me/vadik/knigopis/MainActivity.kt

@@ -77,12 +77,6 @@ class MainActivity : AppCompatActivity(), Router {
     if (needUpdate) {
       refresh()
     }
-    booksPlaceholder.setOnClickListener { refresh() }
-  }
-
-  override fun onStop() {
-    booksPlaceholder.setOnClickListener(null)
-    super.onStop()
   }
 
   override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -146,6 +140,10 @@ class MainActivity : AppCompatActivity(), Router {
           AlertDialog.Builder(this).setView(dialogView).show()
           true
         }
+        R.id.option_refresh -> {
+          refresh()
+          true
+        }
         else -> false
       }
     }

+ 11 - 5
app/src/main/res/menu/options.xml

@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/option_login"
-        android:orderInCategory="2"
-        android:visible="false" />
+        android:visible="false"/>
+
+    <item
+        android:id="@+id/option_refresh"
+        android:title="@string/option_refresh"
+        app:showAsAction="never"/>
 
     <item
         android:id="@+id/option_about"
-        android:orderInCategory="1"
-        android:title="@string/option_about" />
+        android:title="@string/option_about"
+        app:showAsAction="never"/>
 
 </menu>

+ 1 - 0
app/src/main/res/values-ru/strings.xml

@@ -12,6 +12,7 @@
     <!-- menu -->
     <string name="option_login">Войти</string>
     <string name="option_logout">Выйти</string>
+    <string name="option_refresh">Обновить</string>
     <string name="option_about">О приложении</string>
 
     <!-- books -->

+ 1 - 0
app/src/main/res/values/strings.xml

@@ -12,6 +12,7 @@
     <!-- menu -->
     <string name="option_login">Login</string>
     <string name="option_logout">Logout</string>
+    <string name="option_refresh">Refresh</string>
     <string name="option_about">About</string>
 
     <!-- books -->