From cdbc18e54d021964d7b82c23f3e5a6fee49a81b2 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe+git@uwetrottmann.com>
Date: Fri, 17 Nov 2023 10:31:14 +0100
Subject: [PATCH 1/4] Add dialog: buttons on top, horizontal.

---
 .../search/discover/AddShowDialogFragment.kt  |   7 +-
 .../seriesguide/streaming/StreamingSearch.kt  |  14 +-
 app/src/main/res/layout/dialog_addshow.xml    | 141 +++++++++---------
 app/src/main/res/values/styles.xml            |  12 +-
 4 files changed, 88 insertions(+), 86 deletions(-)

diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/AddShowDialogFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/AddShowDialogFragment.kt
index 908e483f48..17632419eb 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/AddShowDialogFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/AddShowDialogFragment.kt
@@ -98,7 +98,6 @@ class AddShowDialogFragment : AppCompatDialogFragment() {
             StreamingSearch.initButtons(
                 buttonAddStreamingSearch, buttonAddStreamingSearchInfo, parentFragmentManager
             )
-            textViewAddStreamingSearch.isGone = true
             buttonNegative.apply {
                 setText(R.string.dismiss)
                 setOnClickListener { dismiss() }
@@ -166,11 +165,7 @@ class AddShowDialogFragment : AppCompatDialogFragment() {
             }
             model.watchProvider.observe(this) { watchInfo ->
                 this.binding?.buttonAddStreamingSearch?.let {
-                    val providerInfo = StreamingSearch.configureButton(it, watchInfo, false)
-                    this.binding?.textViewAddStreamingSearch?.apply {
-                        text = providerInfo
-                        isGone = providerInfo == null
-                    }
+                    StreamingSearch.configureButton(it, watchInfo, true)
                 }
             }
         }
diff --git a/app/src/main/java/com/battlelancer/seriesguide/streaming/StreamingSearch.kt b/app/src/main/java/com/battlelancer/seriesguide/streaming/StreamingSearch.kt
index 4c81d725db..4a681bb674 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/streaming/StreamingSearch.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/streaming/StreamingSearch.kt
@@ -219,13 +219,17 @@ object StreamingSearch {
         }
     }
 
