Shows discover: revert floating button to search icon and description

UweTrottmann · Dec 5, 2024 · 3bc807e · 3bc807e
1 parent 9803268
commit 3bc807e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,10 @@ Releases marked with 🧪 (or previously with the "beta" suffix) were released o
 
 ## Version 2024.5
 
+### Unreleased
+
+* 🔧 Shows: revert to search symbol for primary button on discover screen.
+
 ### 2024.5.2 - 2024-12-04 🧪
 
 * 🔧 Shows: when viewing the stream or purchase provider filters, the reset button is shown as

diff --git a/app/src/androidTest/java/com/battlelancer/seriesguide/ui/ShowsActivityTest.java b/app/src/androidTest/java/com/battlelancer/seriesguide/ui/ShowsActivityTest.java
@@ -64,7 +64,7 @@ public void testAddShowAndSetWatchedThenReturn() {
 
         // Open discover screen
         ViewInteraction floatingActionButton = onView(
-                allOf(withId(R.id.buttonShowsAdd), isDisplayed()));
+                allOf(withId(R.id.buttonShowsFloating), isDisplayed()));
         floatingActionButton.perform(click());
 
         // Added a sleep statement to match the app's execution delay.

diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/ShowsActivityImpl.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/ShowsActivityImpl.kt
@@ -187,9 +187,9 @@ open class ShowsActivityImpl : BaseTopActivity() {
     }
 
     private fun setupViews() {
-        // setup floating action button for adding shows
-        val buttonAddShow = findViewById<FloatingActionButton>(R.id.buttonShowsAdd)
-        buttonAddShow.setOnClickListener {
+        // setup floating action button
+        val floatingActionButton = findViewById<FloatingActionButton>(R.id.buttonShowsFloating)
+        floatingActionButton.setOnClickListener {
             startActivity(ShowsDiscoverPagingActivity.intentSearch(this))
         }
 
@@ -204,7 +204,7 @@ open class ShowsActivityImpl : BaseTopActivity() {
         tabs.setOnPageChangeListener(
             ShowsPageChangeListener(
                 findViewById(R.id.sgAppBarLayout),
-                buttonAddShow,
+                floatingActionButton,
                 viewModel
             )
         )
@@ -357,7 +357,6 @@ open class ShowsActivityImpl : BaseTopActivity() {
             }
             appBarLayout.liftOnScrollTargetViewId = liftOnScrollTarget
 
-            // only display add show button on Shows tab
             if (position == Tab.DISCOVER.index) {
                 floatingActionButton.show()
             } else {

diff --git a/app/src/main/res/layout/activity_shows.xml b/app/src/main/res/layout/activity_shows.xml
@@ -21,16 +21,16 @@
             app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/buttonShowsAdd"
+            android:id="@+id/buttonShowsFloating"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_marginStart="0dp"
             android:layout_marginTop="0dp"
             android:layout_marginEnd="@dimen/fab_margin"
             android:layout_marginBottom="@dimen/fab_margin"
-            android:contentDescription="@string/action_shows_add"
-            app:srcCompat="@drawable/ic_add_white_24dp" />
+            android:contentDescription="@string/search"
+            app:srcCompat="@drawable/ic_search_white_24dp" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>