X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fmain_app_layout.xml;h=ab68dcdcb366d5c5d7d1cb5c421d38b8adf4d67a;hb=18c7b6dcb2ab4c3049588335b472663fb569b6c2;hp=86e918707ad247d628cc18b4c0c3df431038f376;hpb=72661d2cd04cc3fcb378f22c3cdbc290a5171d8e;p=mobile-ledger-staging.git

diff --git a/app/src/main/res/layout/main_app_layout.xml b/app/src/main/res/layout/main_app_layout.xml
index 86e91870..ab68dcdc 100644
--- a/app/src/main/res/layout/main_app_layout.xml
+++ b/app/src/main/res/layout/main_app_layout.xml
@@ -21,8 +21,8 @@
     android:id="@+id/main_app_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?android:attr/colorBackground"
     android:orientation="vertical"
-    android:theme="@style/AppTheme.AppBarOverlay"
     tools:context=".ui.activity.MainActivity">
 
 
@@ -32,11 +32,13 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
-        app:backgroundTint="?colorAccent"
+        app:backgroundTint="?colorSecondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:maxImageSize="36dp"
-        app:srcCompat="@drawable/ic_add_white_24dp" />
+        app:srcCompat="@drawable/ic_add_white_24dp"
+        android:contentDescription="@string/new_transaction_fab_description"
+        />
 
     <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/drawer_layout"
@@ -52,8 +54,9 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="@dimen/toolbar_height"
                 android:background="?colorPrimary"
+                android:theme="@style/AppTheme.AppBarOverlay"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -68,33 +71,6 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/toolbar">
 
-                <LinearLayout
-                    android:id="@+id/transactions_last_update_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:elevation="24dp"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/transaction_last_update_label"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:paddingStart="8dp"
-                        android:paddingEnd="8dp"
-                        android:text="@string/transactions_last_update_label"
-                        android:textColor="@android:color/tertiary_text_light" />
-
-                    <TextView
-                        android:id="@+id/transactions_last_update"
-                        style="@android:style/Widget.DeviceDefault.Light.TextView"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:text="\?"
-                        android:textColor="@android:color/tertiary_text_light"
-                        tools:ignore="HardcodedText" />
-                </LinearLayout>
-
                 <LinearLayout
                     android:id="@+id/transaction_progress_layout"
                     android:layout_width="match_parent"
@@ -113,6 +89,7 @@
                         android:layout_weight="1"
                         android:indeterminate="true"
                         android:padding="0dp"
+                        android:min="0"
                         android:progressTint="?colorPrimary"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent" />
@@ -124,12 +101,12 @@
                         android:background="@drawable/ic_clear_accent_24dp"
                         android:clickable="true"
                         android:focusable="true"
-                        android:onClick="onStopTransactionRefreshClick" />
+                        />
                 </LinearLayout>
 
             </LinearLayout>
 
-            <androidx.viewpager.widget.ViewPager
+            <androidx.viewpager2.widget.ViewPager2
                 android:id="@+id/root_frame"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
@@ -138,11 +115,11 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/main_header">
 
-            </androidx.viewpager.widget.ViewPager>
+            </androidx.viewpager2.widget.ViewPager2>
 
             <View
                 android:layout_width="0dp"
-                android:layout_height="4dp"
+                android:layout_height="?attr/main_header_shadow_height"
                 android:background="@drawable/drop_shadow"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"