diff --git a/appcompose/src/androidTest/java/com/readrops/app/compose/FeedColorsTest.kt b/appcompose/src/androidTest/java/com/readrops/app/compose/FeedColorsTest.kt index 8271e781..137675f9 100644 --- a/appcompose/src/androidTest/java/com/readrops/app/compose/FeedColorsTest.kt +++ b/appcompose/src/androidTest/java/com/readrops/app/compose/FeedColorsTest.kt @@ -4,7 +4,7 @@ import android.content.Context import androidx.test.core.app.ApplicationProvider import com.readrops.api.apiModule import com.readrops.api.utils.ApiUtils -import com.readrops.app.compose.utils.FeedColors +import com.readrops.app.compose.util.FeedColors import kotlinx.coroutines.runBlocking import okhttp3.mockwebserver.MockResponse import okhttp3.mockwebserver.MockWebServer 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 1a8769fa..03c0df30 100644 --- a/appcompose/src/main/java/com/readrops/app/compose/MainActivity.kt +++ b/appcompose/src/main/java/com/readrops/app/compose/MainActivity.kt @@ -10,7 +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 com.readrops.app.compose.util.theme.ReadropsTheme import org.koin.androidx.viewmodel.ext.android.getViewModel class MainActivity : ComponentActivity() { diff --git a/appcompose/src/main/java/com/readrops/app/compose/repositories/LocalRSSRepository.kt b/appcompose/src/main/java/com/readrops/app/compose/repositories/LocalRSSRepository.kt index ac2409e6..9fb3d66e 100644 --- a/appcompose/src/main/java/com/readrops/app/compose/repositories/LocalRSSRepository.kt +++ b/appcompose/src/main/java/com/readrops/app/compose/repositories/LocalRSSRepository.kt @@ -4,7 +4,7 @@ import com.readrops.api.localfeed.LocalRSSDataSource import com.readrops.api.services.SyncResult import com.readrops.api.utils.ApiUtils import com.readrops.api.utils.HtmlParser -import com.readrops.app.compose.utils.FeedColors +import com.readrops.app.compose.util.FeedColors import com.readrops.db.Database import com.readrops.db.entities.Feed import com.readrops.db.entities.Item diff --git a/appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineItem.kt b/appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineItem.kt index 6aa03fa7..2608420e 100644 --- a/appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineItem.kt +++ b/appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineItem.kt @@ -30,9 +30,9 @@ import androidx.compose.ui.unit.dp import coil.compose.AsyncImage import com.readrops.api.utils.DateUtils import com.readrops.app.compose.R -import com.readrops.app.compose.utils.theme.ShortSpacer -import com.readrops.app.compose.utils.theme.VeryShortSpacer -import com.readrops.app.compose.utils.theme.spacing +import com.readrops.app.compose.util.theme.ShortSpacer +import com.readrops.app.compose.util.theme.VeryShortSpacer +import com.readrops.app.compose.util.theme.spacing import com.readrops.db.pojo.ItemWithFeed @Composable diff --git a/appcompose/src/main/java/com/readrops/app/compose/utils/FeedColors.kt b/appcompose/src/main/java/com/readrops/app/compose/util/FeedColors.kt similarity index 97% rename from appcompose/src/main/java/com/readrops/app/compose/utils/FeedColors.kt rename to appcompose/src/main/java/com/readrops/app/compose/util/FeedColors.kt index 3f2fc6af..f487ddc8 100644 --- a/appcompose/src/main/java/com/readrops/app/compose/utils/FeedColors.kt +++ b/appcompose/src/main/java/com/readrops/app/compose/util/FeedColors.kt @@ -1,4 +1,4 @@ -package com.readrops.app.compose.utils +package com.readrops.app.compose.util import android.content.Context import android.graphics.drawable.BitmapDrawable diff --git a/appcompose/src/main/java/com/readrops/app/compose/utils/theme/Color.kt b/appcompose/src/main/java/com/readrops/app/compose/util/theme/Color.kt similarity index 98% rename from appcompose/src/main/java/com/readrops/app/compose/utils/theme/Color.kt rename to appcompose/src/main/java/com/readrops/app/compose/util/theme/Color.kt index 196fef21..6b21d590 100644 --- a/appcompose/src/main/java/com/readrops/app/compose/utils/theme/Color.kt +++ b/appcompose/src/main/java/com/readrops/app/compose/util/theme/Color.kt @@ -1,4 +1,4 @@ -package com.readrops.app.compose.utils.theme +package com.readrops.app.compose.util.theme import androidx.compose.ui.graphics.Color diff --git a/appcompose/src/main/java/com/readrops/app/compose/utils/theme/Spacing.kt b/appcompose/src/main/java/com/readrops/app/compose/util/theme/Spacing.kt similarity index 94% rename from appcompose/src/main/java/com/readrops/app/compose/utils/theme/Spacing.kt rename to appcompose/src/main/java/com/readrops/app/compose/util/theme/Spacing.kt index cdcf12f2..2d1045ce 100644 --- a/appcompose/src/main/java/com/readrops/app/compose/utils/theme/Spacing.kt +++ b/appcompose/src/main/java/com/readrops/app/compose/util/theme/Spacing.kt @@ -1,4 +1,4 @@ -package com.readrops.app.compose.utils.theme +package com.readrops.app.compose.util.theme import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.size diff --git a/appcompose/src/main/java/com/readrops/app/compose/utils/theme/Theme.kt b/appcompose/src/main/java/com/readrops/app/compose/util/theme/Theme.kt similarity index 98% rename from appcompose/src/main/java/com/readrops/app/compose/utils/theme/Theme.kt rename to appcompose/src/main/java/com/readrops/app/compose/util/theme/Theme.kt index d06d61c7..fa076746 100644 --- a/appcompose/src/main/java/com/readrops/app/compose/utils/theme/Theme.kt +++ b/appcompose/src/main/java/com/readrops/app/compose/util/theme/Theme.kt @@ -1,4 +1,4 @@ -package com.readrops.app.compose.utils.theme +package com.readrops.app.compose.util.theme import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme