feat(profile): Implement network proxy configuration settings

rainxchzed · rainxchzed · commit 8da15327043a · 2026-02-25T22:57:54.000+05:00
This commit introduces a new Network section in the profile settings, allowing users to configure HTTP, SOCKS, or system-wide proxy settings. The configuration is persisted using DataStore and applied via a `ProxyManager`.

- **feat(profile)**: Added `networkSection` UI component to `ProfileRoot` featuring a `ProxyTypeCard` and a `ProxyDetailsCard` for host, port, and authentication credentials.
- **feat(core/domain)**: Introduced `ProxyRepository` interface and `ProxyConfig` models (None, System, HTTP, SOCKS).
- **feat(core/data)**: Implemented `ProxyRepositoryImpl` using `DataStore` to persist proxy settings.
- **feat(profile)**: Updated `ProfileViewModel` and `ProfileState` to handle proxy actions (type selection, host/port/credential changes, and saving).
- **refactor(app)**: Updated `MainViewModel` to initialize and apply the saved proxy configuration on application startup.
- **i18n**: Added string resources for proxy types, labels, and status messages.
- **chore(di)**: Registered `ProxyRepository` in the dependency injection modules.
diff --git a/composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/MainViewModel.kt b/composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/MainViewModel.kt
@@ -7,8 +7,12 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.flow.first
+import zed.rainxch.core.data.network.ProxyManager
+import zed.rainxch.core.domain.model.ProxyConfig
 import zed.rainxch.core.domain.repository.AuthenticationState
 import zed.rainxch.core.domain.repository.InstalledAppsRepository
+import zed.rainxch.core.domain.repository.ProxyRepository
 import zed.rainxch.core.domain.repository.RateLimitRepository
 import zed.rainxch.core.domain.repository.ThemesRepository
 import zed.rainxch.core.domain.use_cases.SyncInstalledAppsUseCase
@@ -18,7 +22,8 @@ class MainViewModel(
     private val installedAppsRepository: InstalledAppsRepository,
     private val authenticationState: AuthenticationState,
     private val rateLimitRepository: RateLimitRepository,
-    private val syncUseCase: SyncInstalledAppsUseCase
+    private val syncUseCase: SyncInstalledAppsUseCase,
+    private val proxyRepository: ProxyRepository
 ) : ViewModel() {
 
     private val _state = MutableStateFlow(MainState())
@@ -94,6 +99,26 @@ class MainViewModel(
                 installedAppsRepository.checkAllForUpdates()
             }
         }
+
+        viewModelScope.launch(Dispatchers.IO) {
+            val savedConfig = proxyRepository.getProxyConfig().first()
+            when (savedConfig) {
+                is ProxyConfig.None -> ProxyManager.setNoProxy()
+                is ProxyConfig.System -> ProxyManager.setSystemProxy()
+                is ProxyConfig.Http -> ProxyManager.setHttpProxy(
+                    host = savedConfig.host,
+                    port = savedConfig.port,
+                    username = savedConfig.username,
+                    password = savedConfig.password
+                )
+                is ProxyConfig.Socks -> ProxyManager.setSocksProxy(
+                    host = savedConfig.host,
+                    port = savedConfig.port,
+                    username = savedConfig.username,
+                    password = savedConfig.password
+                )
+            }
+        }
     }
 
     fun onAction(action: MainAction) {
diff --git a/composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/app/di/SharedModules.kt b/composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/app/di/SharedModules.kt
@@ -15,7 +15,8 @@ val mainModule: Module = module {
             installedAppsRepository = get(),
             rateLimitRepository = get(),
             syncUseCase = get(),
-            authenticationState = get()
+            authenticationState = get(),
+            proxyRepository = get()
         )
     }
 }
