Dimensions file and compose cleanups

Author: jbsession

app/src/main/java/org/thoughtcrime/securesms/mediasend/compose/Components.kt

@@ -32,20 +32,18 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.core.net.toUri
+import coil3.compose.AsyncImage
+import coil3.request.ImageRequest
 import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi
-import com.bumptech.glide.integration.compose.GlideImage
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.mediasend.Media
 import org.thoughtcrime.securesms.ui.theme.LocalColors
+import org.thoughtcrime.securesms.ui.theme.LocalDimensions
 import org.thoughtcrime.securesms.ui.theme.LocalType
 import org.thoughtcrime.securesms.util.MediaUtil
-import kotlin.collections.filterNot
-import androidx.core.net.toUri
-import coil3.compose.AsyncImage
-import coil3.request.ImageRequest
-import org.thoughtcrime.securesms.ui.theme.LocalDimensions
 
-@OptIn(ExperimentalGlideComposeApi::class)
 @Composable
 fun MediaFolderCell(
     title: String,
@@ -141,7 +139,7 @@ fun MediaPickerItemCell(
             .aspectRatio(1f)
             .border(
                 width = LocalDimensions.current.borderStroke,
-                color = Color.White.copy(alpha = 0.20f)
+                color = LocalColors.current.borders.copy(alpha = 0.20f)
             )
             .combinedClickable(
                 onClick = {
@@ -175,7 +173,7 @@ fun MediaPickerItemCell(
             Box(
                 modifier = Modifier
                     .align(Alignment.Center)
-                    .size(LocalDimensions.current.mediaPlayOverlay)
+                    .size(36.dp)
                     .clip(CircleShape)
                     .background(Color.White),
                 contentAlignment = Alignment.Center
@@ -207,7 +205,7 @@ fun MediaPickerItemCell(
                         .padding(LocalDimensions.current.xxsSpacing),
                     contentAlignment = Alignment.Center
                 ) {
-                    IndicatorOn(size = LocalDimensions.current.smallRadius)
+                    IndicatorOn()
 
                     Text(
                         text = (selectedIndex + 1).toString(),
@@ -223,15 +221,15 @@ fun MediaPickerItemCell(
                         .align(Alignment.TopEnd)
                         .padding(LocalDimensions.current.xxsSpacing)
                 ) {
-                    IndicatorOff(size = LocalDimensions.current.smallRadius)
+                    IndicatorOff()
                 }
             }
         }
     }
 }
 
 @Composable
-private fun IndicatorOff(size: Dp, modifier: Modifier = Modifier) {
+private fun IndicatorOff(modifier: Modifier = Modifier, size: Dp = 26.dp ) {
     Box(
         modifier = modifier
             .size(size)
@@ -245,7 +243,7 @@ private fun IndicatorOff(size: Dp, modifier: Modifier = Modifier) {
 }
 
 @Composable
-private fun IndicatorOn(size: Dp, modifier: Modifier = Modifier) {
+private fun IndicatorOn(modifier: Modifier = Modifier, size: Dp = 26.dp) {
     Box(
         modifier = modifier
             .size(size)

app/src/main/java/org/thoughtcrime/securesms/mediasend/compose/MediaPickerFolderScreen.kt

@@ -113,8 +113,8 @@ private fun MediaPickerFolder(
                 modifier = Modifier
                     .fillMaxSize()
                     .background(LocalColors.current.background),
-                horizontalArrangement = Arrangement.spacedBy(LocalDimensions.current.mediaItemGridSpacing),
-                verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.mediaItemGridSpacing)
+                horizontalArrangement = Arrangement.spacedBy(LocalDimensions.current.tinySpacing),
+                verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.tinySpacing)
             ) {
                 items(
                     items = folders,

app/src/main/java/org/thoughtcrime/securesms/mediasend/compose/MediaPickerItemScreen.kt

@@ -16,7 +16,6 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -81,7 +80,7 @@ private fun MediaPickerItem(
     isMultiSelect: Boolean = false
 ) {
 
-    val itemWidth = LocalDimensions.current.mediaPickerItemWidth
+    val itemWidth = 85.dp
     val screenWidth = LocalConfiguration.current.screenWidthDp.dp
     val columns = maxOf(1, (screenWidth / itemWidth).toInt())
 
@@ -114,8 +113,8 @@ private fun MediaPickerItem(
                 .padding(padding)
                 .fillMaxSize()
                 .background(LocalColors.current.background),
-            horizontalArrangement = Arrangement.spacedBy(LocalDimensions.current.mediaItemGridSpacing),
-            verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.mediaItemGridSpacing)
+            horizontalArrangement = Arrangement.spacedBy(LocalDimensions.current.tinySpacing),
+            verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.tinySpacing)
         ) {
             items(media, key = { it.uri }) { item ->
                 val isSelected = selectedMedia.any { it.uri == item.uri }

app/src/main/java/org/thoughtcrime/securesms/ui/theme/Dimensions.kt

@@ -7,6 +7,7 @@ import androidx.compose.ui.unit.dp
 val LocalDimensions = staticCompositionLocalOf { Dimensions() }
 
 data class Dimensions(
+    val tinySpacing : Dp = 2.dp,
     val xxxsSpacing: Dp = 4.dp,
     val xxsSpacing: Dp = 8.dp,
     val xsSpacing: Dp = 12.dp,
@@ -53,10 +54,4 @@ data class Dimensions(
     val maxContentSize: Dp = 520.dp,
     val minContentSizeMedium: Dp = 160.dp,
     val maxContentSizeMedium: Dp = 620.dp,
-
-    val mediaPickerItemWidth : Dp = 85.dp,
-    val mediaItemGridSpacing : Dp = 2.dp,
-    val mediaPlayOverlay : Dp = 36.dp,
-
-    val smallRadius : Dp = 26.dp
 )