Skip to content

Commit 975f463

Browse files
SuperDragonXDSuperDragonXD
committed
Minor UI tweaks
1 parent 15ef5c3 commit 975f463

File tree

6 files changed

+47
-36
lines changed

6 files changed

+47
-36
lines changed

‎app/src/main/kotlin/app/lawnchair/lawnicons/ui/components/home/IconPreviewGrid.kt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ import androidx.compose.foundation.layout.statusBarsPadding
2424
import androidx.compose.foundation.layout.width
2525
import androidx.compose.foundation.layout.widthIn
2626
import androidx.compose.foundation.lazy.grid.GridCells
27-
import androidx.compose.foundation.lazy.grid.GridItemSpan
28-
import androidx.compose.foundation.lazy.grid.LazyGridItemScope
27+
import androidx.compose.foundation.lazy.grid.LazyGridScope
2928
import androidx.compose.foundation.lazy.grid.LazyGridState
3029
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
3130
import androidx.compose.foundation.lazy.grid.items
@@ -96,7 +95,7 @@ fun IconPreviewGrid(
9695
contentPadding: IconPreviewGridPadding = IconPreviewGridPadding.Defaults,
9796
isIconPicker: Boolean = false,
9897
gridState: LazyGridState = rememberLazyGridState(),
99-
otherContent: @Composable (LazyGridItemScope.() -> Unit) = {},
98+
otherContent: (LazyGridScope.() -> Unit) = {},
10099
) {
101100
val indexOfFirstItem by remember { derivedStateOf { gridState.firstVisibleItemIndex } }
102101
val letter = iconInfo[indexOfFirstItem].label[0].uppercase()
@@ -120,11 +119,7 @@ fun IconPreviewGrid(
120119
),
121120
state = gridState,
122121
) {
123-
item(
124-
span = { GridItemSpan(maxLineSpan) },
125-
) {
126-
otherContent()
127-
}
122+
otherContent()
128123
items(
129124
items = iconInfo,
130125
contentType = { "icon_preview" },
@@ -241,6 +236,7 @@ fun AppBarListItem(modifier: Modifier = Modifier) {
241236
contentDescription = stringResource(id = R.string.app_name),
242237
modifier = Modifier
243238
.size(36.dp)
239+
.clip(CircleShape)
244240
.combinedClickable(
245241
onClick = {},
246242
onLongClick = {

‎app/src/main/kotlin/app/lawnchair/lawnicons/ui/components/home/NewIconsCard.kt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import androidx.compose.animation.AnimatedVisibility
2020
import androidx.compose.foundation.clickable
2121
import androidx.compose.foundation.layout.Row
2222
import androidx.compose.foundation.layout.Spacer
23+
import androidx.compose.foundation.layout.fillMaxWidth
2324
import androidx.compose.foundation.layout.padding
2425
import androidx.compose.foundation.layout.width
2526
import androidx.compose.material.icons.Icons
@@ -38,7 +39,6 @@ import androidx.compose.ui.unit.dp
3839
import app.lawnchair.lawnicons.BuildConfig
3940
import app.lawnchair.lawnicons.R
4041
import app.lawnchair.lawnicons.repository.preferenceManager
41-
import app.lawnchair.lawnicons.ui.components.core.Card
4242
import app.lawnchair.lawnicons.ui.theme.LawniconsTheme
4343
import app.lawnchair.lawnicons.ui.util.PreviewLawnicons
4444

@@ -67,8 +67,13 @@ fun NewIconsCard(
6767
modifier: Modifier = Modifier,
6868
) {
6969
AnimatedVisibility(visible) {
70-
Card(
71-
modifier = modifier,
70+
Surface(
71+
color = MaterialTheme.colorScheme.surfaceContainer,
72+
shape = MaterialTheme.shapes.extraLarge,
73+
modifier = modifier
74+
.padding(horizontal = 8.dp)
75+
.padding(bottom = 12.dp)
76+
.fillMaxWidth(),
7277
) {
7378
Row(
7479
verticalAlignment = Alignment.CenterVertically,

‎app/src/main/kotlin/app/lawnchair/lawnicons/ui/destination/About.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
1111
import androidx.compose.foundation.layout.padding
1212
import androidx.compose.foundation.layout.size
1313
import androidx.compose.foundation.lazy.LazyColumn
14+
import androidx.compose.foundation.shape.CircleShape
1415
import androidx.compose.material.icons.Icons
1516
import androidx.compose.material.icons.rounded.Star
1617
import androidx.compose.material3.Icon
@@ -19,6 +20,7 @@ import androidx.compose.material3.Text
1920
import androidx.compose.runtime.Composable
2021
import androidx.compose.ui.Alignment
2122
import androidx.compose.ui.Modifier
23+
import androidx.compose.ui.draw.clip
2224
import androidx.compose.ui.graphics.asImageBitmap
2325
import androidx.compose.ui.platform.LocalContext
2426
import androidx.compose.ui.platform.LocalInspectionMode
@@ -103,7 +105,9 @@ private fun About(
103105
Image(
104106
bitmap = context.appIcon().asImageBitmap(),
105107
contentDescription = stringResource(id = R.string.app_name),
106-
modifier = Modifier.size(72.dp),
108+
modifier = Modifier
109+
.size(72.dp)
110+
.clip(CircleShape),
107111
)
108112
}
109113
Text(

‎app/src/main/kotlin/app/lawnchair/lawnicons/ui/destination/Home.kt

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import androidx.compose.foundation.ExperimentalFoundationApi
66
import androidx.compose.foundation.layout.Arrangement
77
import androidx.compose.foundation.layout.Column
88
import androidx.compose.foundation.layout.fillMaxSize
9+
import androidx.compose.foundation.lazy.grid.GridItemSpan
910
import androidx.compose.foundation.lazy.grid.rememberLazyGridState
1011
import androidx.compose.material3.CircularProgressIndicator
1112
import androidx.compose.material3.Scaffold
@@ -145,11 +146,17 @@ private fun Home(
145146
isIconPicker = isIconPicker,
146147
gridState = lazyGridState,
147148
) {
148-
Column {
149-
if (!isExpandedScreen) {
149+
if (!isExpandedScreen) {
150+
item(
151+
span = { GridItemSpan(maxLineSpan) },
152+
) {
150153
AppBarListItem()
151154
}
152-
if (newIconsInfoModel.iconCount != 0) {
155+
}
156+
if (newIconsInfoModel.iconCount != 0) {
157+
item(
158+
span = { GridItemSpan(maxLineSpan) },
159+
) {
153160
NewIconsCard(onNavigateToNewIcons)
154161
}
155162
}

‎app/src/main/kotlin/app/lawnchair/lawnicons/util/ContextExtensions.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@ import android.content.Context
44
import android.graphics.Bitmap
55
import androidx.core.graphics.drawable.toBitmap
66

7-
fun Context.appIcon(): Bitmap = packageManager.getApplicationIcon(packageName).toBitmap()
7+
fun Context.appIcon(): Bitmap = packageManager
8+
.getApplicationIcon(packageName)
9+
.toBitmap()

‎app/src/main/res/drawable/new_releases.xml

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
1-
<!--
2-
~ Copyright 2024 Lawnchair Launcher
3-
~
4-
~ Licensed under the Apache License, Version 2.0 (the "License");
5-
~ you may not use this file except in compliance with the License.
6-
~ You may obtain a copy of the License at
7-
~
8-
~ http://www.apache.org/licenses/LICENSE-2.0
9-
~
10-
~ Unless required by applicable law or agreed to in writing, software
11-
~ distributed under the License is distributed on an "AS IS" BASIS,
12-
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
~ See the License for the specific language governing permissions and
14-
~ limitations under the License.
15-
-->
16-
17-
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
18-
19-
<path android:fillColor="@android:color/white" android:pathData="M438,508L380,451Q369,440 352.5,440Q336,440 324,452Q313,463 313,480Q313,497 324,508L410,594Q422,606 438,606Q454,606 466,594L636,424Q648,412 647.5,396Q647,380 636,368Q624,356 607.5,355.5Q591,355 579,367L438,508ZM326,870L268,772L158,748Q143,745 134,732.5Q125,720 127,705L138,592L63,506Q53,495 53,480Q53,465 63,454L138,368L127,255Q125,240 134,227.5Q143,215 158,212L268,188L326,90Q334,77 348,72.5Q362,68 376,74L480,118L584,74Q598,68 612,72.5Q626,77 634,90L692,188L802,212Q817,215 826,227.5Q835,240 833,255L822,368L897,454Q907,465 907,480Q907,495 897,506L822,592L833,705Q835,720 826,732.5Q817,745 802,748L692,772L634,870Q626,883 612,887.5Q598,892 584,886L480,842L376,886Q362,892 348,887.5Q334,883 326,870ZM378,798L480,754L584,798L640,702L750,676L740,564L814,480L740,394L750,282L640,258L582,162L480,206L376,162L320,258L210,282L220,394L146,480L220,564L210,678L320,702L378,798ZM480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480Z"/>
20-
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="M12,7.5a1,1 0,0 1,1 1v4a1,1 0,1 1,-2 0v-4a1,1 0,0 1,1 -1Z"
8+
android:fillColor="#000"
9+
android:fillType="evenOdd"/>
10+
<path
11+
android:pathData="M14.67,2.092a1,1 0,0 1,1.292 0.419l1.378,2.456 2.914,0.484a1,1 0,0 1,0.825 1.134l-0.406,2.718 2.026,1.982a1,1 0,0 1,0 1.43l-2.026,1.982 0.406,2.717a1,1 0,0 1,-0.825 1.135l-2.914,0.483 -1.378,2.457a1,1 0,0 1,-1.292 0.418L12,20.672l-2.67,1.235a1,1 0,0 1,-1.292 -0.418L6.66,19.032l-2.914,-0.483a1,1 0,0 1,-0.825 -1.135l0.406,-2.717 -2.026,-1.982a1,1 0,0 1,0 -1.43l2.026,-1.982 -0.406,-2.718a1,1 0,0 1,0.825 -1.134l2.914,-0.484 1.378,-2.456a1,1 0,0 1,1.292 -0.419L12,3.328l2.67,-1.236ZM14.67,4.296 L12.42,5.337a1,1 0,0 1,-0.84 0L9.33,4.296 8.17,6.364a1,1 0,0 1,-0.709 0.498l-2.417,0.401 0.337,2.25a1,1 0,0 1,-0.29 0.862L3.43,12l1.66,1.624a1,1 0,0 1,0.29 0.863l-0.337,2.25 2.417,0.401a1,1 0,0 1,0.709 0.498l1.16,2.068 2.25,-1.041a1,1 0,0 1,0.84 0l2.25,1.04 1.16,-2.067a1,1 0,0 1,0.708 -0.498l2.418,-0.401 -0.337,-2.25a1,1 0,0 1,0.29 -0.863L20.57,12l-1.66,-1.625a1,1 0,0 1,-0.29 -0.862l0.337,-2.25 -2.418,-0.401a1,1 0,0 1,-0.708 -0.498l-1.16,-2.068Z"
12+
android:fillColor="#000"
13+
android:fillType="evenOdd"/>
14+
<path
15+
android:pathData="M11,16a1,1 0,1 1,2 0,1 1,0 0,1 -2,0Z"
16+
android:fillColor="#000"
17+
android:fillType="evenOdd"/>
2118
</vector>

0 commit comments

Comments
 (0)