diff --git a/core/data/src/commonMain/kotlin/zed/rainxch/core/data/di/SharedModule.kt b/core/data/src/commonMain/kotlin/zed/rainxch/core/data/di/SharedModule.kt
@@ -21,13 +21,15 @@ import zed.rainxch.core.data.repository.FavouritesRepositoryImpl
 import zed.rainxch.core.data.repository.InstalledAppsRepositoryImpl
 import zed.rainxch.core.data.repository.RateLimitRepositoryImpl
 import zed.rainxch.core.data.repository.StarredRepositoryImpl
+import zed.rainxch.core.data.repository.ProxyRepositoryImpl
 import zed.rainxch.core.data.repository.ThemesRepositoryImpl
 import zed.rainxch.core.domain.getPlatform
 import zed.rainxch.core.domain.logging.GitHubStoreLogger
 import zed.rainxch.core.domain.model.Platform
 import zed.rainxch.core.domain.repository.AuthenticationState
 import zed.rainxch.core.domain.repository.FavouritesRepository
 import zed.rainxch.core.domain.repository.InstalledAppsRepository
+import zed.rainxch.core.domain.repository.ProxyRepository
 import zed.rainxch.core.domain.repository.RateLimitRepository
 import zed.rainxch.core.domain.repository.StarredRepository
 import zed.rainxch.core.domain.repository.ThemesRepository
@@ -84,6 +86,12 @@ val coreModule = module {
         )
     }
 
