Merge pull request #354 from OpenHub-Store/desktop-scrollbar-impl

Author: rainxchzed

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

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

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

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

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

@@ -80,6 +80,12 @@ class MainViewModel(
             }
         }
 
+        viewModelScope.launch {
+            tweaksRepository.getScrollbarEnabled().collect { enabled ->
+                _state.update { it.copy(isScrollbarEnabled = enabled) }
+            }
+        }
+
         viewModelScope.launch {
             rateLimitRepository.rateLimitState.collect { rateLimitInfo ->
                 _state.update { currentState ->

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

@@ -31,6 +31,7 @@ import zed.rainxch.apps.presentation.AppsViewModel
 import zed.rainxch.auth.presentation.AuthenticationRoot
 import zed.rainxch.core.presentation.locals.LocalBottomNavigationHeight
 import zed.rainxch.core.presentation.locals.LocalBottomNavigationLiquid
+import zed.rainxch.core.presentation.locals.LocalScrollbarEnabled
 import zed.rainxch.details.presentation.DetailsRoot
 import zed.rainxch.devprofile.presentation.DeveloperProfileRoot
 import zed.rainxch.favourites.presentation.FavouritesRoot
@@ -43,6 +44,7 @@ import zed.rainxch.starred.presentation.StarredReposRoot
 fun AppNavigation(
     navController: NavHostController,
     isLiquidGlassEnabled: Boolean = true,
+    isScrollbarEnabled: Boolean = false,
 ) {
     val liquidState = rememberLiquidState()
     var bottomNavigationHeight by remember { mutableStateOf(0.dp) }
@@ -54,6 +56,7 @@ fun AppNavigation(
     CompositionLocalProvider(
         LocalBottomNavigationLiquid provides liquidState,
         LocalBottomNavigationHeight provides bottomNavigationHeight,
+        LocalScrollbarEnabled provides isScrollbarEnabled,
     ) {
         Box(
             modifier = Modifier.fillMaxSize(),

core/data/src/commonMain/kotlin/zed/rainxch/core/data/repository/TweaksRepositoryImpl.kt

@@ -157,6 +157,17 @@ class TweaksRepositoryImpl(
         }
     }
 
+    override fun getScrollbarEnabled(): Flow<Boolean> =
+        preferences.data.map { prefs ->
+            prefs[SCROLLBAR_ENABLED_KEY] ?: false
+        }
+
+    override suspend fun setScrollbarEnabled(enabled: Boolean) {
+        preferences.edit { prefs ->
+            prefs[SCROLLBAR_ENABLED_KEY] = enabled
+        }
+    }
+
     companion object {
         private const val DEFAULT_UPDATE_CHECK_INTERVAL_HOURS = 6L
 
@@ -172,5 +183,6 @@ class TweaksRepositoryImpl(
         private val INCLUDE_PRE_RELEASES_KEY = booleanPreferencesKey("include_pre_releases")
         private val LIQUID_GLASS_ENABLED_KEY = booleanPreferencesKey("liquid_glass_enabled")
         private val HIDE_SEEN_ENABLED_KEY = booleanPreferencesKey("hide_seen_enabled")
+        private val SCROLLBAR_ENABLED_KEY = booleanPreferencesKey("scrollbar_enabled")
     }
 }

core/domain/src/commonMain/kotlin/zed/rainxch/core/domain/repository/TweaksRepository.kt

@@ -54,4 +54,8 @@ interface TweaksRepository {
     fun getDiscoveryPlatform(): Flow<DiscoveryPlatform>
 
     suspend fun setDiscoveryPlatform(platform: DiscoveryPlatform)
+
+    fun getScrollbarEnabled(): Flow<Boolean>
+
+    suspend fun setScrollbarEnabled(enabled: Boolean)
 }

core/presentation/src/androidMain/kotlin/zed/rainxch/core/presentation/components/ScrollbarContainer.android.kt

@@ -0,0 +1,31 @@
+package zed.rainxch.core.presentation.components
+
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+
+@Composable
+actual fun ScrollbarContainer(
+    listState: LazyListState,
+    enabled: Boolean,
+    modifier: Modifier,
+    content: `@Composable` () -> Unit,
+) {
+    Box(modifier = modifier) {
+        content()
+    }
+}
+
+`@Composable`
+actual fun ScrollbarContainer(
+    gridState: LazyStaggeredGridState,
+    enabled: Boolean,
+    modifier: Modifier,
+    content: `@Composable` () -> Unit,
+) {
+    Box(modifier = modifier) {
+        content()
+    }
+}
+}

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

@@ -440,6 +440,7 @@
     <string name="auth_hint_denied">لقد رفضت طلب التفويض. حاول مرة أخرى إذا كان ذلك غير مقصود.</string>
     <string name="auth_check_status">لقد قمت بالتفويض بالفعل</string>
     <string name="auth_polling_status">جارٍ التحقق…</string>
+    <string name="auth_rate_limited">تم تقييد المعدل — إعادة المحاولة خلال %1$d ثانية</string>
 
     <!-- Read More / Show Less -->
     <string name="read_more">اقرأ المزيد</string>
@@ -594,6 +595,9 @@
     <string name="liquid_glass_option_title">تأثير الزجاج السائل</string>
     <string name="liquid_glass_option_description">تحسين الواجهة بمظهر زجاجي ناعم</string>
 
+    <string name="scrollbar_option_title">شريط التمرير</string>
+    <string name="scrollbar_option_description">إظهار شريط التمرير في القوائم القابلة للتمرير (سطح المكتب)</string>
+
     <string name="hide_seen_title">إخفاء المستودعات المشاهَدة</string>
     <string name="hide_seen_description">إخفاء المستودعات التي شاهدتها بالفعل من خلاصات الاكتشاف</string>
     <string name="clear_seen_history">مسح سجل المشاهدة</string>

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

@@ -440,6 +440,7 @@
     <string name="auth_hint_denied">আপনি অনুমোদনের অনুরোধ প্রত্যাখ্যান করেছেন। এটি অনিচ্ছাকৃত হলে আবার চেষ্টা করুন।</string>
     <string name="auth_check_status">আমি ইতিমধ্যেই অনুমোদন করেছি</string>
     <string name="auth_polling_status">যাচাই করা হচ্ছে…</string>
+    <string name="auth_rate_limited">অনুরোধ সীমাবদ্ধ — %1$d সেকেন্ডে পুনরায় চেষ্টা করা হবে</string>
 
     <!-- Read More / Show Less -->
     <string name="read_more">আরও পড়ুন</string>
@@ -593,6 +594,9 @@
     <string name="liquid_glass_option_title">লিকুইড গ্লাস ইফেক্ট</string>
     <string name="liquid_glass_option_description">একটি মসৃণ কাচের মতো চেহারা দিয়ে ইন্টারফেস উন্নত করুন</string>
 
+    <string name="scrollbar_option_title">স্ক্রলবার</string>
+    <string name="scrollbar_option_description">স্ক্রলযোগ্য তালিকায় স্ক্রলবার দেখান (ডেস্কটপ)</string>
+
     <string name="hide_seen_title">দেখা রিপোজিটরি লুকান</string>
     <string name="hide_seen_description">আপনি ইতিমধ্যে দেখেছেন এমন রিপোজিটরি আবিষ্কার ফিড থেকে লুকান</string>
     <string name="clear_seen_history">দেখার ইতিহাস মুছুন</string>

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

@@ -405,6 +405,7 @@
     <string name="auth_hint_denied">Rechazaste la solicitud de autorización. Intenta de nuevo si fue involuntario.</string>
     <string name="auth_check_status">Ya he autorizado</string>
     <string name="auth_polling_status">Comprobando…</string>
+    <string name="auth_rate_limited">Límite alcanzado — reintentando en %1$d s</string>
 
     <!-- Read More / Show Less -->
     <string name="read_more">Leer más</string>
@@ -554,6 +555,9 @@
     <string name="liquid_glass_option_title">Efecto de cristal líquido</string>
     <string name="liquid_glass_option_description">Mejora la interfaz con una apariencia suave tipo cristal</string>
 
+    <string name="scrollbar_option_title">Barra de desplazamiento</string>
+    <string name="scrollbar_option_description">Mostrar barra de desplazamiento en listas desplazables (escritorio)</string>
+
     <string name="hide_seen_title">Ocultar repositorios vistos</string>
     <string name="hide_seen_description">Ocultar repositorios que ya has visto de las fuentes de descubrimiento</string>
     <string name="clear_seen_history">Borrar historial de vistos</string>