Skip to content

Commit f697ef0

Browse files
machiav3llimachiav3lli
committed
Clean up
1 parent d7c4ee2 commit f697ef0

File tree

10 files changed

+6
-26
lines changed

10 files changed

+6
-26
lines changed

‎src/main/java/com/machiav3lli/backup/ui/compose/component/Recyclers.kt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.machiav3lli.backup.ui.compose.component
22

33
import androidx.compose.foundation.layout.Arrangement
44
import androidx.compose.foundation.layout.Box
5-
import androidx.compose.foundation.layout.ExperimentalLayoutApi
65
import androidx.compose.foundation.layout.FlowRow
76
import androidx.compose.foundation.layout.PaddingValues
87
import androidx.compose.foundation.layout.Spacer
@@ -235,7 +234,6 @@ fun LogRecycler(
235234
}
236235
}
237236

238-
@OptIn(ExperimentalLayoutApi::class)
239237
@Composable
240238
fun InfoChipsBlock(
241239
modifier: Modifier = Modifier,
@@ -264,7 +262,6 @@ fun InfoChipsBlock(
264262
}
265263

266264

267-
@OptIn(ExperimentalLayoutApi::class)
268265
@Composable
269266
fun SelectableChipGroup(
270267
//TODO hg42 move to item/Icons.kt ?
@@ -288,7 +285,6 @@ fun SelectableChipGroup(
288285
}
289286
}
290287

291-
@OptIn(ExperimentalLayoutApi::class)
292288
@Composable
293289
fun MultiSelectableChipGroup(
294290
//TODO hg42 move to item/Icons.kt ?
@@ -312,7 +308,6 @@ fun MultiSelectableChipGroup(
312308
}
313309
}
314310

315-
@OptIn(ExperimentalLayoutApi::class)
316311
@Composable
317312
fun MultiSelectableChipGroup(
318313
modifier: Modifier = Modifier,

‎src/main/java/com/machiav3lli/backup/ui/compose/component/Tags.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import androidx.compose.foundation.background
55
import androidx.compose.foundation.border
66
import androidx.compose.foundation.layout.Arrangement
77
import androidx.compose.foundation.layout.Column
8-
import androidx.compose.foundation.layout.ExperimentalLayoutApi
98
import androidx.compose.foundation.layout.FlowRow
109
import androidx.compose.foundation.layout.Row
1110
import androidx.compose.foundation.layout.fillMaxWidth
@@ -59,7 +58,7 @@ import com.machiav3lli.backup.ui.compose.icons.phosphor.X
5958
import com.machiav3lli.backup.ui.compose.icons.phosphor.XCircle
6059
import java.time.LocalDateTime
6160

62-
@OptIn(ExperimentalLayoutApi::class, ExperimentalMaterial3Api::class)
61+
@OptIn(ExperimentalMaterial3Api::class)
6362
@Composable
6463
fun TagsBlock(
6564
modifier: Modifier = Modifier,
@@ -230,7 +229,6 @@ fun AddTagView(
230229
}
231230

232231

233-
@OptIn(ExperimentalLayoutApi::class)
234232
@Preview
235233
@Composable
236234
fun NoteTagItemPreview() {

‎src/main/java/com/machiav3lli/backup/ui/navigation/BottomSheetScene.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.machiav3lli.backup.ui.navigation
22

33
import androidx.compose.material3.ExperimentalMaterial3Api
4+
import androidx.compose.material3.MaterialTheme
45
import androidx.compose.material3.ModalBottomSheet
56
import androidx.compose.material3.ModalBottomSheetProperties
67
import androidx.compose.material3.rememberModalBottomSheetState
@@ -23,6 +24,7 @@ internal class BottomSheetScene<T : Any>(
2324
ModalBottomSheet(
2425
onDismissRequest = onBack,
2526
properties = modalBottomSheetProperties,
27+
containerColor = MaterialTheme.colorScheme.surfaceContainerLowest,
2628
sheetState = rememberModalBottomSheetState(true)
2729
) {
2830
entry.Content()

‎src/main/java/com/machiav3lli/backup/ui/pages/BatchPage.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import androidx.compose.foundation.layout.Column
2323
import androidx.compose.foundation.layout.Row
2424
import androidx.compose.foundation.layout.fillMaxSize
2525
import androidx.compose.foundation.layout.padding
26-
import androidx.compose.material3.ExperimentalMaterial3Api
2726
import androidx.compose.material3.HorizontalDivider
2827
import androidx.compose.material3.MaterialTheme
2928
import androidx.compose.material3.Scaffold
@@ -68,7 +67,6 @@ import com.machiav3lli.backup.ui.navigation.NavItem
6867
import com.machiav3lli.backup.utils.altModeToMode
6968
import com.machiav3lli.backup.viewmodels.BatchVM
7069

71-
@OptIn(ExperimentalMaterial3Api::class)
7270
@Composable
7371
fun BatchPage(
7472
viewModel: BatchVM,

‎src/main/java/com/machiav3lli/backup/ui/pages/HomePage.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
*/
1818
package com.machiav3lli.backup.ui.pages
1919

20-
import android.annotation.SuppressLint
2120
import androidx.activity.compose.BackHandler
2221
import androidx.activity.compose.LocalActivity
2322
import androidx.compose.foundation.layout.Arrangement
@@ -88,8 +87,7 @@ import com.machiav3lli.backup.utils.extensions.koinNeoViewModel
8887
import com.machiav3lli.backup.viewmodels.HomeVM
8988
import kotlinx.coroutines.launch
9089

91-
@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter") // TODO remove Scaffold
92-
@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3AdaptiveApi::class)
90+
@OptIn(ExperimentalMaterial3AdaptiveApi::class)
9391
@Composable
9492
fun HomePage(
9593
viewModel: HomeVM = koinNeoViewModel(),

‎src/main/java/com/machiav3lli/backup/ui/pages/PrefsPage.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package com.machiav3lli.backup.ui.pages
1919

2020
import androidx.compose.foundation.layout.padding
2121
import androidx.compose.foundation.pager.rememberPagerState
22-
import androidx.compose.material3.ExperimentalMaterial3Api
2322
import androidx.compose.material3.MaterialTheme
2423
import androidx.compose.material3.Scaffold
2524
import androidx.compose.runtime.Composable
@@ -45,7 +44,6 @@ import com.topjohnwu.superuser.Shell
4544
import kotlinx.collections.immutable.persistentListOf
4645
import kotlinx.coroutines.launch
4746

48-
@OptIn(ExperimentalMaterial3Api::class)
4947
@Composable
5048
fun PrefsPage(
5149
navigateUp: () -> Unit,

‎src/main/java/com/machiav3lli/backup/ui/pages/SchedulePage.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package com.machiav3lli.backup.ui.pages
1919

2020
import androidx.compose.foundation.layout.Arrangement
2121
import androidx.compose.foundation.layout.Column
22-
import androidx.compose.foundation.layout.ExperimentalLayoutApi
2322
import androidx.compose.foundation.layout.FlowRow
2423
import androidx.compose.foundation.layout.PaddingValues
2524
import androidx.compose.foundation.layout.Row
@@ -97,7 +96,7 @@ import com.machiav3lli.backup.utils.timeLeft
9796
import com.machiav3lli.backup.viewmodels.ScheduleVM
9897
import java.time.LocalTime
9998

100-
@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
99+
@OptIn(ExperimentalMaterial3Api::class)
101100
@Composable
102101
fun SchedulePage(
103102
scheduleId: Long,

‎src/main/java/com/machiav3lli/backup/ui/pages/TerminalPage.kt‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
*/
1818
package com.machiav3lli.backup.ui.pages
1919

20-
import android.annotation.SuppressLint
2120
import android.content.Context
2221
import android.os.Environment
2322
import android.os.Process
@@ -28,7 +27,6 @@ import androidx.compose.foundation.horizontalScroll
2827
import androidx.compose.foundation.layout.Arrangement
2928
import androidx.compose.foundation.layout.Box
3029
import androidx.compose.foundation.layout.Column
31-
import androidx.compose.foundation.layout.ExperimentalLayoutApi
3230
import androidx.compose.foundation.layout.FlowRow
3331
import androidx.compose.foundation.layout.Row
3432
import androidx.compose.foundation.layout.fillMaxHeight
@@ -586,8 +584,6 @@ fun TerminalText(
586584
}
587585
}
588586

589-
@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
590-
@OptIn(ExperimentalLayoutApi::class)
591587
@Composable
592588
fun TerminalPage(
593589
title: String? = null,
@@ -614,8 +610,6 @@ fun TerminalPage(
614610
}
615611
}
616612

617-
@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
618-
@OptIn(ExperimentalLayoutApi::class)
619613
@Composable
620614
fun Terminal(
621615
modifier: Modifier = Modifier,

‎src/main/java/com/machiav3lli/backup/ui/pages/WelcomePage.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import androidx.compose.foundation.layout.windowInsetsPadding
3535
import androidx.compose.foundation.lazy.LazyColumn
3636
import androidx.compose.foundation.lazy.LazyRow
3737
import androidx.compose.foundation.lazy.items
38-
import androidx.compose.material3.ExperimentalMaterial3Api
3938
import androidx.compose.material3.ListItem
4039
import androidx.compose.material3.ListItemDefaults
4140
import androidx.compose.material3.MaterialTheme
@@ -64,7 +63,6 @@ import com.machiav3lli.backup.ui.compose.icons.phosphor.ArrowRight
6463
import com.machiav3lli.backup.ui.navigation.NavRoute
6564
import com.machiav3lli.backup.utils.SystemUtils.applicationIssuer
6665

67-
@OptIn(ExperimentalMaterial3Api::class)
6866
@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
6967
@Composable
7068
fun WelcomePage() {

‎src/main/java/com/machiav3lli/backup/ui/sheets/BatchPrefsSheet.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import androidx.compose.foundation.lazy.LazyColumn
2424
import androidx.compose.runtime.Composable
2525
import androidx.compose.ui.Modifier
2626
import androidx.compose.ui.unit.dp
27-
import com.machiav3lli.backup.ui.compose.component.PrefsGroup
2827
import com.machiav3lli.backup.data.entity.Pref
28+
import com.machiav3lli.backup.ui.compose.component.PrefsGroup
2929
import kotlinx.collections.immutable.persistentListOf
3030
import kotlinx.collections.immutable.toPersistentList
3131

0 commit comments

Comments
 (0)