From 8cfec712596c914ab62afaa95890320586a3fb2e Mon Sep 17 00:00:00 2001 From: Rahul Patel Date: Tue, 13 Aug 2024 02:54:08 +0530 Subject: [PATCH] Address filter fab color issue --- .../store/view/ui/search/SearchResultsFragment.kt | 14 ++++++++++++-- app/src/main/res/layout/fragment_search_result.xml | 6 ++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsFragment.kt index f425e1d81..a5d4d4d1e 100644 --- a/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsFragment.kt @@ -21,6 +21,7 @@ package com.aurora.store.view.ui.search import android.content.SharedPreferences import android.content.SharedPreferences.OnSharedPreferenceChangeListener +import android.content.res.ColorStateList import android.os.Bundle import android.text.Editable import android.text.TextWatcher @@ -30,6 +31,8 @@ import android.view.inputmethod.EditorInfo import android.widget.TextView import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController +import com.aurora.extensions.accentColor +import com.aurora.extensions.contrastingColor import com.aurora.extensions.hideKeyboard import com.aurora.extensions.showKeyboard import com.aurora.gplayapi.data.models.App @@ -100,8 +103,15 @@ class SearchResultsFragment : BaseFragment(), binding.recycler.addOnScrollListener(endlessRecyclerOnScrollListener) // Filter - binding.filterFab.setOnClickListener { - findNavController().navigate(R.id.filterSheet) + binding.filterFab.apply { + val onSurfaceColor = contrastingColor(requireContext().accentColor()) + setTextColor(onSurfaceColor) + iconTint = ColorStateList.valueOf(onSurfaceColor) + backgroundTintList = ColorStateList.valueOf(requireContext().accentColor()) + + setOnClickListener { + findNavController().navigate(R.id.filterSheet) + } } viewModel.liveData.observe(viewLifecycleOwner) { diff --git a/app/src/main/res/layout/fragment_search_result.xml b/app/src/main/res/layout/fragment_search_result.xml index accaa3bdf..e495a48c4 100644 --- a/app/src/main/res/layout/fragment_search_result.xml +++ b/app/src/main/res/layout/fragment_search_result.xml @@ -58,8 +58,6 @@ android:layout_marginBottom="@dimen/margin_normal" android:text="@string/action_filter" android:textAppearance="@style/TextAppearance.Aurora.SubTitle.Alt" - android:textColor="@color/colorWhite" - app:backgroundTint="@color/colorAccent" - app:icon="@drawable/ic_filter" - app:iconTint="@color/colorWhite" /> + app:iconPadding="@dimen/padding_small" + app:icon="@drawable/ic_filter" />