[23657] BottomSheet cards refactoring

TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/controller/homeviewcontroller/TKUIHomeViewControllerFragment.kt

@@ -2,7 +2,9 @@ package com.skedgo.tripkit.ui.controller.homeviewcontroller
 
 import android.Manifest
 import android.content.Context
+import android.content.Intent
 import android.os.Bundle
+import android.provider.Settings
 import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
@@ -63,6 +65,8 @@ import com.skedgo.tripkit.ui.utils.deFocusAndHideKeyboard
 import com.skedgo.tripkit.ui.utils.hideKeyboard
 import com.skedgo.tripkit.ui.utils.isPermissionGranted
 import com.skedgo.tripkit.ui.utils.replaceFragment
+import com.skedgo.tripkit.ui.utils.showConfirmationPopUpDialog
+import com.skedgo.tripkit.checkIfLocationProviderIsEnabled
 import io.reactivex.Completable
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -429,7 +433,8 @@ class TKUIHomeViewControllerFragment :
             }
 
             override fun reloadMapMarkers() {
-                mapFragment.setShowPoiMarkers(true, emptyList())
+                // Use the new restoration method to properly restore previous state
+                mapFragment.restorePoiMarkersState()
 
                 Observable.timer(500, TimeUnit.MILLISECONDS)
                     .observeOn(AndroidSchedulers.mainThread())
@@ -668,6 +673,20 @@ class TKUIHomeViewControllerFragment :
     }
 
     private fun checkLocationPermission(callback: (Boolean) -> Unit) {
+        // First check if device location is enabled
+        if (!requireContext().checkIfLocationProviderIsEnabled()) {
+            requireContext().showConfirmationPopUpDialog(
+                title = getString(R.string.location_services_required),
+                message = getString(R.string.device_location_is_turned_off),
+                positiveLabel = getString(R.string.settings),
+                positiveCallback = {
+                    val intent = Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)
+                    startActivity(intent)
+                }
+            )
+            return
+        }
+
         ExcuseMe.couldYouGive(this)
             .permissionFor(Manifest.permission.ACCESS_FINE_LOCATION) {
                 callback.invoke(it.granted.contains(Manifest.permission.ACCESS_FINE_LOCATION))
@@ -770,15 +789,13 @@ class TKUIHomeViewControllerFragment :
         segmentId: Long,
         fromTripAction: Boolean = false
     ) {
-        val pageIndexStream = PublishSubject.create<Pair<Long, String>>()
         val paymentDataStream = PublishSubject.create<PaymentData>()
         val ticketActionStream = PublishSubject.create<String>()
 
         tripSegmentOnPreview = tripSegment
 
         val headerFragment =
             TripPreviewHeaderFragment.newInstance(
-                pageIndexStream,
                 tripSegment.trip?.hideExactTimes == true ||
                     tripSegment.trip?.segmentList?.any { it.isHideExactTimes } ?: false
             )
@@ -789,7 +806,6 @@ class TKUIHomeViewControllerFragment :
             tripSegment.trip!!.uuid, segmentId,
             initTripPreviewPagerFragmentListener(tripSegment),
             fromTripAction,
-            pageIndexStream,
             paymentDataStream,
             ticketActionStream
         ) {

TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/controller/locationsearchcontroller/TKUILocationSearchViewControllerFragment.kt

@@ -152,7 +152,11 @@ class TKUILocationSearchViewControllerFragment :
     }
 
     fun setQuery(query: String, isRouting: Boolean = false) {
-        locationSearchFragment?.setQuery(query, isRouting)
+        locationSearchFragment?.let { fragment ->
+            if (fragment.isAdded && fragment.isVisible) {
+                fragment.setQuery(query, isRouting)
+            }
+        }
     }
 
     companion object {

TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/controller/routeviewcontroller/TKUIRouteFragment.kt

@@ -1,8 +1,10 @@
 package com.skedgo.tripkit.ui.controller.routeviewcontroller
 
 import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
+import android.provider.Settings
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.View
@@ -33,6 +35,8 @@ import com.skedgo.tripkit.ui.core.addTo
 import com.skedgo.tripkit.ui.databinding.FragmentTkuiRouteBinding
 import com.skedgo.tripkit.ui.search.FixedSuggestions
 import com.skedgo.tripkit.ui.utils.showKeyboard
+import com.skedgo.tripkit.ui.utils.showConfirmationPopUpDialog
+import com.skedgo.tripkit.checkIfLocationProviderIsEnabled
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import kotlinx.coroutines.launch
@@ -71,7 +75,11 @@ class TKUIRouteFragment : BaseFragment<FragmentTkuiRouteBinding>() {
             // Only pay attention if one of the EditText's has focus. When the swap button is pressed, both
             // focuses are cleared so we won't trigger a new query
             if (!ignoreNextTextChange && (binding.tieStartEdit.hasFocus() || binding.tieDestinationEdit.hasFocus())) {
-                locationSearchFragment?.setQuery(text.toString(), true)
+                locationSearchFragment?.let { fragment ->
+                    if (fragment.isAdded && fragment.isVisible) {
+                        fragment.setQuery(text.toString(), true)
+                    }
+                }
 
                 if (text.toString().isEmpty()) {
                     setCorrectLocation(null)
@@ -113,17 +121,33 @@ class TKUIRouteFragment : BaseFragment<FragmentTkuiRouteBinding>() {
         if (v == binding.tieStartEdit && hasFocus) {
             focusedField = binding.tieStartEdit
             if (viewModel.startLocation?.locationType != Location.TYPE_CURRENT_LOCATION) {
-                locationSearchFragment?.setQuery(binding.tieStartEdit.text.toString(), true)
+                locationSearchFragment?.let { fragment ->
+                    if (fragment.isAdded && fragment.isVisible) {
+                        fragment.setQuery(binding.tieStartEdit.text.toString(), true)
+                    }
+                }
             } else {
-                locationSearchFragment?.setQuery("", true)
+                locationSearchFragment?.let { fragment ->
+                    if (fragment.isAdded && fragment.isVisible) {
+                        fragment.setQuery("", true)
+                    }
+                }
             }
             viewModel.focusedField = TKUIRouteViewModel.FocusedField.START
         } else if (v == binding.tieDestinationEdit && hasFocus) {
             focusedField = binding.tieDestinationEdit
             if (viewModel.destinationLocation?.locationType != Location.TYPE_CURRENT_LOCATION) {
-                locationSearchFragment?.setQuery(binding.tieDestinationEdit.text.toString(), true)
+                locationSearchFragment?.let { fragment ->
+                    if (fragment.isAdded && fragment.isVisible) {
+                        fragment.setQuery(binding.tieDestinationEdit.text.toString(), true)
+                    }
+                }
             } else {
-                locationSearchFragment?.setQuery("", true)
+                locationSearchFragment?.let { fragment ->
+                    if (fragment.isAdded && fragment.isVisible) {
+                        fragment.setQuery("", true)
+                    }
+                }
             }
             viewModel.focusedField = TKUIRouteViewModel.FocusedField.DESTINATION
         }
@@ -232,14 +256,22 @@ class TKUIRouteFragment : BaseFragment<FragmentTkuiRouteBinding>() {
             viewModel.startLocation = null
             toggleShowCurrentLocation()
             binding.tieStartEdit.requestFocus()
-            locationSearchFragment?.setQuery("", true)
+            locationSearchFragment?.let { fragment ->
+                if (fragment.isAdded && fragment.isVisible) {
+                    fragment.setQuery("", true)
+                }
+            }
         }
         binding.tilDestinationEdit.setEndIconOnClickListener {
             ignoreNextTextChange = true
             viewModel.destinationLocation = null
             toggleShowCurrentLocation()
             binding.tieDestinationEdit.requestFocus()
-            locationSearchFragment?.setQuery("", true)
+            locationSearchFragment?.let { fragment ->
+                if (fragment.isAdded && fragment.isVisible) {
+                    fragment.setQuery("", true)
+                }
+            }
         }
     }
 
@@ -345,6 +377,20 @@ class TKUIRouteFragment : BaseFragment<FragmentTkuiRouteBinding>() {
     }
 
     private suspend fun getCurrentLocation() {
+        // First check if device location is enabled
+        if (!requireContext().checkIfLocationProviderIsEnabled()) {
+            requireContext().showConfirmationPopUpDialog(
+                title = getString(R.string.location_services_required),
+                message = getString(R.string.device_location_is_turned_off),
+                positiveLabel = getString(R.string.settings),
+                positiveCallback = {
+                    val intent = Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)
+                    startActivity(intent)
+                }
+            )
+            return
+        }
+
         if (ExcuseMe.couldYouGive(this)
                 .permissionFor(android.Manifest.permission.ACCESS_FINE_LOCATION)
         ) {
@@ -448,7 +494,11 @@ class TKUIRouteFragment : BaseFragment<FragmentTkuiRouteBinding>() {
                         lat = 0.0
                         lon = 0.0
                     }
-                    locationSearchFragment?.setQuery("") // To reset the list
+                    locationSearchFragment?.let { fragment ->
+                        if (fragment.isAdded && fragment.isVisible) {
+                            fragment.setQuery("") // To reset the list
+                        }
+                    }
                     setCorrectLocation(fixedLocation)
                     lifecycleScope.launch {
                         getCurrentLocation()

TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/controller/timetableviewcontroller/TKUITimetableControllerFragment.kt

@@ -161,7 +161,7 @@ class TKUITimetableControllerFragment : BaseFragment<FragmentTkuiTimetableContro
         time: Long
     ) {
 
-        mapFragment?.setShowPoiMarkers(false, null)
+        mapFragment?.setShowMarkers(false, null)
 
         serviceDetailsFragment = ServiceDetailFragment.Builder()
             .withStop(scheduledStop)
@@ -188,7 +188,7 @@ class TKUITimetableControllerFragment : BaseFragment<FragmentTkuiTimetableContro
     }
 
     private fun resetMapState() {
-        mapFragment?.setShowPoiMarkers(true, emptyList())
+        mapFragment?.setShowMarkers(true, emptyList())
         val contributor = serviceDetailsFragment?.contributor()
         if (contributor is TimetableMapContributor) {
             contributor.getMapPreviousPosition().let {

TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/controller/tripdetailsviewcontroller/TKUITripDetailsViewControllerFragment.kt

@@ -21,7 +21,6 @@ import com.skedgo.tripkit.ui.favorites.trips.FavoriteTrip
 import com.skedgo.tripkit.ui.map.home.TripKitMapFragment
 import com.skedgo.tripkit.ui.routingresults.TripGroupRepository
 import com.skedgo.tripkit.ui.tripresult.TripResultPagerFragment
-import com.skedgo.tripkit.ui.tripresult.TripResultPagerFragment.OnTripUpdatedListener
 import com.skedgo.tripkit.ui.tripresult.TripSegmentListFragment
 import com.skedgo.tripkit.ui.tripresults.actionbutton.ActionButtonHandlerFactory
 import kotlinx.coroutines.CoroutineScope
@@ -30,7 +29,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.rx2.awaitFirstOrNull
 import javax.inject.Inject
 
-
+// TODO changes from TripDetailsFragment (TripGo) should also be applied here
 class TKUITripDetailsViewControllerFragment :
     BaseFragment<FragmentTkuiTripDetailsViewControllerBinding>() {
 
@@ -92,10 +91,18 @@ class TKUITripDetailsViewControllerFragment :
     fun settled() {
         tripKitMapFragment?.apply {
             setContributor(pagerFragment?.contributor())
-            setShowPoiMarkers(false, null)
+            // Only disable POI markers temporarily while in trip details mode
+            setShowMarkers(false, null)
         }
     }
 
+    /**
+     * Restore map state when exiting trip details
+     */
+    fun restoreMapState() {
+        tripKitMapFragment?.restorePoiMarkersState()
+    }
+
     private fun initPagerFragment() {
 
         if (pagerFragment == null) {
@@ -139,7 +146,7 @@ class TKUITripDetailsViewControllerFragment :
             pagerFragment?.setOnCloseButtonListener {
                 eventBus.publish(ViewControllerEvent.OnCloseAction())
             }
-            pagerFragment?.setOnTripUpdatedListener(object : OnTripUpdatedListener {
+            pagerFragment?.setOnTripUpdatedListener(object : TripResultPagerFragment.OnTripUpdatedListener {
                 override fun onTripUpdated(trip: Trip?) {
                     trip?.group?.let {
                         val list = ArrayList<TripGroup>()
@@ -192,6 +199,18 @@ class TKUITripDetailsViewControllerFragment :
         pagerFragment?.updateTripGroupResult(tripGroup)
     }
 
+    override fun onDestroyView() {
+        // Ensure map state is restored when fragment is destroyed
+        restoreMapState()
+        super.onDestroyView()
+    }
+
+    override fun onDetach() {
+        // Fallback restoration in case onDestroyView wasn't called
+        restoreMapState()
+        super.onDetach()
+    }
+
     companion object {
         const val TAG = "TKUITripDetailsViewControllerFragment"