+    /**
+     * Set [replaceButtonText] to instead of appending on a new line replace button text with
+     * watch provider info.
+     */
     @SuppressLint("SetTextI18n")
     @JvmStatic
     fun configureButton(
         button: Button,
         watchInfo: TmdbTools2.WatchInfo,
-        addToButtonText: Boolean = true
-    ): String? {
+        replaceButtonText: Boolean = false
+    ) {
         val context = button.context
         val urlOrNull = watchInfo.url
         if (urlOrNull != null) {
@@ -240,14 +244,14 @@ object StreamingSearch {
                 " + " + context.getString(R.string.more, watchInfo.countMore)
             } else ""
             val providerText = (providerOrNull.provider_name ?: "") + moreText
-            if (addToButtonText) {
+            if (replaceButtonText) {
+                button.text = providerText
+            } else {
                 button.text = context.getString(R.string.action_stream) +
                         "\n" + providerText
             }
-            providerText
         } else {
             button.setText(R.string.action_stream)
-            null
         }
     }
 
diff --git a/app/src/main/res/layout/dialog_addshow.xml b/app/src/main/res/layout/dialog_addshow.xml
index cf1b40d7dc..405751a4be 100644
--- a/app/src/main/res/layout/dialog_addshow.xml
+++ b/app/src/main/res/layout/dialog_addshow.xml
@@ -80,27 +80,82 @@
 
             </RelativeLayout>
 
-            <Button
-                android:id="@+id/buttonAddTrailer"
-                style="@style/Widget.SeriesGuide.Button.Outlined"
-                android:layout_width="wrap_content"
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/constraintLayoutAddButtons"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/containerShowInfo"
-                android:layout_marginLeft="@dimen/default_padding"
-                android:layout_marginTop="@dimen/default_padding"
-                android:layout_marginRight="@dimen/default_padding"
-                android:text="@string/trailer"
-                app:icon="@drawable/ic_movie_white_24dp"
-                app:iconGravity="start" />
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="4dp"
+                android:layout_marginEnd="8dp">
+
+                <androidx.constraintlayout.helper.widget.Flow
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    app:constraint_referenced_ids="buttonAddTrailer,buttonAddDisplaySimilar,containerAddStreamingSearch"
+                    app:flow_horizontalBias="0"
+                    app:flow_horizontalGap="4dp"
+                    app:flow_horizontalStyle="packed"
+                    app:flow_wrapMode="chain"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <Button
+                    android:id="@+id/buttonAddTrailer"
+                    style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/trailer"
+                    app:icon="@drawable/ic_movie_white_24dp"
+                    app:iconGravity="start" />
+
+                <Button
+                    android:id="@+id/buttonAddDisplaySimilar"
+                    style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:drawablePadding="@dimen/default_padding"
+                    android:text="@string/title_similar_shows"
+                    app:icon="@drawable/ic_search_white_24dp"
+                    app:iconGravity="start" />
+
+                <!-- To keep config button close, wrap in LinearLayout. -->
+                <LinearLayout
+                    android:id="@+id/containerAddStreamingSearch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <Button
+                        android:id="@+id/buttonAddStreamingSearch"
+                        style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:contentDescription="@string/action_stream"
+                        android:text="@string/action_stream"
+                        app:icon="@drawable/ic_play_arrow_black_24dp" />
+
+                    <Button
+                        android:id="@+id/buttonAddStreamingSearchInfo"
+                        style="@style/Widget.SeriesGuide.Button.IconButton.Outlined"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:contentDescription="@string/action_stream_info"
+                        app:icon="@drawable/ic_settings_control_24dp" />
+
+                </LinearLayout>
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
             <Button
                 android:id="@+id/buttonAddLanguage"
                 style="@style/Widget.SeriesGuide.Button.Borderless.Default"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/buttonAddTrailer"
+                android:layout_below="@+id/constraintLayoutAddButtons"
                 android:layout_marginLeft="@dimen/default_padding"
-                android:layout_marginTop="@dimen/default_padding"
                 android:layout_marginRight="@dimen/default_padding"
                 app:icon="@drawable/ic_language_white_24dp"
                 app:iconGravity="start"
@@ -176,68 +231,6 @@
                 android:text="@string/trakt"
                 android:textAppearance="@style/TextAppearance.SeriesGuide.Caption" />
 
-            <Button
-                android:id="@+id/buttonAddDisplaySimilar"
-                style="@style/Widget.SeriesGuide.Button.Borderless.Caption"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/textViewAddRatingLabel"
-                android:layout_marginLeft="@dimen/default_padding"
-                android:layout_marginTop="@dimen/default_padding"
-                android:layout_marginRight="@dimen/default_padding"
-                android:drawablePadding="@dimen/default_padding"
-                android:text="@string/title_similar_shows"
-                app:icon="@drawable/ic_search_white_24dp"
-                app:iconGravity="start" />
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/containerAddStreamingSearch"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/buttonAddDisplaySimilar"
-                android:layout_marginStart="@dimen/default_padding"
-                android:layout_marginEnd="@dimen/default_padding"
-                android:maxWidth="@dimen/max_width_text_size_body">
-
-                <!-- MaterialButton ignores line breaks here (wtf?), so use separate TextView. -->
-                <Button
-                    android:id="@+id/buttonAddStreamingSearch"
-                    style="@style/Widget.SeriesGuide.Button.Borderless.Caption"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:contentDescription="@string/action_stream"
-                    android:gravity="center_vertical|start"
-                    android:text="@string/action_stream"
-                    app:icon="@drawable/ic_play_arrow_black_24dp"
-                    app:layout_constraintEnd_toStartOf="@+id/buttonAddStreamingSearchInfo"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/textViewAddStreamingSearch"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="36dp"
-                    android:contentDescription="@string/action_stream"
-                    android:textAppearance="@style/TextAppearance.SeriesGuide.Caption.Narrow"
-                    app:layout_constraintEnd_toStartOf="@+id/buttonAddStreamingSearchInfo"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/buttonAddStreamingSearch"
-                    tools:text="Watch provider + 1 more" />
-
-                <ImageButton
-                    android:id="@+id/buttonAddStreamingSearchInfo"
-                    style="?attr/borderlessButtonStyle"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:background="?attr/selectableItemBackgroundBorderless"
-                    android:contentDescription="@string/action_stream_info"
-                    android:src="@drawable/ic_info_control_24dp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
         </RelativeLayout>
     </ScrollView>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2774fe1cb1..f5f549a662 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2023 Uwe Trottmann -->
+<!-- SPDX-License-Identifier: Apache-2.0 -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Text styles -->
@@ -105,6 +108,13 @@
     <!-- Buttons -->
     <style name="Widget.SeriesGuide.Button" parent="Widget.Material3.Button" />
     <style name="Widget.SeriesGuide.Button.Outlined" parent="Widget.Material3.Button.OutlinedButton" />
+    <style name="Widget.SeriesGuide.Button.Outlined.Icon" parent="Widget.Material3.Button.OutlinedButton.Icon">
+        <!-- Parent style decreases only left margin which looks off, so reduce both. -->
+        <item name="android:paddingLeft">16dp</item>
+        <item name="android:paddingRight">16dp</item>
+    </style>
+
+    <style name="Widget.SeriesGuide.Button.IconButton.Outlined" parent="Widget.Material3.Button.IconButton.Outlined" />
 
     <style name="Widget.SeriesGuide.Button.Borderless" parent="Widget.Material3.Button.TextButton">
         <item name="android:maxLines">2</item>
@@ -143,7 +153,7 @@
     <style name="Widget.SeriesGuide.Button.Borderless.Error">
         <item name="materialThemeOverlay">@style/ThemeOverlay.SeriesGuide.Button.Error</item>
     </style>
-    
+
     <style name="ThemeOverlay.SeriesGuide.Button.Error" parent="ThemeOverlay.Material3.Button.TextButton">
         <item name="colorPrimary">?attr/colorError</item>
     </style>

From 6049291e00af61bb4d0554d92d1ee2901a340a9d Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe+git@uwetrottmann.com>
Date: Fri, 17 Nov 2023 13:14:41 +0100
Subject: [PATCH 2/4] Less bright outline on outline buttons with icon.

---
 app/src/main/res/values/attrs.xml  |  1 +
 app/src/main/res/values/colors.xml |  2 ++
 app/src/main/res/values/styles.xml | 12 +++++++++++-
 app/src/main/res/values/themes.xml |  2 ++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 97ae45e463..9bcb20a5d0 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -15,6 +15,7 @@
     <attr name="sgColorShadow" format="reference|color" />
     <attr name="sgColorStatusBarOverlay" format="reference|color" />
     <attr name="sgColorTopAppBar" format="reference|color" />
+    <attr name="sgColorOutlineLighter" format="reference|color" />
 
     <!-- Custom view attributes -->
     <declare-styleable name="EmptyView">
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index e14558e1fd..e87704fb8e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -39,6 +39,8 @@
 
     <!-- 38% primary, not using color state list as using theme-dependant attribute is API 23+. -->
     <color name="sg_color_control_activated">#606545a0</color>
+    <color name="sg_color_outline_dark">#58535D</color>
+    <color name="sg_color_outline_light">#A5A2A8</color>
 
     <color name="sg_background_gradient_start">#aaffffff</color>
     <color name="sg_background_gradient_end">#ffffffff</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f5f549a662..d76a2c4681 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -108,13 +108,23 @@
     <!-- Buttons -->
     <style name="Widget.SeriesGuide.Button" parent="Widget.Material3.Button" />
     <style name="Widget.SeriesGuide.Button.Outlined" parent="Widget.Material3.Button.OutlinedButton" />
+
+    <!-- With less bright outline. -->
     <style name="Widget.SeriesGuide.Button.Outlined.Icon" parent="Widget.Material3.Button.OutlinedButton.Icon">
         <!-- Parent style decreases only left margin which looks off, so reduce both. -->
         <item name="android:paddingLeft">16dp</item>
         <item name="android:paddingRight">16dp</item>
+        <item name="materialThemeOverlay">@style/ThemeOverlay.SeriesGuide.Button.Outlined</item>
+    </style>
+
+    <style name="Widget.SeriesGuide.Button.IconButton.Outlined" parent="Widget.Material3.Button.IconButton.Outlined">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.SeriesGuide.Button.Outlined</item>
     </style>
 
-    <style name="Widget.SeriesGuide.Button.IconButton.Outlined" parent="Widget.Material3.Button.IconButton.Outlined" />
+    <style name="ThemeOverlay.SeriesGuide.Button.Outlined" parent="ThemeOverlay.Material3.Button.TextButton">
+        <item name="colorOutline">?attr/sgColorOutlineLighter</item>
+        <item name="colorOnContainer">?attr/colorOnSurfaceVariant</item>
+    </style>
 
     <style name="Widget.SeriesGuide.Button.Borderless" parent="Widget.Material3.Button.TextButton">
         <item name="android:maxLines">2</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 4e02b6bea3..5857ebe203 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -65,6 +65,7 @@
         <item name="sgColorShadow">@color/sg_black_40</item>
         <item name="sgColorStatusBarOverlay">@color/sg_black_87</item>
         <item name="sgColorTopAppBar">@color/sg_background_app_bar_dark</item>
+        <item name="sgColorOutlineLighter">@color/sg_color_outline_dark</item>
 
         <!-- dialogTheme is used by AppCompatDialogFragment. -->
         <item name="dialogTheme">@style/ThemeOverlay.Material3.Dialog</item>
@@ -137,6 +138,7 @@
         <item name="sgColorShadow">@color/sg_black_7</item>
         <item name="sgColorStatusBarOverlay">@color/sg_white_87</item>
         <item name="sgColorTopAppBar">@color/sg_color_background</item>
+        <item name="sgColorOutlineLighter">@color/sg_color_outline_light</item>
 
         <!-- dialogTheme is used by AppCompatDialogFragment. -->
         <item name="dialogTheme">@style/ThemeOverlay.Material3.Dialog</item>

From 4548edb744ae3914a5481a5f30c7427bb259c481 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe+git@uwetrottmann.com>
Date: Fri, 17 Nov 2023 13:15:22 +0100
Subject: [PATCH 3/4] Show info: use horizontal buttons for secondary actions.

---
 .../main/res/layout/fragment_show_narrow.xml  | 96 +++++++++++--------
 .../main/res/layout/fragment_show_regular.xml | 96 +++++++++++--------
 2 files changed, 112 insertions(+), 80 deletions(-)

diff --git a/app/src/main/res/layout/fragment_show_narrow.xml b/app/src/main/res/layout/fragment_show_narrow.xml
index f2a72e4e34..e5023ab293 100644
--- a/app/src/main/res/layout/fragment_show_narrow.xml
+++ b/app/src/main/res/layout/fragment_show_narrow.xml
@@ -162,48 +162,64 @@
 
         </com.google.android.material.card.MaterialCardView>
 
-        <Button
-            android:id="@+id/buttonShowTrailer"
-            style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/constraintLayoutShowButtons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/trailer"
-            app:icon="@drawable/ic_movie_white_24dp"
-            app:iconGravity="start" />
-
-        <Button
-            android:id="@+id/buttonShowSimilar"
-            style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/title_similar_shows"
-            app:icon="@drawable/ic_search_white_24dp"
-            app:iconGravity="start" />
-
-        <Button
-            android:id="@+id/buttonShowShare"
-            style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/share_show"
-            app:icon="@drawable/ic_share_white_24dp"
-            app:iconGravity="start" />
-
-        <Button
-            android:id="@+id/buttonShowComments"
-            style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/comments"
-            app:icon="@drawable/ic_forum_black_24dp"
-            app:iconGravity="start" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginLeft="@dimen/large_padding"
-            android:layout_marginRight="@dimen/large_padding"
-            android:background="?attr/sgColorDivider" />
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp">
+
+            <androidx.constraintlayout.helper.widget.Flow
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:constraint_referenced_ids="buttonShowTrailer,buttonShowSimilar,buttonShowShare,buttonShowComments"
+                app:flow_horizontalBias="0"
+                app:flow_horizontalGap="4dp"
+                app:flow_horizontalStyle="packed"
+                app:flow_wrapMode="chain"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <Button
+                android:id="@+id/buttonShowTrailer"
+                style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/trailer"
+                app:icon="@drawable/ic_movie_white_24dp"
+                app:iconGravity="start" />
+
+            <Button
+                android:id="@+id/buttonShowSimilar"
+                style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/title_similar_shows"
+                app:icon="@drawable/ic_search_white_24dp"
+                app:iconGravity="start" />
+
+            <Button
+                android:id="@+id/buttonShowShare"
+                style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/share_show"
+                app:icon="@drawable/ic_share_white_24dp"
+                app:iconGravity="start" />
+
+            <Button
+                android:id="@+id/buttonShowComments"
+                style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/comments"
+                app:icon="@drawable/ic_forum_black_24dp"
+                app:iconGravity="start" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <include
             android:id="@+id/containerRatings"
diff --git a/app/src/main/res/layout/fragment_show_regular.xml b/app/src/main/res/layout/fragment_show_regular.xml
index ceceb6e315..ed78e88de6 100644
--- a/app/src/main/res/layout/fragment_show_regular.xml
+++ b/app/src/main/res/layout/fragment_show_regular.xml
@@ -155,48 +155,64 @@
 
         </com.google.android.material.card.MaterialCardView>
 
-        <Button
-            android:id="@+id/buttonShowTrailer"
-            style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/constraintLayoutShowButtons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/trailer"
-            app:icon="@drawable/ic_movie_white_24dp"
-            app:iconGravity="start" />
-
-        <Button
-            android:id="@+id/buttonShowSimilar"
-            style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/title_similar_shows"
-            app:icon="@drawable/ic_search_white_24dp"
-            app:iconGravity="start" />
-
-        <Button
-            android:id="@+id/buttonShowShare"
-            style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/share_show"
-            app:icon="@drawable/ic_share_white_24dp"
-            app:iconGravity="start" />
-
-        <Button
-            android:id="@+id/buttonShowComments"
-            style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/comments"
-            app:icon="@drawable/ic_forum_black_24dp"
-            app:iconGravity="start" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginLeft="@dimen/large_padding"
-            android:layout_marginRight="@dimen/large_padding"
-            android:background="?attr/sgColorDivider" />
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="8dp">
+
+            <androidx.constraintlayout.helper.widget.Flow
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:constraint_referenced_ids="buttonShowTrailer,buttonShowSimilar,buttonShowShare,buttonShowComments"
+                app:flow_horizontalBias="0"
+                app:flow_horizontalGap="4dp"
+                app:flow_horizontalStyle="packed"
+                app:flow_wrapMode="chain"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <Button
+                android:id="@+id/buttonShowTrailer"
+                style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/trailer"
+                app:icon="@drawable/ic_movie_white_24dp"
+                app:iconGravity="start" />
+
+            <Button
+                android:id="@+id/buttonShowSimilar"
+                style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/title_similar_shows"
+                app:icon="@drawable/ic_search_white_24dp"
+                app:iconGravity="start" />
+
+            <Button
+                android:id="@+id/buttonShowShare"
+                style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/share_show"
+                app:icon="@drawable/ic_share_white_24dp"
+                app:iconGravity="start" />
+
+            <Button
+                android:id="@+id/buttonShowComments"
+                style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/comments"
+                app:icon="@drawable/ic_forum_black_24dp"
+                app:iconGravity="start" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <include
             android:id="@+id/containerRatings"

From 03036db47b0246fe0ee8ec39966442434d7f5a72 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe+git@uwetrottmann.com>
Date: Fri, 17 Nov 2023 13:22:12 +0100
Subject: [PATCH 4/4] Stream search: use cog icon for configure button also for
 episode/movie.

---
 app/src/main/res/layout/buttons_episode.xml | 2 +-
 app/src/main/res/layout/buttons_movie.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/buttons_episode.xml b/app/src/main/res/layout/buttons_episode.xml
index aed4e461cd..62c54fec5d 100644
--- a/app/src/main/res/layout/buttons_episode.xml
+++ b/app/src/main/res/layout/buttons_episode.xml
@@ -107,7 +107,7 @@
             android:layout_height="48dp"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/action_stream_info"
-            android:src="@drawable/ic_info_control_24dp"
+            android:src="@drawable/ic_settings_control_24dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/main/res/layout/buttons_movie.xml b/app/src/main/res/layout/buttons_movie.xml
index fa65c79141..3ad33a4baf 100644
--- a/app/src/main/res/layout/buttons_movie.xml
+++ b/app/src/main/res/layout/buttons_movie.xml
@@ -89,7 +89,7 @@
             android:layout_height="48dp"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/action_stream_info"
-            android:src="@drawable/ic_info_control_24dp"
+            android:src="@drawable/ic_settings_control_24dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />