Move component module to lib/ui/component

Author: kl

android/app/build.gradle.kts

@@ -364,7 +364,6 @@ protobuf {
 
 dependencies {
     implementation(projects.lib.common)
-    implementation(projects.lib.component)
     implementation(projects.lib.daemonGrpc)
     implementation(projects.lib.endpoint)
     implementation(projects.lib.map)
@@ -374,6 +373,7 @@ dependencies {
     implementation(projects.lib.shared)
     implementation(projects.lib.talpid)
     implementation(projects.lib.tv)
+    implementation(projects.lib.ui.component)
     implementation(projects.tile)
     implementation(projects.lib.theme)
     implementation(projects.service)

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

@@ -17,9 +17,9 @@ import net.mullvad.mullvadvpn.lib.model.ErrorState
 import net.mullvad.mullvadvpn.lib.model.ErrorStateCause
 import net.mullvad.mullvadvpn.lib.model.InAppNotification
 import net.mullvad.mullvadvpn.lib.model.VersionInfo
-import net.mullvad.mullvadvpn.lib.shared.compose.AnimatedNotificationBanner
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.tv.NotificationBannerTv
+import net.mullvad.mullvadvpn.lib.ui.component.AnimatedNotificationBanner
 
 @Preview
 @Composable

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

@@ -18,8 +18,8 @@ import net.mullvad.mullvadvpn.compose.component.textResource
 import net.mullvad.mullvadvpn.compose.preview.DevicePreviewParameterProvider
 import net.mullvad.mullvadvpn.lib.model.Device
 import net.mullvad.mullvadvpn.lib.model.DeviceId
-import net.mullvad.mullvadvpn.lib.shared.compose.toAnnotatedString
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
+import net.mullvad.mullvadvpn.lib.ui.component.toAnnotatedString
 
 @Preview
 @Composable

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

@@ -24,10 +24,10 @@ import androidx.core.text.HtmlCompat
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.button.PrimaryButton
 import net.mullvad.mullvadvpn.compose.component.drawVerticalScrollbar
-import net.mullvad.mullvadvpn.lib.shared.compose.toAnnotatedString
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.Dimens
 import net.mullvad.mullvadvpn.lib.theme.color.AlphaScrollbar
+import net.mullvad.mullvadvpn.lib.ui.component.toAnnotatedString
 
 @Preview
 @Composable

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

@@ -56,11 +56,11 @@ import net.mullvad.mullvadvpn.compose.component.NavigateBackIconButton
 import net.mullvad.mullvadvpn.compose.component.ScaffoldWithLargeTopBarAndButton
 import net.mullvad.mullvadvpn.compose.transitions.SlideInFromRightTransition
 import net.mullvad.mullvadvpn.lib.common.util.openVpnSettings
-import net.mullvad.mullvadvpn.lib.shared.compose.toAnnotatedString
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.Dimens
 import net.mullvad.mullvadvpn.lib.theme.color.AlphaInvisible
 import net.mullvad.mullvadvpn.lib.theme.color.AlphaVisible
+import net.mullvad.mullvadvpn.lib.ui.component.toAnnotatedString
 import net.mullvad.mullvadvpn.service.constant.IS_PLAY_BUILD
 import net.mullvad.mullvadvpn.util.appendHideNavOnPlayBuild
 

android/lib/tv/build.gradle.kts

@@ -36,11 +36,11 @@ dependencies {
     implementation(libs.androidx.activity.compose)
     implementation(libs.compose.material3)
     implementation(libs.compose.ui)
-    implementation(projects.lib.component)
     implementation(projects.lib.model)
     implementation(projects.lib.resource)
     implementation(projects.lib.shared)
     implementation(projects.lib.theme)
+    implementation(projects.lib.ui.component)
 
     // UI tooling
     implementation(libs.compose.ui.tooling.preview)

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

@@ -9,9 +9,9 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import net.mullvad.mullvadvpn.lib.model.InAppNotification
-import net.mullvad.mullvadvpn.lib.shared.compose.AnimatedNotificationBanner
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.Dimens
+import net.mullvad.mullvadvpn.lib.ui.component.AnimatedNotificationBanner
 
 @Preview
 @Composable

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

@@ -5,7 +5,7 @@ plugins {
 }
 
 android {
-    namespace = "net.mullvad.mullvadvpn.lib.shared.compose"
+    namespace = "net.mullvad.mullvadvpn.lib.ui.component"
     compileSdk = Versions.compileSdkVersion
     buildToolsVersion = Versions.buildToolsVersion
 

android/lib/component/src/main/AndroidManifest.xml android/lib/ui/component/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
-package net.mullvad.mullvadvpn.lib.shared.compose
+package net.mullvad.mullvadvpn.lib.ui.component
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.animateContentSize
@@ -27,11 +27,11 @@ import androidx.constraintlayout.compose.ConstraintLayout
 import androidx.constraintlayout.compose.Dimension
 import net.mullvad.mullvadvpn.lib.model.InAppNotification
 import net.mullvad.mullvadvpn.lib.model.StatusLevel
-import net.mullvad.mullvadvpn.lib.shared.compose.test.NOTIFICATION_BANNER
-import net.mullvad.mullvadvpn.lib.shared.compose.test.NOTIFICATION_BANNER_ACTION
-import net.mullvad.mullvadvpn.lib.shared.compose.test.NOTIFICATION_BANNER_TEXT_ACTION
 import net.mullvad.mullvadvpn.lib.theme.Dimens
 import net.mullvad.mullvadvpn.lib.theme.color.warning
+import net.mullvad.mullvadvpn.lib.ui.component.test.NOTIFICATION_BANNER
+import net.mullvad.mullvadvpn.lib.ui.component.test.NOTIFICATION_BANNER_ACTION
+import net.mullvad.mullvadvpn.lib.ui.component.test.NOTIFICATION_BANNER_TEXT_ACTION
 
 @Composable
 fun AnimatedNotificationBanner(

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

@@ -1,4 +1,4 @@
-package net.mullvad.mullvadvpn.lib.shared.compose
+package net.mullvad.mullvadvpn.lib.ui.component
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.OpenInNew

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,4 +1,4 @@
-package net.mullvad.mullvadvpn.lib.shared.compose
+package net.mullvad.mullvadvpn.lib.ui.component
 
 /*
  * Code snippet taken from:

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,4 +1,4 @@
-package net.mullvad.mullvadvpn.lib.shared.compose
+package net.mullvad.mullvadvpn.lib.ui.component
 
 import android.content.res.Resources
 import java.time.Duration

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,4 +1,4 @@
-package net.mullvad.mullvadvpn.lib.shared.compose
+package net.mullvad.mullvadvpn.lib.ui.component
 
 import android.graphics.Typeface
 import android.text.Spanned

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,4 +1,4 @@
-package net.mullvad.mullvadvpn.lib.shared.compose.test
+package net.mullvad.mullvadvpn.lib.ui.component.test
 
 // ConnectScreen - Notification banner
 const val NOTIFICATION_BANNER = "notification_banner"

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

@@ -16,7 +16,6 @@ include(
     ":lib:billing",
     ":lib:common",
     ":lib:common-test",
-    ":lib:component",
     ":lib:daemon-grpc",
     ":lib:endpoint",
     ":lib:map",
@@ -27,6 +26,8 @@ include(
     ":lib:talpid",
     ":lib:theme",
     ":lib:tv",
+    ":lib:ui",
+    ":lib:ui:component",
 )
 
 include(":test", ":test:arch", ":test:common", ":test:e2e", ":test:mockapi")