Skip to content

Commit 059f4b6

Browse files
committed
Rectifying dimension changes
1 parent b4a4031 commit 059f4b6

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

app/src/main/java/org/thoughtcrime/securesms/home/startconversation/home/StartConversation.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ internal fun StartConversationScreen(
7474
text = annotatedStringResource(newMessageTitleTxt),
7575
textStyle = LocalType.current.xl,
7676
iconRes = R.drawable.ic_message_square,
77+
iconSize = LocalDimensions.current.iconMedium2,
7778
modifier = Modifier.qaTag(R.string.AccessibilityId_messageNew),
7879
onClick = {
7980
navigateTo(StartConversationDestination.NewMessage)
@@ -89,6 +90,7 @@ internal fun StartConversationScreen(
8990
text = annotatedStringResource(R.string.groupCreate),
9091
textStyle = LocalType.current.xl,
9192
iconRes = R.drawable.ic_users_group_custom,
93+
iconSize = LocalDimensions.current.iconMedium2,
9294
modifier = Modifier.qaTag(R.string.AccessibilityId_groupCreate),
9395
onClick = {
9496
navigateTo(StartConversationDestination.CreateGroup)
@@ -104,6 +106,7 @@ internal fun StartConversationScreen(
104106
text = annotatedStringResource(R.string.communityJoin),
105107
textStyle = LocalType.current.xl,
106108
iconRes = R.drawable.ic_globe,
109+
iconSize = LocalDimensions.current.iconMedium2,
107110
modifier = Modifier.qaTag(R.string.AccessibilityId_communityJoin),
108111
onClick = {
109112
navigateTo(StartConversationDestination.JoinCommunity)
@@ -119,6 +122,7 @@ internal fun StartConversationScreen(
119122
text = annotatedStringResource(R.string.sessionInviteAFriend),
120123
textStyle = LocalType.current.xl,
121124
iconRes = R.drawable.ic_user_round_plus,
125+
iconSize = LocalDimensions.current.iconMedium2,
122126
modifier = Modifier.qaTag(R.string.AccessibilityId_sessionInviteAFriendButton),
123127
onClick = {
124128
navigateTo(StartConversationDestination.InviteFriend)

app/src/main/java/org/thoughtcrime/securesms/preferences/prosettings/ProSettingsHomeScreen.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ fun ProStats(
254254
verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.smallSpacing)
255255
){
256256
Row(
257+
verticalAlignment = Alignment.CenterVertically,
257258
horizontalArrangement = Arrangement.spacedBy(LocalDimensions.current.xsSpacing)
258259
) {
259260
// groups updated
@@ -281,6 +282,7 @@ fun ProStats(
281282
}
282283

283284
Row(
285+
verticalAlignment = Alignment.CenterVertically,
284286
horizontalArrangement = Arrangement.spacedBy(LocalDimensions.current.xsSpacing)
285287
) {
286288
// Pro Badges
@@ -324,7 +326,7 @@ fun ProStatItem(
324326
Image(
325327
painter = painterResource(id = icon),
326328
contentDescription = null,
327-
modifier = Modifier.size(LocalDimensions.current.iconRowItem),
329+
modifier = Modifier.size(LocalDimensions.current.iconMedium2),
328330
colorFilter = ColorFilter.tint(LocalColors.current.accent)
329331
)
330332

app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ fun ItemButton(
264264
modifier: Modifier = Modifier,
265265
textStyle: TextStyle = LocalType.current.h8,
266266
iconTint: Color? = null,
267-
iconSize: Dp = LocalDimensions.current.iconRowItem,
267+
iconSize: Dp = LocalDimensions.current.iconMedium,
268268
subtitle: String? = null,
269269
@StringRes subtitleQaTag: Int? = null,
270270
enabled: Boolean = true,
@@ -1058,7 +1058,7 @@ fun IconActionRowItem(
10581058
textStyle: TextStyle = LocalType.current.h8,
10591059
subtitleStyle: TextStyle = LocalType.current.small,
10601060
iconColor: Color = LocalColors.current.text,
1061-
iconSize: Dp = LocalDimensions.current.iconRowItem,
1061+
iconSize: Dp = LocalDimensions.current.iconMedium,
10621062
minHeight: Dp = LocalDimensions.current.minItemButtonHeight,
10631063
paddingValues: PaddingValues = PaddingValues(horizontal = LocalDimensions.current.smallSpacing),
10641064
){

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ data class Dimensions(
3232
val iconSmall: Dp = 20.dp,
3333
val iconMedium: Dp = 24.dp,
3434
val iconMediumAvatar: Dp = 26.dp,
35-
val iconRowItem: Dp = 24.dp,
35+
val iconMedium2: Dp = 32.dp,
3636
val iconLargeAvatar: Dp = 36.dp,
3737
val iconLarge: Dp = 46.dp,
3838
val iconXLarge: Dp = 60.dp,

0 commit comments

Comments
 (0)