From b7d5a16d3c78bc10429b4bcd79088c8a8423526a Mon Sep 17 00:00:00 2001 From: Niko Diamadis Date: Sun, 5 Feb 2023 12:45:12 +0100 Subject: [PATCH 1/5] Update Nav Header placeholder text --- app/src/main/res/layout/nav_header_drawer.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/layout/nav_header_drawer.xml b/app/src/main/res/layout/nav_header_drawer.xml index 254d281..9e1e202 100644 --- a/app/src/main/res/layout/nav_header_drawer.xml +++ b/app/src/main/res/layout/nav_header_drawer.xml @@ -1,6 +1,7 @@ + app:layout_constraintStart_toStartOf="parent" + tools:text="jmattheis" /> + app:layout_constraintStart_toStartOf="parent" + tools:text="https://your.domain.de" /> + app:layout_constraintStart_toStartOf="parent" + tools:text="gotify/android vX.X.X; gotify/server vX.X.X" /> Date: Sun, 5 Feb 2023 12:46:48 +0100 Subject: [PATCH 2/5] Limit Nav Header max lines of username and url to 2 --- app/src/main/res/layout/nav_header_drawer.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/res/layout/nav_header_drawer.xml b/app/src/main/res/layout/nav_header_drawer.xml index 9e1e202..c6b002c 100644 --- a/app/src/main/res/layout/nav_header_drawer.xml +++ b/app/src/main/res/layout/nav_header_drawer.xml @@ -32,6 +32,8 @@ android:layout_height="wrap_content" android:paddingTop="@dimen/nav_header_vertical_spacing" android:textAppearance="@style/TextAppearance.AppCompat.Body1" + android:maxLines="2" + android:ellipsize="end" app:layout_constraintBottom_toTopOf="@+id/header_connection" app:layout_constraintStart_toStartOf="parent" tools:text="jmattheis" /> @@ -42,6 +44,8 @@ android:layout_height="wrap_content" android:layout_marginBottom="2dp" android:textSize="12sp" + android:maxLines="2" + android:ellipsize="end" app:layout_constraintBottom_toTopOf="@+id/header_version" app:layout_constraintStart_toStartOf="parent" tools:text="https://your.domain.de" /> From 9fec25a8bf5818db6760798e1dbc06c125af8c05 Mon Sep 17 00:00:00 2001 From: Niko Diamadis Date: Sun, 5 Feb 2023 12:53:21 +0100 Subject: [PATCH 3/5] Cut the username prefix of url in Nav Header --- .../main/kotlin/com/github/gotify/messages/MessagesActivity.kt | 2 +- app/src/main/res/values/strings.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt b/app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt index 5b5704c..60d89d9 100644 --- a/app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt +++ b/app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt @@ -228,7 +228,7 @@ internal class MessagesActivity : user.text = settings.user?.name val connection = headerView.findViewById(R.id.header_connection) - connection.text = getString(R.string.connection, settings.user?.name, settings.url) + connection.text = settings.url val version = headerView.findViewById(R.id.header_version) version.text = diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 22e40cc..7310c44 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -67,7 +67,6 @@ Warning Using HTTP is insecure and it\'s recommend to use HTTPS instead. Use your favorite search engine to get more information about this topic. I Understand - %s@%s There are no messages, yet.\nSend a message to Gotify\nand it will appear here. Settings Appearance From d21243297f9a086609fe48bdfdf850cb83a4866d Mon Sep 17 00:00:00 2001 From: Niko Diamadis Date: Sun, 5 Feb 2023 13:11:26 +0100 Subject: [PATCH 4/5] Update Nav Header component style --- app/src/main/res/layout/nav_header_drawer.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/nav_header_drawer.xml b/app/src/main/res/layout/nav_header_drawer.xml index c6b002c..a8da9f7 100644 --- a/app/src/main/res/layout/nav_header_drawer.xml +++ b/app/src/main/res/layout/nav_header_drawer.xml @@ -12,7 +12,7 @@ android:paddingTop="@dimen/activity_vertical_margin" android:paddingRight="@dimen/activity_horizontal_margin" android:paddingBottom="@dimen/activity_vertical_margin" - android:theme="@style/ThemeOverlay.AppCompat.Dark"> + android:theme="@style/ThemeOverlay.Material3.Dark"> Date: Sun, 5 Feb 2023 13:22:59 +0100 Subject: [PATCH 5/5] Let Nav Header expand to fit multi line textviews --- app/src/main/res/layout/nav_header_drawer.xml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/layout/nav_header_drawer.xml b/app/src/main/res/layout/nav_header_drawer.xml index a8da9f7..bb70ce6 100644 --- a/app/src/main/res/layout/nav_header_drawer.xml +++ b/app/src/main/res/layout/nav_header_drawer.xml @@ -3,7 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="@dimen/nav_header_height" + android:layout_height="wrap_content" + android:minHeight="@dimen/nav_header_height" android:layout_alignParentBottom="false" android:background="@drawable/side_nav_bar" android:gravity="bottom" @@ -22,7 +23,8 @@ android:focusableInTouchMode="true" android:paddingTop="@dimen/nav_header_vertical_spacing" android:scaleType="fitCenter" - app:layout_constraintBottom_toTopOf="@+id/header_user" + android:layout_marginTop="30dp" + app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" app:srcCompat="@drawable/gotify" /> @@ -34,7 +36,7 @@ android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:maxLines="2" android:ellipsize="end" - app:layout_constraintBottom_toTopOf="@+id/header_connection" + app:layout_constraintTop_toBottomOf="@id/imageView" app:layout_constraintStart_toStartOf="parent" tools:text="jmattheis" /> @@ -46,7 +48,7 @@ android:textSize="12sp" android:maxLines="2" android:ellipsize="end" - app:layout_constraintBottom_toTopOf="@+id/header_version" + app:layout_constraintTop_toBottomOf="@id/header_user" app:layout_constraintStart_toStartOf="parent" tools:text="https://your.domain.de" /> @@ -55,7 +57,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="10sp" - app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@id/header_connection" app:layout_constraintStart_toStartOf="parent" tools:text="gotify/android vX.X.X; gotify/server vX.X.X" />