From 63a8d67abfb71be1eb9086cc1af1c38245500c94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolf=20Montwe=CC=81?= Date: Tue, 14 Mar 2023 13:06:29 +0100 Subject: [PATCH] Change `core:ui:compose:demo` module to `app-ui-catalog --- app-ui-catalog/README.md | 7 +++++++ .../demo => app-ui-catalog}/build.gradle.kts | 4 ++-- .../demo => app-ui-catalog}/proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 2 +- .../java/app/k9mail/ui/catalog}/MainActivity.kt | 3 +-- .../main/java/app/k9mail/ui/catalog}/MainView.kt | 2 +- .../res/drawable-v24/ic_launcher_foreground.xml | 0 .../main/res/drawable/ic_launcher_foreground.xml | 0 .../src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin .../src/main/res/values/colors.xml | 0 app-ui-catalog/src/main/res/values/strings.xml | 3 +++ app-ui-catalog/src/main/res/values/themes.xml | 4 ++++ .../ui/compose/demo/src/main/res/values/strings.xml | 3 --- core/ui/compose/demo/src/main/res/values/themes.xml | 4 ---- settings.gradle.kts | 5 ++++- 26 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 app-ui-catalog/README.md rename {core/ui/compose/demo => app-ui-catalog}/build.gradle.kts (76%) rename {core/ui/compose/demo => app-ui-catalog}/proguard-rules.pro (100%) rename {core/ui/compose/demo => app-ui-catalog}/src/main/AndroidManifest.xml (93%) rename {core/ui/compose/demo/src/main/java/app/k9mail/core/ui/compose/demo => app-ui-catalog/src/main/java/app/k9mail/ui/catalog}/MainActivity.kt (88%) rename {core/ui/compose/demo/src/main/java/app/k9mail/core/ui/compose/demo => app-ui-catalog/src/main/java/app/k9mail/ui/catalog}/MainView.kt (98%) rename {core/ui/compose/demo => app-ui-catalog}/src/main/res/drawable-v24/ic_launcher_foreground.xml (100%) rename {core/ui/compose/demo => app-ui-catalog}/src/main/res/drawable/ic_launcher_foreground.xml (100%) rename {core/ui/compose/demo => app-ui-catalog}/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename {core/ui/compose/demo => app-ui-catalog}/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename {core/ui/compose/demo => app-ui-catalog}/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename {core/ui/compose/demo => app-ui-catalog}/src/main/res/mipmap-hdpi/ic_launcher_round.png (100%) rename {core/ui/compose/demo => app-ui-catalog}/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename {core/ui/compose/demo => app-ui-catalog}/src/main/res/mipmap-mdpi/ic_launcher_round.png (100%) rename {core/ui/compose/demo => app-ui-catalog}/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename {core/ui/compose/demo => app-ui-catalog}/src/main/res/mipmap-xhdpi/ic_launcher_round.png (100%) rename {core/ui/compose/demo => app-ui-catalog}/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {core/ui/compose/demo => app-ui-catalog}/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (100%) rename {core/ui/compose/demo => app-ui-catalog}/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {core/ui/compose/demo => app-ui-catalog}/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (100%) rename {core/ui/compose/demo => app-ui-catalog}/src/main/res/values/colors.xml (100%) create mode 100644 app-ui-catalog/src/main/res/values/strings.xml create mode 100644 app-ui-catalog/src/main/res/values/themes.xml delete mode 100644 core/ui/compose/demo/src/main/res/values/strings.xml delete mode 100644 core/ui/compose/demo/src/main/res/values/themes.xml diff --git a/app-ui-catalog/README.md b/app-ui-catalog/README.md new file mode 100644 index 000000000..1d5eac25e --- /dev/null +++ b/app-ui-catalog/README.md @@ -0,0 +1,7 @@ +# Thunderbird UI Catalog + +Uses [`:core:ui:compose:designsystem`](../core/ui/compose/designsystem/README.md) + +This is a catalog of all the components in the Thunderbird design system. + +It is a work in progress, and will be updated as the design system evolves. diff --git a/core/ui/compose/demo/build.gradle.kts b/app-ui-catalog/build.gradle.kts similarity index 76% rename from core/ui/compose/demo/build.gradle.kts rename to app-ui-catalog/build.gradle.kts index 0cb67e1e9..20a04627f 100644 --- a/core/ui/compose/demo/build.gradle.kts +++ b/app-ui-catalog/build.gradle.kts @@ -3,10 +3,10 @@ plugins { } android { - namespace = "app.k9mail.core.ui.compose.demo" + namespace = "app.k9mail.ui.catalog" defaultConfig { - applicationId = "app.k9mail.core.ui.compose.demo" + applicationId = "app.k9mail.ui.catalog" versionCode = 1 versionName = "1.0" } diff --git a/core/ui/compose/demo/proguard-rules.pro b/app-ui-catalog/proguard-rules.pro similarity index 100% rename from core/ui/compose/demo/proguard-rules.pro rename to app-ui-catalog/proguard-rules.pro diff --git a/core/ui/compose/demo/src/main/AndroidManifest.xml b/app-ui-catalog/src/main/AndroidManifest.xml similarity index 93% rename from core/ui/compose/demo/src/main/AndroidManifest.xml rename to app-ui-catalog/src/main/AndroidManifest.xml index e5489c868..cf0ab8413 100644 --- a/core/ui/compose/demo/src/main/AndroidManifest.xml +++ b/app-ui-catalog/src/main/AndroidManifest.xml @@ -7,7 +7,7 @@ android:roundIcon="@mipmap/ic_launcher_round" android:label="@string/app_name" android:supportsRtl="true" - android:theme="@style/Theme.K9" + android:theme="@style/Theme.Thunderbird" > + Thunderbird Catalog + diff --git a/app-ui-catalog/src/main/res/values/themes.xml b/app-ui-catalog/src/main/res/values/themes.xml new file mode 100644 index 000000000..fa7f5df74 --- /dev/null +++ b/app-ui-catalog/src/main/res/values/themes.xml @@ -0,0 +1,4 @@ + + +