X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Factivity_main.xml;h=d30b88a1015dd95dffed8db4a71e3dd2dac56518;hb=f6285a302e422758b452cd923efe6041eedb96ff;hp=1fc6d8b614f3898242fd2536c64754fceb9cd0d4;hpb=b520c878635649cce634b9a0f133691a59d8290f;p=mobile-ledger-staging.git

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1fc6d8b6..d30b88a1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -100,7 +100,6 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
         android:id="@+id/main_app_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -148,51 +147,43 @@
                     app:popupTheme="@style/AppTheme.PopupOverlay"
                     />
 
+
                 <LinearLayout
-                    android:id="@+id/main_header"
+                    android:id="@+id/transaction_progress_layout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:visibility="gone"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/toolbar"
                     >
 
-                    <LinearLayout
-                        android:id="@+id/transaction_progress_layout"
-                        android:layout_width="match_parent"
+                    <ProgressBar
+                        android:id="@+id/transaction_list_progress_bar"
+                        style="?android:attr/progressBarStyleHorizontal"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:visibility="gone"
-                        >
-
-                        <ProgressBar
-                            android:id="@+id/transaction_list_progress_bar"
-                            style="?android:attr/progressBarStyleHorizontal"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="-8dp"
-                            android:layout_marginBottom="-7dp"
-                            android:layout_weight="1"
-                            android:indeterminate="true"
-                            android:min="0"
-                            android:padding="0dp"
-                            android:progressTint="?colorPrimary"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            />
-
-                        <TextView
-                            android:id="@+id/transaction_list_cancel_download"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/ic_clear_accent_24dp"
-                            android:clickable="true"
-                            android:focusable="true"
-                            />
-                    </LinearLayout>
+                        android:layout_marginTop="-8dp"
+                        android:layout_marginBottom="-7dp"
+                        android:layout_weight="1"
+                        android:indeterminate="true"
+                        android:min="0"
+                        android:padding="0dp"
+                        android:progressTint="?colorPrimary"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        />
 
+                    <TextView
+                        android:id="@+id/transaction_list_cancel_download"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/ic_clear_accent_24dp"
+                        android:clickable="true"
+                        android:focusable="true"
+                        />
                 </LinearLayout>
 
                 <androidx.viewpager2.widget.ViewPager2
@@ -202,7 +193,7 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/main_header"
+                    app:layout_constraintTop_toBottomOf="@id/transaction_progress_layout"
                     >
 
                 </androidx.viewpager2.widget.ViewPager2>
@@ -213,14 +204,13 @@
                     android:background="@drawable/drop_shadow"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/main_header"
+                    app:layout_constraintTop_toBottomOf="@id/transaction_progress_layout"
                     />
 
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
-            <com.google.android.material.navigation.NavigationView xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
+            <com.google.android.material.navigation.NavigationView xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/nav_view"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
@@ -292,7 +282,6 @@
                                 <TextView
                                     android:id="@+id/nav_account_summary"
                                     style="@style/nav_button"
-                                    android:onClick="onAccountSummaryClicked"
                                     android:text="@string/account_summary_title"
                                     app:drawableStartCompat="@drawable/ic_home_black_24dp"
                                     />
@@ -300,7 +289,6 @@
                                 <TextView
                                     android:id="@+id/nav_latest_transactions"
                                     style="@style/nav_button"
-                                    android:onClick="onLatestTransactionsClicked"
                                     android:text="@string/nav_transactions_title"
                                     app:drawableStartCompat="@drawable/ic_event_note_black_24dp"
                                     />
@@ -313,7 +301,7 @@
                                     app:drawableStartCompat="@drawable/ic_assignment_black_24dp"
                                     />
 
-                                <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                <androidx.constraintlayout.widget.ConstraintLayout
                                     android:id="@+id/nav_profile_list_head_layout"
                                     android:layout_width="match_parent"
                                     android:layout_height="@dimen/thumb_row_height"