Skip to content

Commit 7c7bd85

Browse files
committed
Update icon size
1 parent d430101 commit 7c7bd85

3 files changed

Lines changed: 23 additions & 11 deletions

File tree

app/src/main/java/com/paulcoding/hviewer/ui/component/HIcon.kt

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.paulcoding.hviewer.ui.component
22

3+
import androidx.compose.foundation.layout.Column
34
import androidx.compose.foundation.layout.size
45
import androidx.compose.material.icons.Icons
56
import androidx.compose.material.icons.automirrored.outlined.ArrowBack
@@ -52,7 +53,6 @@ fun HFavoriteIcon(
5253
fun HIcon(
5354
imageVector: ImageVector = Icons.Outlined.Settings,
5455
description: String = "",
55-
size: Int = 24,
5656
modifier: Modifier = Modifier,
5757
colors: IconButtonColors = IconButtonDefaults.filledTonalIconButtonColors(),
5858
rounded: Boolean = false,
@@ -65,15 +65,21 @@ fun HIcon(
6565
enabled = enabled,
6666
colors = colors
6767
) {
68-
Icon(imageVector, description, modifier = Modifier.size(size.dp))
68+
Icon(
69+
imageVector, description,
70+
modifier = modifier,
71+
)
6972
}
7073
else
7174
IconButton(
7275
onClick = { onClick() },
7376
enabled = enabled,
7477
colors = colors.copy(containerColor = Color.Transparent)
7578
) {
76-
Icon(imageVector, description, modifier = modifier.size(size.dp))
79+
Icon(
80+
imageVector, description,
81+
modifier = modifier,
82+
)
7783
}
7884
}
7985

@@ -93,5 +99,8 @@ private fun PreviewHNotFavoriteIcon() {
9399
@Preview
94100
@Composable
95101
private fun PreviewHIcon() {
96-
HIcon {}
102+
Column {
103+
HIcon(onClick = {})
104+
HIcon(modifier = Modifier.size(128.dp), imageVector = Icons.Outlined.Settings, onClick = {})
105+
}
97106
}

app/src/main/java/com/paulcoding/hviewer/ui/page/sites/composable/BottomRowActions.kt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.paulcoding.hviewer.ui.page.sites.composable
22

33
import androidx.compose.foundation.layout.Arrangement
44
import androidx.compose.foundation.layout.Row
5+
import androidx.compose.foundation.layout.size
56
import androidx.compose.material.icons.Icons
67
import androidx.compose.material.icons.outlined.ClearAll
78
import androidx.compose.material.icons.outlined.Close
@@ -10,6 +11,7 @@ import androidx.compose.material3.IconButtonDefaults
1011
import androidx.compose.material3.MaterialTheme
1112
import androidx.compose.runtime.Composable
1213
import androidx.compose.ui.Alignment
14+
import androidx.compose.ui.Modifier
1315
import androidx.compose.ui.tooling.preview.Preview
1416
import androidx.compose.ui.unit.dp
1517
import com.paulcoding.hviewer.model.PostItem
@@ -28,7 +30,7 @@ internal fun BottomRowActions(
2830
onClickInfo?.let {
2931
HIcon(
3032
Icons.Outlined.Info,
31-
size = 32,
33+
modifier = Modifier.size(32.dp),
3234
rounded = true
3335
) {
3436
onClickInfo()
@@ -43,17 +45,17 @@ internal fun BottomRowActions(
4345

4446
onClickRemove?.let {
4547
HIcon(
46-
Icons.Outlined.Close,
47-
size = 32,
48+
imageVector = Icons.Outlined.Close,
49+
modifier = Modifier.size(32.dp),
4850
rounded = true,
4951
onClick = onClickRemove
5052
)
5153
}
5254

5355
onClickRemoveAll?.let {
5456
HIcon(
55-
Icons.Outlined.ClearAll,
56-
size = 32,
57+
imageVector = Icons.Outlined.ClearAll,
58+
modifier = Modifier.size(32.dp),
5759
rounded = true,
5860
colors = IconButtonDefaults.filledTonalIconButtonColors(
5961
containerColor = MaterialTheme.colorScheme.errorContainer,

app/src/main/java/com/paulcoding/hviewer/ui/page/sites/post/ImageList.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
1313
import androidx.compose.foundation.layout.navigationBarsPadding
1414
import androidx.compose.foundation.layout.offset
1515
import androidx.compose.foundation.layout.padding
16+
import androidx.compose.foundation.layout.size
1617
import androidx.compose.foundation.layout.statusBarsPadding
1718
import androidx.compose.foundation.layout.systemBarsPadding
1819
import androidx.compose.foundation.lazy.LazyColumn
@@ -208,8 +209,8 @@ private fun ImageList(
208209
bottomRowActions()
209210
Spacer(modifier = Modifier.weight(1f))
210211
HIcon(
211-
Icons.Outlined.KeyboardArrowUp,
212-
size = 32,
212+
imageVector = Icons.Outlined.KeyboardArrowUp,
213+
modifier = Modifier.size(32.dp),
213214
rounded = true
214215
) {
215216
scope.launch {

0 commit comments

Comments
 (0)