Merge pull request #363 from OpenHub-Store/feat-tweaks

Author: rainxchzed

composeApp/build.gradle.kts

@@ -65,6 +65,7 @@ kotlin {
             implementation(projects.feature.starred.presentation)
 
             implementation(projects.feature.recentlyViewed.presentation)
+            implementation(projects.feature.tweaks.presentation)
 
             implementation(libs.jetbrains.compose.navigation)
             implementation(libs.bundles.koin.common)

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/app/di/ViewModelsModule.kt

@@ -12,6 +12,7 @@ import zed.rainxch.profile.presentation.ProfileViewModel
 import zed.rainxch.recentlyviewed.presentation.RecentlyViewedViewModel
 import zed.rainxch.search.presentation.SearchViewModel
 import zed.rainxch.starred.presentation.StarredReposViewModel
+import zed.rainxch.tweaks.presentation.TweaksViewModel
 
 val viewModelsModule =
     module {
@@ -24,5 +25,6 @@ val viewModelsModule =
         viewModelOf(::RecentlyViewedViewModel)
         viewModelOf(::SearchViewModel)
         viewModelOf(::ProfileViewModel)
+        viewModelOf(::TweaksViewModel)
         viewModelOf(::StarredReposViewModel)
     }

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/app/navigation/AppNavigation.kt

@@ -37,9 +37,11 @@ import zed.rainxch.devprofile.presentation.DeveloperProfileRoot
 import zed.rainxch.favourites.presentation.FavouritesRoot
 import zed.rainxch.home.presentation.HomeRoot
 import zed.rainxch.profile.presentation.ProfileRoot
+import zed.rainxch.profile.presentation.SponsorScreen
 import zed.rainxch.recentlyviewed.presentation.RecentlyViewedRoot
 import zed.rainxch.search.presentation.SearchRoot
 import zed.rainxch.starred.presentation.StarredReposRoot
+import zed.rainxch.tweaks.presentation.TweaksRoot
 
 @Composable
 fun AppNavigation(
@@ -283,13 +285,17 @@ fun AppNavigation(
                 }
 
                 composable<GithubStoreGraph.SponsorScreen> {
-                    zed.rainxch.profile.presentation.SponsorScreen(
+                    SponsorScreen(
                         onNavigateBack = {
                             navController.navigateUp()
                         },
                     )
                 }
 
+                composable<GithubStoreGraph.TweaksScreen> {
+                    TweaksRoot()
+                }
+
                 composable<GithubStoreGraph.AppsScreen> {
                     AppsRoot(
                         onNavigateBack = {

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/app/navigation/BottomNavigation.kt

@@ -71,17 +71,9 @@ fun BottomNavigation(
 ) {
     val liquidState = LocalBottomNavigationLiquid.current
 
-    if (currentScreen !in BottomNavigationUtils.allowedScreens()) return
+    if (currentScreen !in BottomNavigationUtils.allowedScreens().map { it.screen }) return
 
-    val visibleItems =
-        remember {
-            BottomNavigationUtils.items().filterNot {
-                getPlatform() != Platform.ANDROID &&
-                    it.screen == GithubStoreGraph.AppsScreen
-            }
-        }
-
-    val selectedIndex = visibleItems.indexOfFirst { it.screen == currentScreen }
+    val selectedIndex = BottomNavigationUtils.allowedScreens().indexOfFirst { it.screen == currentScreen }
 
     val itemPositions = remember { mutableMapOf<Int, Pair<Float, Float>>() }
 
@@ -272,7 +264,7 @@ fun BottomNavigation(
                 horizontalArrangement = Arrangement.spacedBy(4.dp),
                 verticalAlignment = Alignment.CenterVertically,
             ) {
-                visibleItems.forEachIndexed { index, item ->
+                BottomNavigationUtils.allowedScreens().forEachIndexed { index, item ->
                     LiquidGlassTabItem(
                         item = item,
                         hasBadge = item.screen == GithubStoreGraph.AppsScreen && isUpdateAvailable,

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/app/navigation/BottomNavigationUtils.kt

@@ -1,14 +1,8 @@
 package zed.rainxch.githubstore.app.navigation
 
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Apps
-import androidx.compose.material.icons.filled.Home
-import androidx.compose.material.icons.filled.Person2
-import androidx.compose.material.icons.filled.Search
-import androidx.compose.material.icons.outlined.Apps
-import androidx.compose.material.icons.outlined.Home
-import androidx.compose.material.icons.outlined.Person2
-import androidx.compose.material.icons.outlined.Search
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.ui.graphics.vector.ImageVector
 import org.jetbrains.compose.resources.StringResource
 import zed.rainxch.core.domain.getPlatform
@@ -49,12 +43,18 @@ object BottomNavigationUtils {
                 iconFilled = Icons.Filled.Person2,
                 screen = GithubStoreGraph.ProfileScreen,
             ),
+            BottomNavigationItem(
+                titleRes = Res.string.bottom_nav_profile_tweaks,
+                iconOutlined = Icons.Outlined.Settings,
+                iconFilled = Icons.Filled.Settings,
+                screen = GithubStoreGraph.TweaksScreen,
+            ),
         )
 
-    fun allowedScreens(): List<GithubStoreGraph> =
+    fun allowedScreens(): List<BottomNavigationItem> =
         items()
             .filterNot {
                 getPlatform() != Platform.ANDROID &&
                     it.screen == GithubStoreGraph.AppsScreen
-            }.map { it.screen }
+            }
 }

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/app/navigation/GithubStoreGraph.kt

@@ -29,6 +29,9 @@ sealed interface GithubStoreGraph {
     @Serializable
     data object ProfileScreen : GithubStoreGraph
 
+    @Serializable
+    data object TweaksScreen : GithubStoreGraph
+
     @Serializable
     data object FavouritesScreen : GithubStoreGraph
 

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/app/navigation/NavigationUtils.kt

@@ -14,6 +14,8 @@ fun NavBackStackEntry?.getCurrentScreen(): GithubStoreGraph? {
         route.contains("DetailsScreen") -> toRoute<GithubStoreGraph.DetailsScreen>()
         route.contains("DeveloperProfileScreen") -> toRoute<GithubStoreGraph.DeveloperProfileScreen>()
         route.contains("ProfileScreen") -> GithubStoreGraph.ProfileScreen
+        route.contains("TweaksScreen") -> GithubStoreGraph.TweaksScreen
+        route.contains("RecentlyViewedScreen") -> GithubStoreGraph.RecentlyViewedScreen
         route.contains("FavouritesScreen") -> GithubStoreGraph.FavouritesScreen
         route.contains("StarredReposScreen") -> GithubStoreGraph.StarredReposScreen
         route.contains("AppsScreen") -> GithubStoreGraph.AppsScreen

core/presentation/src/commonMain/composeResources/values/strings.xml

@@ -394,6 +394,7 @@
     <string name="bottom_nav_search_title">Search</string>
     <string name="bottom_nav_apps_title">Apps</string>
     <string name="bottom_nav_profile_title">Profile</string>
+    <string name="bottom_nav_profile_tweaks">Tweaks</string>
 
     <string name="forked_repository">Fork</string>
 
@@ -620,4 +621,6 @@
     <string name="recent_searches">Recent searches</string>
     <string name="clear_all_history">Clear all</string>
     <string name="remove_search_history_item">Remove</string>
+
+    <string name="tweaks_title">Tweaks</string>
 </resources>

feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileAction.kt

@@ -1,116 +1,20 @@
 package zed.rainxch.profile.presentation
 
-import zed.rainxch.core.domain.model.AppTheme
-import zed.rainxch.core.domain.model.FontTheme
-import zed.rainxch.core.domain.model.InstallerType
-import zed.rainxch.profile.presentation.model.ProxyType
-
 sealed interface ProfileAction {
-    data object OnNavigateBackClick : ProfileAction
-
-    data class OnThemeColorSelected(
-        val themeColor: AppTheme,
-    ) : ProfileAction
-
-    data class OnAmoledThemeToggled(
-        val enabled: Boolean,
-    ) : ProfileAction
-
-    data class OnDarkThemeChange(
-        val isDarkTheme: Boolean?,
-    ) : ProfileAction
-
     data object OnLogoutClick : ProfileAction
 
     data object OnLogoutConfirmClick : ProfileAction
 
     data object OnStarredReposClick : ProfileAction
 
     data object OnFavouriteReposClick : ProfileAction
+    data class OnRepositoriesClick(val username: String) : ProfileAction
 
     data object OnLogoutDismiss : ProfileAction
 
-    data object OnHelpClick : ProfileAction
-
     data object OnLoginClick : ProfileAction
 
-    data object OnRefreshCacheSize : ProfileAction
-
-    data object OnClearCacheClick : ProfileAction
-
-    data object OnClearDownloadsConfirm : ProfileAction
-
-    data object OnClearDownloadsDismiss : ProfileAction
-
-    data class OnFontThemeSelected(
-        val fontTheme: FontTheme,
-    ) : ProfileAction
-
-    data class OnProxyTypeSelected(
-        val type: ProxyType,
-    ) : ProfileAction
-
-    data class OnProxyHostChanged(
-        val host: String,
-    ) : ProfileAction
-
-    data class OnProxyPortChanged(
-        val port: String,
-    ) : ProfileAction
-
-    data class OnRepositoriesClick(
-        val username: String,
-    ) : ProfileAction
-
-    data class OnProxyUsernameChanged(
-        val username: String,
-    ) : ProfileAction
-
-    data class OnProxyPasswordChanged(
-        val password: String,
-    ) : ProfileAction
-
-    data object OnProxyPasswordVisibilityToggle : ProfileAction
-
-    data class OnLiquidGlassEnabledChange(
-        val enabled: Boolean,
-    ) : ProfileAction
-
-    data object OnProxySave : ProfileAction
-
-    data class OnInstallerTypeSelected(
-        val type: InstallerType,
-    ) : ProfileAction
-
-    data object OnRequestShizukuPermission : ProfileAction
-
-    data class OnAutoUpdateToggled(
-        val enabled: Boolean,
-    ) : ProfileAction
-
-    data class OnUpdateCheckIntervalChanged(
-        val hours: Long,
-    ) : ProfileAction
-
-    data class OnIncludePreReleasesToggled(
-        val enabled: Boolean,
-    ) : ProfileAction
-
-    data class OnAutoDetectClipboardToggled(
-        val enabled: Boolean,
-    ) : ProfileAction
-
-    data class OnHideSeenToggled(
-        val enabled: Boolean,
-    ) : ProfileAction
-
-    data object OnClearSeenRepos : ProfileAction
-
     data object OnRecentlyViewedClick : ProfileAction
 
     data object OnSponsorClick : ProfileAction
-
-    data class OnScrollbarToggled(
-        val enabled: Boolean,
-    ) : ProfileAction
 }

feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileRoot.kt

@@ -36,11 +36,8 @@ import zed.rainxch.core.presentation.utils.ObserveAsEvents
 import zed.rainxch.githubstore.core.presentation.res.*
 import zed.rainxch.profile.presentation.components.ClearDownloadsDialog
 import zed.rainxch.profile.presentation.components.LogoutDialog
-import zed.rainxch.profile.presentation.components.sections.about
 import zed.rainxch.profile.presentation.components.sections.logout
-import zed.rainxch.profile.presentation.components.sections.othersSection
 import zed.rainxch.profile.presentation.components.sections.profile
-import zed.rainxch.profile.presentation.components.sections.settings
 
 @Composable
 fun ProfileRoot(
@@ -57,20 +54,6 @@ fun ProfileRoot(
     val snackbarState = remember { SnackbarHostState() }
     val coroutineScope = rememberCoroutineScope()
 
-    val lifecycleOwner = LocalLifecycleOwner.current
-    DisposableEffect(lifecycleOwner) {
-        val observer =
-            androidx.lifecycle.LifecycleEventObserver { _, event ->
-                if (event == androidx.lifecycle.Lifecycle.Event.ON_RESUME) {
-                    viewModel.onAction(ProfileAction.OnRefreshCacheSize)
-                }
-            }
-        lifecycleOwner.lifecycle.addObserver(observer)
-        onDispose {
-            lifecycleOwner.lifecycle.removeObserver(observer)
-        }
-    }
-
     ObserveAsEvents(viewModel.events) { event ->
         when (event) {
             ProfileEvent.OnLogoutSuccessful -> {
@@ -123,10 +106,6 @@ fun ProfileRoot(
         state = state,
         onAction = { action ->
             when (action) {
-                ProfileAction.OnNavigateBackClick -> {
-                    onNavigateBack()
-                }
-
                 ProfileAction.OnLoginClick -> {
                     onNavigateToAuthentication()
                 }
@@ -169,18 +148,6 @@ fun ProfileRoot(
             },
         )
     }
-
-    if (state.isClearDownloadsDialogVisible) {
-        ClearDownloadsDialog(
-            cacheSize = state.cacheSize,
-            onDismissRequest = {
-                viewModel.onAction(ProfileAction.OnClearDownloadsDismiss)
-            },
-            onConfirm = {
-                viewModel.onAction(ProfileAction.OnClearDownloadsConfirm)
-            },
-        )
-    }
 }
 
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
@@ -228,33 +195,6 @@ fun ProfileScreen(
                 Spacer(Modifier.height(32.dp))
             }
 
-            settings(
-                state = state,
-                onAction = onAction,
-            )
-
-            item {
-                Spacer(Modifier.height(16.dp))
-            }
-
-            othersSection(
-                state = state,
-                onAction = onAction,
-            )
-
-            item {
-                Spacer(Modifier.height(32.dp))
-            }
-
-            about(
-                versionName = state.versionName,
-                onAction = onAction,
-            )
-
-            item {
-                Spacer(Modifier.height(32.dp))
-            }
-
             if (state.isUserLoggedIn) {
                 logout(
                     onAction = onAction,