Clean up

Author: Pururun

android/app/build.gradle.kts

@@ -328,7 +328,6 @@ dependencies {
     implementation(Dependencies.AndroidX.activityCompose)
     implementation(Dependencies.AndroidX.coreKtx)
     implementation(Dependencies.AndroidX.coreSplashscreen)
-    implementation(Dependencies.AndroidX.dataStorePreferences)
     implementation(Dependencies.AndroidX.lifecycleRuntimeKtx)
     implementation(Dependencies.AndroidX.lifecycleViewmodelKtx)
     implementation(Dependencies.AndroidX.lifecycleRuntimeCompose)

android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt

@@ -33,8 +33,6 @@ class SettingsScreenTest {
                             isLoggedIn = true,
                             isSupportedVersion = true,
                             isPlayBuild = false,
-                            isMaterialYouTheme = false,
-                            darkThemeState = DarkThemeState.OFF
                         ),
                 )
             }
@@ -58,8 +56,6 @@ class SettingsScreenTest {
                             isLoggedIn = false,
                             isSupportedVersion = true,
                             isPlayBuild = false,
-                            isMaterialYouTheme = false,
-                            darkThemeState = DarkThemeState.OFF
                         ),
                 )
             }

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ConnectionButton.kt

@@ -55,7 +55,8 @@ fun ConnectionButton(
         if (state is TunnelState.Disconnected) {
             MaterialTheme.colorScheme.variant
         } else {
-            MaterialTheme.colorScheme.error//.copy(alpha = AlphaDisconnectButton)
+            // TODO Should we make this transparent or not?
+            MaterialTheme.colorScheme.error // .copy(alpha = AlphaDisconnectButton)
         }
 
     val contentColor =

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/SwitchLocationButton.kt

@@ -10,7 +10,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.component.SpacedColumn
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
-import net.mullvad.mullvadvpn.lib.theme.color.Alpha20
 
 @Preview
 @Composable

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/CustomPortCell.kt

@@ -89,11 +89,12 @@ fun CustomPortCell(
                 title = title,
                 style = MaterialTheme.typography.labelLarge,
                 textAlign = TextAlign.Start,
-                textColor = if (isSelected) {
-                    MaterialTheme.colorScheme.onSelected
-                } else {
-                    MaterialTheme.colorScheme.onSurface
-                }
+                textColor =
+                    if (isSelected) {
+                        MaterialTheme.colorScheme.onSelected
+                    } else {
+                        MaterialTheme.colorScheme.onSurface
+                    }
             )
         }
         Spacer(modifier = Modifier.width(Dimens.verticalSpacer))

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt

@@ -46,7 +46,6 @@ import net.mullvad.mullvadvpn.lib.theme.Dimens
 import net.mullvad.mullvadvpn.lib.theme.color.AlphaInactive
 import net.mullvad.mullvadvpn.lib.theme.color.AlphaInvisible
 import net.mullvad.mullvadvpn.lib.theme.color.AlphaVisible
-import net.mullvad.mullvadvpn.lib.theme.color.onSelected
 import net.mullvad.mullvadvpn.lib.theme.color.selected
 import net.mullvad.mullvadvpn.relaylist.children
 

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Text.kt

@@ -1,7 +1,6 @@
 package net.mullvad.mullvadvpn.compose.component
 
 import androidx.compose.material3.LocalTextStyle
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreen.kt

@@ -21,7 +21,6 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt

@@ -22,7 +22,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreen.kt

@@ -3,7 +3,6 @@ package net.mullvad.mullvadvpn.compose.screen
 import android.content.Context
 import android.net.Uri
 import androidx.compose.animation.animateContentSize
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -31,11 +30,8 @@ import com.ramcosta.composedestinations.generated.destinations.VpnSettingsDestin
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.cell.DefaultExternalLinkView
-import net.mullvad.mullvadvpn.compose.cell.HeaderCell
-import net.mullvad.mullvadvpn.compose.cell.HeaderSwitchComposeCell
 import net.mullvad.mullvadvpn.compose.cell.NavigationCellBody
 import net.mullvad.mullvadvpn.compose.cell.NavigationComposeCell
-import net.mullvad.mullvadvpn.compose.cell.SelectableCell
 import net.mullvad.mullvadvpn.compose.component.NavigateBackDownIconButton
 import net.mullvad.mullvadvpn.compose.component.ScaffoldWithMediumTopBar
 import net.mullvad.mullvadvpn.compose.extensions.itemWithDivider

android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt

@@ -3,8 +3,6 @@ package net.mullvad.mullvadvpn.di
 import android.content.Context
 import android.content.SharedPreferences
 import android.content.pm.PackageManager
-import androidx.datastore.dataStoreFile
-import androidx.datastore.preferences.core.PreferenceDataStoreFactory
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
 import net.mullvad.mullvadvpn.BuildConfig
@@ -157,9 +155,6 @@ val uiModule = module {
     }
 
     single { ProblemReportRepository() }
-    single {
-        PreferenceDataStoreFactory.create { androidContext().dataStoreFile(APP_PREFERENCES_NAME) }
-    }
 
     single { AppVersionInfoRepository(get(), get()) }
 

android/buildSrc/src/main/kotlin/Dependencies.kt

