Merge branch 'main' into flatpak-pr

Author: rainxchzed

.github/workflows/build-desktop-platforms.yml

@@ -267,6 +267,28 @@ jobs:
           ls -lh "$OUTPUT" "$OUTPUT.zsync"
         shell: bash
 
+      - name: Patch deb scripts for headless/WSL compatibility
+        run: |
+          set -euo pipefail
+          for deb in composeApp/build/compose/binaries/main/deb/*.deb; do
+            [ -f "$deb" ] || continue
+            echo "Patching: $deb"
+            tmpdir=$(mktemp -d)
+            dpkg-deb -R "$deb" "$tmpdir"
+
+            for script in "$tmpdir/DEBIAN/postinst" "$tmpdir/DEBIAN/prerm" "$tmpdir/DEBIAN/postrm"; do
+              [ -f "$script" ] || continue
+              # Make xdg-desktop-menu / xdg-icon-resource / xdg-mime calls non-fatal
+              # so install/remove succeeds in headless environments (WSL, containers, servers)
+              sed -i '/xdg-desktop-menu\|xdg-icon-resource\|xdg-mime/{/|| true$/!s/$/ || true/}' "$script"
+            done
+
+            dpkg-deb -b "$tmpdir" "$deb"
+            rm -rf "$tmpdir"
+            echo "Patched successfully: $deb"
+          done
+        shell: bash
+
       - name: Upload Linux installers
         uses: actions/upload-artifact@v4
         with:

README.md

@@ -64,6 +64,8 @@ Built with Kotlin Multiplatform and Compose Multiplatform for Android and Deskto
 
 </div>
 
+<div align="center"><a href="https://github.com/Safouene1/support-palestine-banner/blob/master/Markdown-pages/Support.md"><img src="https://raw.githubusercontent.com/Safouene1/support-palestine-banner/master/banner-project.svg" alt="Support Palestine" style="width: 100%;"></a></div>
+
 > [!CAUTION]
 > Free and Open-Source Android is under threat. Google will turn Android into a locked-down platform, restricting your essential freedom to install apps of your choice. Make your voice heard – [keepandroidopen.org](https://keepandroidopen.org/).
 

composeApp/src/androidMain/kotlin/zed/rainxch/githubstore/app/GithubStoreApp.kt

@@ -17,7 +17,7 @@ import zed.rainxch.core.data.services.UpdateScheduler
 import zed.rainxch.core.domain.model.InstallSource
 import zed.rainxch.core.domain.model.InstalledApp
 import zed.rainxch.core.domain.repository.InstalledAppsRepository
-import zed.rainxch.core.domain.repository.ThemesRepository
+import zed.rainxch.core.domain.repository.TweaksRepository
 import zed.rainxch.core.domain.system.PackageMonitor
 import zed.rainxch.githubstore.app.di.initKoin
 
@@ -83,7 +83,7 @@ class GithubStoreApp : Application() {
     private fun scheduleBackgroundUpdateChecks() {
         appScope.launch {
             try {
-                val intervalHours = get<ThemesRepository>().getUpdateCheckInterval().first()
+                val intervalHours = get<TweaksRepository>().getUpdateCheckInterval().first()
                 UpdateScheduler.schedule(
                     context = this@GithubStoreApp,
                     intervalHours = intervalHours,

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/Main.kt

@@ -102,6 +102,7 @@ fun App(deepLinkUri: String? = null) {
 
         AppNavigation(
             navController = navController,
+            isLiquidGlassEnabled = state.isLiquidGlassEnabled,
         )
     }
 }

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/MainState.kt

@@ -13,4 +13,5 @@ data class MainState(
     val isAmoledTheme: Boolean = false,
     val isDarkTheme: Boolean? = null,
     val currentFontTheme: FontTheme = FontTheme.CUSTOM,
+    val isLiquidGlassEnabled: Boolean = true,
 )

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/MainViewModel.kt

@@ -10,11 +10,11 @@ import kotlinx.coroutines.launch
 import zed.rainxch.core.domain.repository.AuthenticationState
 import zed.rainxch.core.domain.repository.InstalledAppsRepository
 import zed.rainxch.core.domain.repository.RateLimitRepository
-import zed.rainxch.core.domain.repository.ThemesRepository
+import zed.rainxch.core.domain.repository.TweaksRepository
 import zed.rainxch.core.domain.use_cases.SyncInstalledAppsUseCase
 
 class MainViewModel(
-    private val themesRepository: ThemesRepository,
+    private val tweaksRepository: TweaksRepository,
     private val installedAppsRepository: InstalledAppsRepository,
     private val authenticationState: AuthenticationState,
     private val rateLimitRepository: RateLimitRepository,
@@ -37,7 +37,7 @@ class MainViewModel(
         }
 
         viewModelScope.launch {
-            themesRepository
+            tweaksRepository
                 .getThemeColor()
                 .collect { theme ->
                     _state.update {
@@ -46,7 +46,7 @@ class MainViewModel(
                 }
         }
         viewModelScope.launch {
-            themesRepository
+            tweaksRepository
                 .getAmoledTheme()
                 .collect { isAmoled ->
                     _state.update {
@@ -55,7 +55,7 @@ class MainViewModel(
                 }
         }
         viewModelScope.launch {
-            themesRepository
+            tweaksRepository
                 .getIsDarkTheme()
                 .collect { isDarkTheme ->
                     _state.update {
@@ -65,7 +65,7 @@ class MainViewModel(
         }
 
         viewModelScope.launch {
-            themesRepository
+            tweaksRepository
                 .getFontTheme()
                 .collect { fontTheme ->
                     _state.update {
@@ -74,6 +74,12 @@ class MainViewModel(
                 }
         }
 
+        viewModelScope.launch {
+            tweaksRepository.getLiquidGlassEnabled().collect { enabled ->
+                _state.update { it.copy(isLiquidGlassEnabled = enabled) }
+            }
+        }
+
         viewModelScope.launch {
             rateLimitRepository.rateLimitState.collect { rateLimitInfo ->
                 _state.update { currentState ->

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

@@ -9,7 +9,7 @@ val mainModule: Module =
     module {
         viewModel {
             MainViewModel(
-                themesRepository = get(),
+                tweaksRepository = get(),
                 installedAppsRepository = get(),
                 rateLimitRepository = get(),
                 syncUseCase = get(),

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

@@ -40,7 +40,10 @@ import zed.rainxch.search.presentation.SearchRoot
 import zed.rainxch.starred.presentation.StarredReposRoot
 
 @Composable
-fun AppNavigation(navController: NavHostController) {
+fun AppNavigation(
+    navController: NavHostController,
+    isLiquidGlassEnabled: Boolean = true,
+) {
     val liquidState = rememberLiquidState()
     var bottomNavigationHeight by remember { mutableStateOf(0.dp) }
     val density = LocalDensity.current
@@ -294,6 +297,7 @@ fun AppNavigation(navController: NavHostController) {
                         }
                     },
                     isUpdateAvailable = appsState.apps.any { it.installedApp.isUpdateAvailable },
+                    isLiquidGlassEnabled = isLiquidGlassEnabled,
                     modifier =
                         Modifier
                             .align(Alignment.BottomCenter)

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

@@ -8,6 +8,7 @@ import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.spring
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
+import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.collectIsPressedAsState
@@ -65,6 +66,7 @@ fun BottomNavigation(
     currentScreen: GithubStoreGraph,
     onNavigate: (GithubStoreGraph) -> Unit,
     isUpdateAvailable: Boolean,
+    isLiquidGlassEnabled: Boolean = true,
     modifier: Modifier = Modifier,
 ) {
     val liquidState = LocalBottomNavigationLiquid.current
@@ -129,31 +131,36 @@ fun BottomNavigation(
         modifier = modifier,
         contentAlignment = Alignment.Center,
     ) {
+        val useLiquid = isLiquidGlassEnabled && isLiquidFrostAvailable()
+
         Box(
             modifier =
                 Modifier
                     .clip(CircleShape)
-                    .background(
-                        if (isLiquidFrostAvailable()) {
-                            MaterialTheme.colorScheme.surfaceContainerHighest.copy(
-                                alpha = if (isDarkTheme) .25f else .15f,
-                            )
-                        } else {
-                            MaterialTheme.colorScheme.surfaceContainerHighest
-                        },
-                    ).then(
-                        if (isLiquidFrostAvailable()) {
-                            Modifier.liquid(liquidState) {
-                                this.shape = CircleShape
-                                this.frost = if (isDarkTheme) 12.dp else 10.dp
-                                this.curve = if (isDarkTheme) .35f else .45f
-                                this.refraction = if (isDarkTheme) .08f else .12f
-                                this.dispersion = if (isDarkTheme) .18f else .25f
-                                this.saturation = if (isDarkTheme) .40f else .55f
-                                this.contrast = if (isDarkTheme) 1.8f else 1.6f
-                            }
+                    .then(
+                        if (useLiquid) {
+                            Modifier
+                                .background(
+                                    MaterialTheme.colorScheme.surfaceContainerHighest.copy(
+                                        alpha = if (isDarkTheme) .25f else .15f,
+                                    ),
+                                ).liquid(liquidState) {
+                                    this.shape = CircleShape
+                                    this.frost = if (isDarkTheme) 12.dp else 10.dp
+                                    this.curve = if (isDarkTheme) .35f else .45f
+                                    this.refraction = if (isDarkTheme) .08f else .12f
+                                    this.dispersion = if (isDarkTheme) .18f else .25f
+                                    this.saturation = if (isDarkTheme) .40f else .55f
+                                    this.contrast = if (isDarkTheme) 1.8f else 1.6f
+                                }
                         } else {
                             Modifier
+                                .background(MaterialTheme.colorScheme.surfaceContainer)
+                                .border(
+                                    width = 1.dp,
+                                    color = MaterialTheme.colorScheme.outlineVariant,
+                                    shape = CircleShape,
+                                )
                         },
                     ).pointerInput(Unit) { },
         ) {