From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Wed, 3 Mar 2021 12:32:31 +0000 (+0000)
Subject: drop collapsing toolbar layout, plain toolbar is fine
X-Git-Tag: v0.17.0~50
X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=commitdiff_plain;h=268e7250a18b60ec49bb243d15d394d56cf0bbc8;hp=d63a611dce420b30fa0c0711eea1d02603945a43

drop collapsing toolbar layout, plain toolbar is fine

same as the other places
---

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/templates/TemplatesActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/templates/TemplatesActivity.java
index 7bc72220..ed652879 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/templates/TemplatesActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/templates/TemplatesActivity.java
@@ -79,7 +79,7 @@ public class TemplatesActivity extends CrashReportingActivity
 
         navController.addOnDestinationChangedListener((controller, destination, arguments) -> {
             if (destination.getId() == R.id.templateListFragment) {
-                b.toolbarLayout.setTitle(getString(R.string.title_activity_templates));
+                b.toolbar.setTitle(getString(R.string.title_activity_templates));
                 b.fab.setImageResource(R.drawable.ic_add_white_24dp);
             }
             else {
@@ -87,7 +87,7 @@ public class TemplatesActivity extends CrashReportingActivity
             }
         });
 
-        b.toolbarLayout.setTitle(getString(R.string.title_activity_templates));
+        b.toolbar.setTitle(getString(R.string.title_activity_templates));
 
         b.fab.setOnClickListener(v -> {
             if (navController.getCurrentDestination()
@@ -125,14 +125,14 @@ public class TemplatesActivity extends CrashReportingActivity
     public void onEditTemplate(Long id) {
         if (id == null) {
             navController.navigate(R.id.action_templateListFragment_to_templateDetailsFragment);
-            b.toolbarLayout.setTitle(getString(R.string.title_new_template));
+            b.toolbar.setTitle(getString(R.string.title_new_template));
         }
         else {
             Bundle bundle = new Bundle();
             bundle.putLong(TemplateDetailsFragment.ARG_TEMPLATE_ID, id);
             navController.navigate(R.id.action_templateListFragment_to_templateDetailsFragment,
                     bundle);
-            b.toolbarLayout.setTitle(getString(R.string.title_edit_template));
+            b.toolbar.setTitle(getString(R.string.title_edit_template));
         }
     }
     @Override
diff --git a/app/src/main/res/layout/activity_templates.xml b/app/src/main/res/layout/activity_templates.xml
index 30c998df..a60a650f 100644
--- a/app/src/main/res/layout/activity_templates.xml
+++ b/app/src/main/res/layout/activity_templates.xml
@@ -26,28 +26,17 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/app_bar_height"
+        android:layout_height="@dimen/toolbar_height"
         android:fitsSystemWindows="true"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         >
-        <com.google.android.material.appbar.CollapsingToolbarLayout
-            android:id="@+id/toolbar_layout"
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:fitsSystemWindows="true"
-            app:contentScrim="?attr/colorPrimary"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed"
-            app:toolbarId="@+id/toolbar"
-            >
-
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                app:layout_collapseMode="pin"
-                app:popupTheme="@style/ThemeOverlay.AppCompat.DayNight"
-                />
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
+            app:layout_collapseMode="pin"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.DayNight"
+            />
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.core.widget.NestedScrollView