+    single<ProxyRepository> {
+        ProxyRepositoryImpl(
+            preferences = get()
+        )
+    }
+
     single<SyncInstalledAppsUseCase> {
         SyncInstalledAppsUseCase(
             packageMonitor = get(),
diff --git a/core/data/src/commonMain/kotlin/zed/rainxch/core/data/repository/ProxyRepositoryImpl.kt b/core/data/src/commonMain/kotlin/zed/rainxch/core/data/repository/ProxyRepositoryImpl.kt
@@ -0,0 +1,115 @@
+package zed.rainxch.core.data.repository
+
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.intPreferencesKey
+import androidx.datastore.preferences.core.stringPreferencesKey
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import zed.rainxch.core.data.network.ProxyManager
+import zed.rainxch.core.domain.model.ProxyConfig
+import zed.rainxch.core.domain.repository.ProxyRepository
+
+class ProxyRepositoryImpl(
+    private val preferences: DataStore<Preferences>
+) : ProxyRepository {
+
+    private val proxyTypeKey = stringPreferencesKey("proxy_type")
+    private val proxyHostKey = stringPreferencesKey("proxy_host")
+    private val proxyPortKey = intPreferencesKey("proxy_port")
+    private val proxyUsernameKey = stringPreferencesKey("proxy_username")
+    private val proxyPasswordKey = stringPreferencesKey("proxy_password")
+
+    override fun getProxyConfig(): Flow<ProxyConfig> {
+        return preferences.data.map { prefs ->
+            when (prefs[proxyTypeKey]) {
+                "system" -> ProxyConfig.System
+                "http" -> ProxyConfig.Http(
+                    host = prefs[proxyHostKey] ?: "",
+                    port = prefs[proxyPortKey] ?: 8080,
+                    username = prefs[proxyUsernameKey],
+                    password = prefs[proxyPasswordKey]
+                )
+                "socks" -> ProxyConfig.Socks(
+                    host = prefs[proxyHostKey] ?: "",
+                    port = prefs[proxyPortKey] ?: 1080,
+                    username = prefs[proxyUsernameKey],
+                    password = prefs[proxyPasswordKey]
+                )
+                else -> ProxyConfig.None
+            }
+        }
+    }
+
+    override suspend fun setProxyConfig(config: ProxyConfig) {
+        applyToProxyManager(config)
+        preferences.edit { prefs ->
+            when (config) {
+                is ProxyConfig.None -> {
+                    prefs[proxyTypeKey] = "none"
+                    prefs.remove(proxyHostKey)
+                    prefs.remove(proxyPortKey)
+                    prefs.remove(proxyUsernameKey)
+                    prefs.remove(proxyPasswordKey)
+                }
+                is ProxyConfig.System -> {
+                    prefs[proxyTypeKey] = "system"
+                    prefs.remove(proxyHostKey)
+                    prefs.remove(proxyPortKey)
+                    prefs.remove(proxyUsernameKey)
+                    prefs.remove(proxyPasswordKey)
+                }
+                is ProxyConfig.Http -> {
+                    prefs[proxyTypeKey] = "http"
+                    prefs[proxyHostKey] = config.host
+                    prefs[proxyPortKey] = config.port
+                    if (config.username != null) {
+                        prefs[proxyUsernameKey] = config.username!!
+                    } else {
+                        prefs.remove(proxyUsernameKey)
+                    }
+                    if (config.password != null) {
+                        prefs[proxyPasswordKey] = config.password!!
+                    } else {
+                        prefs.remove(proxyPasswordKey)
+                    }
+                }
+                is ProxyConfig.Socks -> {
+                    prefs[proxyTypeKey] = "socks"
+                    prefs[proxyHostKey] = config.host
+                    prefs[proxyPortKey] = config.port
+                    if (config.username != null) {
+                        prefs[proxyUsernameKey] = config.username!!
+                    } else {
+                        prefs.remove(proxyUsernameKey)
+                    }
+                    if (config.password != null) {
+                        prefs[proxyPasswordKey] = config.password!!
+                    } else {
+                        prefs.remove(proxyPasswordKey)
+                    }
+                }
+            }
+        }
+    }
+
+    private fun applyToProxyManager(config: ProxyConfig) {
+        when (config) {
+            is ProxyConfig.None -> ProxyManager.setNoProxy()
+            is ProxyConfig.System -> ProxyManager.setSystemProxy()
+            is ProxyConfig.Http -> ProxyManager.setHttpProxy(
+                host = config.host,
+                port = config.port,
+                username = config.username,
+                password = config.password
+            )
+            is ProxyConfig.Socks -> ProxyManager.setSocksProxy(
+                host = config.host,
+                port = config.port,
+                username = config.username,
+                password = config.password
+            )
+        }
+    }
+}
diff --git a/core/domain/src/commonMain/kotlin/zed/rainxch/core/domain/repository/ProxyRepository.kt b/core/domain/src/commonMain/kotlin/zed/rainxch/core/domain/repository/ProxyRepository.kt
@@ -0,0 +1,9 @@
+package zed.rainxch.core.domain.repository
+
+import kotlinx.coroutines.flow.Flow
+import zed.rainxch.core.domain.model.ProxyConfig
+
+interface ProxyRepository {
+    fun getProxyConfig(): Flow<ProxyConfig>
+    suspend fun setProxyConfig(config: ProxyConfig)
+}
diff --git a/core/presentation/src/commonMain/composeResources/values/strings.xml b/core/presentation/src/commonMain/composeResources/values/strings.xml
@@ -108,6 +108,7 @@
 
     <!-- Sections -->
     <string name="section_appearance">APPEARANCE</string>
+    <string name="section_network">NETWORK</string>
     <string name="section_about">ABOUT</string>
 
     <!-- Appearance -->
@@ -123,6 +124,19 @@
     <!-- Account -->
     <string name="logout">Logout</string>
 
+    <!-- Proxy -->
+    <string name="proxy_type">Proxy Type</string>
+    <string name="proxy_none">None</string>
+    <string name="proxy_system">System</string>
+    <string name="proxy_http">HTTP</string>
+    <string name="proxy_socks">SOCKS</string>
+    <string name="proxy_host">Host</string>
+    <string name="proxy_port">Port</string>
+    <string name="proxy_username">Username (optional)</string>
+    <string name="proxy_password">Password (optional)</string>
+    <string name="proxy_save">Save</string>
+    <string name="proxy_saved">Proxy settings saved</string>
+
     <!-- Snackbar -->
     <string name="logout_success">Logged out successfully, redirecting...</string>
 
diff --git a/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileAction.kt b/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileAction.kt
@@ -13,4 +13,10 @@ sealed interface ProfileAction {
     data object OnLogoutDismiss : ProfileAction
     data object OnHelpClick : 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 OnProxyUsernameChanged(val username: String) : ProfileAction
+    data class OnProxyPasswordChanged(val password: String) : ProfileAction
+    data object OnProxySave : ProfileAction
 }
diff --git a/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileEvent.kt b/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileEvent.kt
@@ -3,4 +3,5 @@ package zed.rainxch.profile.presentation
 sealed interface ProfileEvent {
     data object OnLogoutSuccessful : ProfileEvent
     data class OnLogoutError(val message: String) : ProfileEvent
+    data object OnProxySaved : ProfileEvent
 }
diff --git a/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileRoot.kt b/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileRoot.kt
@@ -40,6 +40,7 @@ import zed.rainxch.core.presentation.utils.ObserveAsEvents
 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.networkSection
 import zed.rainxch.profile.presentation.components.sections.profile
 import zed.rainxch.profile.presentation.components.sections.settings
 
@@ -67,6 +68,12 @@ fun ProfileRoot(
                     snackbarState.showSnackbar(event.message)
                 }
             }
+
+            ProfileEvent.OnProxySaved -> {
+                coroutineScope.launch {
+                    snackbarState.showSnackbar(getString(Res.string.proxy_saved))
+                }
+            }
         }
     }
 
