X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Factivity_main.xml;h=7f01a1befa32de1569f24d92b56c626b8b8ddb34;hp=81b8a28c04e03cf634f8c6ca9908069e985a66b2;hb=2153781141de6036d6f12ce081e738082daeeb9a;hpb=57240f714b30ac2c75b59687f6ceab5c3da2dc52

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 81b8a28c..7f01a1be 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -40,135 +40,144 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <android.support.design.widget.FloatingActionButton
-                android:id="@+id/btn_add_transaction"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|end"
-                android:layout_margin="@dimen/fab_margin"
-                android:onClick="fab_new_transaction_clicked"
-                app:backgroundTint="@color/colorPrimary"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:srcCompat="@drawable/svg_thick_plus_white" />
-
-            <LinearLayout
-                android:id="@+id/main_header"
+            <android.support.constraint.ConstraintLayout
+                android:id="@+id/pager_layout"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:theme="@style/AppTheme"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
+                android:layout_height="match_parent">
+
+                <android.support.design.widget.FloatingActionButton
+                    android:id="@+id/btn_add_transaction"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom|end"
+                    android:layout_margin="@dimen/fab_margin"
+                    android:onClick="fabNewTransactionClicked"
+                    app:backgroundTint="@color/colorAccent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:srcCompat="@drawable/svg_thick_plus_white" />
 
                 <LinearLayout
-                    android:id="@+id/transaction_list_account_name_filter"
+                    android:id="@+id/main_header"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="horizontal"
-                    android:visibility="gone">
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:theme="@style/AppTheme"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:background="@drawable/ic_filter_list_black_24dp" />
+                    <LinearLayout
+                        android:id="@+id/transaction_list_account_name_filter"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="horizontal"
+                        android:visibility="gone">
 
-                    <AutoCompleteTextView
-                        android:id="@+id/transaction_filter_account_name"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1" />
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/ic_filter_list_black_24dp" />
 
-                    <TextView
-                        android:id="@+id/clearAccountNameFilter"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:background="@drawable/ic_clear_black_24dp"
-                        android:clickable="true"
-                        android:focusable="true" />
+                        <AutoCompleteTextView
+                            android:id="@+id/transaction_filter_account_name"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1" />
 
-                </LinearLayout>
+                        <TextView
+                            android:id="@+id/clearAccountNameFilter"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/ic_clear_black_24dp"
+                            android:clickable="true"
+                            android:focusable="true" />
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:elevation="24dp"
-                    android:orientation="horizontal">
+                    </LinearLayout>
 
-                    <TextView
-                        android:id="@+id/transaction_last_update_label"
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         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:elevation="24dp"
+                        android:orientation="horizontal">
 
-                    <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>
+                        <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" />
 
-                <LinearLayout
-                    android:id="@+id/transaction_progress_layout"
-                    android:layout_width="match_parent"
-                    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:padding="0dp"
-                        android:progressTint="@color/colorPrimary"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/transaction_list_head" />
+                        <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>
 
-                    <TextView
-                        android:id="@+id/transaction_list_cancel_download"
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:id="@+id/transaction_progress_layout"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:background="@drawable/ic_clear_black_24dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:onClick="onStopTransactionRefreshClick" />
+                        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:padding="0dp"
+                            android:progressTint="@color/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_black_24dp"
+                            android:clickable="true"
+                            android:focusable="true"
+                            android:onClick="onStopTransactionRefreshClick" />
+                    </LinearLayout>
+
                 </LinearLayout>
 
-            </LinearLayout>
+                <android.support.v4.view.ViewPager
+                    android:id="@+id/root_frame"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/main_header">
 
-            <android.support.v4.view.ViewPager
-                android:id="@+id/root_frame"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/main_header">
+                </android.support.v4.view.ViewPager>
 
-            </android.support.v4.view.ViewPager>
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="4dp"
+                    android:background="@drawable/drop_shadow"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/main_header" />
 
-            <View
-                android:layout_width="0dp"
-                android:layout_height="4dp"
-                android:background="@drawable/drop_shadow"
-                app:layout_constraintTop_toBottomOf="@id/main_header" />
 
-        </android.support.constraint.ConstraintLayout>
+            </android.support.constraint.ConstraintLayout>
 
+            <include layout="@layout/no_profiles" />
+        </android.support.constraint.ConstraintLayout>
 
         <android.support.design.widget.NavigationView
             android:id="@+id/nav_view"
