Skip to content

Commit 7b8ea9f

Browse files
PururunPururun
committed
Clean up
1 parent 9496701 commit 7b8ea9f

File tree

19 files changed

+8
-76
lines changed

19 files changed

+8
-76
lines changed

‎android/app/build.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,6 @@ dependencies {
325325

326326
implementation(Dependencies.commonsValidator)
327327
implementation(Dependencies.AndroidX.coreKtx)
328-
implementation(Dependencies.AndroidX.dataStorePreferences)
329328
implementation(Dependencies.AndroidX.lifecycleRuntimeKtx)
330329
implementation(Dependencies.AndroidX.lifecycleViewmodelKtx)
331330
implementation(Dependencies.AndroidX.lifecycleRuntimeCompose)

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

-4
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ class SettingsScreenTest {
3333
isLoggedIn = true,
3434
isUpdateAvailable = true,
3535
isPlayBuild = false,
36-
isMaterialYouTheme = false,
37-
darkThemeState = DarkThemeState.OFF
3836
),
3937
)
4038
}
@@ -58,8 +56,6 @@ class SettingsScreenTest {
5856
isLoggedIn = false,
5957
isUpdateAvailable = true,
6058
isPlayBuild = false,
61-
isMaterialYouTheme = false,
62-
darkThemeState = DarkThemeState.OFF
6359
),
6460
)
6561
}

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ fun ConnectionButton(
5555
if (state is TunnelState.Disconnected) {
5656
MaterialTheme.colorScheme.variant
5757
} else {
58-
MaterialTheme.colorScheme.error//.copy(alpha = AlphaDisconnectButton)
58+
// TODO Should we make this transparent or not?
59+
MaterialTheme.colorScheme.error // .copy(alpha = AlphaDisconnectButton)
5960
}
6061

6162
val contentColor =

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

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import androidx.compose.ui.tooling.preview.Preview
1010
import net.mullvad.mullvadvpn.R
1111
import net.mullvad.mullvadvpn.compose.component.SpacedColumn
1212
import net.mullvad.mullvadvpn.lib.theme.AppTheme
13-
import net.mullvad.mullvadvpn.lib.theme.color.Alpha20
1413

1514
@Preview
1615
@Composable

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

+6-5
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,12 @@ fun CustomPortCell(
8989
title = title,
9090
style = MaterialTheme.typography.labelLarge,
9191
textAlign = TextAlign.Start,
92-
textColor = if (isSelected) {
93-
MaterialTheme.colorScheme.onSelected
94-
} else {
95-
MaterialTheme.colorScheme.onSurface
96-
}
92+
textColor =
93+
if (isSelected) {
94+
MaterialTheme.colorScheme.onSelected
95+
} else {
96+
MaterialTheme.colorScheme.onSurface
97+
}
9798
)
9899
}
99100
Spacer(modifier = Modifier.width(Dimens.verticalSpacer))

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

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ import net.mullvad.mullvadvpn.lib.theme.Dimens
4646
import net.mullvad.mullvadvpn.lib.theme.color.AlphaInactive
4747
import net.mullvad.mullvadvpn.lib.theme.color.AlphaInvisible
4848
import net.mullvad.mullvadvpn.lib.theme.color.AlphaVisible
49-
import net.mullvad.mullvadvpn.lib.theme.color.onSelected
5049
import net.mullvad.mullvadvpn.lib.theme.color.selected
5150
import net.mullvad.mullvadvpn.relaylist.children
5251

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

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package net.mullvad.mullvadvpn.compose.component
22

33
import androidx.compose.material3.LocalTextStyle
4-
import androidx.compose.material3.MaterialTheme
54
import androidx.compose.material3.Text
65
import androidx.compose.runtime.Composable
76
import androidx.compose.runtime.getValue

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

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import androidx.compose.runtime.saveable.rememberSaveable
2121
import androidx.compose.runtime.setValue
2222
import androidx.compose.ui.Alignment
2323
import androidx.compose.ui.Modifier
24-
import androidx.compose.ui.graphics.Color
2524
import androidx.compose.ui.res.painterResource
2625
import androidx.compose.ui.res.stringResource
2726
import androidx.compose.ui.text.style.TextAlign

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

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import androidx.compose.runtime.Composable
2222
import androidx.compose.runtime.getValue
2323
import androidx.compose.ui.Alignment
2424
import androidx.compose.ui.Modifier
25-
import androidx.compose.ui.graphics.ColorFilter
2625
import androidx.compose.ui.platform.LocalContext
2726
import androidx.compose.ui.res.painterResource
2827
import androidx.compose.ui.res.stringResource

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

