Skip to content

Commit ea919f1

Browse files
committed
Move component module to lib/ui/component
1 parent c2ad634 commit ea919f1

File tree

16 files changed

+19
-18
lines changed

16 files changed

+19
-18
lines changed

android/app/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,6 @@ protobuf {
364364

365365
dependencies {
366366
implementation(projects.lib.common)
367-
implementation(projects.lib.component)
368367
implementation(projects.lib.daemonGrpc)
369368
implementation(projects.lib.endpoint)
370369
implementation(projects.lib.map)
@@ -374,6 +373,7 @@ dependencies {
374373
implementation(projects.lib.shared)
375374
implementation(projects.lib.talpid)
376375
implementation(projects.lib.tv)
376+
implementation(projects.lib.ui.component)
377377
implementation(projects.tile)
378378
implementation(projects.lib.theme)
379379
implementation(projects.service)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import net.mullvad.mullvadvpn.lib.model.ErrorState
1717
import net.mullvad.mullvadvpn.lib.model.ErrorStateCause
1818
import net.mullvad.mullvadvpn.lib.model.InAppNotification
1919
import net.mullvad.mullvadvpn.lib.model.VersionInfo
20-
import net.mullvad.mullvadvpn.lib.shared.compose.AnimatedNotificationBanner
2120
import net.mullvad.mullvadvpn.lib.theme.AppTheme
2221
import net.mullvad.mullvadvpn.lib.tv.NotificationBannerTv
22+
import net.mullvad.mullvadvpn.lib.ui.component.AnimatedNotificationBanner
2323

2424
@Preview
2525
@Composable

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/RemoveDeviceConfirmationDialog.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import net.mullvad.mullvadvpn.compose.component.textResource
1818
import net.mullvad.mullvadvpn.compose.preview.DevicePreviewParameterProvider
1919
import net.mullvad.mullvadvpn.lib.model.Device
2020
import net.mullvad.mullvadvpn.lib.model.DeviceId
21-
import net.mullvad.mullvadvpn.lib.shared.compose.toAnnotatedString
2221
import net.mullvad.mullvadvpn.lib.theme.AppTheme
22+
import net.mullvad.mullvadvpn.lib.ui.component.toAnnotatedString
2323

2424
@Preview
2525
@Composable

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/info/InfoDialog.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import androidx.core.text.HtmlCompat
2424
import net.mullvad.mullvadvpn.R
2525
import net.mullvad.mullvadvpn.compose.button.PrimaryButton
2626
import net.mullvad.mullvadvpn.compose.component.drawVerticalScrollbar
27-
import net.mullvad.mullvadvpn.lib.shared.compose.toAnnotatedString
2827
import net.mullvad.mullvadvpn.lib.theme.AppTheme
2928
import net.mullvad.mullvadvpn.lib.theme.Dimens
3029
import net.mullvad.mullvadvpn.lib.theme.color.AlphaScrollbar
30+
import net.mullvad.mullvadvpn.lib.ui.component.toAnnotatedString
3131

3232
@Preview
3333
@Composable

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ import net.mullvad.mullvadvpn.compose.component.NavigateBackIconButton
5656
import net.mullvad.mullvadvpn.compose.component.ScaffoldWithLargeTopBarAndButton
5757
import net.mullvad.mullvadvpn.compose.transitions.SlideInFromRightTransition
5858
import net.mullvad.mullvadvpn.lib.common.util.openVpnSettings
59-
import net.mullvad.mullvadvpn.lib.shared.compose.toAnnotatedString
6059
import net.mullvad.mullvadvpn.lib.theme.AppTheme
6160
import net.mullvad.mullvadvpn.lib.theme.Dimens
6261
import net.mullvad.mullvadvpn.lib.theme.color.AlphaInvisible
6362
import net.mullvad.mullvadvpn.lib.theme.color.AlphaVisible
63+
import net.mullvad.mullvadvpn.lib.ui.component.toAnnotatedString
6464
import net.mullvad.mullvadvpn.service.constant.IS_PLAY_BUILD
6565
import net.mullvad.mullvadvpn.util.appendHideNavOnPlayBuild
6666

android/lib/tv/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ dependencies {
3636
implementation(libs.androidx.activity.compose)
3737
implementation(libs.compose.material3)
3838
implementation(libs.compose.ui)
39-
implementation(projects.lib.component)
4039
implementation(projects.lib.model)
4140
implementation(projects.lib.resource)
4241
implementation(projects.lib.shared)
4342
implementation(projects.lib.theme)
43+
implementation(projects.lib.ui.component)
4444

4545
// UI tooling
4646
implementation(libs.compose.ui.tooling.preview)

android/lib/tv/src/main/kotlin/net/mullvad/mullvadvpn/lib/tv/NotificationBannerTv.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import androidx.compose.ui.draw.clip
99
import androidx.compose.ui.tooling.preview.Preview
1010
import androidx.compose.ui.unit.dp
1111
import net.mullvad.mullvadvpn.lib.model.InAppNotification
12-
import net.mullvad.mullvadvpn.lib.shared.compose.AnimatedNotificationBanner
1312
import net.mullvad.mullvadvpn.lib.theme.AppTheme
1413
import net.mullvad.mullvadvpn.lib.theme.Dimens
14+
import net.mullvad.mullvadvpn.lib.ui.component.AnimatedNotificationBanner
1515

1616
@Preview
1717
@Composable

android/lib/component/build.gradle.kts android/lib/ui/component/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
}
66

77
android {
8-
namespace = "net.mullvad.mullvadvpn.lib.shared.compose"
8+
namespace = "net.mullvad.mullvadvpn.lib.ui.component"
99
compileSdk = Versions.compileSdkVersion
1010
buildToolsVersion = Versions.buildToolsVersion
1111

android/lib/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/compose/AnimatedNotificationBanner.kt android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/AnimatedNotificationBanner.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.mullvad.mullvadvpn.lib.shared.compose
1+
package net.mullvad.mullvadvpn.lib.ui.component
22

33
import androidx.compose.animation.AnimatedVisibility
44
import androidx.compose.animation.animateContentSize
@@ -27,11 +27,11 @@ import androidx.constraintlayout.compose.ConstraintLayout
2727
import androidx.constraintlayout.compose.Dimension
2828
import net.mullvad.mullvadvpn.lib.model.InAppNotification
2929
import net.mullvad.mullvadvpn.lib.model.StatusLevel
30-
import net.mullvad.mullvadvpn.lib.shared.compose.test.NOTIFICATION_BANNER
31-
import net.mullvad.mullvadvpn.lib.shared.compose.test.NOTIFICATION_BANNER_ACTION
32-
import net.mullvad.mullvadvpn.lib.shared.compose.test.NOTIFICATION_BANNER_TEXT_ACTION
3330
import net.mullvad.mullvadvpn.lib.theme.Dimens
3431
import net.mullvad.mullvadvpn.lib.theme.color.warning
32+
import net.mullvad.mullvadvpn.lib.ui.component.test.NOTIFICATION_BANNER
33+
import net.mullvad.mullvadvpn.lib.ui.component.test.NOTIFICATION_BANNER_ACTION
34+
import net.mullvad.mullvadvpn.lib.ui.component.test.NOTIFICATION_BANNER_TEXT_ACTION
3535

3636
@Composable
3737
fun AnimatedNotificationBanner(

android/lib/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/compose/NotificationData.kt android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/NotificationData.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.mullvad.mullvadvpn.lib.shared.compose
1+
package net.mullvad.mullvadvpn.lib.ui.component
22

33
import androidx.compose.material.icons.Icons
44
import androidx.compose.material.icons.automirrored.filled.OpenInNew

android/lib/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/compose/RememberPrevious.kt android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/RememberPrevious.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.mullvad.mullvadvpn.lib.shared.compose
1+
package net.mullvad.mullvadvpn.lib.ui.component
22

33
/*
44
* Code snippet taken from:

android/lib/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/compose/ResourcesExtensions.kt android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/ResourcesExtensions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.mullvad.mullvadvpn.lib.shared.compose
1+
package net.mullvad.mullvadvpn.lib.ui.component
22

33
import android.content.res.Resources
44
import java.time.Duration

android/lib/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/compose/SpannedExtensions.kt android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/SpannedExtensions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.mullvad.mullvadvpn.lib.shared.compose
1+
package net.mullvad.mullvadvpn.lib.ui.component
22

33
import android.graphics.Typeface
44
import android.text.Spanned

android/lib/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/compose/test/ComposeTestTagConstants.kt android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/test/ComposeTestTagConstants.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.mullvad.mullvadvpn.lib.shared.compose.test
1+
package net.mullvad.mullvadvpn.lib.ui.component.test
22

33
// ConnectScreen - Notification banner
44
const val NOTIFICATION_BANNER = "notification_banner"

android/settings.gradle.kts

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ include(
1616
":lib:billing",
1717
":lib:common",
1818
":lib:common-test",
19-
":lib:component",
2019
":lib:daemon-grpc",
2120
":lib:endpoint",
2221
":lib:map",
@@ -27,6 +26,8 @@ include(
2726
":lib:talpid",
2827
":lib:theme",
2928
":lib:tv",
29+
":lib:ui",
30+
":lib:ui:component",
3031
)
3132

3233
include(":test", ":test:arch", ":test:common", ":test:e2e", ":test:mockapi")

0 commit comments

Comments
 (0)