Skip to content

Add support for Pull to Refresh on the Home screen. #17

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

Merged
titooan merged 1 commit into from
Oct 27, 2025
Merged

Add support for Pull to Refresh on the Home screen. #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ dependencies {
implementation(libs.androidx.compose.ui.graphics)
implementation(libs.androidx.compose.ui.tooling.preview)
implementation(libs.androidx.compose.material3)
implementation(libs.androidx.compose.material)
implementation(libs.androidx.compose.material3.adaptive.navigation.suite)

// Navigation Compose
Expand Down
69 changes: 41 additions & 28 deletions app/src/main/java/org/mozilla/tryfox/ui/screens/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,19 @@ package org.mozilla.tryfox.ui.screens

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.AccountCircle
import androidx.compose.material.icons.filled.Search
import androidx.compose.material.pullrefresh.PullRefreshIndicator
import androidx.compose.material.pullrefresh.pullRefresh
import androidx.compose.material.pullrefresh.rememberPullRefreshState
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
Expand Down Expand Up @@ -47,7 +49,7 @@ import org.mozilla.tryfox.ui.models.AppUiModel
import org.mozilla.tryfox.util.parseDateToMillis
import java.io.File

@OptIn(ExperimentalMaterial3Api::class)
@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
@Composable
fun HomeScreen(
modifier: Modifier = Modifier,
Expand All @@ -56,6 +58,8 @@ fun HomeScreen(
homeViewModel: HomeViewModel = viewModel(),
) {
val screenState by homeViewModel.homeScreenState.collectAsState()
val isRefreshing by homeViewModel.isRefreshing.collectAsState()
val pullRefreshState = rememberPullRefreshState(isRefreshing, { homeViewModel.refreshData() })

LaunchedEffect(Unit) {
homeViewModel.initialLoad()
Expand Down Expand Up @@ -111,33 +115,36 @@ fun HomeScreen(
)
},
) { innerPadding ->
when (val currentScreenState = screenState) {
is HomeScreenState.InitialLoading -> {
Box(
modifier = Modifier
.fillMaxSize()
.padding(innerPadding),
contentAlignment = Alignment.Center,
) {
CircularProgressIndicator()
Text(
stringResource(id = R.string.home_loading_initial_data),
modifier = Modifier.padding(top = 70.dp), // Adjust as needed to place below indicator
)
Box(
modifier = Modifier
.fillMaxSize()
.padding(innerPadding)
.pullRefresh(pullRefreshState),
) {
when (val currentScreenState = screenState) {
is HomeScreenState.InitialLoading -> {
Box(
modifier = Modifier
.fillMaxSize(),
contentAlignment = Alignment.Center,
) {
CircularProgressIndicator()
Text(
stringResource(id = R.string.home_loading_initial_data),
modifier = Modifier.padding(top = 70.dp), // Adjust as needed to place below indicator
)
}
}
}

is HomeScreenState.Loaded -> {
Column(
modifier = Modifier
.fillMaxSize()
.padding(innerPadding)
.padding(horizontal = 16.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Top,
) {
Spacer(modifier = Modifier.height(16.dp))
LazyColumn(modifier = Modifier.fillMaxWidth()) {
is HomeScreenState.Loaded -> {
LazyColumn(
modifier = Modifier
.fillMaxSize()
.padding(horizontal = 16.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Top,
) {
item { Spacer(modifier = Modifier.height(16.dp)) }
items(currentScreenState.apps.values.toList()) { app ->
AppComponent(
app = app,
Expand All @@ -157,6 +164,12 @@ fun HomeScreen(
}
}
}

PullRefreshIndicator(
refreshing = isRefreshing,
state = pullRefreshState,
modifier = Modifier.align(Alignment.TopCenter),
)
}
}
}
Expand Down
114 changes: 65 additions & 49 deletions app/src/main/java/org/mozilla/tryfox/ui/screens/HomeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ class HomeViewModel(
private val _homeScreenState = MutableStateFlow<HomeScreenState>(HomeScreenState.InitialLoading)
val homeScreenState: StateFlow<HomeScreenState> = _homeScreenState.asStateFlow()

private val _isRefreshing = MutableStateFlow(false)
val isRefreshing: StateFlow<Boolean> = _isRefreshing.asStateFlow()

private val deviceSupportedAbis: List<String> by lazy {
deviceSupportedAbisForTesting ?: Build.SUPPORTED_ABIS?.toList() ?: emptyList()
}
Expand Down Expand Up @@ -108,66 +111,79 @@ class HomeViewModel(
fun initialLoad() {
viewModelScope.launch {
_homeScreenState.value = HomeScreenState.InitialLoading
_isRefreshing.value = true
cacheManager.checkCacheStatus() // Initial check
fetchData()
_isRefreshing.value = false
}
}

val appInfoMap = mapOf(
FENIX to mozillaPackageManager.fenix,
FOCUS to mozillaPackageManager.focus,
REFERENCE_BROWSER to mozillaPackageManager.referenceBrowser,
)

_homeScreenState.update {
val currentCacheState = cacheManager.cacheState.value
val initialApps = appInfoMap.mapValues { (appName, appState) ->
AppUiModel(
name = appName,
packageName = appState.packageName,
installedVersion = appState.version,
installedDate = appState.formattedInstallDate,
apks = ApksResult.Loading,
)
}
HomeScreenState.Loaded(
apps = initialApps,
cacheManagementState = currentCacheState,
isDownloadingAnyFile = false,
)
}
fun refreshData() {
viewModelScope.launch {
_isRefreshing.value = true
fetchData()
_isRefreshing.value = false
}
}

val results = mapOf(
FENIX to mozillaArchiveRepository.getFenixNightlyBuilds(),
FOCUS to mozillaArchiveRepository.getFocusNightlyBuilds(),
REFERENCE_BROWSER to mozillaArchiveRepository.getReferenceBrowserNightlyBuilds(),
)
private suspend fun fetchData() {
val appInfoMap = mapOf(
FENIX to mozillaPackageManager.fenix,
FOCUS to mozillaPackageManager.focus,
REFERENCE_BROWSER to mozillaPackageManager.referenceBrowser,
)

val newApps = results.mapValues { (appName, result) ->
val appState = appInfoMap[appName]
val apksResult = when (result) {
is NetworkResult.Success -> {
val latestApks = getLatestApks(result.data)
ApksResult.Success(convertParsedApksToUiModels(latestApks))
}
is NetworkResult.Error -> ApksResult.Error("Error fetching $appName nightly builds: ${result.message}")
}
_homeScreenState.update {
val currentCacheState = cacheManager.cacheState.value
val initialApps = appInfoMap.mapValues { (appName, appState) ->
AppUiModel(
name = appName,
packageName = appState?.packageName ?: "",
installedVersion = appState?.version,
installedDate = appState?.formattedInstallDate,
apks = apksResult,
packageName = appState.packageName,
installedVersion = appState.version,
installedDate = appState.formattedInstallDate,
apks = ApksResult.Loading,
)
}
HomeScreenState.Loaded(
apps = initialApps,
cacheManagementState = currentCacheState,
isDownloadingAnyFile = false,
)
}

val isDownloading = newApps.values.any { app ->
(app.apks as? ApksResult.Success)?.apks?.any { it.downloadState is DownloadState.InProgress } == true
}
val results = mapOf(
FENIX to mozillaArchiveRepository.getFenixNightlyBuilds(),
FOCUS to mozillaArchiveRepository.getFocusNightlyBuilds(),
REFERENCE_BROWSER to mozillaArchiveRepository.getReferenceBrowserNightlyBuilds(),
)

_homeScreenState.update {
if (it is HomeScreenState.Loaded) {
it.copy(apps = newApps, isDownloadingAnyFile = isDownloading)
} else {
it
val newApps = results.mapValues { (appName, result) ->
val appState = appInfoMap[appName]
val apksResult = when (result) {
is NetworkResult.Success -> {
val latestApks = getLatestApks(result.data)
ApksResult.Success(convertParsedApksToUiModels(latestApks))
}
is NetworkResult.Error -> ApksResult.Error("Error fetching $appName nightly builds: ${result.message}")
}
AppUiModel(
name = appName,
packageName = appState?.packageName ?: "",
installedVersion = appState?.version,
installedDate = appState?.formattedInstallDate,
apks = apksResult,
)
}

val isDownloading = newApps.values.any { app ->
(app.apks as? ApksResult.Success)?.apks?.any { it.downloadState is DownloadState.InProgress } == true
}

_homeScreenState.update {
if (it is HomeScreenState.Loaded) {
it.copy(apps = newApps, isDownloadingAnyFile = isDownloading)
} else {
it
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ mockitoKotlin = "6.0.0"
logcat = "0.4"
espressoIntents = "3.7.0" # Added javax.inject version
koin = "4.1.1"
composeMaterial = "1.6.8"

[libraries]
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
Expand All @@ -45,6 +46,7 @@ androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "u
androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
androidx-compose-material = { group = "androidx.compose.material", name = "material", version.ref = "composeMaterial" }
androidx-compose-material3-adaptive-navigation-suite = { group = "androidx.compose.material3", name = "material3-adaptive-navigation-suite" }
retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
Expand Down