Skip to content

Commit a702a9a

Browse files
shub39shub39
committed
🔧 chore: applied spotless
Signed-off-by: shub39 <cptnshubham39@gmail.com>
1 parent f899d41 commit a702a9a

9 files changed

Lines changed: 47 additions & 30 deletions

File tree

‎shared/src/commonMain/composeResources/drawable/nav_arrow_back.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<!--
2+
~ Copyright (C) 2026 The Android Open Source Project
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+
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
17+
18+
<path android:fillColor="#e3e3e3" android:pathData="m368,543 l157,157q19,19 19,45t-19,45q-19,18 -45,18t-45,-19L171,525q-9,-9 -14,-21t-5,-24q0,-12 5,-24t14,-21l265,-265q19,-19 44.5,-19t44.5,19q19,19 19,45t-19,45L368,417h403q26,0 44.5,18.5T834,480q0,26 -18.5,44.5T771,543L368,543Z"/>
19+
20+
</vector>

‎shared/src/commonMain/kotlin/com/shub39/grit/core/habits/presentation/ui/component/CalendarCommon.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ import androidx.compose.ui.Modifier
3333
import androidx.compose.ui.draw.clip
3434
import androidx.compose.ui.text.TextStyle
3535
import androidx.compose.ui.unit.Dp
36-
import androidx.compose.ui.unit.TextUnit
3736
import androidx.compose.ui.unit.dp
38-
import androidx.compose.ui.unit.sp
3937
import com.kizitonwose.calendar.core.CalendarDay
4038
import com.kizitonwose.calendar.core.CalendarMonth
4139
import com.kizitonwose.calendar.core.DayPosition

