From 6400d1d3954a7a5a42c8e68dd7d452cfc2b87d00 Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Fri, 18 Feb 2022 12:31:07 +0000 Subject: [PATCH] Alterations to the pass filter dialog UI --- .../{PassesPrefsDialog.kt => FilterDialog.kt} | 23 +-- .../passesScreen/PassesFragment.kt | 6 +- app/src/main/res/layout/card_prefs_other.xml | 9 +- .../main/res/layout/card_prefs_tracking.xml | 3 +- app/src/main/res/layout/dialog_filter.xml | 131 ++++++++++++++++++ app/src/main/res/layout/dialog_modes.xml | 2 - app/src/main/res/layout/dialog_passes.xml | 95 ------------- .../main/res/navigation/navigation_graph.xml | 10 +- 8 files changed, 159 insertions(+), 120 deletions(-) rename app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/{PassesPrefsDialog.kt => FilterDialog.kt} (62%) create mode 100644 app/src/main/res/layout/dialog_filter.xml delete mode 100644 app/src/main/res/layout/dialog_passes.xml diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesPrefsDialog.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/FilterDialog.kt similarity index 62% rename from app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesPrefsDialog.kt rename to app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/FilterDialog.kt index b714324b..a1fbb848 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesPrefsDialog.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/FilterDialog.kt @@ -8,45 +8,46 @@ import android.view.WindowManager import androidx.appcompat.app.AppCompatDialogFragment import com.rtbishop.look4sat.R import com.rtbishop.look4sat.data.ISettingsHandler -import com.rtbishop.look4sat.databinding.DialogPassesBinding +import com.rtbishop.look4sat.databinding.DialogFilterBinding import com.rtbishop.look4sat.presentation.setNavResult import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject @AndroidEntryPoint -class PassesPrefsDialog : AppCompatDialogFragment() { +class FilterDialog : AppCompatDialogFragment() { @Inject lateinit var preferences: ISettingsHandler override fun onCreateView(inflater: LayoutInflater, group: ViewGroup?, state: Bundle?): View? { - return inflater.inflate(R.layout.dialog_passes, group, false) + return inflater.inflate(R.layout.dialog_filter, group, false) } override fun onViewCreated(view: View, state: Bundle?) { super.onViewCreated(view, state) - DialogPassesBinding.bind(view).apply { + DialogFilterBinding.bind(view).apply { + dialog?.window?.setBackgroundDrawableResource(R.color.transparent) dialog?.window?.setLayout( - WindowManager.LayoutParams.MATCH_PARENT, + (resources.displayMetrics.widthPixels * 0.94).toInt(), WindowManager.LayoutParams.WRAP_CONTENT ) - hoursAheadEdit.setText(preferences.getHoursAhead().toString()) - minElevEdit.setText(preferences.getMinElevation().toString()) - passPrefBtnPos.setOnClickListener { + filterHoursEdit.setText(preferences.getHoursAhead().toString()) + filterElevEdit.setText(preferences.getMinElevation().toString()) + filterPosBtn.setOnClickListener { val hoursAhead = try { - hoursAheadEdit.text.toString().toInt() + filterHoursEdit.text.toString().toInt() } catch (exception: Exception) { 8 } val minElevation = try { - minElevEdit.text.toString().toDouble() + filterElevEdit.text.toString().toDouble() } catch (exception: Exception) { 16.0 } setNavResult("prefs", Pair(hoursAhead, minElevation)) dismiss() } - passPrefBtnNeg.setOnClickListener { dismiss() } + filterNegBtn.setOnClickListener { dismiss() } } } } diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt index 8b1ef131..daef425a 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt @@ -67,7 +67,7 @@ class PassesFragment : Fragment(R.layout.fragment_passes), PassesAdapter.PassesC } passesRefreshBtn.setOnClickListener { refreshPasses() } passesMapBtn.setOnClickListener { navigateToMap() } - passesFilterBtn.setOnClickListener { navigateToPassPrefs() } + passesFilterBtn.setOnClickListener { navigateToFilter() } passesFab.setOnClickListener { navigateToEntries() } passesSettingsBtn.setOnClickListener { navigateToSettings() } } @@ -136,8 +136,8 @@ class PassesFragment : Fragment(R.layout.fragment_passes), PassesAdapter.PassesC findNavController().navigate(direction) } - private fun navigateToPassPrefs() { - val direction = PassesFragmentDirections.actionPassesToPassPrefs() + private fun navigateToFilter() { + val direction = PassesFragmentDirections.actionPassesToFilter() findNavController().navigate(direction) } diff --git a/app/src/main/res/layout/card_prefs_other.xml b/app/src/main/res/layout/card_prefs_other.xml index 5baff69e..675ba7f7 100644 --- a/app/src/main/res/layout/card_prefs_other.xml +++ b/app/src/main/res/layout/card_prefs_other.xml @@ -19,7 +19,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - - - - diff --git a/app/src/main/res/layout/dialog_filter.xml b/app/src/main/res/layout/dialog_filter.xml new file mode 100644 index 00000000..955d94b1 --- /dev/null +++ b/app/src/main/res/layout/dialog_filter.xml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + +