From 57240f714b30ac2c75b59687f6ceab5c3da2dc52 Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Sat, 12 Jan 2019 05:32:31 +0000
Subject: [PATCH 1/1] landscape layout adjustments

---
 .../res/layout-h360dp/nav_header_logo.xml     |  27 +++
 app/src/main/res/layout/activity_main.xml     | 157 +++++++++---------
 app/src/main/res/layout/nav_header_logo.xml   |  23 +++
 app/src/main/res/values-h360dp/dimens.xml     |  21 +++
 app/src/main/res/values-h360dp/styles.xml     |  30 ++++
 app/src/main/res/values/dimens.xml            |   4 +-
 app/src/main/res/values/styles.xml            |   6 +-
 7 files changed, 182 insertions(+), 86 deletions(-)
 create mode 100644 app/src/main/res/layout-h360dp/nav_header_logo.xml
 create mode 100644 app/src/main/res/layout/nav_header_logo.xml
 create mode 100644 app/src/main/res/values-h360dp/dimens.xml
 create mode 100644 app/src/main/res/values-h360dp/styles.xml

diff --git a/app/src/main/res/layout-h360dp/nav_header_logo.xml b/app/src/main/res/layout-h360dp/nav_header_logo.xml
new file mode 100644
index 00000000..c6d35bf2
--- /dev/null
+++ b/app/src/main/res/layout-h360dp/nav_header_logo.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright © 2019 Damyan Ivanov.
+  ~ This file is part of Mobile-Ledger.
+  ~ Mobile-Ledger is free software: you can distribute it and/or modify it
+  ~ under the term of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your opinion), any later version.
+  ~
+  ~ Mobile-Ledger is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  ~ GNU General Public License terms for details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with Mobile-Ledger. If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:contentDescription="@string/nav_header_desc"
+    android:paddingBottom="@dimen/nav_header_vertical_spacing"
+    android:visibility="visible"
+    app:srcCompat="@mipmap/ic_launcher_round"
+    tools:showIn="@layout/activity_main" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 656af511..81b8a28c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -155,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>
 
@@ -179,55 +178,58 @@
             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="nav_profiles_clicked"
+                        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="nav_settings_clicked"
+                        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" />
+                    <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>
+                </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"
@@ -237,6 +239,36 @@
                         app:layout_constraintBottom_toTopOf="@+id/nav_fixed_items"
                         app:layout_constraintTop_toBottomOf="@+id/nav_header">
 
+                        <LinearLayout
+                            android:id="@+id/nav_header"
+                            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">
+
+                            <include layout="@layout/nav_header_logo" />
+
+                            <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="@string/nav_header_subtitle" />
+
+                        </LinearLayout>
+
                         <TextView
                             android:id="@+id/nav_account_summary"
                             style="@style/nav_button"
@@ -258,46 +290,9 @@
                             android:text="@string/nav_reports_title" />
 
                     </LinearLayout>
+                </ScrollView>
 
-                    <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/nav_profiles"
-                            style="@style/nav_button"
-                            android:layout_width="match_parent"
-                            android:layout_weight="1"
-                            android:drawableStart="@drawable/ic_view_list_black_24dp"
-                            android:onClick="nav_profiles_clicked"
-                            android:text="@string/profiles" />
-
-                        <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.support.constraint.ConstraintLayout>
-            </ScrollView>
+            </android.support.constraint.ConstraintLayout>
 
         </android.support.design.widget.NavigationView>
 
diff --git a/app/src/main/res/layout/nav_header_logo.xml b/app/src/main/res/layout/nav_header_logo.xml
new file mode 100644
index 00000000..48d0b56d
--- /dev/null
+++ b/app/src/main/res/layout/nav_header_logo.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright © 2019 Damyan Ivanov.
+  ~ This file is part of Mobile-Ledger.
+  ~ Mobile-Ledger is free software: you can distribute it and/or modify it
+  ~ under the term of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your opinion), any later version.
+  ~
+  ~ Mobile-Ledger is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  ~ GNU General Public License terms for details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with Mobile-Ledger. If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:visibility="gone"
+    tools:showIn="@layout/activity_main" />
\ No newline at end of file
diff --git a/app/src/main/res/values-h360dp/dimens.xml b/app/src/main/res/values-h360dp/dimens.xml
new file mode 100644
index 00000000..eb26a27c
--- /dev/null
+++ b/app/src/main/res/values-h360dp/dimens.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright © 2019 Damyan Ivanov.
+  ~ This file is part of Mobile-Ledger.
+  ~ Mobile-Ledger is free software: you can distribute it and/or modify it
+  ~ under the term of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your opinion), any later version.
+  ~
+  ~ Mobile-Ledger is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  ~ GNU General Public License terms for details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with Mobile-Ledger. If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+    <dimen name="nav_header_vertical_spacing">8dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-h360dp/styles.xml b/app/src/main/res/values-h360dp/styles.xml
new file mode 100644
index 00000000..990ea35a
--- /dev/null
+++ b/app/src/main/res/values-h360dp/styles.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright © 2019 Damyan Ivanov.
+  ~ This file is part of Mobile-Ledger.
+  ~ Mobile-Ledger is free software: you can distribute it and/or modify it
+  ~ under the term of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your opinion), any later version.
+  ~
+  ~ Mobile-Ledger is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  ~ GNU General Public License terms for details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with Mobile-Ledger. If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+
+    <style name="nav_button">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">48dp</item>
+        <item name="android:clickable">true</item>
+        <item name="android:drawablePadding">36dp</item>
+        <item name="android:focusable">auto</item>
+        <item name="android:gravity">center_vertical|start</item>
+        <item name="android:paddingStart">@dimen/activity_horizontal_margin</item>
+        <item name="android:paddingEnd">@dimen/activity_horizontal_margin</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index d00fc166..060121bc 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -18,8 +18,8 @@
 <resources>
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-    <dimen name="nav_header_vertical_spacing">8dp</dimen>
+    <dimen name="activity_vertical_margin">8dp</dimen>
+    <dimen name="nav_header_vertical_spacing">4dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
     <dimen name="app_bar_height">200dp</dimen>
     <dimen name="item_width">200dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2ee03e40..bb354f50 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright © 2018 Damyan Ivanov.
+  ~ Copyright © 2019 Damyan Ivanov.
   ~ This file is part of Mobile-Ledger.
   ~ Mobile-Ledger is free software: you can distribute it and/or modify it
   ~ under the term of the GNU General Public License as published by
@@ -36,9 +36,9 @@
 
     <style name="nav_button">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">48dp</item>
+        <item name="android:layout_height">40dp</item>
         <item name="android:clickable">true</item>
-        <item name="android:drawablePadding">32dp</item>
+        <item name="android:drawablePadding">24dp</item>
         <item name="android:focusable">auto</item>
         <item name="android:gravity">center_vertical|start</item>
         <item name="android:paddingStart">@dimen/activity_horizontal_margin</item>
-- 
2.39.2