diff options
Diffstat (limited to 'android')
64 files changed, 335 insertions, 161 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 56b6480210..9d39ef8117 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -233,6 +233,7 @@ dependencies { implementation(project(Dependencies.Mullvad.modelLib)) implementation(project(Dependencies.Mullvad.resourceLib)) implementation(project(Dependencies.Mullvad.talpidLib)) + implementation(project(Dependencies.Mullvad.themeLib)) implementation(Dependencies.androidMaterial) implementation(Dependencies.commonsValidator) diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogDialogTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogDialogTest.kt index 85a9c49810..791eb1f0c5 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogDialogTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogDialogTest.kt @@ -11,7 +11,7 @@ import io.mockk.just import io.mockk.verify import kotlinx.coroutines.flow.MutableStateFlow import net.mullvad.mullvadvpn.compose.dialog.ChangelogDialog -import net.mullvad.mullvadvpn.compose.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.AppTheme import net.mullvad.mullvadvpn.viewmodel.ChangelogDialogUiState import net.mullvad.mullvadvpn.viewmodel.ChangelogViewModel import org.junit.Before diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceRevokedScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceRevokedScreenTest.kt index 908207359b..f7d40399fe 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceRevokedScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceRevokedScreenTest.kt @@ -7,7 +7,7 @@ import io.mockk.MockKAnnotations import io.mockk.mockk import io.mockk.verify import net.mullvad.mullvadvpn.compose.state.DeviceRevokedUiState -import net.mullvad.mullvadvpn.compose.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.AppTheme import org.junit.Before import org.junit.Rule import org.junit.Test diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt index 1bf4d5edbe..c7992edf34 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt @@ -10,7 +10,7 @@ import io.mockk.verify import kotlinx.coroutines.flow.MutableSharedFlow import net.mullvad.mullvadvpn.compose.state.SelectLocationUiState import net.mullvad.mullvadvpn.compose.test.CIRCULAR_PROGRESS_INDICATOR -import net.mullvad.mullvadvpn.compose.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.AppTheme import net.mullvad.mullvadvpn.model.PortRange import net.mullvad.mullvadvpn.model.RelayEndpointData import net.mullvad.mullvadvpn.model.RelayList diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ActionButton.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ActionButton.kt index 8b8a6cd319..faf7052d4f 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ActionButton.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ActionButton.kt @@ -15,7 +15,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import net.mullvad.mullvadvpn.compose.theme.Dimens +import net.mullvad.mullvadvpn.lib.theme.Dimens @Composable fun ActionButton( diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/AnimatedIconButton.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/AnimatedIconButton.kt index 0054b560e8..919dc33bf0 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/AnimatedIconButton.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/AnimatedIconButton.kt @@ -15,7 +15,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.painter.Painter import kotlinx.coroutines.delay -import net.mullvad.mullvadvpn.compose.theme.Dimens +import net.mullvad.mullvadvpn.lib.theme.Dimens internal const val PRESS_EFFECT_TIME_SPAN: Long = 1000 diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ConnectionButton.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ConnectionButton.kt index 94dddae90c..06b4074730 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ConnectionButton.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ConnectionButton.kt @@ -25,9 +25,9 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import net.mullvad.mullvadvpn.R -import net.mullvad.mullvadvpn.compose.theme.AlphaDisconnectButton -import net.mullvad.mullvadvpn.compose.theme.AppTheme -import net.mullvad.mullvadvpn.compose.theme.Dimens +import net.mullvad.mullvadvpn.lib.theme.AlphaDisconnectButton +import net.mullvad.mullvadvpn.lib.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.Dimens import net.mullvad.mullvadvpn.model.TunnelState @Composable diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/SwitchLocationButton.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/SwitchLocationButton.kt index 2d6e149af8..e58e7e2202 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/SwitchLocationButton.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/SwitchLocationButton.kt @@ -16,9 +16,9 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.component.SpacedColumn -import net.mullvad.mullvadvpn.compose.theme.Alpha20 -import net.mullvad.mullvadvpn.compose.theme.AppTheme -import net.mullvad.mullvadvpn.compose.theme.Dimens +import net.mullvad.mullvadvpn.lib.theme.Alpha20 +import net.mullvad.mullvadvpn.lib.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.Dimens @Preview @Composable diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/BaseCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/BaseCell.kt index 01e2aed039..c3c3b4ddef 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/BaseCell.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/BaseCell.kt @@ -23,8 +23,8 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import net.mullvad.mullvadvpn.compose.component.SpacedColumn -import net.mullvad.mullvadvpn.compose.theme.AppTheme -import net.mullvad.mullvadvpn.compose.theme.Dimens +import net.mullvad.mullvadvpn.lib.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.Dimens @Preview @Composable diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/CustomPortCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/CustomPortCell.kt index d15e8140d8..ab3e45c5c4 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/CustomPortCell.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/CustomPortCell.kt @@ -26,10 +26,10 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.component.SpacedColumn -import net.mullvad.mullvadvpn.compose.theme.AlphaInvisible -import net.mullvad.mullvadvpn.compose.theme.AlphaVisible -import net.mullvad.mullvadvpn.compose.theme.AppTheme -import net.mullvad.mullvadvpn.compose.theme.Dimens +import net.mullvad.mullvadvpn.lib.theme.AlphaInvisible +import net.mullvad.mullvadvpn.lib.theme.AlphaVisible +import net.mullvad.mullvadvpn.lib.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.Dimens @Preview @Composable diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/DnsCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/DnsCell.kt index 81b9195498..19efbde9ca 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/DnsCell.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/DnsCell.kt @@ -18,7 +18,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import net.mullvad.mullvadvpn.R -import net.mullvad.mullvadvpn.compose.theme.MullvadHelmetYellow +import net.mullvad.mullvadvpn.lib.theme.MullvadHelmetYellow @Preview @Composable diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/ExpandableComposeCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/ExpandableComposeCell.kt index 70b975bd98..15e94dddb9 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/ExpandableComposeCell.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/ExpandableComposeCell.kt @@ -22,10 +22,10 @@ import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.component.ChevronView import net.mullvad.mullvadvpn.compose.component.textResource import net.mullvad.mullvadvpn.compose.extensions.toAnnotatedString -import net.mullvad.mullvadvpn.compose.theme.AlphaInactive -import net.mullvad.mullvadvpn.compose.theme.AlphaVisible -import net.mullvad.mullvadvpn.compose.theme.AppTheme -import net.mullvad.mullvadvpn.compose.theme.Dimens +import net.mullvad.mullvadvpn.lib.theme.AlphaInactive +import net.mullvad.mullvadvpn.lib.theme.AlphaVisible +import net.mullvad.mullvadvpn.lib.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.Dimens @Preview @Composable diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/InformationComposeCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/InformationComposeCell.kt index 283aa17591..009edf90ef 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/InformationComposeCell.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/InformationComposeCell.kt @@ -17,10 +17,10 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import net.mullvad.mullvadvpn.R -import net.mullvad.mullvadvpn.compose.theme.AlphaInactive -import net.mullvad.mullvadvpn.compose.theme.AlphaVisible -import net.mullvad.mullvadvpn.compose.theme.MullvadBlue -import net.mullvad.mullvadvpn.compose.theme.MullvadWhite +import net.mullvad.mullvadvpn.lib.theme.AlphaInactive +import net.mullvad.mullvadvpn.lib.theme.AlphaVisible +import net.mullvad.mullvadvpn.lib.theme.MullvadBlue +import net.mullvad.mullvadvpn.lib.theme.MullvadWhite @Preview @Composable diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/MtuComposeCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/MtuComposeCell.kt index e14849b599..1ccd8e8e4f 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/MtuComposeCell.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/MtuComposeCell.kt @@ -12,9 +12,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import net.mullvad.mullvadvpn.R -import net.mullvad.mullvadvpn.compose.theme.AppTheme import net.mullvad.mullvadvpn.constant.MTU_MAX_VALUE import net.mullvad.mullvadvpn.constant.MTU_MIN_VALUE +import net.mullvad.mullvadvpn.lib.theme.AppTheme @Preview @Composable diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/NavigationComposeCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/NavigationComposeCell.kt index 3bb06a35b3..14cfc9ad1f 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/NavigationComposeCell.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/NavigationComposeCell.kt @@ -17,7 +17,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import net.mullvad.mullvadvpn.R -import net.mullvad.mullvadvpn.compose.theme.Dimens +import net.mullvad.mullvadvpn.lib.theme.Dimens @Preview @Composable diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt index 3965422df9..5836a5aca1 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt @@ -28,11 +28,11 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.component.ChevronView -import net.mullvad.mullvadvpn.compose.theme.AlphaInactive -import net.mullvad.mullvadvpn.compose.theme.AlphaInvisible -import net.mullvad.mullvadvpn.compose.theme.AlphaVisible -import net.mullvad.mullvadvpn.compose.theme.AppTheme -import net.mullvad.mullvadvpn.compose.theme.Dimens +import net.mullvad.mullvadvpn.lib.theme.AlphaInactive +import net.mullvad.mullvadvpn.lib.theme.AlphaInvisible +import net.mullvad.mullvadvpn.lib.theme.AlphaVisible +import net.mullvad.mullvadvpn.lib.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.Dimens import net.mullvad.mullvadvpn.model.GeographicLocationConstraint import net.mullvad.mullvadvpn.relaylist.Relay import net.mullvad.mullvadvpn.relaylist.RelayCity diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SelectableCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SelectableCell.kt index e9ba569d47..b43217614c 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SelectableCell.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SelectableCell.kt @@ -14,10 +14,10 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.component.SpacedColumn -import net.mullvad.mullvadvpn.compose.theme.AlphaInvisible -import net.mullvad.mullvadvpn.compose.theme.AlphaVisible -import net.mullvad.mullvadvpn.compose.theme.AppTheme -import net.mullvad.mullvadvpn.compose.theme.Dimens +import net.mullvad.mullvadvpn.lib.theme.AlphaInvisible +import net.mullvad.mullvadvpn.lib.theme.AlphaVisible +import net.mullvad.mullvadvpn.lib.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.Dimens @Preview @Composable diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SplitTunnelingCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SplitTunnelingCell.kt index 48694332b7..aaf0d28838 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SplitTunnelingCell.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SplitTunnelingCell.kt @@ -24,9 +24,9 @@ import androidx.compose.ui.tooling.preview.Preview import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import net.mullvad.mullvadvpn.R -import net.mullvad.mullvadvpn.compose.theme.AppTheme -import net.mullvad.mullvadvpn.compose.theme.Dimens -import net.mullvad.mullvadvpn.compose.theme.typeface.listItemText +import net.mullvad.mullvadvpn.lib.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.Dimens +import net.mullvad.mullvadvpn.lib.theme.typeface.listItemText import org.koin.androidx.compose.get @Preview diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SwitchComposeCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SwitchComposeCell.kt index 78fda6015f..ccd6a541ef 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SwitchComposeCell.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SwitchComposeCell.kt @@ -24,8 +24,8 @@ import net.mullvad.mullvadvpn.compose.component.CellSwitch import net.mullvad.mullvadvpn.compose.component.SpacedColumn import net.mullvad.mullvadvpn.compose.component.textResource import net.mullvad.mullvadvpn.compose.extensions.toAnnotatedString -import net.mullvad.mullvadvpn.compose.theme.AppTheme -import net.mullvad.mullvadvpn.compose.theme.Dimens +import net.mullvad.mullvadvpn.lib.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.Dimens @Preview @Composable diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/CollapsingTopBar.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/CollapsingTopBar.kt index ef1fdbf54d..f8b20db7bf 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/CollapsingTopBar.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/CollapsingTopBar.kt @@ -28,8 +28,8 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import net.mullvad.mullvadvpn.R -import net.mullvad.mullvadvpn.compose.theme.MullvadDarkBlue -import net.mullvad.mullvadvpn.compose.theme.MullvadWhite60 +import net.mullvad.mullvadvpn.lib.theme.MullvadDarkBlue +import net.mullvad.mullvadvpn.lib.theme.MullvadWhite60 @Preview @Composable diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/ConnectionStatusText.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/ConnectionStatusText.kt index 4cc1d82fcd..2f5374a3c1 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/ConnectionStatusText.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/ConnectionStatusText.kt @@ -5,8 +5,8 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.tooling.preview.Preview import net.mullvad.mullvadvpn.R -import net.mullvad.mullvadvpn.compose.theme.AppTheme -import net.mullvad.mullvadvpn.compose.theme.typeface.connectionStatus +import net.mullvad.mullvadvpn.lib.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.typeface.connectionStatus import net.mullvad.mullvadvpn.model.TunnelState import net.mullvad.talpid.tunnel.ActionAfterDisconnect import net.mullvad.talpid.tunnel.ErrorState diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/CopyableObfuscationView.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/CopyableObfuscationView.kt index 9efdcc96d8..bf33c12ddd 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/CopyableObfuscationView.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/CopyableObfuscationView.kt @@ -15,8 +15,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.button.AnimatedIconButton -import net.mullvad.mullvadvpn.compose.theme.Dimens import net.mullvad.mullvadvpn.lib.common.util.SdkUtils +import net.mullvad.mullvadvpn.lib.theme.Dimens import net.mullvad.mullvadvpn.ui.extension.copyToClipboard @Preview diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/InformationView.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/InformationView.kt index 7eddace4c2..bfaaf2bacd 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/InformationView.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/InformationView.kt @@ -11,9 +11,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview -import net.mullvad.mullvadvpn.compose.theme.Dimens -import net.mullvad.mullvadvpn.compose.theme.typeface.TypeScale.TextMedium -import net.mullvad.mullvadvpn.compose.theme.typeface.TypeScale.TextSmall +import net.mullvad.mullvadvpn.lib.theme.Dimens @Preview @Composable @@ -38,8 +36,8 @@ fun InformationView( AutoResizeText( style = MaterialTheme.typography.titleSmall, text = content, - minTextSize = TextSmall, - maxTextSize = TextMedium, + minTextSize = MaterialTheme.typography.labelMedium.fontSize, + maxTextSize = MaterialTheme.typography.titleSmall.fontSize, maxLines = maxLines, modifier = modifier.padding( @@ -54,8 +52,8 @@ fun InformationView( AutoResizeText( style = MaterialTheme.typography.titleMedium, text = content, - minTextSize = TextSmall, - maxTextSize = TextMedium, + minTextSize = MaterialTheme.typography.labelMedium.fontSize, + maxTextSize = MaterialTheme.typography.titleSmall.fontSize, maxLines = maxLines, modifier = modifier.padding( diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/List.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/List.kt index 8f1196bddf..d7b550a3d0 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/List.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/List.kt @@ -25,10 +25,10 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.constraintlayout.compose.ConstraintLayout import net.mullvad.mullvadvpn.R -import net.mullvad.mullvadvpn.compose.theme.AppTheme -import net.mullvad.mullvadvpn.compose.theme.Dimens -import net.mullvad.mullvadvpn.compose.theme.typeface.listItemSubText -import net.mullvad.mullvadvpn.compose.theme.typeface.listItemText +import net.mullvad.mullvadvpn.lib.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.Dimens +import net.mullvad.mullvadvpn.lib.theme.typeface.listItemSubText +import net.mullvad.mullvadvpn.lib.theme.typeface.listItemText @Preview @Composable diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/LocationInfo.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/LocationInfo.kt index 15dcc030e7..3f12457b86 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/LocationInfo.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/LocationInfo.kt @@ -15,11 +15,11 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import net.mullvad.mullvadvpn.R -import net.mullvad.mullvadvpn.compose.theme.AlphaInactive -import net.mullvad.mullvadvpn.compose.theme.AlphaInvisible -import net.mullvad.mullvadvpn.compose.theme.AlphaVisible -import net.mullvad.mullvadvpn.compose.theme.AppTheme -import net.mullvad.mullvadvpn.compose.theme.Dimens +import net.mullvad.mullvadvpn.lib.theme.AlphaInactive +import net.mullvad.mullvadvpn.lib.theme.AlphaInvisible +import net.mullvad.mullvadvpn.lib.theme.AlphaVisible +import net.mullvad.mullvadvpn.lib.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.Dimens import net.mullvad.mullvadvpn.model.GeoIpLocation import net.mullvad.talpid.net.TransportProtocol diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/SpacedColumn.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/SpacedColumn.kt index 7a78d66ac1..efc39f9268 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/SpacedColumn.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/SpacedColumn.kt @@ -7,7 +7,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.Dp -import net.mullvad.mullvadvpn.compose.theme.Dimens +import net.mullvad.mullvadvpn.lib.theme.Dimens @Composable fun SpacedColumn( diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Switch.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Switch.kt index 49fe9a1b26..90fe865588 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Switch.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Switch.kt @@ -21,11 +21,11 @@ import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import net.mullvad.mullvadvpn.compose.theme.AlphaInactive -import net.mullvad.mullvadvpn.compose.theme.AlphaVisible -import net.mullvad.mullvadvpn.compose.theme.MullvadGreen -import net.mullvad.mullvadvpn.compose.theme.MullvadRed -import net.mullvad.mullvadvpn.compose.theme.MullvadWhite +import net.mullvad.mullvadvpn.lib.theme.AlphaInactive +import net.mullvad.mullvadvpn.lib.theme.AlphaVisible +import net.mullvad.mullvadvpn.lib.theme.MullvadGreen +import net.mullvad.mullvadvpn.lib.theme.MullvadRed +import net.mullvad.mullvadvpn.lib.theme.MullvadWhite @Preview @Composable diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomPortDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomPortDialog.kt index 57d2073672..ce8b525c4d 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomPortDialog.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomPortDialog.kt @@ -17,11 +17,11 @@ import androidx.compose.ui.tooling.preview.Preview import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.button.ActionButton import net.mullvad.mullvadvpn.compose.textfield.CustomPortTextField -import net.mullvad.mullvadvpn.compose.theme.AlphaDescription -import net.mullvad.mullvadvpn.compose.theme.AlphaDisabled -import net.mullvad.mullvadvpn.compose.theme.AlphaInactive -import net.mullvad.mullvadvpn.compose.theme.AppTheme -import net.mullvad.mullvadvpn.compose.theme.Dimens +import net.mullvad.mullvadvpn.lib.theme.AlphaDescription +import net.mullvad.mullvadvpn.lib.theme.AlphaDisabled +import net.mullvad.mullvadvpn.lib.theme.AlphaInactive +import net.mullvad.mullvadvpn.lib.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.Dimens import net.mullvad.mullvadvpn.model.PortRange import net.mullvad.mullvadvpn.util.asString import net.mullvad.mullvadvpn.util.isPortInValidRanges diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialog.kt index ad2c80d2ae..f49798b68d 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialog.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialog.kt @@ -27,12 +27,12 @@ import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.DialogProperties import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.textfield.DnsTextField -import net.mullvad.mullvadvpn.compose.theme.MullvadBlue -import net.mullvad.mullvadvpn.compose.theme.MullvadDarkBlue -import net.mullvad.mullvadvpn.compose.theme.MullvadRed -import net.mullvad.mullvadvpn.compose.theme.MullvadWhite -import net.mullvad.mullvadvpn.compose.theme.MullvadWhite20 -import net.mullvad.mullvadvpn.compose.theme.MullvadWhite60 +import net.mullvad.mullvadvpn.lib.theme.MullvadBlue +import net.mullvad.mullvadvpn.lib.theme.MullvadDarkBlue +import net.mullvad.mullvadvpn.lib.theme.MullvadRed +import net.mullvad.mullvadvpn.lib.theme.MullvadWhite +import net.mullvad.mullvadvpn.lib.theme.MullvadWhite20 +import net.mullvad.mullvadvpn.lib.theme.MullvadWhite60 import net.mullvad.mullvadvpn.viewmodel.StagedDns @OptIn(ExperimentalComposeUiApi::class) diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/InfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/InfoDialog.kt index dd52abc492..c3420bad26 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/InfoDialog.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/InfoDialog.kt @@ -28,7 +28,7 @@ import androidx.compose.ui.unit.sp import androidx.compose.ui.window.DialogProperties import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.component.HtmlText -import net.mullvad.mullvadvpn.compose.theme.MullvadWhite +import net.mullvad.mullvadvpn.lib.theme.MullvadWhite @Preview @Composable diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialog.kt index fe04575de2..b6cfa73fdb 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialog.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialog.kt @@ -27,13 +27,13 @@ import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.DialogProperties import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.textfield.MtuTextField -import net.mullvad.mullvadvpn.compose.theme.MullvadBlue -import net.mullvad.mullvadvpn.compose.theme.MullvadDarkBlue -import net.mullvad.mullvadvpn.compose.theme.MullvadWhite -import net.mullvad.mullvadvpn.compose.theme.MullvadWhite20 -import net.mullvad.mullvadvpn.compose.theme.MullvadWhite60 import net.mullvad.mullvadvpn.constant.MTU_MAX_VALUE import net.mullvad.mullvadvpn.constant.MTU_MIN_VALUE +import net.mullvad.mullvadvpn.lib.theme.MullvadBlue +import net.mullvad.mullvadvpn.lib.theme.MullvadDarkBlue +import net.mullvad.mullvadvpn.lib.theme.MullvadWhite +import net.mullvad.mullvadvpn.lib.theme.MullvadWhite20 +import net.mullvad.mullvadvpn.lib.theme.MullvadWhite60 import net.mullvad.mullvadvpn.util.isValidMtu @OptIn(ExperimentalComposeUiApi::class) diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt index 7ad818b650..eb58188e49 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt @@ -34,9 +34,9 @@ import net.mullvad.mullvadvpn.compose.component.InformationView import net.mullvad.mullvadvpn.compose.component.MissingPolicy import net.mullvad.mullvadvpn.compose.component.drawVerticalScrollbar import net.mullvad.mullvadvpn.compose.state.AccountUiState -import net.mullvad.mullvadvpn.compose.theme.Dimens import net.mullvad.mullvadvpn.lib.common.util.capitalizeFirstCharOfEachWord import net.mullvad.mullvadvpn.lib.common.util.openAccountPageInBrowser +import net.mullvad.mullvadvpn.lib.theme.Dimens import net.mullvad.mullvadvpn.util.toExpiryDateString import net.mullvad.mullvadvpn.viewmodel.AccountViewModel diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt index 384c92d590..98278797d0 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt @@ -35,8 +35,8 @@ import net.mullvad.mullvadvpn.compose.test.CONNECT_BUTTON_TEST_TAG import net.mullvad.mullvadvpn.compose.test.LOCATION_INFO_TEST_TAG import net.mullvad.mullvadvpn.compose.test.RECONNECT_BUTTON_TEST_TAG import net.mullvad.mullvadvpn.compose.test.SELECT_LOCATION_BUTTON_TEST_TAG -import net.mullvad.mullvadvpn.compose.theme.AppTheme -import net.mullvad.mullvadvpn.compose.theme.Dimens +import net.mullvad.mullvadvpn.lib.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.Dimens import net.mullvad.mullvadvpn.model.TunnelState import net.mullvad.talpid.tunnel.ActionAfterDisconnect diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt index ef68452ecf..160ae532c8 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt @@ -32,15 +32,15 @@ import net.mullvad.mullvadvpn.compose.component.ScaffoldWithTopBar import net.mullvad.mullvadvpn.compose.dialog.ShowDeviceRemovalDialog import net.mullvad.mullvadvpn.compose.state.DeviceListItemUiState import net.mullvad.mullvadvpn.compose.state.DeviceListUiState -import net.mullvad.mullvadvpn.compose.theme.AppTheme -import net.mullvad.mullvadvpn.compose.theme.Dimens -import net.mullvad.mullvadvpn.compose.theme.MullvadBlue -import net.mullvad.mullvadvpn.compose.theme.MullvadGreen -import net.mullvad.mullvadvpn.compose.theme.MullvadGreen40 -import net.mullvad.mullvadvpn.compose.theme.MullvadWhite -import net.mullvad.mullvadvpn.compose.theme.MullvadWhite80 import net.mullvad.mullvadvpn.lib.common.util.capitalizeFirstCharOfEachWord import net.mullvad.mullvadvpn.lib.common.util.parseAsDateTime +import net.mullvad.mullvadvpn.lib.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.Dimens +import net.mullvad.mullvadvpn.lib.theme.MullvadBlue +import net.mullvad.mullvadvpn.lib.theme.MullvadGreen +import net.mullvad.mullvadvpn.lib.theme.MullvadGreen40 +import net.mullvad.mullvadvpn.lib.theme.MullvadWhite +import net.mullvad.mullvadvpn.lib.theme.MullvadWhite80 import net.mullvad.mullvadvpn.model.Device import net.mullvad.mullvadvpn.util.formatDate diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceRevokedScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceRevokedScreen.kt index 4b4107a586..68a445f3a9 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceRevokedScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceRevokedScreen.kt @@ -26,7 +26,7 @@ import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.button.ActionButton import net.mullvad.mullvadvpn.compose.component.ScaffoldWithTopBar import net.mullvad.mullvadvpn.compose.state.DeviceRevokedUiState -import net.mullvad.mullvadvpn.compose.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.AppTheme @Preview @Composable diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt index 832179f95c..c7abfe72fc 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt @@ -32,7 +32,7 @@ import androidx.constraintlayout.compose.Dimension import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.button.ActionButton import net.mullvad.mullvadvpn.compose.component.ScaffoldWithTopBar -import net.mullvad.mullvadvpn.compose.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.AppTheme @Preview @Composable diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt index b76b097ad1..162c0317a6 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt @@ -44,8 +44,8 @@ import net.mullvad.mullvadvpn.compose.extensions.toAnnotatedString import net.mullvad.mullvadvpn.compose.state.SelectLocationUiState import net.mullvad.mullvadvpn.compose.test.CIRCULAR_PROGRESS_INDICATOR import net.mullvad.mullvadvpn.compose.textfield.SearchTextField -import net.mullvad.mullvadvpn.compose.theme.AppTheme -import net.mullvad.mullvadvpn.compose.theme.Dimens +import net.mullvad.mullvadvpn.lib.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.Dimens import net.mullvad.mullvadvpn.relaylist.RelayCountry import net.mullvad.mullvadvpn.relaylist.RelayItem diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreen.kt index c03d4cf723..fdae96dd5a 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreen.kt @@ -34,10 +34,10 @@ import net.mullvad.mullvadvpn.compose.component.drawVerticalScrollbar import net.mullvad.mullvadvpn.compose.extensions.itemWithDivider import net.mullvad.mullvadvpn.compose.state.SettingsUiState import net.mullvad.mullvadvpn.compose.test.LAZY_LIST_TEST_TAG -import net.mullvad.mullvadvpn.compose.theme.Dimens import net.mullvad.mullvadvpn.lib.common.constant.BuildTypes import net.mullvad.mullvadvpn.lib.common.util.appendHideNavOnReleaseBuild import net.mullvad.mullvadvpn.lib.common.util.openLink +import net.mullvad.mullvadvpn.lib.theme.Dimens @OptIn(ExperimentalMaterial3Api::class) @Preview diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreen.kt index 174a1ad0e4..138f569b30 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreen.kt @@ -37,8 +37,8 @@ import net.mullvad.mullvadvpn.compose.constant.ContentType import net.mullvad.mullvadvpn.compose.constant.SplitTunnelingContentKey import net.mullvad.mullvadvpn.compose.extensions.itemWithDivider import net.mullvad.mullvadvpn.compose.state.SplitTunnelingUiState -import net.mullvad.mullvadvpn.compose.theme.AppTheme -import net.mullvad.mullvadvpn.compose.theme.Dimens +import net.mullvad.mullvadvpn.lib.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.Dimens @Preview @Composable diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt index a3d0e58f1e..6eefb362ec 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt @@ -77,9 +77,9 @@ import net.mullvad.mullvadvpn.compose.test.LAZY_LIST_TEST_TAG import net.mullvad.mullvadvpn.compose.test.LAZY_LIST_WIREGUARD_CUSTOM_PORT_NUMBER_TEST_TAG import net.mullvad.mullvadvpn.compose.test.LAZY_LIST_WIREGUARD_CUSTOM_PORT_TEXT_TEST_TAG import net.mullvad.mullvadvpn.compose.test.LAZY_LIST_WIREGUARD_PORT_ITEM_X_TEST_TAG -import net.mullvad.mullvadvpn.compose.theme.AppTheme -import net.mullvad.mullvadvpn.compose.theme.Dimens import net.mullvad.mullvadvpn.constant.WIREGUARD_PRESET_PORTS +import net.mullvad.mullvadvpn.lib.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.Dimens import net.mullvad.mullvadvpn.model.Constraint import net.mullvad.mullvadvpn.model.Port import net.mullvad.mullvadvpn.model.QuantumResistantState diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/CustomTextField.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/CustomTextField.kt index 2eeffce8dd..13d91df68b 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/CustomTextField.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/CustomTextField.kt @@ -36,8 +36,8 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import net.mullvad.mullvadvpn.R -import net.mullvad.mullvadvpn.compose.theme.MullvadBlue -import net.mullvad.mullvadvpn.compose.theme.MullvadWhite10 +import net.mullvad.mullvadvpn.lib.theme.MullvadBlue +import net.mullvad.mullvadvpn.lib.theme.MullvadWhite10 private const val EMPTY_STRING = "" private const val NEWLINE_STRING = "\n" diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/SearchTextField.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/SearchTextField.kt index 8e68e7e2a0..55c0283aff 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/SearchTextField.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/SearchTextField.kt @@ -26,9 +26,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.tooling.preview.Preview import net.mullvad.mullvadvpn.R -import net.mullvad.mullvadvpn.compose.theme.AppTheme -import net.mullvad.mullvadvpn.compose.theme.Dimens -import net.mullvad.mullvadvpn.compose.theme.MullvadWhite10 +import net.mullvad.mullvadvpn.lib.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.Dimens +import net.mullvad.mullvadvpn.lib.theme.MullvadWhite10 @Preview @Composable diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/Color.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/Color.kt deleted file mode 100644 index d8beb3e7ae..0000000000 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/Color.kt +++ /dev/null @@ -1,30 +0,0 @@ -package net.mullvad.mullvadvpn.compose.theme - -import androidx.compose.ui.graphics.Color - -val MullvadBeige = Color(0xFFFFCD86) -val MullvadBlue = Color(0xFF294D73) -val MullvadBlue60 = Color(0x99294D73) -val MullvadBlue40 = Color(0x66294D73) -val MullvadBlue20 = Color(0x33294D73) -val MullvadBrown = Color(0xFFD2943B) -val MullvadDarkBlue = Color(0xFF192E45) -val MullvadGreen = Color(0xFF44AD4D) -val MullvadGreen40 = Color(0x6644AD4D) -val MullvadRed = Color(0xFFE34039) -val MullvadYellow = Color(0xFFFFD524) -val MullvadHelmetYellow = Color(0xFFFFD524) -val MullvadWhite = Color(0xFFFFFFFF) -val MullvadWhite10 = Color(0x1AFFFFFF) -val MullvadWhite20 = Color(0x33FFFFFF) -val MullvadWhite40 = Color(0x66FFFFFF) -val MullvadWhite60 = Color(0x99FFFFFF) -val MullvadWhite80 = Color(0xCCFFFFFF) - -const val AlphaVisible = 1f -const val AlphaDisabled = 0.2f -const val Alpha20 = 0.2f -const val AlphaInactive = 0.4f -const val AlphaDescription = 0.6f -const val AlphaDisconnectButton = 0.6f -const val AlphaInvisible = 0f diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/AccountFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/AccountFragment.kt index 97b9ba94f1..52e131ed79 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/AccountFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/AccountFragment.kt @@ -10,7 +10,7 @@ import androidx.compose.runtime.collectAsState import androidx.compose.ui.platform.ComposeView import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.screen.AccountScreen -import net.mullvad.mullvadvpn.compose.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.AppTheme import net.mullvad.mullvadvpn.ui.NavigationBarPainter import net.mullvad.mullvadvpn.ui.StatusBarPainter import net.mullvad.mullvadvpn.ui.extension.requireMainActivity diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ConnectFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ConnectFragment.kt index a8bdc2d53a..2fbaf591d3 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ConnectFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ConnectFragment.kt @@ -17,9 +17,9 @@ import kotlinx.coroutines.launch import net.mullvad.mullvadvpn.BuildConfig import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.screen.ConnectScreen -import net.mullvad.mullvadvpn.compose.theme.AppTheme import net.mullvad.mullvadvpn.lib.common.constant.BuildTypes import net.mullvad.mullvadvpn.lib.common.util.JobTracker +import net.mullvad.mullvadvpn.lib.theme.AppTheme import net.mullvad.mullvadvpn.model.TunnelState import net.mullvad.mullvadvpn.repository.AccountRepository import net.mullvad.mullvadvpn.ui.NavigationBarPainter diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/DeviceListFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/DeviceListFragment.kt index c89466f7e6..ab6de40dc2 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/DeviceListFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/DeviceListFragment.kt @@ -15,7 +15,7 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.screen.DeviceListScreen -import net.mullvad.mullvadvpn.compose.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.AppTheme import net.mullvad.mullvadvpn.ui.MainActivity import net.mullvad.mullvadvpn.viewmodel.DeviceListViewModel import org.koin.androidx.viewmodel.ext.android.viewModel diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/DeviceRevokedFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/DeviceRevokedFragment.kt index 0e8e77622f..4b744d568a 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/DeviceRevokedFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/DeviceRevokedFragment.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.platform.ComposeView import androidx.fragment.app.Fragment import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.screen.DeviceRevokedScreen -import net.mullvad.mullvadvpn.compose.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.AppTheme import net.mullvad.mullvadvpn.ui.MainActivity import net.mullvad.mullvadvpn.viewmodel.DeviceRevokedViewModel import org.koin.androidx.viewmodel.ext.android.viewModel diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/LoadingFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/LoadingFragment.kt index 7d33bd85e2..0000351c33 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/LoadingFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/LoadingFragment.kt @@ -8,7 +8,7 @@ import androidx.compose.ui.platform.ComposeView import androidx.fragment.app.Fragment import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.screen.LoadingScreen -import net.mullvad.mullvadvpn.compose.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.AppTheme import net.mullvad.mullvadvpn.ui.MainActivity import net.mullvad.mullvadvpn.ui.NavigationBarPainter import net.mullvad.mullvadvpn.ui.StatusBarPainter diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/PrivacyDisclaimerFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/PrivacyDisclaimerFragment.kt index 10d2e5e249..464395d2d8 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/PrivacyDisclaimerFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/PrivacyDisclaimerFragment.kt @@ -10,9 +10,9 @@ import androidx.compose.ui.platform.ComposeView import androidx.fragment.app.Fragment import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.screen.PrivacyDisclaimerScreen -import net.mullvad.mullvadvpn.compose.theme.AppTheme import net.mullvad.mullvadvpn.lib.common.util.appendHideNavOnReleaseBuild import net.mullvad.mullvadvpn.lib.endpoint.getApiEndpointConfigurationExtras +import net.mullvad.mullvadvpn.lib.theme.AppTheme import net.mullvad.mullvadvpn.ui.MainActivity import net.mullvad.mullvadvpn.ui.NavigationBarPainter import net.mullvad.mullvadvpn.ui.StatusBarPainter diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SelectLocationFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SelectLocationFragment.kt index 12f135ffed..ec7a768b6d 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SelectLocationFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SelectLocationFragment.kt @@ -10,7 +10,7 @@ import androidx.compose.ui.platform.ComposeView import com.google.accompanist.systemuicontroller.rememberSystemUiController import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.screen.SelectLocationScreen -import net.mullvad.mullvadvpn.compose.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.AppTheme import net.mullvad.mullvadvpn.ui.NavigationBarPainter import net.mullvad.mullvadvpn.ui.StatusBarPainter import net.mullvad.mullvadvpn.viewmodel.SelectLocationViewModel diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SettingsFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SettingsFragment.kt index 7758986702..1c126c4dab 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SettingsFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SettingsFragment.kt @@ -10,7 +10,7 @@ import androidx.compose.ui.platform.ComposeView import androidx.fragment.app.Fragment import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.screen.SettingsScreen -import net.mullvad.mullvadvpn.compose.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.AppTheme import net.mullvad.mullvadvpn.ui.NavigationBarPainter import net.mullvad.mullvadvpn.ui.StatusBarPainter import net.mullvad.mullvadvpn.viewmodel.SettingsViewModel diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SplitTunnelingFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SplitTunnelingFragment.kt index 854167a03b..7004303ae8 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SplitTunnelingFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SplitTunnelingFragment.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.platform.ComposeView import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.applist.ApplicationsIconManager import net.mullvad.mullvadvpn.compose.screen.SplitTunnelingScreen -import net.mullvad.mullvadvpn.compose.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.AppTheme import net.mullvad.mullvadvpn.viewmodel.SplitTunnelingViewModel import org.koin.android.ext.android.inject import org.koin.androidx.viewmodel.ext.android.viewModel diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/VpnSettingsFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/VpnSettingsFragment.kt index c8a2a4e914..d30608728b 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/VpnSettingsFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/VpnSettingsFragment.kt @@ -8,7 +8,7 @@ import androidx.compose.runtime.collectAsState import androidx.compose.ui.platform.ComposeView import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.screen.VpnSettingsScreen -import net.mullvad.mullvadvpn.compose.theme.AppTheme +import net.mullvad.mullvadvpn.lib.theme.AppTheme import net.mullvad.mullvadvpn.viewmodel.VpnSettingsViewModel import org.koin.androidx.viewmodel.ext.android.viewModel diff --git a/android/buildSrc/src/main/kotlin/Dependencies.kt b/android/buildSrc/src/main/kotlin/Dependencies.kt index d171b55cc7..353314105e 100644 --- a/android/buildSrc/src/main/kotlin/Dependencies.kt +++ b/android/buildSrc/src/main/kotlin/Dependencies.kt @@ -98,6 +98,7 @@ object Dependencies { const val modelLib = ":lib:model" const val resourceLib = ":lib:resource" const val talpidLib = ":lib:talpid" + const val themeLib = ":lib:theme" } object Plugin { diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml index 09888862b3..594706b6d1 100644 --- a/android/gradle/verification-metadata.xml +++ b/android/gradle/verification-metadata.xml @@ -58,6 +58,14 @@ <sha256 value="536ab6630c9abbd61d527788af0ae76a8500db6536252512cac3b529d84d2e3a" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.activity" name="activity" version="1.7.0"> + <artifact name="activity-1.7.0.aar"> + <sha256 value="e44b2032273387156982912c591ef7e2dd485ba0b2e689b528b5a42f271a4f27" origin="Generated by Gradle"/> + </artifact> + <artifact name="activity-1.7.0.module"> + <sha256 value="2a746b0126a8ab2f576e7167f1a785b452ef7ee997abd979ee0c5a29c36f6ea6" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.activity" name="activity" version="1.7.2"> <artifact name="activity-1.7.2.aar"> <sha256 value="2a1abf8e0a598d246b1edcb71e2395e39f32332195ebe5ea40a3dd21355ba3ae" origin="Generated by Gradle"/> @@ -72,6 +80,9 @@ </artifact> </component> <component group="androidx.activity" name="activity-compose" version="1.7.0"> + <artifact name="activity-compose-1.7.0.aar"> + <sha256 value="caa72885d1ce7979c1d6c59a8b255c6097b770780d4d4da95d56979a348646cd" origin="Generated by Gradle"/> + </artifact> <artifact name="activity-compose-1.7.0.module"> <sha256 value="f7a29bcba338575dcf89a553cff9cfad3f140340eaf2b56fd0193244da602c0a" origin="Generated by Gradle"/> </artifact> @@ -84,6 +95,11 @@ <sha256 value="d59bc3de4242a9dc2854405843ed7de8ed014a5a1e4df38a64b40d592aa45edf" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.activity" name="activity-ktx" version="1.5.0"> + <artifact name="activity-ktx-1.5.0.module"> + <sha256 value="17f2e587e31720e0017c00bc243b3d896a5c7eefff46084bf12f81738ffd2a27" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.activity" name="activity-ktx" version="1.5.1"> <artifact name="activity-ktx-1.5.1.module"> <sha256 value="890eb6f3aa3d119236b4c96ec6b1beb647c296a4d99ca7e4a500a164a95ca2cb" origin="Generated by Gradle"/> @@ -98,6 +114,9 @@ </artifact> </component> <component group="androidx.activity" name="activity-ktx" version="1.7.0"> + <artifact name="activity-ktx-1.7.0.aar"> + <sha256 value="fce317d61a22f12967b475bfcb80c89dda66e418975e890ea703cb74e12b5b11" origin="Generated by Gradle"/> + </artifact> <artifact name="activity-ktx-1.7.0.module"> <sha256 value="f4001a709b6f7132b22a5e17c24f8b8a9b3c462a598de3b0f16cc57a4344bab6" origin="Generated by Gradle"/> </artifact> @@ -110,6 +129,11 @@ <sha256 value="c5769b13afe55023c1dc30c72ea86189ab70aa3ca770ecfb04c970f4d6e6be65" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.annotation" name="annotation" version="1.1.0"> + <artifact name="annotation-1.1.0.jar"> + <sha256 value="d38d63edb30f1467818d50aaf05f8a692dea8b31392a049bfa991b159ad5b692" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.annotation" name="annotation" version="1.2.0"> <artifact name="annotation-1.2.0.jar"> <sha256 value="9029262bddce116e6d02be499e4afdba21f24c239087b76b3b57d7e98b490a36" origin="Generated by Gradle"/> @@ -243,6 +267,19 @@ <sha256 value="2bfc54475c047131913361f56d0f7f019c6e5bee53eeb0eb7d94a7c499a05227" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.compose.animation" name="animation" version="1.2.1"> + <artifact name="animation-1.2.1.aar"> + <sha256 value="58ffb6fa8e45a78861e3fd421c7569924b9069aaf395f96e73fff4f264995dad" origin="Generated by Gradle"/> + </artifact> + <artifact name="animation-1.2.1.module"> + <sha256 value="30b8d3c1da201e45cb47f6c9b16c27b2bdd410f4004b40ff9876ae7b6e49b210" origin="Generated by Gradle"/> + </artifact> + </component> + <component group="androidx.compose.animation" name="animation" version="1.4.1"> + <artifact name="animation-1.4.1.module"> + <sha256 value="4f80d4941ac9d4547f4138725103ec728ca57d649b44b6b94cfbb86eb2e7cf0c" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.compose.animation" name="animation" version="1.5.0-rc01"> <artifact name="animation-1.5.0-rc01.module"> <sha256 value="604a11e1ab360bde5e8b4d8ae4c0d67a003d374dcb75f165126ece24d9d3615c" origin="Generated by Gradle"/> @@ -259,6 +296,14 @@ <sha256 value="e0fe0d2dcb88acd3ed99baf7d7f21103b89633ce844744b7df2c88e083081af8" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.compose.animation" name="animation-core" version="1.2.1"> + <artifact name="animation-core-1.2.1.aar"> + <sha256 value="e1a44dc558d1966e3345f5c51f63afaaf2b5aeea20f478f026594363ae910675" origin="Generated by Gradle"/> + </artifact> + <artifact name="animation-core-1.2.1.module"> + <sha256 value="9083ac53ad162f4167ecfb895469943504f4cd6a624e612936a5209144c5b6bf" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.compose.animation" name="animation-core" version="1.4.1"> <artifact name="animation-core-1.4.1.module"> <sha256 value="681ee4ed6f028adcfb0d32bdaf238e877df35167f9757f5689bff801e3cbe9a4" origin="Generated by Gradle"/> @@ -288,6 +333,14 @@ <sha256 value="96b3e519d5ce3d48ae409f914e04f71403371e74490f4b3aa2b869f27811f5f3" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.compose.foundation" name="foundation" version="1.4.1"> + <artifact name="foundation-1.4.1.aar"> + <sha256 value="e3874cf5e971912748b226a3e648f9f0a512160467c16391e92f60ab88f2c72f" origin="Generated by Gradle"/> + </artifact> + <artifact name="foundation-1.4.1.module"> + <sha256 value="f36fdcaea9c265dd58bf184e46d585000e069e7b914daa14432a3c41d698e60c" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.compose.foundation" name="foundation" version="1.5.0-rc01"> <artifact name="foundation-1.5.0-rc01.module"> <sha256 value="b1f1f42cd01797a61491a488f8b932a1e00854c0e35d2aaa3565ff7140bb23f0" origin="Generated by Gradle"/> @@ -310,6 +363,9 @@ </artifact> </component> <component group="androidx.compose.foundation" name="foundation-layout" version="1.4.1"> + <artifact name="foundation-layout-1.4.1.aar"> + <sha256 value="7370e5a27ec30b9e8425a47b3db75a5581d157ead2413db51a73ce76d4d53386" origin="Generated by Gradle"/> + </artifact> <artifact name="foundation-layout-1.4.1.module"> <sha256 value="f68392b42626ce9a99f92ff85f5e438509623f2a1ca4d79c463e8e44f47b39bb" origin="Generated by Gradle"/> </artifact> @@ -403,11 +459,21 @@ <sha256 value="2904c25ce6080506e24d22283d373b99af5014b2ba6a515036e1d71b13913660" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.compose.runtime" name="runtime-saveable" version="1.0.1"> + <artifact name="runtime-saveable-1.0.1.module"> + <sha256 value="c0d6f142542d8d74f65481ef6526d2be265f01f812a112948fcde87a458f4fb6" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.compose.runtime" name="runtime-saveable" version="1.3.0"> <artifact name="runtime-saveable-1.3.0.module"> <sha256 value="287a863084c22ede23f7b04faf8f037294a2ab7d604abdc29629ec239d9953dd" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.compose.runtime" name="runtime-saveable" version="1.4.1"> + <artifact name="runtime-saveable-1.4.1.module"> + <sha256 value="e1b028db4da86903ff49688d5d1ff9648f1df5b190487a6376732b412c3055a4" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.compose.runtime" name="runtime-saveable" version="1.5.0-rc01"> <artifact name="runtime-saveable-1.5.0-rc01.module"> <sha256 value="43335f288e070e041de60a5f113c2a2578d585cf02902cae2dd032fbc659673c" origin="Generated by Gradle"/> @@ -601,6 +667,11 @@ <sha256 value="f3939264eec23987508fb20fd4874f3fe2fbf9f26e806e9ea434547e6eec36e6" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.compose.ui" name="ui-unit" version="1.2.1"> + <artifact name="ui-unit-1.2.1.module"> + <sha256 value="51e3c85c2bcac6a108778788aac7400f4a7a581c6756da5a7b83d6576e640dda" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.compose.ui" name="ui-unit" version="1.3.0"> <artifact name="ui-unit-1.3.0.module"> <sha256 value="71e10252c40ddf2d3eeeb19d4f659264f9be45e616bf3cd21fe9847f41149808" origin="Generated by Gradle"/> @@ -627,6 +698,11 @@ <sha256 value="0264547c8b179b54ae440ba3db9e62eb93357572ed6b06125a4d4f9539e57da0" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.compose.ui" name="ui-util" version="1.4.1"> + <artifact name="ui-util-1.4.1.module"> + <sha256 value="767f9f11f508a1f918f98c78a7bc4bec71e8424b01524941433b99e5f4ba32dc" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.compose.ui" name="ui-util" version="1.5.0-rc01"> <artifact name="ui-util-1.5.0-rc01.module"> <sha256 value="de7f2c6afa966a08d359ddf9602e0b526d3ede241f6fe524f2644b30a5cc351f" origin="Generated by Gradle"/> @@ -719,6 +795,11 @@ <sha256 value="8348e2b5c0c7e283370b85037cec8b32b4acab8d73a7a53235a372446b1387c8" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.core" name="core" version="1.7.0"> + <artifact name="core-1.7.0.module"> + <sha256 value="988f820899d5a4982e5c878ca1cd417970ace332ea2ff72f5be19b233fa0e788" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.core" name="core" version="1.8.0"> <artifact name="core-1.8.0.aar"> <sha256 value="48c64a15ec3eb11bfb33339e5ceb70ec7f821bd2dfa2eb8675ebd5353317e792" origin="Generated by Gradle"/> @@ -3648,6 +3729,14 @@ <sha256 value="7d123a4dc35526324c57b2bdabfd73870fca623e5f9be4ad6926f403b284a975" origin="Generated by Gradle"/> </artifact> </component> + <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-jvm" version="1.6.4"> + <artifact name="kotlinx-coroutines-core-jvm-1.6.4.jar"> + <sha256 value="c24c8bb27bb320c4a93871501a7e5e0c61607638907b197aef675513d4c820be" origin="Generated by Gradle"/> + </artifact> + <artifact name="kotlinx-coroutines-core-jvm-1.6.4.module"> + <sha256 value="0d94c8a41483e7c2707ebd693e1b1357a84152998ce85550ebbc54ca4321a3a7" origin="Generated by Gradle"/> + </artifact> + </component> <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-jvm" version="1.7.2"> <artifact name="kotlinx-coroutines-core-jvm-1.7.2.jar"> <sha256 value="754f3a0f11dcaa019bf17c4f67836b371eb4f37693ac8e7c3badf5c6b1308d7c" origin="Generated by Gradle"/> diff --git a/android/lib/theme/build.gradle.kts b/android/lib/theme/build.gradle.kts new file mode 100644 index 0000000000..d5efe5c96f --- /dev/null +++ b/android/lib/theme/build.gradle.kts @@ -0,0 +1,49 @@ +plugins { + id(Dependencies.Plugin.androidLibraryId) + id(Dependencies.Plugin.kotlinAndroidId) +} + +android { + namespace = "net.mullvad.mullvadvpn.lib.theme" + compileSdk = Versions.Android.compileSdkVersion + + defaultConfig { + minSdk = Versions.Android.minSdkVersion + } + + buildFeatures { + compose = true + } + + composeOptions { + kotlinCompilerExtensionVersion = Versions.kotlinCompilerExtensionVersion + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = Versions.jvmTarget + } + + lint { + lintConfig = file("${rootProject.projectDir}/config/lint.xml") + abortOnError = true + warningsAsErrors = true + } +} + +configurations.all { + resolutionStrategy { + // Hold back emoji2 since newer versions require api level 34 which is not yet stable. + force("androidx.emoji2:emoji2:1.3.0") + } +} + +dependencies { + implementation(Dependencies.Compose.material3) + implementation(Dependencies.Compose.ui) + implementation(Dependencies.Kotlin.stdlib) +} diff --git a/android/lib/theme/src/main/AndroidManifest.xml b/android/lib/theme/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..cc947c5679 --- /dev/null +++ b/android/lib/theme/src/main/AndroidManifest.xml @@ -0,0 +1 @@ +<manifest /> diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Color.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Color.kt new file mode 100644 index 0000000000..391189c406 --- /dev/null +++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Color.kt @@ -0,0 +1,64 @@ +package net.mullvad.mullvadvpn.lib.theme + +import androidx.compose.ui.graphics.Color + +internal val MullvadBeige = Color(0xFFFFCD86) +internal val MullvadBlue60 = Color(0x99294D73) +internal val MullvadBlue40 = Color(0x66294D73) +internal val MullvadBlue20 = Color(0x33294D73) +internal val MullvadBrown = Color(0xFFD2943B) +internal val MullvadYellow = Color(0xFFFFD524) +internal val MullvadWhite40 = Color(0x66FFFFFF) + +@Deprecated( + "Deprecated for external usage and will be marked as internal in the future. Use material colors instead." +) +val MullvadBlue = Color(0xFF294D73) +@Deprecated( + "Deprecated for external usage and will be marked as internal in the future. Use material colors instead." +) +val MullvadDarkBlue = Color(0xFF192E45) +@Deprecated( + "Deprecated for external usage and will be marked as internal in the future. Use material colors instead." +) +val MullvadGreen = Color(0xFF44AD4D) +@Deprecated( + "Deprecated for external usage and will be marked as internal in the future. Use material colors instead." +) +val MullvadGreen40 = Color(0x6644AD4D) +@Deprecated( + "Deprecated for external usage and will be marked as internal in the future. Use material colors instead." +) +val MullvadRed = Color(0xFFE34039) +@Deprecated( + "Deprecated for external usage and will be marked as internal in the future. Use material colors instead." +) +val MullvadHelmetYellow = Color(0xFFFFD524) +@Deprecated( + "Deprecated for external usage and will be marked as internal in the future. Use material colors instead." +) +val MullvadWhite = Color(0xFFFFFFFF) +@Deprecated( + "Deprecated for external usage and will be marked as internal in the future. Use material colors instead." +) +val MullvadWhite10 = Color(0x1AFFFFFF) +@Deprecated( + "Deprecated for external usage and will be marked as internal in the future. Use material colors instead." +) +val MullvadWhite20 = Color(0x33FFFFFF) +@Deprecated( + "Deprecated for external usage and will be marked as internal in the future. Use material colors instead." +) +val MullvadWhite60 = Color(0x99FFFFFF) +@Deprecated( + "Deprecated for external usage and will be marked as internal in the future. Use material colors instead." +) +val MullvadWhite80 = Color(0xCCFFFFFF) + +const val AlphaVisible = 1f +const val AlphaDisabled = 0.2f +const val Alpha20 = 0.2f +const val AlphaInactive = 0.4f +const val AlphaDescription = 0.6f +const val AlphaDisconnectButton = 0.6f +const val AlphaInvisible = 0f diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/Theme.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt index a4d1b26dba..cad213e548 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/Theme.kt +++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt @@ -1,4 +1,4 @@ -package net.mullvad.mullvadvpn.compose.theme +package net.mullvad.mullvadvpn.lib.theme import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.MaterialTheme @@ -14,9 +14,9 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.dp -import net.mullvad.mullvadvpn.compose.theme.dimensions.Dimensions -import net.mullvad.mullvadvpn.compose.theme.dimensions.defaultDimensions -import net.mullvad.mullvadvpn.compose.theme.typeface.TypeScale +import net.mullvad.mullvadvpn.lib.theme.dimensions.Dimensions +import net.mullvad.mullvadvpn.lib.theme.dimensions.defaultDimensions +import net.mullvad.mullvadvpn.lib.theme.typeface.TypeScale // Add our own definitions here private val MullvadTypography = diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/Type.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Type.kt index 160b133172..55997a8f71 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/Type.kt +++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Type.kt @@ -1,4 +1,4 @@ -package net.mullvad.mullvadvpn.compose.theme +package net.mullvad.mullvadvpn.lib.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/dimensions/Dimensions.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt index 9a35a2b32d..fa922eac9e 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/dimensions/Dimensions.kt +++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt @@ -1,4 +1,4 @@ -package net.mullvad.mullvadvpn.compose.theme.dimensions +package net.mullvad.mullvadvpn.lib.theme.dimensions import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/typeface/TypeScale.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/typeface/TypeScale.kt index 41396152c1..09ee7cafde 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/typeface/TypeScale.kt +++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/typeface/TypeScale.kt @@ -1,4 +1,4 @@ -package net.mullvad.mullvadvpn.compose.theme.typeface +package net.mullvad.mullvadvpn.lib.theme.typeface import androidx.compose.ui.unit.sp diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/typeface/Typeface.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/typeface/Typeface.kt index aadf2601ac..5b79b1df15 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/typeface/Typeface.kt +++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/typeface/Typeface.kt @@ -1,4 +1,4 @@ -package net.mullvad.mullvadvpn.compose.theme.typeface +package net.mullvad.mullvadvpn.lib.theme.typeface import androidx.compose.material3.Typography import androidx.compose.runtime.Composable diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts index 6ddce2d9b1..606fb8d4dd 100644 --- a/android/settings.gradle.kts +++ b/android/settings.gradle.kts @@ -4,12 +4,13 @@ include( ":tile" ) include( - ":lib:common:", + ":lib:common", ":lib:endpoint", ":lib:ipc", - ":lib:model:", + ":lib:model", ":lib:resource", - ":lib:talpid:" + ":lib:talpid", + ":lib:theme" ) include( ":test", |