From 7c69b1b64928cf678f9dece4301d72ad857d931e Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 27 Sep 2020 13:41:25 -0400 Subject: [PATCH] Tweak navigation view group header style --- .../main/res/layout/navigation_view_group.xml | 5 +---- .../res/layout/reader_color_filter_sheet.xml | 20 +++++++++---------- .../source_main_controller_card_header.xml | 4 +--- app/src/main/res/values/styles.xml | 10 ++++++---- 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/app/src/main/res/layout/navigation_view_group.xml b/app/src/main/res/layout/navigation_view_group.xml index 188429ccf4..abf5ce9339 100644 --- a/app/src/main/res/layout/navigation_view_group.xml +++ b/app/src/main/res/layout/navigation_view_group.xml @@ -3,8 +3,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="?attr/listPreferredItemHeightSmall" - android:background="?attr/colorPrimary" - android:elevation="2dp" android:gravity="center_vertical" android:orientation="horizontal" android:paddingStart="?attr/listPreferredItemPaddingStart" @@ -17,8 +15,7 @@ android:layout_weight="1" android:ellipsize="end" android:maxLines="1" - android:textAppearance="@style/TextAppearance.AppCompat.Body1" - android:textColor="?attr/colorOnPrimary" + android:textAppearance="@style/TextAppearance.Medium.SubHeading" tools:text="Header" /> @@ -51,7 +51,7 @@ android:layout_width="30dp" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary" + android:textAppearance="@style/TextAppearance.Medium.SubHeading" app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_red" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_red" /> @@ -75,7 +75,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/color_filter_g_value" - android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary" + android:textAppearance="@style/TextAppearance.Medium.SubHeading" app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_green" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_green" /> @@ -85,7 +85,7 @@ android:layout_width="30dp" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary" + android:textAppearance="@style/TextAppearance.Medium.SubHeading" app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_green" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_green" /> @@ -109,7 +109,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/color_filter_b_value" - android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary" + android:textAppearance="@style/TextAppearance.Medium.SubHeading" app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_blue" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_blue" /> @@ -119,7 +119,7 @@ android:layout_width="30dp" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary" + android:textAppearance="@style/TextAppearance.Medium.SubHeading" app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_blue" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_blue" /> @@ -143,7 +143,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/color_filter_a_value" - android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary" + android:textAppearance="@style/TextAppearance.Medium.SubHeading" app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_alpha" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_alpha" /> @@ -153,7 +153,7 @@ android:layout_width="30dp" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary" + android:textAppearance="@style/TextAppearance.Medium.SubHeading" app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_alpha" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_alpha" /> @@ -208,7 +208,7 @@ android:id="@+id/txt_brightness_seekbar_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary" + android:textAppearance="@style/TextAppearance.Medium.SubHeading" android:tint="?attr/colorOnBackground" app:layout_constraintBottom_toBottomOf="@id/brightness_seekbar" app:layout_constraintStart_toStartOf="parent" @@ -219,7 +219,7 @@ android:id="@+id/txt_brightness_seekbar_value" android:layout_width="30dp" android:layout_height="wrap_content" - android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary" + android:textAppearance="@style/TextAppearance.Medium.SubHeading" app:layout_constraintBottom_toBottomOf="@id/brightness_seekbar" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/brightness_seekbar" /> diff --git a/app/src/main/res/layout/source_main_controller_card_header.xml b/app/src/main/res/layout/source_main_controller_card_header.xml index b334e6e2b9..0e36518558 100644 --- a/app/src/main/res/layout/source_main_controller_card_header.xml +++ b/app/src/main/res/layout/source_main_controller_card_header.xml @@ -6,15 +6,13 @@ diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index cbc6e3957c..d3d2acb8ed 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -83,10 +83,6 @@ 14sp - - @@ -103,6 +99,12 @@ ?android:attr/textColorHint + +