diff --git a/.github/workflows/build-debug.yml b/.github/workflows/build-debug.yml index c0dbe850..3359f65a 100644 --- a/.github/workflows/build-debug.yml +++ b/.github/workflows/build-debug.yml @@ -36,3 +36,11 @@ jobs: path: | **/build/outputs/apk/*/*.apk **/build/outputs/aar/*.aar + + - name: Upload test theme + uses: actions/upload-artifact@v2 + with: + name: generated-test-theme.zip + path: | + playground/theme-builder/build/generated/theme-builder + playground/theme-builder/build/generated/theme-builder-res diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index af34c840..69368dd6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -30,7 +30,6 @@ kotlinPoet = "1.12.0" plugin-androidCacheFix = "3.0.1" plugin-gradleNexusPublish = "1.3.0" plugin-gradlePluginPublish = "1.2.1" -material = "1.11.0" [libraries] base-androidX-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidX-appcompat" } @@ -71,8 +70,6 @@ base-gradle-paparazzi = { module = "app.cash.paparazzi:paparazzi-gradle-plugin", base-gradle-spotless= { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "staticAnalysis-spotless" } base-gradle-cacheFix= { module = "org.gradle.android.cache-fix:org.gradle.android.cache-fix.gradle.plugin", version.ref = "plugin-androidCacheFix" } base-gradle-nexusPublish= { module = "io.github.gradle-nexus:publish-plugin", version.ref = "plugin-gradleNexusPublish" } -material = { group = "com.google.android.material", name = "material", version.ref = "material" } - [plugins] android-lib = { id = "com.android.library", version.ref = "global-gradle" } diff --git a/playground/theme-builder/build.gradle.kts b/playground/theme-builder/build.gradle.kts index 06601418..4f6f5bce 100644 --- a/playground/theme-builder/build.gradle.kts +++ b/playground/theme-builder/build.gradle.kts @@ -9,11 +9,13 @@ plugins { android { namespace = "com.sdds.playground.themebuilder" + resourcePrefix = "thmbldr" } configure { themeUrl.set("file://${projectDir.path}/new_theme_scheme.json") - target.set(ThemeBuilderTarget.COMPOSE.value) + target.set(ThemeBuilderTarget.ALL) + packageName.set("com.sdds.playground.themebuilder.tokens") } dependencies { diff --git a/playground/theme-builder/src/main/res/values/dimens.xml b/playground/theme-builder/src/main/res/values/dimens.xml deleted file mode 100644 index 3261aff6..00000000 --- a/playground/theme-builder/src/main/res/values/dimens.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/playground/theme-builder/src/main/res/values/styles.xml b/playground/theme-builder/src/main/res/values/styles.xml index a1cc563b..56a6268d 100644 --- a/playground/theme-builder/src/main/res/values/styles.xml +++ b/playground/theme-builder/src/main/res/values/styles.xml @@ -1,7 +1,5 @@ - + diff --git a/sdds-core/plugin_theme_builder/src/test/resources/typography-outputs/test-appearances-output.xml b/sdds-core/plugin_theme_builder/src/test/resources/typography-outputs/test-appearances-output.xml new file mode 100644 index 00000000..85342b3a --- /dev/null +++ b/sdds-core/plugin_theme_builder/src/test/resources/typography-outputs/test-appearances-output.xml @@ -0,0 +1,13 @@ + + + + diff --git a/sdds-core/plugin_theme_builder/src/test/resources/typography-outputs/test-appearances-small-output.xml b/sdds-core/plugin_theme_builder/src/test/resources/typography-outputs/test-appearances-small-output.xml new file mode 100644 index 00000000..1a9c5983 --- /dev/null +++ b/sdds-core/plugin_theme_builder/src/test/resources/typography-outputs/test-appearances-small-output.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/sdds-core/plugin_theme_builder/src/test/resources/typography-outputs/test-typography-output.xml b/sdds-core/plugin_theme_builder/src/test/resources/typography-outputs/test-typography-output.xml new file mode 100644 index 00000000..6b50e4ea --- /dev/null +++ b/sdds-core/plugin_theme_builder/src/test/resources/typography-outputs/test-typography-output.xml @@ -0,0 +1,8 @@ + + + +