Skip to content

Commit f9fbcad

Browse files
committed
Updated paddings and color values
1 parent 794a101 commit f9fbcad

File tree

3 files changed

+29
-25
lines changed

3 files changed

+29
-25
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ fun MediaFolderCell(
7575
Brush.verticalGradient(
7676
colorStops = arrayOf(
7777
0.0f to Color.Transparent,
78-
0.5f to Color.Black.copy(alpha = 0.5f),
79-
1.0f to Color.Black.copy(alpha = 0.7f)
78+
0.5f to Color.Black.copy(alpha = 0.8f),
79+
1.0f to Color.Black.copy(alpha = 0.9f)
8080
)
8181
)
8282
)
@@ -139,7 +139,7 @@ fun MediaPickerItemCell(
139139
.aspectRatio(1f)
140140
.border(
141141
width = LocalDimensions.current.borderStroke,
142-
color = LocalColors.current.borders.copy(alpha = 0.20f)
142+
color = LocalColors.current.borders
143143
)
144144
.combinedClickable(
145145
onClick = {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ private fun MediaPickerFolder(
102102
LazyVerticalGrid(
103103
columns = GridCells.Fixed(columns),
104104
modifier = Modifier
105+
.padding(LocalDimensions.current.tinySpacing)
105106
.fillMaxSize()
106107
.background(LocalColors.current.background),
107108
horizontalArrangement = Arrangement.spacedBy(LocalDimensions.current.tinySpacing),

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

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.mediasend.compose
22

33
import androidx.compose.foundation.background
44
import androidx.compose.foundation.layout.Arrangement
5+
import androidx.compose.foundation.layout.Box
56
import androidx.compose.foundation.layout.fillMaxSize
67
import androidx.compose.foundation.layout.padding
78
import androidx.compose.foundation.lazy.grid.GridCells
@@ -107,28 +108,30 @@ private fun MediaPickerItem(
107108
)
108109
},
109110
) { padding ->
110-
LazyVerticalGrid(
111-
columns = GridCells.Fixed(columns),
112-
modifier = Modifier
113-
.padding(padding)
114-
.fillMaxSize()
115-
.background(LocalColors.current.background),
116-
horizontalArrangement = Arrangement.spacedBy(LocalDimensions.current.tinySpacing),
117-
verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.tinySpacing)
118-
) {
119-
items(media, key = { it.uri }) { item ->
120-
val isSelected = selectedMedia.any { it.uri == item.uri }
121-
MediaPickerItemCell(
122-
media = item,
123-
isSelected = isSelected,
124-
selectedIndex = selectedMedia.indexOfFirst { it.uri == item.uri },
125-
isMultiSelect = isMultiSelect,
126-
canLongPress = canLongPress,
127-
showSelectionOn = isSelected,
128-
onMediaChosen = { onSinglePick(it) },
129-
onSelectionStarted = onStartMultiSelect,
130-
onSelectionChanged = onToggleSelection,
131-
)
111+
Box(modifier = Modifier.padding(padding)) {
112+
LazyVerticalGrid(
113+
columns = GridCells.Fixed(columns),
114+
modifier = Modifier
115+
.padding(LocalDimensions.current.tinySpacing)
116+
.fillMaxSize()
117+
.background(LocalColors.current.background),
118+
horizontalArrangement = Arrangement.spacedBy(LocalDimensions.current.tinySpacing),
119+
verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.tinySpacing)
120+
) {
121+
items(media, key = { it.uri }) { item ->
122+
val isSelected = selectedMedia.any { it.uri == item.uri }
123+
MediaPickerItemCell(
124+
media = item,
125+
isSelected = isSelected,
126+
selectedIndex = selectedMedia.indexOfFirst { it.uri == item.uri },
127+
isMultiSelect = isMultiSelect,
128+
canLongPress = canLongPress,
129+
showSelectionOn = isSelected,
130+
onMediaChosen = { onSinglePick(it) },
131+
onSelectionStarted = onStartMultiSelect,
132+
onSelectionChanged = onToggleSelection,
133+
)
134+
}
132135
}
133136
}
134137
}

0 commit comments

Comments
 (0)