‎shared/src/commonMain/kotlin/com/shub39/grit/core/habits/presentation/ui/sections/AnalyticsPage.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ import androidx.compose.foundation.shape.CircleShape
3737
import androidx.compose.foundation.shape.RoundedCornerShape
3838
import androidx.compose.material3.ButtonShapes
3939
import androidx.compose.material3.FilledIconButton
40+
import androidx.compose.material3.FilledTonalIconButton
4041
import androidx.compose.material3.Icon
41-
import androidx.compose.material3.IconButton
4242
import androidx.compose.material3.IconButtonShapes
4343
import androidx.compose.material3.MaterialShapes
4444
import androidx.compose.material3.MaterialTheme
@@ -142,9 +142,9 @@ fun AnalyticsPage(
142142
TopAppBarDefaults.windowInsets
143143
},
144144
navigationIcon = {
145-
IconButton(onClick = onNavigateBack) {
145+
FilledTonalIconButton(onClick = onNavigateBack) {
146146
Icon(
147-
imageVector = vectorResource(Res.drawable.arrow_back),
147+
imageVector = vectorResource(Res.drawable.nav_arrow_back),
148148
contentDescription = "Navigate Back",
149149
)
150150
}

‎shared/src/commonMain/kotlin/com/shub39/grit/core/habits/presentation/ui/sections/Calendar.kt‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import androidx.compose.foundation.layout.WindowInsets
2626
import androidx.compose.foundation.layout.fillMaxSize
2727
import androidx.compose.foundation.layout.padding
2828
import androidx.compose.material3.ButtonGroupDefaults
29+
import androidx.compose.material3.FilledTonalIconButton
2930
import androidx.compose.material3.Icon
30-
import androidx.compose.material3.IconButton
3131
import androidx.compose.material3.MaterialTheme
3232
import androidx.compose.material3.Text
3333
import androidx.compose.material3.ToggleButton
@@ -62,9 +62,9 @@ import com.shub39.grit.core.habits.presentation.ui.sections.CalendarType.Compani
6262
import com.shub39.grit.core.theme.flexFontEmphasis
6363
import com.shub39.grit.core.theme.flexFontRounded
6464
import grit.shared.generated.resources.Res
65-
import grit.shared.generated.resources.arrow_back
6665
import grit.shared.generated.resources.calendar
6766
import grit.shared.generated.resources.monthly
67+
import grit.shared.generated.resources.nav_arrow_back
6868
import grit.shared.generated.resources.yearly
6969
import kotlinx.datetime.DayOfWeek
7070
import kotlinx.datetime.LocalDate
@@ -112,9 +112,9 @@ fun Calendar(
112112
Text(text = stringResource(Res.string.calendar), fontFamily = flexFontEmphasis())
113113
},
114114
navigationIcon = {
115-
IconButton(onClick = onNavigateBack) {
115+
FilledTonalIconButton(onClick = onNavigateBack) {
116116
Icon(
117-
imageVector = vectorResource(Res.drawable.arrow_back),
117+
imageVector = vectorResource(Res.drawable.nav_arrow_back),
118118
contentDescription = "Navigate Back",
119119
)
120120
}
@@ -187,7 +187,7 @@ fun Calendar(
187187
}
188188
},
189189
monthHeader = { calendarMonth ->
190-
if (calendarMonth.yearMonth <= today.yearMonth){
190+
if (calendarMonth.yearMonth <= today.yearMonth) {
191191
CalendarMonthHeader(
192192
calendarMonth = calendarMonth,
193193
style = MaterialTheme.typography.labelMedium,
@@ -204,9 +204,8 @@ fun Calendar(
204204
edgeWeeks = edgeWeeks,
205205
onDateClick = { onDateClick(currentHabit.habit, it) },
206206
height = 20.dp,
207-
style = MaterialTheme.typography.labelSmall.copy(
208-
fontSize = 8.sp
209-
),
207+
style =
208+
MaterialTheme.typography.labelSmall.copy(fontSize = 8.sp),
210209
)
211210
}
212211
},

‎shared/src/commonMain/kotlin/com/shub39/grit/core/habits/presentation/ui/sections/OverallAnalytics.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import androidx.compose.foundation.layout.fillMaxSize
2424
import androidx.compose.foundation.layout.widthIn
2525
import androidx.compose.foundation.lazy.staggeredgrid.LazyVerticalStaggeredGrid
2626
import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells
27+
import androidx.compose.material3.FilledTonalIconButton
2728
import androidx.compose.material3.Icon
28-
import androidx.compose.material3.IconButton
29-
import androidx.compose.material3.MediumFlexibleTopAppBar
3029
import androidx.compose.material3.Text
30+
import androidx.compose.material3.TopAppBar
3131
import androidx.compose.material3.TopAppBarDefaults
3232
import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
3333
import androidx.compose.runtime.Composable
@@ -73,7 +73,7 @@ fun OverallAnalytics(
7373

7474
val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior()
7575
Column(modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection).fillMaxSize()) {
76-
MediumFlexibleTopAppBar(
76+
TopAppBar(
7777
scrollBehavior = scrollBehavior,
7878
colors =
7979
TopAppBarDefaults.topAppBarColors(
@@ -94,9 +94,9 @@ fun OverallAnalytics(
9494
},
9595
navigationIcon = {
9696
if (showNavigateBack) {
97-
IconButton(onClick = onNavigateBack) {
97+
FilledTonalIconButton(onClick = onNavigateBack) {
9898
Icon(
99-
imageVector = vectorResource(Res.drawable.arrow_back),
99+
imageVector = vectorResource(Res.drawable.nav_arrow_back),
100100
contentDescription = "Navigate Back",
101101
)
102102
}

‎shared/src/commonMain/kotlin/com/shub39/grit/core/settings/presentation/ui/section/About.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import androidx.compose.foundation.lazy.LazyListScope
3535
import androidx.compose.material3.Card
3636
import androidx.compose.material3.FilledTonalIconButton
3737
import androidx.compose.material3.Icon
38-
import androidx.compose.material3.IconButton
3938
import androidx.compose.material3.IconButtonDefaults
4039
import androidx.compose.material3.ListItem
4140
import androidx.compose.material3.MaterialShapes
@@ -90,9 +89,9 @@ fun About(versionName: String, onNavigateBack: () -> Unit, modifier: Modifier =
9089
Text(text = stringResource(Res.string.about), fontFamily = flexFontEmphasis())
9190
},
9291
navigationIcon = {
93-
IconButton(onClick = onNavigateBack) {
92+
FilledTonalIconButton(onClick = onNavigateBack) {
9493
Icon(
95-
painter = painterResource(Res.drawable.arrow_back),
94+
imageVector = vectorResource(Res.drawable.nav_arrow_back),
9695
contentDescription = "Navigate Back",
9796
)
9897
}

‎shared/src/commonMain/kotlin/com/shub39/grit/core/settings/presentation/ui/section/BackupPage.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import androidx.compose.foundation.layout.size
2828
import androidx.compose.foundation.lazy.LazyColumn
2929
import androidx.compose.material3.Button
3030
import androidx.compose.material3.CircularProgressIndicator
31+
import androidx.compose.material3.FilledTonalIconButton
3132
import androidx.compose.material3.Icon
32-
import androidx.compose.material3.IconButton
3333
import androidx.compose.material3.ListItem
3434
import androidx.compose.material3.MaterialTheme
3535
import androidx.compose.material3.MediumFlexibleTopAppBar
@@ -80,9 +80,9 @@ fun BackupPage(
8080
Text(text = stringResource(Res.string.backup), fontFamily = flexFontEmphasis())
8181
},
8282
navigationIcon = {
83-
IconButton(onClick = onNavigateBack) {
83+
FilledTonalIconButton(onClick = onNavigateBack) {
8484
Icon(
85-
imageVector = vectorResource(Res.drawable.arrow_back),
85+
imageVector = vectorResource(Res.drawable.nav_arrow_back),
8686
contentDescription = "Navigate Back",
8787
)
8888
}

‎shared/src/commonMain/kotlin/com/shub39/grit/core/settings/presentation/ui/section/Changelog.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import androidx.compose.foundation.layout.fillMaxSize
2323
import androidx.compose.foundation.layout.height
2424
import androidx.compose.foundation.lazy.LazyColumn
2525
import androidx.compose.foundation.lazy.itemsIndexed
26+
import androidx.compose.material3.FilledTonalIconButton
2627
import androidx.compose.material3.Icon
27-
import androidx.compose.material3.IconButton
2828
import androidx.compose.material3.ListItem
2929
import androidx.compose.material3.MaterialTheme
3030
import androidx.compose.material3.MediumFlexibleTopAppBar
@@ -49,8 +49,8 @@ import com.shub39.grit.core.theme.GritTheme
4949
import com.shub39.grit.core.theme.flexFontEmphasis
5050
import com.shub39.grit.core.theme.flexFontRounded
5151
import grit.shared.generated.resources.*
52-
import org.jetbrains.compose.resources.painterResource
5352
import org.jetbrains.compose.resources.stringResource
53+
import org.jetbrains.compose.resources.vectorResource
5454

5555
@Composable
5656
fun Changelog(modifier: Modifier = Modifier, changelog: Changelog, onNavigateBack: () -> Unit) {
@@ -67,9 +67,9 @@ fun Changelog(modifier: Modifier = Modifier, changelog: Changelog, onNavigateBac
6767
)
6868
},
6969
navigationIcon = {
70-
IconButton(onClick = onNavigateBack) {
70+
FilledTonalIconButton(onClick = onNavigateBack) {
7171
Icon(
72-
painter = painterResource(Res.drawable.arrow_back),
72+
imageVector = vectorResource(Res.drawable.nav_arrow_back),
7373
contentDescription = "Navigate Back",
7474
)
7575
}

‎shared/src/commonMain/kotlin/com/shub39/grit/core/settings/presentation/ui/section/LookAndFeelPage.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import androidx.compose.foundation.layout.padding
3030
import androidx.compose.foundation.lazy.LazyColumn
3131
import androidx.compose.material3.Button
3232
import androidx.compose.material3.ButtonGroupDefaults
33+
import androidx.compose.material3.FilledTonalIconButton
3334
import androidx.compose.material3.Icon
3435
import androidx.compose.material3.IconButton
3536
import androidx.compose.material3.IconButtonDefaults
@@ -105,9 +106,9 @@ fun LookAndFeelPage(
105106
)
106107
},
107108
navigationIcon = {
108-
IconButton(onClick = onNavigateBack) {
109+
FilledTonalIconButton(onClick = onNavigateBack) {
109110
Icon(
110-
imageVector = vectorResource(Res.drawable.arrow_back),
111+
imageVector = vectorResource(Res.drawable.nav_arrow_back),
111112
contentDescription = "Navigate Back",
112113
)
113114
}

0 commit comments

Comments
 (0)