diff options
| author | David Göransson <david.goransson@mullvad.net> | 2025-06-23 16:35:58 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2025-07-04 15:47:25 +0200 |
| commit | b6b01dbc66f8a903476b86d2b068e56cfe05e248 (patch) | |
| tree | 57037ccb231bb39ade8e7cb65e09202a05ad2c08 /android | |
| parent | 3e5795cbab6866fcd3eafee58d1790fc9e7f1829 (diff) | |
| download | mullvadvpn-b6b01dbc66f8a903476b86d2b068e56cfe05e248.tar.xz mullvadvpn-b6b01dbc66f8a903476b86d2b068e56cfe05e248.zip | |
Create new design system module
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/build.gradle.kts | 1 | ||||
| -rw-r--r-- | android/lib/ui/component/build.gradle.kts | 2 | ||||
| -rw-r--r-- | android/lib/ui/designsystem/build.gradle.kts | 43 | ||||
| -rw-r--r-- | android/lib/ui/designsystem/src/main/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | android/settings.gradle.kts | 3 |
5 files changed, 51 insertions, 2 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 32ed53060b..24172279fc 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -348,6 +348,7 @@ dependencies { implementation(projects.lib.shared) implementation(projects.lib.talpid) implementation(projects.lib.tv) + implementation(projects.lib.ui.designsystem) implementation(projects.lib.ui.component) implementation(projects.lib.ui.tag) implementation(projects.tile) diff --git a/android/lib/ui/component/build.gradle.kts b/android/lib/ui/component/build.gradle.kts index 8ca10e29c5..37ba3e1230 100644 --- a/android/lib/ui/component/build.gradle.kts +++ b/android/lib/ui/component/build.gradle.kts @@ -36,6 +36,7 @@ android { dependencies { implementation(projects.lib.ui.tag) + implementation(libs.compose.material3) implementation(libs.compose.ui) implementation(libs.compose.constrainlayout) @@ -43,7 +44,6 @@ dependencies { implementation(libs.compose.icons.extended) implementation(libs.androidx.ktx) implementation(projects.lib.resource) - implementation(projects.lib.shared) implementation(projects.lib.theme) implementation(projects.lib.model) } diff --git a/android/lib/ui/designsystem/build.gradle.kts b/android/lib/ui/designsystem/build.gradle.kts new file mode 100644 index 0000000000..efc9d0108b --- /dev/null +++ b/android/lib/ui/designsystem/build.gradle.kts @@ -0,0 +1,43 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.compose) +} + +android { + namespace = "net.mullvad.mullvadvpn.lib.ui.designsystem" + compileSdk = libs.versions.compile.sdk.get().toInt() + buildToolsVersion = libs.versions.build.tools.get() + + defaultConfig { minSdk = libs.versions.min.sdk.get().toInt() } + + buildFeatures { compose = true } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = libs.versions.jvm.target.get() + allWarningsAsErrors = true + } + + lint { + lintConfig = file("${rootProject.projectDir}/config/lint.xml") + abortOnError = true + warningsAsErrors = true + } +} + +dependencies { + implementation(projects.lib.theme) + implementation(projects.lib.model) + implementation(projects.lib.ui.tag) + + implementation(libs.compose.ui) + implementation(libs.compose.ui.tooling) + implementation(libs.compose.ui.tooling.preview) + implementation(libs.compose.material3) + implementation(libs.compose.icons.extended) +} diff --git a/android/lib/ui/designsystem/src/main/AndroidManifest.xml b/android/lib/ui/designsystem/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..8bdb7e14b3 --- /dev/null +++ b/android/lib/ui/designsystem/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android"> + +</manifest> diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts index 686df96851..0d3df97602 100644 --- a/android/settings.gradle.kts +++ b/android/settings.gradle.kts @@ -29,7 +29,9 @@ include( ":lib:talpid", ":lib:theme", ":lib:tv", + ":lib:ui:designsystem", ":lib:ui:component", + ":lib:ui:tag" ) include( ":test", @@ -38,4 +40,3 @@ include( ":test:e2e", ":test:mockapi" ) -include(":lib:ui:tag") |