@@ -201,7 +210,7 @@
                         android:layout_width="match_parent"
                         android:layout_weight="1"
                         android:drawableStart="@drawable/ic_view_list_black_24dp"
-                        android:onClick="nav_profiles_clicked"
+                        android:onClick="navProfilesClicked"
                         android:text="@string/profiles" />
 
                     <TextView
@@ -209,17 +218,9 @@
                         style="@style/nav_button"
                         android:layout_weight="1"
                         android:drawableStart="@drawable/ic_settings_black_24dp"
-                        android:onClick="nav_settings_clicked"
+                        android:onClick="navSettingsClicked"
                         android:text="@string/action_settings" />
 
-                    <TextView
-                        android:id="@+id/nav_exit"
-                        style="@style/nav_button"
-                        android:layout_weight="1"
-                        android:drawableStart="@drawable/ic_exit_to_app_black_24dp"
-                        android:onClick="nav_exit_clicked"
-                        android:text="@string/nav_exit_title" />
-
                 </LinearLayout>
 
                 <ScrollView
@@ -232,7 +233,7 @@
                     app:layout_constraintTop_toTopOf="parent">
 
                     <LinearLayout
-                        android:id="@+id/nav_actions"
+                        android:id="@+id/nav_upper"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
@@ -244,50 +245,65 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:background="@drawable/side_nav_bar"
-                            android:gravity="bottom"
-                            android:orientation="vertical"
-                            android:paddingLeft="@dimen/activity_horizontal_margin"
-                            android:paddingTop="@dimen/activity_vertical_margin"
-                            android:paddingRight="@dimen/activity_horizontal_margin"
-                            android:paddingBottom="@dimen/activity_vertical_margin"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal"
+                            android:padding="@dimen/activity_vertical_margin"
                             android:theme="@style/ThemeOverlay.AppCompat.Dark"
                             app:layout_constraintTop_toTopOf="parent">
 
                             <include layout="@layout/nav_header_logo" />
 
-                            <TextView
+                            <LinearLayout
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text="@string/app_name"
-                                android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
-
-                            <TextView
-                                android:id="@+id/drawer_version_text"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/nav_header_subtitle" />
+                                android:layout_height="match_parent"
+                                android:layout_marginStart="@dimen/activity_horizontal_margin"
+                                android:layout_marginEnd="@dimen/activity_horizontal_margin"
+                                android:gravity="center_vertical"
+                                android:orientation="vertical">
+
+                                <TextView
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:text="@string/app_name"
+                                    android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+
+                                <TextView
+                                    android:id="@+id/drawer_version_text"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="dummy version"
+                                    tools:ignore="HardcodedText" />
+                            </LinearLayout>
 
                         </LinearLayout>
 
-                        <TextView
-                            android:id="@+id/nav_account_summary"
-                            style="@style/nav_button"
-                            android:drawableStart="@drawable/ic_home_black_24dp"
-                            android:onClick="onAccountSummaryClicked"
-                            android:text="@string/account_summary_title" />
+                        <LinearLayout
+                            android:id="@+id/nav_actions"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:orientation="vertical">
 
-                        <TextView
-                            android:id="@+id/nav_latest_transactions"
-                            style="@style/nav_button"
-                            android:drawableStart="@drawable/ic_event_note_black_24dp"
-                            android:onClick="onLatestTransactionsClicked"
-                            android:text="@string/nav_latest_transactions_title" />
+                            <TextView
+                                android:id="@+id/nav_account_summary"
+                                style="@style/nav_button"
+                                android:drawableStart="@drawable/ic_home_black_24dp"
+                                android:onClick="onAccountSummaryClicked"
+                                android:text="@string/account_summary_title" />
 
-                        <TextView
-                            android:id="@+id/textView5"
-                            style="@style/nav_button"
-                            android:drawableStart="@drawable/ic_assignment_black_24dp"
-                            android:text="@string/nav_reports_title" />
+                            <TextView
+                                android:id="@+id/nav_latest_transactions"
+                                style="@style/nav_button"
+                                android:drawableStart="@drawable/ic_event_note_black_24dp"
+                                android:onClick="onLatestTransactionsClicked"
+                                android:text="@string/nav_latest_transactions_title" />
+
+                            <TextView
+                                android:id="@+id/textView5"
+                                style="@style/nav_button"
+                                android:drawableStart="@drawable/ic_assignment_black_24dp"
+                                android:text="@string/nav_reports_title" />
+
+                        </LinearLayout>
 
                     </LinearLayout>
                 </ScrollView>