common:uiモジュールを作成しui.themeを移動

kwmt · Jan 7, 2024 · e613e88 · e613e88
1 parent 6c0c8e0
commit e613e88
Show file tree

Hide file tree

Showing 31 changed files with 75 additions and 135 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,7 +13,8 @@ android {
 }
 
 dependencies {
-    implementation project(":camerax")
+    implementation(projects.common.ui)
+    implementation(projects.camerax)
     implementation(projects.legacy)
     implementation(projects.slide)
     implementation(libs.androidx.compose.foundation)

diff --git a/app/src/main/java/net/kwmt27/jetpackcomposeplayground/MainActivity.kt b/app/src/main/java/net/kwmt27/jetpackcomposeplayground/MainActivity.kt
@@ -14,9 +14,9 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.navigation.compose.rememberNavController
-import net.kwmt27.jetpackcomposeplayground.legacy.ui.theme.JetpackComposePlayGroundTheme
-import net.kwmt27.jetpackcomposeplayground.legacy.utils.LocalSysUiController
-import net.kwmt27.jetpackcomposeplayground.legacy.utils.SystemUiController
+import net.kwmt27.jetpackcomposeplayground.common.ui.theme.JetpackComposePlayGroundTheme
+import net.kwmt27.jetpackcomposeplayground.common.ui.utils.LocalSysUiController
+import net.kwmt27.jetpackcomposeplayground.common.ui.utils.SystemUiController
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {

diff --git a/...rc/main/java/net/kwmt27/jetpackcomposeplayground/coroutine/CancellationExceptionSample.kt b/...rc/main/java/net/kwmt27/jetpackcomposeplayground/coroutine/CancellationExceptionSample.kt
@@ -26,8 +26,8 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
+import net.kwmt27.jetpackcomposeplayground.common.ui.theme.JetpackComposePlayGroundTheme
 import net.kwmt27.jetpackcomposeplayground.coroutine.CancellationExceptionSampleViewModel.State
-import net.kwmt27.jetpackcomposeplayground.legacy.ui.theme.JetpackComposePlayGroundTheme
 
 @Composable
 fun CancellationExceptionSample(

diff --git a/camerax/build.gradle b/camerax/build.gradle
@@ -13,6 +13,7 @@ android {
 }
 
 dependencies {
+    implementation(projects.common.ui)
     implementation(libs.androidx.compose.foundation)
     implementation(libs.androidx.compose.material)
     debugImplementation(libs.androidx.compose.ui.tooling)

diff --git a/camerax/src/main/java/net/kwmt27/camerax/CameraXActivity.kt b/camerax/src/main/java/net/kwmt27/camerax/CameraXActivity.kt
@@ -10,7 +10,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import net.kwmt27.camerax.ui.theme.JetpackComposePlayGroundTheme
+import net.kwmt27.jetpackcomposeplayground.common.ui.theme.JetpackComposePlayGroundTheme
 
 class CameraXActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {

diff --git a/camerax/src/main/java/net/kwmt27/camerax/ui/theme/Color.kt b/camerax/src/main/java/net/kwmt27/camerax/ui/theme/Color.kt
diff --git a/camerax/src/main/java/net/kwmt27/camerax/ui/theme/Theme.kt b/camerax/src/main/java/net/kwmt27/camerax/ui/theme/Theme.kt
diff --git a/camerax/src/main/java/net/kwmt27/camerax/ui/theme/Type.kt b/camerax/src/main/java/net/kwmt27/camerax/ui/theme/Type.kt
diff --git a/common/ui/.gitignore b/common/ui/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/common/ui/build.gradle.kts b/common/ui/build.gradle.kts
@@ -0,0 +1,21 @@
+plugins {
+    alias(libs.plugins.jetpackcomposeplayground.android.library)
+    alias(libs.plugins.jetpackcomposeplayground.android.library.compose)
+}
+android {
+    namespace = "net.kwmt27.jetpackcomposeplayground.common.ui"
+}
+
+dependencies {
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.google.material)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.test.junit)
+    androidTestImplementation(libs.espresso)
+
+    implementation(libs.androidx.compose.foundation)
+    implementation(libs.androidx.compose.material)
+    debugImplementation(libs.androidx.compose.ui.tooling)
+    implementation(libs.androidx.compose.ui.tooling.preview)
+}
diff --git a/common/ui/consumer-rules.pro b/common/ui/consumer-rules.pro
diff --git a/common/ui/proguard-rules.pro b/common/ui/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/common/ui/src/main/AndroidManifest.xml b/common/ui/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/...omposeplayground/legacy/ui/theme/Color.kt → ...omposeplayground/common/ui/theme/Color.kt b/...omposeplayground/legacy/ui/theme/Color.kt → ...omposeplayground/common/ui/theme/Color.kt
@@ -1,4 +1,4 @@
-package net.kwmt27.jetpackcomposeplayground.legacy.ui.theme
+package net.kwmt27.jetpackcomposeplayground.common.ui.theme
 
 import androidx.compose.ui.graphics.Color
 

diff --git a/...java/net/kwmt27/camerax/ui/theme/Shape.kt → ...omposeplayground/common/ui/theme/Shape.kt b/...java/net/kwmt27/camerax/ui/theme/Shape.kt → ...omposeplayground/common/ui/theme/Shape.kt
@@ -1,4 +1,4 @@
-package net.kwmt27.jetpackcomposeplayground.ui.theme
+package net.kwmt27.jetpackcomposeplayground.common.ui.theme
 
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Shapes

diff --git a/...omposeplayground/legacy/ui/theme/Theme.kt → ...omposeplayground/common/ui/theme/Theme.kt b/...omposeplayground/legacy/ui/theme/Theme.kt → ...omposeplayground/common/ui/theme/Theme.kt
@@ -1,4 +1,4 @@
-package net.kwmt27.jetpackcomposeplayground.legacy.ui.theme
+package net.kwmt27.jetpackcomposeplayground.common.ui.theme
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material.MaterialTheme
@@ -7,21 +7,19 @@ import androidx.compose.material.lightColors
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.ui.graphics.Color
-import net.kwmt27.jetpackcomposeplayground.legacy.utils.LocalSysUiController
+import net.kwmt27.jetpackcomposeplayground.common.ui.utils.LocalSysUiController
 
 private val DarkColorPalette = darkColors(
     primary = purple200,
     primaryVariant = purple700,
     secondary = teal200,
     background = Color(0xff121212),
 )
-
 private val LightColorPalette = lightColors(
     primary = purple500,
     primaryVariant = purple700,
     secondary = teal200,
     background = Color.White,
-
     /* Other default colors to override
 surface = Color.White,
 onPrimary = Color.White,

diff --git a/...composeplayground/legacy/ui/theme/Type.kt → ...composeplayground/common/ui/theme/Type.kt b/...composeplayground/legacy/ui/theme/Type.kt → ...composeplayground/common/ui/theme/Type.kt
@@ -1,4 +1,4 @@
-package net.kwmt27.jetpackcomposeplayground.legacy.ui.theme
+package net.kwmt27.jetpackcomposeplayground.common.ui.theme
 
 import androidx.compose.material.Typography
 import androidx.compose.ui.text.TextStyle

diff --git a/...omposeplayground/legacy/utils/SystemUi.kt → ...oseplayground/common/ui/utils/SystemUi.kt b/...omposeplayground/legacy/utils/SystemUi.kt → ...oseplayground/common/ui/utils/SystemUi.kt
@@ -1,4 +1,4 @@
-package net.kwmt27.jetpackcomposeplayground.legacy.utils
+package net.kwmt27.jetpackcomposeplayground.common.ui.utils
 
 import android.os.Build
 import android.view.View

diff --git a/legacy/build.gradle.kts b/legacy/build.gradle.kts
@@ -8,6 +8,7 @@ android {
 }
 
 dependencies {
+    implementation(projects.common.ui)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.google.material)

diff --git a/.../src/main/java/net/kwmt27/jetpackcomposeplayground/legacy/feature/box/BoxDashedBoarder.kt b/.../src/main/java/net/kwmt27/jetpackcomposeplayground/legacy/feature/box/BoxDashedBoarder.kt
@@ -17,7 +17,7 @@ import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import net.kwmt27.jetpackcomposeplayground.legacy.ui.theme.JetpackComposePlayGroundTheme
+import net.kwmt27.jetpackcomposeplayground.common.ui.theme.JetpackComposePlayGroundTheme
 
 @Composable
 fun BoxDashedBoarderSample() {

diff --git a/legacy/src/main/java/net/kwmt27/jetpackcomposeplayground/legacy/feature/list/Grid.kt b/legacy/src/main/java/net/kwmt27/jetpackcomposeplayground/legacy/feature/list/Grid.kt
@@ -13,7 +13,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import net.kwmt27.jetpackcomposeplayground.legacy.ui.theme.JetpackComposePlayGroundTheme
+import net.kwmt27.jetpackcomposeplayground.common.ui.theme.JetpackComposePlayGroundTheme
 
 @Composable
 fun VerticalGridSample() {

diff --git a/...y/src/main/java/net/kwmt27/jetpackcomposeplayground/legacy/feature/list/GridCustomItem.kt b/...y/src/main/java/net/kwmt27/jetpackcomposeplayground/legacy/feature/list/GridCustomItem.kt
@@ -14,7 +14,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import net.kwmt27.jetpackcomposeplayground.legacy.ui.theme.JetpackComposePlayGroundTheme
+import net.kwmt27.jetpackcomposeplayground.common.ui.theme.JetpackComposePlayGroundTheme
 
 @Composable
 fun GridCustomItem() {

diff --git a/legacy/src/main/java/net/kwmt27/jetpackcomposeplayground/legacy/feature/list/List.kt b/legacy/src/main/java/net/kwmt27/jetpackcomposeplayground/legacy/feature/list/List.kt
@@ -31,7 +31,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import net.kwmt27.jetpackcomposeplayground.legacy.ui.theme.JetpackComposePlayGroundTheme
+import net.kwmt27.jetpackcomposeplayground.common.ui.theme.JetpackComposePlayGroundTheme
 
 @Composable
 fun SampleVerticalList() {

diff --git a/...src/main/java/net/kwmt27/jetpackcomposeplayground/legacy/feature/list/OverlapImageList.kt b/...src/main/java/net/kwmt27/jetpackcomposeplayground/legacy/feature/list/OverlapImageList.kt
@@ -13,7 +13,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
-import net.kwmt27.jetpackcomposeplayground.legacy.ui.theme.JetpackComposePlayGroundTheme
+import net.kwmt27.jetpackcomposeplayground.common.ui.theme.JetpackComposePlayGroundTheme
 
 @Composable
 fun OverlapImageListSample() {

diff --git a/...wmt27/jetpackcomposeplayground/legacy/feature/list/instagram/InstagramSearchListLayout.kt b/...wmt27/jetpackcomposeplayground/legacy/feature/list/instagram/InstagramSearchListLayout.kt
@@ -27,7 +27,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import net.kwmt27.jetpackcomposeplayground.legacy.ui.theme.JetpackComposePlayGroundTheme
+import net.kwmt27.jetpackcomposeplayground.common.ui.theme.JetpackComposePlayGroundTheme
 
 private const val TAG = "InstagramSearchList"
 

diff --git a/...mt27/jetpackcomposeplayground/legacy/feature/list/instagram/InstagramSearchListLayout2.kt b/...mt27/jetpackcomposeplayground/legacy/feature/list/instagram/InstagramSearchListLayout2.kt
@@ -26,7 +26,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import net.kwmt27.jetpackcomposeplayground.legacy.ui.theme.JetpackComposePlayGroundTheme
+import net.kwmt27.jetpackcomposeplayground.common.ui.theme.JetpackComposePlayGroundTheme
 
 private const val TAG = "InstagramSearchList"
 

diff --git a/...mt27/jetpackcomposeplayground/legacy/feature/list/instagram/InstagramSearchListLayout3.kt b/...mt27/jetpackcomposeplayground/legacy/feature/list/instagram/InstagramSearchListLayout3.kt
@@ -26,7 +26,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import net.kwmt27.jetpackcomposeplayground.legacy.ui.theme.JetpackComposePlayGroundTheme
+import net.kwmt27.jetpackcomposeplayground.common.ui.theme.JetpackComposePlayGroundTheme
 
 private const val TAG = "InstagramSearchList"
 

diff --git a/...mt27/jetpackcomposeplayground/legacy/feature/list/instagram/InstagramSearchListLayout4.kt b/...mt27/jetpackcomposeplayground/legacy/feature/list/instagram/InstagramSearchListLayout4.kt
@@ -26,7 +26,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import net.kwmt27.jetpackcomposeplayground.legacy.ui.theme.JetpackComposePlayGroundTheme
+import net.kwmt27.jetpackcomposeplayground.common.ui.theme.JetpackComposePlayGroundTheme
 
 private const val TAG = "InstagramSearchList"
 

diff --git a/legacy/src/main/java/net/kwmt27/jetpackcomposeplayground/legacy/ui/theme/Shape.kt b/legacy/src/main/java/net/kwmt27/jetpackcomposeplayground/legacy/ui/theme/Shape.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -22,3 +22,5 @@ include(":app")
 include(":legacy")
 include(":camerax")
 include(":slide")
+include(":common:ui")
+