Ver Fonte

Fixed toolbar title on edit book screen

sirekanyan há 8 anos atrás
pai
commit
fbfe9af700

+ 11 - 12
app/src/main/AndroidManifest.xml

@@ -1,37 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="me.vadik.knigopis">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
 
     <application
         android:name=".App"
-        android:allowBackup="true"
-        android:fullBackupContent="false"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        tools:ignore="GoogleAppIndexingWarning">
+        tools:ignore="GoogleAppIndexingWarning"
+        tools:replace="android:allowBackup">
 
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
 
-        <activity
-            android:name=".BookActivity"
-            android:label="@string/book_edit_title" />
+        <activity android:name=".BookActivity"/>
 
         <activity
             android:name="ru.ulogin.sdk.UloginAuthActivity"
-            android:configChanges="orientation|screenSize" />
+            android:configChanges="orientation|screenSize"/>
     </application>
 </manifest>

+ 1 - 0
app/src/main/java/me/vadik/knigopis/BookActivity.kt

@@ -50,6 +50,7 @@ class BookActivity : AppCompatActivity() {
     setContentView(R.layout.book_edit)
     bookId = intent.getStringExtra(EXTRA_BOOK_ID)
     toolbar.inflateMenu(R.menu.book_menu)
+    toolbar.setTitle(if (bookId == null) R.string.book_add_title else R.string.book_edit_title)
     toolbar.setNavigationIcon(R.drawable.ic_arrow_back)
     toolbar.setNavigationOnClickListener {
       finish()

+ 1 - 1
app/src/main/res/layout/book_edit.xml

@@ -17,7 +17,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:title="@string/book_add_title"/>
+            tools:title="@string/book_add_title"/>
 
     </android.support.design.widget.AppBarLayout>