X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Factivity_main.xml;h=0f66ac3859d5d4773a67d40805bea8dba8003d33;hp=dacbcea8866eb46eb52c174ec736c6270f294035;hb=7ff1c26d71d1f13fab1d7e1dc93c0d9469b64236;hpb=0628b3f6f00212726a03842dff2b169adb64c64c

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index dacbcea8..0f66ac38 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -46,7 +46,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom|end"
                 android:layout_margin="@dimen/fab_margin"
-                android:onClick="fab_new_transaction_clicked"
+                android:onClick="fabNewTransactionClicked"
                 app:backgroundTint="@color/colorPrimary"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -57,10 +57,39 @@
                 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">
 
+                <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">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/ic_filter_list_black_24dp" />
+
+                    <AutoCompleteTextView
+                        android:id="@+id/transaction_filter_account_name"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1" />
+
+                    <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>
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -71,8 +100,8 @@
                         android:id="@+id/transaction_last_update_label"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingEnd="8dp"
                         android:paddingStart="8dp"
+                        android:paddingEnd="8dp"
                         android:text="@string/transactions_last_update_label"
                         android:textColor="@android:color/tertiary_text_light" />
 
@@ -126,10 +155,9 @@
                 android:id="@+id/root_frame"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/main_header"
                 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>
 
@@ -150,116 +178,128 @@
             android:fitsSystemWindows="true"
             android:theme="@style/ThemeOverlay.AppCompat.Light">
 
-            <ScrollView
+
+            <android.support.constraint.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:scrollbars="vertical"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
+                android:layout_marginBottom="0dp"
+                android:orientation="vertical">
 
-                <android.support.constraint.ConstraintLayout
+                <LinearLayout
+                    android:id="@+id/nav_fixed_items"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="0dp"
-                    android:orientation="vertical">
+                    android:divider="@drawable/list_divider"
+                    android:elevation="2dp"
+                    android:orientation="vertical"
+                    android:showDividers="beginning"
+                    app:layout_constraintBottom_toBottomOf="parent">
 
-                    <LinearLayout
-                        android:id="@+id/nav_header"
+                    <TextView
+                        android:id="@+id/nav_profiles"
+                        style="@style/nav_button"
                         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:theme="@style/ThemeOverlay.AppCompat.Dark"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <ImageView
-                            android:id="@+id/imageView"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:contentDescription="@string/nav_header_desc"
-                            android:paddingTop="@dimen/nav_header_vertical_spacing"
-                            app:srcCompat="@mipmap/ic_launcher_round" />
+                        android:layout_weight="1"
+                        android:drawableStart="@drawable/ic_view_list_black_24dp"
+                        android:onClick="navProfilesClicked"
+                        android:text="@string/profiles" />
 
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:paddingTop="@dimen/nav_header_vertical_spacing"
-                            android:text="@string/app_name"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+                    <TextView
+                        android:id="@+id/textView2"
+                        style="@style/nav_button"
+                        android:layout_weight="1"
+                        android:drawableStart="@drawable/ic_settings_black_24dp"
+                        android:onClick="navSettingsClicked"
+                        android:text="@string/action_settings" />
 
-                        <TextView
-                            android:id="@+id/drawer_version_text"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/nav_header_subtitle" />
+                </LinearLayout>
 
-                    </LinearLayout>
+                <ScrollView
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    app:layout_constraintBottom_toTopOf="@+id/nav_fixed_items"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    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"
                         app:layout_constraintBottom_toTopOf="@+id/nav_fixed_items"
                         app:layout_constraintTop_toBottomOf="@+id/nav_header">
 
-                        <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/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
-                        android:id="@+id/nav_fixed_items"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:divider="@drawable/list_divider"
-                        android:elevation="2dp"
-                        android:orientation="vertical"
-                        android:showDividers="beginning"
-                        app:layout_constraintBottom_toBottomOf="parent">
-
-                        <TextView
-                            android:id="@+id/textView2"
-                            style="@style/nav_button"
-                            android:layout_weight="1"
-                            android:drawableStart="@drawable/ic_settings_black_24dp"
-                            android:onClick="nav_settings_clicked"
-                            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
+                            android:id="@+id/nav_header"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/side_nav_bar"
+                            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" />
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                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>
+
+                        <LinearLayout
+                            android:id="@+id/nav_actions"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:orientation="vertical">
+
+                            <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/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>
 
-                </android.support.constraint.ConstraintLayout>
-            </ScrollView>
+            </android.support.constraint.ConstraintLayout>
 
         </android.support.design.widget.NavigationView>