Skip to content

Migrate Offline Area Screens to Compose #3915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shobhitagarwal1612 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Migrate Offline Area Screens to Compose #3915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e60338f
refactor: migrate OfflineAreaSelectorFragment to Jetpack Compose
shobhitagarwal1612 Aug 30, 2026
2524360
refactor: migrate OfflineAreaViewerFragment to Jetpack Compose
shobhitagarwal1612 Aug 30, 2026
48b8173
feat: migrate offline areas screen to Jetpack Compose
shobhitagarwal1612 Aug 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 0 additions & 93 deletions app/src/main/java/org/groundplatform/android/ui/offlineareas/OfflineAreaListItem.kt
View file
Open in desktop

This file was deleted.

66 changes: 30 additions & 36 deletions app/src/main/java/org/groundplatform/android/ui/offlineareas/OfflineAreasFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,15 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.platform.ComposeView
import androidx.compose.ui.platform.ViewCompositionStrategy
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import androidx.navigation.fragment.findNavController
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.launch
import org.groundplatform.android.R
import org.groundplatform.android.databinding.OfflineAreasFragBinding
import org.groundplatform.android.ui.common.AbstractFragment
import org.groundplatform.android.util.setComposableContent

Expand All @@ -58,36 +52,36 @@ class OfflineAreasFragment : AbstractFragment() {
savedInstanceState: Bundle?,
): View {
super.onCreateView(inflater, container, savedInstanceState)
val binding = OfflineAreasFragBinding.inflate(inflater, container, false)
binding.viewModel = viewModel
binding.lifecycleOwner = this
binding.offlineAreasListComposeView.setComposableContent { ShowOfflineAreas() }

getAbstractActivity().setSupportActionBar(binding.offlineAreasToolbar)

return binding.root
}

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
lifecycleScope.launch {
viewModel.navigateToOfflineAreaSelector.collectLatest {
val navController = findNavController()
if (navController.currentDestination?.id == R.id.offline_areas_fragment) {
navController.navigate(OfflineAreasFragmentDirections.showOfflineAreaSelector())
}
return ComposeView(requireContext()).apply {
setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
setComposableContent {
OfflineAreasScreen(
viewModel = viewModel,
onAreaClick = { areaId ->
val navController = findNavController()
if (navController.currentDestination?.id == R.id.offline_areas_fragment) {
navController.navigate(OfflineAreasFragmentDirections.viewOfflineArea(areaId))
}
},
onNavigateUp = {
val navController = findNavController()
if (navController.currentDestination?.id == R.id.offline_areas_fragment) {
navController.navigateUp()
}
},
)
}
}
}

@Composable
private fun ShowOfflineAreas() {
val list by viewModel.offlineAreas.observeAsState()
list?.let {
LazyColumn(Modifier.fillMaxSize().testTag("offline area list")) {
items(it) {
OfflineAreaListItem(offlineAreaDetails = it) { areaId ->
findNavController().navigate(OfflineAreasFragmentDirections.viewOfflineArea(areaId))
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
viewLifecycleOwner.lifecycleScope.launch {
viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
viewModel.navigateToOfflineAreaSelector.collect {
val navController = findNavController()
if (navController.currentDestination?.id == R.id.offline_areas_fragment) {
navController.navigate(OfflineAreasFragmentDirections.showOfflineAreaSelector())
}
}
}
Expand Down
Loading