From 8a04fad0d77530de6cbcf061b33679a3ecfd5712 Mon Sep 17 00:00:00 2001 From: Shinokuni Date: Mon, 14 Aug 2023 18:17:36 +0200 Subject: [PATCH] Add subpackage theme --- .../src/main/java/com/readrops/app/compose/MainActivity.kt | 1 + .../java/com/readrops/app/compose/{ => utils/theme}/Color.kt | 2 +- .../java/com/readrops/app/compose/utils/{ => theme}/Spacing.kt | 2 +- .../java/com/readrops/app/compose/{ => utils/theme}/Theme.kt | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) rename appcompose/src/main/java/com/readrops/app/compose/{ => utils/theme}/Color.kt (98%) rename appcompose/src/main/java/com/readrops/app/compose/utils/{ => theme}/Spacing.kt (94%) rename appcompose/src/main/java/com/readrops/app/compose/{ => utils/theme}/Theme.kt (98%) diff --git a/appcompose/src/main/java/com/readrops/app/compose/MainActivity.kt b/appcompose/src/main/java/com/readrops/app/compose/MainActivity.kt index 8547e9c6..1a8769fa 100644 --- a/appcompose/src/main/java/com/readrops/app/compose/MainActivity.kt +++ b/appcompose/src/main/java/com/readrops/app/compose/MainActivity.kt @@ -10,6 +10,7 @@ import cafe.adriel.voyager.transitions.FadeTransition import com.readrops.app.compose.account.selection.AccountSelectionScreen import com.readrops.app.compose.account.selection.AccountSelectionViewModel import com.readrops.app.compose.home.HomeScreen +import com.readrops.app.compose.utils.theme.ReadropsTheme import org.koin.androidx.viewmodel.ext.android.getViewModel class MainActivity : ComponentActivity() { diff --git a/appcompose/src/main/java/com/readrops/app/compose/Color.kt b/appcompose/src/main/java/com/readrops/app/compose/utils/theme/Color.kt similarity index 98% rename from appcompose/src/main/java/com/readrops/app/compose/Color.kt rename to appcompose/src/main/java/com/readrops/app/compose/utils/theme/Color.kt index 11500362..196fef21 100644 --- a/appcompose/src/main/java/com/readrops/app/compose/Color.kt +++ b/appcompose/src/main/java/com/readrops/app/compose/utils/theme/Color.kt @@ -1,4 +1,4 @@ -package com.readrops.app.compose +package com.readrops.app.compose.utils.theme import androidx.compose.ui.graphics.Color diff --git a/appcompose/src/main/java/com/readrops/app/compose/utils/Spacing.kt b/appcompose/src/main/java/com/readrops/app/compose/utils/theme/Spacing.kt similarity index 94% rename from appcompose/src/main/java/com/readrops/app/compose/utils/Spacing.kt rename to appcompose/src/main/java/com/readrops/app/compose/utils/theme/Spacing.kt index 675e558a..cdcf12f2 100644 --- a/appcompose/src/main/java/com/readrops/app/compose/utils/Spacing.kt +++ b/appcompose/src/main/java/com/readrops/app/compose/utils/theme/Spacing.kt @@ -1,4 +1,4 @@ -package com.readrops.app.compose.utils +package com.readrops.app.compose.utils.theme import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.size diff --git a/appcompose/src/main/java/com/readrops/app/compose/Theme.kt b/appcompose/src/main/java/com/readrops/app/compose/utils/theme/Theme.kt similarity index 98% rename from appcompose/src/main/java/com/readrops/app/compose/Theme.kt rename to appcompose/src/main/java/com/readrops/app/compose/utils/theme/Theme.kt index 7e2086fa..d06d61c7 100644 --- a/appcompose/src/main/java/com/readrops/app/compose/Theme.kt +++ b/appcompose/src/main/java/com/readrops/app/compose/utils/theme/Theme.kt @@ -1,4 +1,4 @@ -package com.readrops.app.compose +package com.readrops.app.compose.utils.theme import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme