From 8d7a2df73d5b1ab14d6b131d349b14cdd747e288 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 10 Aug 2022 23:02:51 +0530 Subject: [PATCH] common: switch to Material3 `Divider` --- .../claw/android/ui/lists/DatabasePosts.kt | 2 +- .../claw/android/ui/lists/NetworkPosts.kt | 2 +- .../msfjarvis/claw/common/comments/Comments.kt | 2 +- .../msfjarvis/claw/common/posts/LobstersCard.kt | 2 +- .../dev/msfjarvis/claw/common/ui/Divider.kt | 15 --------------- 5 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 common/src/main/kotlin/dev/msfjarvis/claw/common/ui/Divider.kt diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/DatabasePosts.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/DatabasePosts.kt index bddb046c..ac77c63a 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/DatabasePosts.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/DatabasePosts.kt @@ -4,10 +4,10 @@ import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.items +import androidx.compose.material3.Divider import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import dev.msfjarvis.claw.common.posts.PostActions -import dev.msfjarvis.claw.common.ui.Divider import dev.msfjarvis.claw.common.ui.decorations.MonthHeader import dev.msfjarvis.claw.database.local.SavedPost import kotlinx.datetime.Month diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/NetworkPosts.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/NetworkPosts.kt index c876ba6f..7379a039 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/NetworkPosts.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/NetworkPosts.kt @@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyListState +import androidx.compose.material3.Divider import androidx.compose.material3.MaterialTheme import androidx.compose.material3.contentColorFor import androidx.compose.runtime.Composable @@ -16,7 +17,6 @@ import com.google.accompanist.swiperefresh.SwipeRefreshIndicator import com.google.accompanist.swiperefresh.rememberSwipeRefreshState import dev.msfjarvis.claw.common.posts.PostActions import dev.msfjarvis.claw.common.posts.toDbModel -import dev.msfjarvis.claw.common.ui.Divider import dev.msfjarvis.claw.database.local.SavedPost import dev.msfjarvis.claw.model.LobstersPost diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/Comments.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/Comments.kt index 7a297196..f7f0b9dd 100644 --- a/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/Comments.kt +++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/Comments.kt @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.material3.Divider import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.material3.Text @@ -18,7 +19,6 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import dev.msfjarvis.claw.common.NetworkState import dev.msfjarvis.claw.common.posts.PostActions -import dev.msfjarvis.claw.common.ui.Divider import dev.msfjarvis.claw.common.ui.NetworkError import dev.msfjarvis.claw.common.ui.ProgressBar import dev.msfjarvis.claw.model.LobstersPostDetails diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt index 7b71dd20..cea9923f 100644 --- a/common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt +++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt @@ -23,6 +23,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.Badge import androidx.compose.material3.BadgedBox +import androidx.compose.material3.Divider import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -40,7 +41,6 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import com.google.accompanist.flowlayout.FlowRow import dev.msfjarvis.claw.common.res.ClawIcons -import dev.msfjarvis.claw.common.ui.Divider import dev.msfjarvis.claw.common.ui.NetworkImage import dev.msfjarvis.claw.database.local.SavedPost diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/Divider.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/Divider.kt deleted file mode 100644 index c260c5ac..00000000 --- a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/Divider.kt +++ /dev/null @@ -1,15 +0,0 @@ -package dev.msfjarvis.claw.common.ui - -import androidx.compose.material3.MaterialTheme -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier - -@Composable -fun Divider(modifier: Modifier = Modifier) { - androidx.compose.material.Divider( - color = MaterialTheme.colorScheme.onBackground.copy(alpha = DividerAlpha), - modifier = modifier, - ) -} - -private const val DividerAlpha = 0.15f