diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/FilterableFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/FilterableFragment.kt index fad2f7b5..e3c000f7 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/FilterableFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/FilterableFragment.kt @@ -6,8 +6,9 @@ import android.content.Intent import android.content.IntentFilter import android.os.Bundle import android.view.* +import android.widget.ImageView +import android.widget.TextView import androidx.appcompat.widget.Toolbar -import kotlinx.android.synthetic.main.view_selected_filter.view.* import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.delay @@ -57,7 +58,11 @@ open class FilterableFragment : RealmFragment(), override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) - parentActivity?.registerReceiver(updateFilterUIBroadcast, IntentFilter(INTENT_FILTER_UPDATE_FILTER_UI)) + parentActivity?.registerReceiver( + updateFilterUIBroadcast, IntentFilter( + INTENT_FILTER_UPDATE_FILTER_UI + ) + ) } override fun onDestroy() { @@ -65,7 +70,11 @@ open class FilterableFragment : RealmFragment(), parentActivity?.unregisterReceiver(updateFilterUIBroadcast) } - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { setHasOptionsMenu(true) return super.onCreateView(inflater, container, savedInstanceState) } @@ -82,9 +91,9 @@ open class FilterableFragment : RealmFragment(), override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { - R.id.menu_item_filter -> { - manageFilters(this) - } + R.id.menu_item_filter -> { + manageFilters(this) + } } return super.onOptionsItemSelected(item) } @@ -119,9 +128,15 @@ open class FilterableFragment : RealmFragment(), } view?.findViewById(R.id.selectedFilter)?.let { viewGroup -> - val layoutCurrentFilter = LayoutInflater.from(requireContext()).inflate(R.layout.view_selected_filter, viewGroup, false) - layoutCurrentFilter.filterName.text = filter.getDisplayName(requireContext()) - layoutCurrentFilter.deselectFilter.setOnClickListener { + val layoutCurrentFilter = LayoutInflater.from(requireContext()).inflate( + R.layout.view_selected_filter, + viewGroup, + false + ) + layoutCurrentFilter.findViewById(R.id.filterName)?.text = filter.getDisplayName( + requireContext() + ) + layoutCurrentFilter.findViewById(R.id.deselectFilter).setOnClickListener { saveFilter(requireContext(), "") }