X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fmain_app_layout.xml;h=d9f4b42687224d2cdd19e545ea875ad3141212c3;hb=605837f87d9731e3529fa9be447bbcf7625cb2eb;hp=4b778d64ba31c0ca44709f068fda1d657a9c5f58;hpb=940c057386c5c9b39404d58a97d98c63182e58ff;p=mobile-ledger.git

diff --git a/app/src/main/res/layout/main_app_layout.xml b/app/src/main/res/layout/main_app_layout.xml
index 4b778d64..d9f4b426 100644
--- a/app/src/main/res/layout/main_app_layout.xml
+++ b/app/src/main/res/layout/main_app_layout.xml
@@ -21,9 +21,8 @@
     android:id="@+id/main_app_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/backgroundColor"
+    android:background="?android:attr/colorBackground"
     android:orientation="vertical"
-    android:theme="@style/AppTheme.AppBarOverlay"
     tools:context=".ui.activity.MainActivity">
 
 
@@ -33,11 +32,12 @@
         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"
+        />
 
     <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/drawer_layout"
@@ -53,8 +53,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"
@@ -69,32 +70,38 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/toolbar">
 
-                <LinearLayout
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/transactions_last_update_layout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:elevation="24dp"
-                    android:orientation="horizontal">
+                    android:orientation="horizontal"
+                    >
 
                     <TextView
                         android:id="@+id/transaction_last_update_label"
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         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" />
+                        android:textAppearance="@android:style/TextAppearance.Material.Small"
+                        app:layout_constraintEnd_toStartOf="@id/transactions_last_update"
+                        app:layout_constraintTop_toTopOf="parent"
+                        />
 
                     <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>
+                        android:textAppearance="@android:style/TextAppearance.Material.Small"
+                        tools:ignore="HardcodedText"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        />
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <LinearLayout
                     android:id="@+id/transaction_progress_layout"
@@ -114,6 +121,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" />
@@ -143,7 +151,7 @@
 
             <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"