From d313749cb16d0a751eed52f766768cd77e1cc2c8 Mon Sep 17 00:00:00 2001
From: Christine Coenen <code.coenen@gmail.com>
Date: Fri, 22 Oct 2021 20:07:06 +0200
Subject: [PATCH] Style search input

---
 .../res/layout/fragment_mediathek_list.xml    |  4 +--
 .../res/layout/mediathek_filter_content.xml   | 25 +++++++++++++------
 app/src/main/res/values/styles.xml            |  8 +++---
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/app/src/main/res/layout/fragment_mediathek_list.xml b/app/src/main/res/layout/fragment_mediathek_list.xml
index c4dd465a..30da4024 100644
--- a/app/src/main/res/layout/fragment_mediathek_list.xml
+++ b/app/src/main/res/layout/fragment_mediathek_list.xml
@@ -82,9 +82,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:background="@color/colorBackground"
-		android:clipToPadding="false"
-		android:elevation="8dp"
-		app:behavior_peekHeight="60dp"
+		app:behavior_peekHeight="46dp"
 		app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
 		<include layout="@layout/mediathek_filter_content" />
diff --git a/app/src/main/res/layout/mediathek_filter_content.xml b/app/src/main/res/layout/mediathek_filter_content.xml
index f5580369..6fa6c6ec 100644
--- a/app/src/main/res/layout/mediathek_filter_content.xml
+++ b/app/src/main/res/layout/mediathek_filter_content.xml
@@ -5,25 +5,32 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:orientation="vertical"
-	android:paddingHorizontal="@dimen/activity_horizontal_margin"
 	android:paddingBottom="@dimen/activity_vertical_margin">
 
 	<com.google.android.material.textfield.TextInputLayout
 		android:id="@+id/textField"
-		style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.Dense"
+		style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:hint="Suche"
-		app:boxBackgroundColor="@null"
-		app:boxBackgroundMode="filled"
+		android:background="?colorPrimary"
+		app:boxBackgroundMode="none"
 		app:endIconMode="clear_text"
-		app:startIconDrawable="@drawable/ic_baseline_search_24">
+		app:endIconTint="?colorOnPrimarySurface"
+		app:hintEnabled="false"
+		app:startIconDrawable="@drawable/ic_baseline_search_24"
+		app:startIconTint="?colorOnPrimarySurface">
 
+		<!-- TODO: give cursor(s) the right color: https://github.com/material-components/material-components-android/issues/820 -->
 		<com.google.android.material.textfield.TextInputEditText
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
+			android:hint="@string/search_query_hint_mediathek"
 			android:imeOptions="actionSearch"
-			android:lines="1" />
+			android:inputType="textFilter"
+			android:maxLines="1"
+			android:paddingVertical="0dp"
+			android:textColor="?colorOnPrimarySurface"
+			android:textColorHint="#66ffffff" />
 
 	</com.google.android.material.textfield.TextInputLayout>
 
@@ -31,6 +38,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="@dimen/activity_vertical_margin"
+		android:paddingHorizontal="@dimen/activity_horizontal_margin"
 		android:text="Sendungslänge" />
 
 	<!--com.google.android.material.chip.ChipGroup
@@ -77,6 +85,7 @@
 	<com.google.android.material.chip.ChipGroup
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:paddingHorizontal="@dimen/activity_horizontal_margin"
 		app:selectionRequired="true">
 
 		<com.google.android.material.chip.Chip
@@ -120,11 +129,13 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="@dimen/activity_vertical_margin"
+		android:paddingHorizontal="@dimen/activity_horizontal_margin"
 		android:text="Sender" />
 
 	<com.google.android.material.chip.ChipGroup
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:paddingHorizontal="@dimen/activity_horizontal_margin"
 		app:selectionRequired="true">
 
 		<com.google.android.material.chip.Chip
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 02d158dc..e249fb17 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -18,9 +18,7 @@
 		<item name="toolbarStyle">@style/ToolbarStyle</item>
 		<item name="actionBarSize">48dp</item>
 		<item name="appBarLayoutStyle">@style/AppBarStyle</item>
-		<item name="bottomNavigationStyle">
-			@style/Widget.MaterialComponents.BottomNavigationView.Colored
-		</item>
+		<item name="bottomNavigationStyle">@style/BottomNavigationViewStyle</item>
 		<item name="android:actionOverflowButtonStyle">@style/OverflowButtonStyle</item>
 		<item name="actionOverflowButtonStyle">@style/OverflowButtonStyle</item>
 
@@ -89,6 +87,10 @@
 		<item name="android:textColorSecondary">?attr/colorOnPrimary</item>
 	</style>
 
+	<style name="BottomNavigationViewStyle" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
+		<item name="android:background">?attr/colorPrimaryDark</item>
+	</style>
+
 	<style name="BottomNavigationTextAppearance" parent="@style/TextAppearance.MaterialComponents.Caption">
 		<item name="android:textSize">10sp</item>
 	</style>