larger logo in the drawer, show on small screens to and move the dext on the right

diff --git a/app/src/main/res/layout-h360dp/nav_header_logo.xml b/app/src/main/res/layout-h360dp/nav_header_logo.xml
deleted file mode 100644 (file)
index 1b73711..0000000
--- a/app/src/main/res/layout-h360dp/nav_header_logo.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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="@drawable/ic_app_icon"
-    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 01e4bb2add8b084fee04eebc746c3a47aefc0b66..d3eb61d6204724144d4542504bb9ffdc45350e01 100644 (file)
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -244,8 +244,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:background="@drawable/side_nav_bar"
-                            android:gravity="bottom"
-                            android:orientation="vertical"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal"
                             android:paddingLeft="@dimen/activity_horizontal_margin"
                             android:paddingTop="@dimen/activity_vertical_margin"
                             android:paddingRight="@dimen/activity_horizontal_margin"
@@ -255,17 +255,26 @@
 
                             <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="16dp"
+                                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>
 

diff --git a/app/src/main/res/layout/nav_header_logo.xml b/app/src/main/res/layout/nav_header_logo.xml
index 48d0b56d089fad694d543436f05cfb58fae6e10e..22fbb23e62c5745c39df65aa49457985a2fce782 100644 (file)
--- a/app/src/main/res/layout/nav_header_logo.xml
+++ b/app/src/main/res/layout/nav_header_logo.xml
@@ -16,8 +16,11 @@
   -->
 
 <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:visibility="gone"
+    android:layout_width="48dp"
+    android:layout_height="48dp"
+    android:contentDescription="@string/nav_header_desc"
+    android:visibility="visible"
+    app:srcCompat="@drawable/ic_app_icon"
     tools:showIn="@layout/activity_main" />
\ No newline at end of file