Move more components to presentation-core module

2023-02-18 16:03:01 -05:00
parent e3cf863230
commit bfe143015a
59 changed files with 71 additions and 70 deletions
--- a/app/src/main/java/eu/kanade/presentation/components/ChangeCategoryDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/ChangeCategoryDialog.kt
@@ -23,9 +23,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import eu.kanade.core.prefs.CheckboxState
 import eu.kanade.presentation.category.visualName
-import eu.kanade.presentation.util.padding
 import eu.kanade.tachiyomi.R
 import tachiyomi.domain.category.model.Category
+import tachiyomi.presentation.core.components.material.padding

@Composable
 fun ChangeCategoryDialog(
--- a/app/src/main/java/eu/kanade/presentation/components/ChapterDownloadIndicator.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/ChapterDownloadIndicator.kt
@@ -35,6 +35,7 @@ import androidx.compose.ui.unit.dp
 import eu.kanade.presentation.util.secondaryItemAlpha
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.download.model.Download
+import tachiyomi.presentation.core.components.material.IconButtonTokens

 enum class ChapterDownloadAction {
    START,
--- a/app/src/main/java/eu/kanade/presentation/components/EmptyScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/EmptyScreen.kt
@@ -27,9 +27,9 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import eu.kanade.presentation.theme.TachiyomiTheme
 import eu.kanade.presentation.util.ThemePreviews
-import eu.kanade.presentation.util.padding
 import eu.kanade.presentation.util.secondaryItemAlpha
 import eu.kanade.tachiyomi.R
+import tachiyomi.presentation.core.components.material.padding
 import kotlin.random.Random

@Composable
--- a/app/src/main/java/eu/kanade/presentation/components/IconButton.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/IconButton.kt
@@ -1,12 +0,0 @@
-package eu.kanade.presentation.components
-
-import androidx.compose.ui.unit.dp
-
-/**
- * Exposing some internal tokens.
- *
- * @see androidx.compose.material3.tokens.IconButtonTokens
- */
-object IconButtonTokens {
-    val StateLayerSize = 40.0.dp
-}
--- a/app/src/main/java/eu/kanade/presentation/components/InfoScaffold.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/InfoScaffold.kt
@@ -28,9 +28,9 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
 import eu.kanade.presentation.theme.TachiyomiTheme
 import eu.kanade.presentation.util.ThemePreviews
-import eu.kanade.presentation.util.padding
 import eu.kanade.presentation.util.secondaryItemAlpha
 import tachiyomi.presentation.core.components.material.Scaffold
+import tachiyomi.presentation.core.components.material.padding

@Composable
 fun InfoScaffold(
--- a/app/src/main/java/eu/kanade/presentation/components/ListGroupHeader.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/ListGroupHeader.kt
@@ -6,7 +6,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
-import eu.kanade.presentation.util.padding
+import tachiyomi.presentation.core.components.material.padding

@Composable
 fun ListGroupHeader(
--- a/app/src/main/java/eu/kanade/presentation/components/LoadingScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/LoadingScreen.kt
@@ -1,18 +0,0 @@
-package eu.kanade.presentation.components
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-
-@Composable
-fun LoadingScreen(modifier: Modifier = Modifier) {
-    Box(
-        modifier = modifier.fillMaxSize(),
-        contentAlignment = Alignment.Center,
-    ) {
-        CircularProgressIndicator()
-    }
-}
--- a/app/src/main/java/eu/kanade/presentation/components/NavigationBar.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/NavigationBar.kt
@@ -1,48 +0,0 @@
-package eu.kanade.presentation.components
-
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.RowScope
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.windowInsetsPadding
-import androidx.compose.foundation.selection.selectableGroup
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.NavigationBarDefaults
-import androidx.compose.material3.contentColorFor
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-
-/**
- * M3 Navbar with no horizontal spacer
- *
- * @see [androidx.compose.material3.NavigationBar]
- */
-@Composable
-fun NavigationBar(
-    modifier: Modifier = Modifier,
-    containerColor: Color = NavigationBarDefaults.containerColor,
-    contentColor: Color = MaterialTheme.colorScheme.contentColorFor(containerColor),
-    tonalElevation: Dp = NavigationBarDefaults.Elevation,
-    windowInsets: WindowInsets = NavigationBarDefaults.windowInsets,
-    content: @Composable RowScope.() -> Unit,
-) {
-    androidx.compose.material3.Surface(
-        color = containerColor,
-        contentColor = contentColor,
-        tonalElevation = tonalElevation,
-        modifier = modifier,
-    ) {
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .windowInsetsPadding(windowInsets)
-                .height(80.dp)
-                .selectableGroup(),
-            content = content,
-        )
-    }
-}
--- a/app/src/main/java/eu/kanade/presentation/components/NavigationRail.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/NavigationRail.kt
@@ -1,61 +0,0 @@
-package eu.kanade.presentation.components
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ColumnScope
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.widthIn
-import androidx.compose.foundation.layout.windowInsetsPadding
-import androidx.compose.foundation.selection.selectableGroup
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.NavigationRailDefaults
-import androidx.compose.material3.contentColorFor
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.dp
-import eu.kanade.presentation.util.padding
-
-/**
- * Center-aligned M3 Navigation rail
- *
- * @see [androidx.compose.material3.NavigationRail]
- */
-@Composable
-fun NavigationRail(
-    modifier: Modifier = Modifier,
-    containerColor: Color = NavigationRailDefaults.ContainerColor,
-    contentColor: Color = contentColorFor(containerColor),
-    header: @Composable (ColumnScope.() -> Unit)? = null,
-    windowInsets: WindowInsets = NavigationRailDefaults.windowInsets,
-    content: @Composable ColumnScope.() -> Unit,
-) {
-    androidx.compose.material3.Surface(
-        color = containerColor,
-        contentColor = contentColor,
-        modifier = modifier,
-        tonalElevation = 3.dp,
-    ) {
-        Column(
-            Modifier
-                .fillMaxHeight()
-                .windowInsetsPadding(windowInsets)
-                .widthIn(min = 80.dp)
-                .padding(vertical = MaterialTheme.padding.tiny)
-                .selectableGroup(),
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.spacedBy(MaterialTheme.padding.tiny, alignment = Alignment.CenterVertically),
-        ) {
-            if (header != null) {
-                header()
-                Spacer(Modifier.height(MaterialTheme.padding.small))
-            }
-            content()
-        }
-    }
-}
--- a/app/src/main/java/eu/kanade/presentation/components/TwoPanelBox.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/TwoPanelBox.kt
@@ -1,46 +0,0 @@
-package eu.kanade.presentation.components
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxScope
-import androidx.compose.foundation.layout.BoxWithConstraints
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.asPaddingValues
-import androidx.compose.foundation.layout.calculateEndPadding
-import androidx.compose.foundation.layout.calculateStartPadding
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.width
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalLayoutDirection
-import androidx.compose.ui.unit.dp
-
-@Composable
-fun TwoPanelBox(
-    modifier: Modifier = Modifier,
-    contentWindowInsets: WindowInsets = WindowInsets(0),
-    startContent: @Composable BoxScope.() -> Unit,
-    endContent: @Composable BoxScope.() -> Unit,
-) {
-    val direction = LocalLayoutDirection.current
-    val padding = contentWindowInsets.asPaddingValues()
-    val startPadding = padding.calculateStartPadding(direction)
-    val endPadding = padding.calculateEndPadding(direction)
-    BoxWithConstraints(modifier = modifier.fillMaxSize()) {
-        val width = maxWidth - startPadding - endPadding
-        val firstWidth = (width / 2).coerceAtMost(450.dp)
-        val secondWidth = width - firstWidth
-        Box(
-            modifier = Modifier
-                .align(Alignment.TopStart)
-                .width(firstWidth + startPadding),
-            content = startContent,
-        )
-        Box(
-            modifier = Modifier
-                .align(Alignment.TopEnd)
-                .width(secondWidth + endPadding),
-            content = endContent,
-        )
-    }
-}
--- a/app/src/main/java/eu/kanade/presentation/components/WheelPicker.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/WheelPicker.kt
@@ -27,10 +27,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
-import eu.kanade.presentation.util.padding
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
+import tachiyomi.presentation.core.components.material.padding
 import java.text.DateFormatSymbols
 import java.time.LocalDate
 import kotlin.math.absoluteValue