-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package net.mullvad.mullvadvpn.compose.screen
33
import android.content.Context
44
import android.net.Uri
55
import androidx.compose.animation.animateContentSize
6-
import androidx.compose.foundation.layout.Column
76
import androidx.compose.foundation.layout.Spacer
87
import androidx.compose.foundation.layout.fillMaxWidth
98
import androidx.compose.foundation.layout.height
@@ -26,11 +25,8 @@ import com.ramcosta.composedestinations.annotation.Destination
2625
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
2726
import net.mullvad.mullvadvpn.R
2827
import net.mullvad.mullvadvpn.compose.cell.DefaultExternalLinkView
29-
import net.mullvad.mullvadvpn.compose.cell.HeaderCell
30-
import net.mullvad.mullvadvpn.compose.cell.HeaderSwitchComposeCell
3128
import net.mullvad.mullvadvpn.compose.cell.NavigationCellBody
3229
import net.mullvad.mullvadvpn.compose.cell.NavigationComposeCell
33-
import net.mullvad.mullvadvpn.compose.cell.SelectableCell
3430
import net.mullvad.mullvadvpn.compose.component.NavigateBackDownIconButton
3531
import net.mullvad.mullvadvpn.compose.component.ScaffoldWithMediumTopBar
3632
import net.mullvad.mullvadvpn.compose.destinations.ApiAccessListDestination

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

-5
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ package net.mullvad.mullvadvpn.di
33
import android.content.Context
44
import android.content.SharedPreferences
55
import android.content.pm.PackageManager
6-
import androidx.datastore.dataStoreFile
7-
import androidx.datastore.preferences.core.PreferenceDataStoreFactory
86
import kotlinx.coroutines.Dispatchers
97
import kotlinx.coroutines.MainScope
108
import net.mullvad.mullvadvpn.BuildConfig
@@ -159,9 +157,6 @@ val uiModule = module {
159157
}
160158

161159
single { ProblemReportRepository() }
162-
single {
163-
PreferenceDataStoreFactory.create { androidContext().dataStoreFile(APP_PREFERENCES_NAME) }
164-
}
165160

166161
single { AppVersionInfoRepository(get(), get()) }
167162

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SettingsViewModel.kt

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import kotlinx.coroutines.flow.SharingStarted
66
import kotlinx.coroutines.flow.StateFlow
77
import kotlinx.coroutines.flow.combine
88
import kotlinx.coroutines.flow.stateIn
9-
import kotlinx.coroutines.launch
109
import net.mullvad.mullvadvpn.compose.state.SettingsUiState
1110
import net.mullvad.mullvadvpn.lib.model.DeviceState
1211
import net.mullvad.mullvadvpn.lib.shared.DeviceRepository

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

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ object Dependencies {
4040
"androidx.test.uiautomator:uiautomator:${Versions.AndroidX.uiautomator}"
4141
const val testOrchestrator =
4242
"androidx.test:orchestrator:${Versions.AndroidX.testOrchestrator}"
43-
const val dataStorePreferences = "androidx.datastore:datastore-preferences:${Versions.AndroidX.dataStore}"
4443
}
4544

4645
object Arrow {

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

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ object Versions {
3232
const val testOrchestrator = "1.4.2"
3333
const val testRunner = "1.5.2"
3434
const val uiautomator = "2.3.0"
35-
const val dataStore = "1.0.0"
3635
}
3736

3837
object Arrow {

‎android/gradle/verification-metadata.xml

-37
Original file line numberDiff line numberDiff line change
@@ -1075,38 +1075,6 @@
10751075
<sha256 value="456006224e620e38bd5d61b2ee8517d606a9953974e8d32da1616f1b48be7330" origin="Generated by Gradle"/>
10761076
</artifact>
10771077
</component>
1078-
<component group="androidx.datastore" name="datastore" version="1.0.0">
1079-
<artifact name="datastore-1.0.0.aar">
1080-
<sha256 value="28fea28d365b4aef4d5e8732fe51f233e580d2042cd4a70a6b293a518daec703" origin="Generated by Gradle"/>
1081-
</artifact>
1082-
<artifact name="datastore-1.0.0.module">
1083-
<sha256 value="d506bc9be96f2fb14fc3026be36776bd1e73515fb2325928f8b31badc6d355aa" origin="Generated by Gradle"/>
1084-
</artifact>
1085-
</component>
1086-
<component group="androidx.datastore" name="datastore-core" version="1.0.0">
1087-
<artifact name="datastore-core-1.0.0.jar">
1088-
<sha256 value="c810505542001593075199355b19d98b855edc36d9575bd764180321e20a92bc" origin="Generated by Gradle"/>
1089-
</artifact>
1090-
<artifact name="datastore-core-1.0.0.module">
1091-
<sha256 value="a6851b363ac4f2e0a60b1106053b5c9a87255fe7fbc08369b2b684e509763709" origin="Generated by Gradle"/>
1092-
</artifact>
1093-
</component>
1094-
<component group="androidx.datastore" name="datastore-preferences" version="1.0.0">
1095-
<artifact name="datastore-preferences-1.0.0.aar">
1096-
<sha256 value="6f9ac72082badb776447cdd579c16c25c18127185c6ba9f2cfab9246473e2db1" origin="Generated by Gradle"/>
1097-
</artifact>
1098-
<artifact name="datastore-preferences-1.0.0.module">
1099-
<sha256 value="2834652dfb603c092394b1fa8fda2193c5401821ceadc95ec73ebe5b98433ab1" origin="Generated by Gradle"/>
1100-
</artifact>
1101-
</component>
1102-
<component group="androidx.datastore" name="datastore-preferences-core" version="1.0.0">
1103-
<artifact name="datastore-preferences-core-1.0.0.jar">
1104-
<sha256 value="ad54de334ad0f4a53a5ba41876f91684319a8cf3396315b767b51102a4138bd1" origin="Generated by Gradle"/>
1105-
</artifact>
1106-
<artifact name="datastore-preferences-core-1.0.0.module">
1107-
<sha256 value="1bececfa9243dbde0255e24498095eb51831be7f045a6db01770786f48ed1426" origin="Generated by Gradle"/>
1108-
</artifact>
1109-
</component>
11101078
<component group="androidx.drawerlayout" name="drawerlayout" version="1.0.0">
11111079
<artifact name="drawerlayout-1.0.0.aar">
11121080
<sha256 value="9402442cdc5a43cf62fb14f8cf98c63342d4d9d9b805c8033c6cf7e802749ac1" origin="Generated by Gradle"/>
@@ -4900,11 +4868,6 @@
49004868
<sha256 value="a679ee2f510f3ab92691818de5eb5b0902e86d88c97674e7db44dc4f2252c5f9" origin="Generated by Gradle"/>
49014869
</artifact>
49024870
</component>
4903-
<component group="org.jetbrains.kotlinx" name="atomicfu" version="0.16.1">
4904-
<artifact name="atomicfu-0.16.1.module">
4905-
<sha256 value="fdcf04fc25f6a43f557f341ee0053caa25e759f591169c86566f1dad37fc77a6" origin="Generated by Gradle"/>
4906-
</artifact>
4907-
</component>
49084871
<component group="org.jetbrains.kotlinx" name="atomicfu" version="0.17.0">
49094872
<artifact name="atomicfu-0.17.0.module">
49104873
<sha256 value="12e828b1269614b2e50adfaf0d834c98ba5bba782b93fd157ce1e0a35e60cc0b" origin="Generated by Gradle"/>

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

-1
Original file line numberDiff line numberDiff line change
@@ -385,5 +385,4 @@
385385
<string name="delete_method_question">Delete method?</string>
386386
<string name="failed_to_set_current_test_error">Failed to set to current - API not reachable</string>
387387
<string name="failed_to_set_current_unknown_error">Failed to set to current - Unknown reason</string>
388-
<string name="split_tunneling_disabled_description">Split tunneling is disabled.</string>
389388
</resources>

‎android/lib/theme/build.gradle.kts

-2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,4 @@ dependencies {
3131
implementation(Dependencies.Compose.material3)
3232
implementation(Dependencies.Compose.ui)
3333
implementation(Dependencies.Kotlin.stdlib)
34-
implementation(Dependencies.AndroidX.dataStorePreferences)
35-
implementation(Dependencies.Koin.core)
3634
}

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

-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package net.mullvad.mullvadvpn.lib.theme
22

3-
import android.os.Build
4-
import androidx.compose.foundation.isSystemInDarkTheme
53
import androidx.compose.foundation.shape.RoundedCornerShape
64
import androidx.compose.material.ripple.LocalRippleTheme
75
import androidx.compose.material.ripple.RippleAlpha
@@ -11,16 +9,12 @@ import androidx.compose.material3.MaterialTheme
119
import androidx.compose.material3.Shapes
1210
import androidx.compose.material3.Typography
1311
import androidx.compose.material3.darkColorScheme
14-
import androidx.compose.material3.dynamicDarkColorScheme
15-
import androidx.compose.material3.dynamicLightColorScheme
1612
import androidx.compose.material3.lightColorScheme
1713
import androidx.compose.runtime.Composable
1814
import androidx.compose.runtime.CompositionLocalProvider
1915
import androidx.compose.runtime.Immutable
20-
import androidx.compose.runtime.collectAsState
2116
import androidx.compose.runtime.remember
2217
import androidx.compose.runtime.staticCompositionLocalOf
23-
import androidx.compose.ui.platform.LocalContext
2418
import androidx.compose.ui.text.TextStyle
2519
import androidx.compose.ui.text.font.FontFamily
2620
import androidx.compose.ui.text.font.FontWeight
@@ -31,7 +25,6 @@ import net.mullvad.mullvadvpn.lib.theme.color.ColorLightTokens
3125
import net.mullvad.mullvadvpn.lib.theme.dimensions.Dimensions
3226
import net.mullvad.mullvadvpn.lib.theme.dimensions.defaultDimensions
3327
import net.mullvad.mullvadvpn.lib.theme.typeface.TypeScale
34-
import org.koin.core.context.GlobalContext.get
3528

3629
// Add our own definitions here
3730
private val MullvadTypography =

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

-1
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,4 @@ internal object OpacityTokens {
3535
val WhiteOnBlue30 = Color(0xFF69829D)
3636
val WhiteOnBlue20 = Color(0xFF54718F)
3737
val WhiteOnBlue10 = Color(0xFF3E5F81)
38-
3938
}

0 commit comments

Comments
 (0)