@@ -44,7 +44,6 @@ object Dependencies {
             "androidx.test.uiautomator:uiautomator:${Versions.AndroidX.uiautomator}"
         const val testOrchestrator =
             "androidx.test:orchestrator:${Versions.AndroidX.testOrchestrator}"
-        const val dataStorePreferences = "androidx.datastore:datastore-preferences:${Versions.AndroidX.dataStore}"
     }
 
     object Arrow {

android/buildSrc/src/main/kotlin/Versions.kt

@@ -34,7 +34,6 @@ object Versions {
         const val testOrchestrator = "1.4.2"
         const val testRunner = "1.5.2"
         const val uiautomator = "2.3.0"
-        const val dataStore = "1.0.0"
     }
 
     object Arrow {

android/gradle/verification-metadata.xml

@@ -1135,38 +1135,6 @@
             <sha256 value="456006224e620e38bd5d61b2ee8517d606a9953974e8d32da1616f1b48be7330" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.datastore" name="datastore" version="1.0.0">
-         <artifact name="datastore-1.0.0.aar">
-            <sha256 value="28fea28d365b4aef4d5e8732fe51f233e580d2042cd4a70a6b293a518daec703" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="datastore-1.0.0.module">
-            <sha256 value="d506bc9be96f2fb14fc3026be36776bd1e73515fb2325928f8b31badc6d355aa" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.datastore" name="datastore-core" version="1.0.0">
-         <artifact name="datastore-core-1.0.0.jar">
-            <sha256 value="c810505542001593075199355b19d98b855edc36d9575bd764180321e20a92bc" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="datastore-core-1.0.0.module">
-            <sha256 value="a6851b363ac4f2e0a60b1106053b5c9a87255fe7fbc08369b2b684e509763709" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.datastore" name="datastore-preferences" version="1.0.0">
-         <artifact name="datastore-preferences-1.0.0.aar">
-            <sha256 value="6f9ac72082badb776447cdd579c16c25c18127185c6ba9f2cfab9246473e2db1" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="datastore-preferences-1.0.0.module">
-            <sha256 value="2834652dfb603c092394b1fa8fda2193c5401821ceadc95ec73ebe5b98433ab1" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.datastore" name="datastore-preferences-core" version="1.0.0">
-         <artifact name="datastore-preferences-core-1.0.0.jar">
-            <sha256 value="ad54de334ad0f4a53a5ba41876f91684319a8cf3396315b767b51102a4138bd1" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="datastore-preferences-core-1.0.0.module">
-            <sha256 value="1bececfa9243dbde0255e24498095eb51831be7f045a6db01770786f48ed1426" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.drawerlayout" name="drawerlayout" version="1.0.0">
          <artifact name="drawerlayout-1.0.0.aar">
             <sha256 value="9402442cdc5a43cf62fb14f8cf98c63342d4d9d9b805c8033c6cf7e802749ac1" origin="Generated by Gradle"/>
@@ -5192,11 +5160,6 @@
             <sha256 value="95f1a677e8d24bc0b32e76783ef173c5c0e09ed41b50471736d6599bed19d875" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlinx" name="atomicfu" version="0.16.1">
-         <artifact name="atomicfu-0.16.1.module">
-            <sha256 value="fdcf04fc25f6a43f557f341ee0053caa25e759f591169c86566f1dad37fc77a6" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlinx" name="atomicfu" version="0.17.0">
          <artifact name="atomicfu-0.17.0.module">
             <sha256 value="12e828b1269614b2e50adfaf0d834c98ba5bba782b93fd157ce1e0a35e60cc0b" origin="Generated by Gradle"/>

android/lib/resource/src/main/res/values/strings.xml

@@ -383,5 +383,4 @@
     <string name="delete_method_question">Delete method?</string>
     <string name="failed_to_set_current_test_error">Failed to set to current - API not reachable</string>
     <string name="failed_to_set_current_unknown_error">Failed to set to current - Unknown reason</string>
-    <string name="split_tunneling_disabled_description">Split tunneling is disabled.</string>
 </resources>

android/lib/theme/build.gradle.kts

@@ -30,6 +30,4 @@ dependencies {
     implementation(Dependencies.Compose.material3)
     implementation(Dependencies.Compose.ui)
     implementation(Dependencies.Kotlin.stdlib)
-    implementation(Dependencies.AndroidX.dataStorePreferences)
-    implementation(Dependencies.Koin.core)
 }

android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt

@@ -1,7 +1,5 @@
 package net.mullvad.mullvadvpn.lib.theme
 
-import android.os.Build
-import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.ripple.RippleAlpha
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -11,14 +9,11 @@ import androidx.compose.material3.RippleConfiguration
 import androidx.compose.material3.Shapes
 import androidx.compose.material3.Typography
 import androidx.compose.material3.darkColorScheme
-import androidx.compose.material3.dynamicDarkColorScheme
-import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.staticCompositionLocalOf
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
@@ -29,7 +24,6 @@ import net.mullvad.mullvadvpn.lib.theme.color.ColorLightTokens
 import net.mullvad.mullvadvpn.lib.theme.dimensions.Dimensions
 import net.mullvad.mullvadvpn.lib.theme.dimensions.defaultDimensions
 import net.mullvad.mullvadvpn.lib.theme.typeface.TypeScale
-import org.koin.core.context.GlobalContext.get
 
 // Add our own definitions here
 private val MullvadTypography =

android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/OpacityTokens.kt

@@ -35,5 +35,4 @@ internal object OpacityTokens {
     val WhiteOnBlue30 = Color(0xFF69829D)
     val WhiteOnBlue20 = Color(0xFF54718F)
     val WhiteOnBlue10 = Color(0xFF3E5F81)
-
 }