@@ -140,6 +147,15 @@ fun ProfileScreen(
                 Spacer(Modifier.height(16.dp))
             }
 
+            networkSection(
+                state = state,
+                onAction = onAction
+            )
+
+            item {
+                Spacer(Modifier.height(16.dp))
+            }
+
             about(
                 versionName = state.versionName,
                 onAction = onAction
diff --git a/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileState.kt b/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileState.kt
@@ -2,6 +2,7 @@ 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.ProxyConfig
 import zed.rainxch.profile.domain.model.UserProfile
 
 data class ProfileState(
@@ -12,5 +13,23 @@ data class ProfileState(
     val isUserLoggedIn: Boolean = false,
     val isAmoledThemeEnabled: Boolean = false,
     val isDarkTheme: Boolean? = null,
-    val versionName: String = ""
-)
+    val versionName: String = "",
+    val proxyType: ProxyType = ProxyType.NONE,
+    val proxyHost: String = "",
+    val proxyPort: String = "",
+    val proxyUsername: String = "",
+    val proxyPassword: String = "",
+)
+
+enum class ProxyType {
+    NONE, SYSTEM, HTTP, SOCKS;
+
+    companion object {
+        fun fromConfig(config: ProxyConfig): ProxyType = when (config) {
+            is ProxyConfig.None -> NONE
+            is ProxyConfig.System -> SYSTEM
+            is ProxyConfig.Http -> HTTP
+            is ProxyConfig.Socks -> SOCKS
+        }
+    }
+}
diff --git a/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileViewModel.kt b/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileViewModel.kt
diff --git a/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/components/sections/Network.kt b/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/components/sections/Network.kt

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,8 @@ val mainModule: Module = module {`
`15`	`15`	`installedAppsRepository = get(),`
`16`	`16`	`rateLimitRepository = get(),`
`17`	`17`	`syncUseCase = get(),`
`18`		`- authenticationState = get()`
	`18`	`+ authenticationState = get(),`
	`19`	`+ proxyRepository = get()`
`19`	`20`	`)`
`20`	`21`	`}`
`21`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,5 @@ package zed.rainxch.profile.presentation`
`3`	`3`	`sealed interface ProfileEvent {`
`4`	`4`	`data object OnLogoutSuccessful : ProfileEvent`
`5`	`5`	`data class OnLogoutError(val message: String) : ProfileEvent`
	`6`	`+ data object OnProxySaved : ProfileEvent`
`6`	`7`	`}`