Skip to content

Commit ba39547

Browse files
Ishan09811Ishan09811
authored
update dependencies (#180)
AGP: update to 8.13.2 gradle: update to 8.13 kotlin: update to 2.3.20 coreKtx: update to 1.18.0 OkHttp3: update to 5.3.2 material: update to 1.13.0 appcompat: update to 1.7.1 navigationCompose: update to 2.9.7 activity: update to 1.13.0 activityCompose: update to 1.13.0 kotlinxSerializationJson: update to 1.10.0 composeBom: update to 2026.02.01
1 parent 152b656 commit ba39547

38 files changed

Lines changed: 290 additions & 224 deletions

‎app/build.gradle.kts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,10 @@ android {
8383
targetCompatibility = JavaVersion.VERSION_11
8484
}
8585

86-
kotlinOptions {
87-
jvmTarget = "11"
86+
kotlin {
87+
compilerOptions {
88+
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
89+
}
8890
}
8991

9092
externalNativeBuild {
@@ -115,7 +117,7 @@ base.archivesName = "rpcsx"
115117
dependencies {
116118
implementation(libs.androidx.navigation.compose)
117119
implementation(libs.androidx.ui.tooling.preview.android)
118-
val composeBom = platform("androidx.compose:compose-bom:2025.02.00")
120+
val composeBom = platform("androidx.compose:compose-bom:2026.02.01")
119121
implementation(composeBom)
120122
implementation(libs.androidx.material3)
121123
implementation(libs.androidx.core.ktx)
@@ -131,4 +133,6 @@ dependencies {
131133
implementation(libs.kotlinx.serialization.json)
132134
implementation(libs.coil.compose)
133135
implementation(libs.squareup.okhttp3)
136+
implementation(libs.androidx.documentfile)
137+
implementation(libs.com.github.ishan09811.materialswitch)
134138
}

‎app/src/main/java/net/rpcsx/overlay/OverlayEditActivity.kt‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ import androidx.compose.foundation.layout.size
3131
import androidx.compose.foundation.layout.width
3232
import androidx.compose.foundation.shape.CircleShape
3333
import androidx.compose.foundation.shape.RoundedCornerShape
34-
import androidx.compose.material.icons.Icons
35-
import androidx.compose.material.icons.automirrored.filled.KeyboardArrowLeft
36-
import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
37-
import androidx.compose.material.icons.filled.Close
38-
import androidx.compose.material.icons.filled.KeyboardArrowDown
39-
import androidx.compose.material.icons.filled.KeyboardArrowUp
4034
import androidx.compose.material3.AlertDialog
4135
import androidx.compose.material3.Checkbox
4236
import androidx.compose.material3.CheckboxDefaults
@@ -173,7 +167,7 @@ fun OverlayEditScreen() {
173167
containerColor = MaterialTheme.colorScheme.primary,
174168
contentColor = Color.White
175169
) {
176-
Icon(Icons.Default.KeyboardArrowDown, contentDescription = "Open Control Panel")
170+
Icon(painter = painterResource(id = R.drawable.ic_keyboard_arrow_down), contentDescription = "Open Control Panel")
177171
}
178172
}
179173

@@ -275,7 +269,7 @@ fun ControlPanel(
275269
verticalAlignment = Alignment.CenterVertically
276270
) {
277271
IconButton(onClick = {}, modifier = Modifier.alpha(0f)) {
278-
Icon(Icons.Default.Close, contentDescription = "Disabled Button")
272+
Icon(painter = painterResource(id = R.drawable.ic_close), contentDescription = "Disabled Button")
279273
}
280274
Text(
281275
text = stringResource(R.string.control_panel),
@@ -285,7 +279,7 @@ fun ControlPanel(
285279
color = MaterialTheme.colorScheme.onSurface
286280
)
287281
IconButton(onClick = onCloseClick) {
288-
Icon(Icons.Default.Close, contentDescription = "Close", tint = MaterialTheme.colorScheme.error)
282+
Icon(painter = painterResource(id = R.drawable.ic_close), contentDescription = "Close", tint = MaterialTheme.colorScheme.error)
289283
}
290284
}
291285

@@ -310,7 +304,7 @@ fun ControlPanel(
310304
) {
311305
IconButton(onClick = onMoveUp) {
312306
Icon(
313-
imageVector = Icons.Default.KeyboardArrowUp,
307+
painter = painterResource(id = R.drawable.ic_keyboard_arrow_up),
314308
contentDescription = "Move Up",
315309
tint = MaterialTheme.colorScheme.primary
316310
)
@@ -321,7 +315,7 @@ fun ControlPanel(
321315
) {
322316
IconButton(onClick = onMoveLeft) {
323317
Icon(
324-
imageVector = Icons.AutoMirrored.Filled.KeyboardArrowLeft,
318+
painter = painterResource(id = R.drawable.ic_keyboard_arrow_left),
325319
contentDescription = "Move Left",
326320
tint = MaterialTheme.colorScheme.primary
327321
)
@@ -340,7 +334,7 @@ fun ControlPanel(
340334

341335
IconButton(onClick = onMoveRight) {
342336
Icon(
343-
imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight,
337+
painter = painterResource(id = R.drawable.ic_keyboard_arrow_right),
344338
contentDescription = "Move Right",
345339
tint = MaterialTheme.colorScheme.primary
346340
)
@@ -349,7 +343,7 @@ fun ControlPanel(
349343

350344
IconButton(onClick = onMoveDown) {
351345
Icon(
352-
imageVector = Icons.Default.KeyboardArrowDown,
346+
painter = painterResource(id = R.drawable.ic_keyboard_arrow_down),
353347
contentDescription = "Move Down",
354348
tint = MaterialTheme.colorScheme.primary
355349
)

‎app/src/main/java/net/rpcsx/ui/channels/UpdateChannelListScreen.kt‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package net.rpcsx.ui.channels
22

3-
import androidx.compose.foundation.clickable
43
import androidx.compose.foundation.layout.Column
54
import androidx.compose.foundation.layout.RowScope
65
import androidx.compose.foundation.layout.Spacer
@@ -11,9 +10,6 @@ import androidx.compose.foundation.layout.padding
1110
import androidx.compose.foundation.lazy.LazyColumn
1211
import androidx.compose.foundation.lazy.items
1312
import androidx.compose.foundation.shape.RoundedCornerShape
14-
import androidx.compose.material.icons.Icons
15-
import androidx.compose.material.icons.automirrored.filled.KeyboardArrowLeft
16-
import androidx.compose.material.icons.filled.Add
1713
import androidx.compose.material3.AlertDialog
1814
import androidx.compose.material3.Button
1915
import androidx.compose.material3.ButtonDefaults
@@ -37,6 +33,7 @@ import androidx.compose.runtime.mutableStateOf
3733
import androidx.compose.runtime.remember
3834
import androidx.compose.runtime.setValue
3935
import androidx.compose.ui.Modifier
36+
import androidx.compose.ui.res.painterResource
4037
import androidx.compose.ui.res.stringResource
4138
import androidx.compose.ui.text.font.FontWeight
4239
import androidx.compose.ui.unit.dp
@@ -108,7 +105,7 @@ fun UpdateChannelListScreen(
108105
IconButton(
109106
onClick = navigateBack
110107
) {
111-
Icon(imageVector = Icons.AutoMirrored.Default.KeyboardArrowLeft, null)
108+
Icon(painter = painterResource(id = R.drawable.ic_keyboard_arrow_left), null)
112109
}
113110
},
114111
actions = actions
@@ -178,7 +175,7 @@ fun UpdateChannelListScreen(
178175
elevation = ButtonDefaults.elevatedButtonElevation(defaultElevation = 4.dp)
179176
) {
180177
Icon(
181-
imageVector = Icons.Default.Add, contentDescription = "Add Source"
178+
painter = painterResource(id = R.drawable.ic_add), contentDescription = "Add Source"
182179
)
183180
}
184181
}

‎app/src/main/java/net/rpcsx/ui/channels/UpdateChannelsScreen.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ import android.content.Context
44
import androidx.compose.foundation.layout.Column
55
import androidx.compose.foundation.layout.fillMaxSize
66
import androidx.compose.foundation.layout.padding
7-
import androidx.compose.material.icons.Icons
8-
import androidx.compose.material.icons.automirrored.filled.KeyboardArrowLeft
97
import androidx.compose.material3.ExperimentalMaterial3Api
108
import androidx.compose.material3.Icon
119
import androidx.compose.material3.IconButton
@@ -19,6 +17,7 @@ import androidx.compose.runtime.Composable
1917
import androidx.compose.runtime.remember
2018
import androidx.compose.ui.Modifier
2119
import androidx.compose.ui.platform.LocalContext
20+
import androidx.compose.ui.res.painterResource
2221
import androidx.compose.ui.res.stringResource
2322
import androidx.compose.ui.text.font.FontWeight
2423
import androidx.compose.ui.unit.dp
@@ -73,7 +72,7 @@ fun UpdateChannelsScreen(
7372
IconButton(
7473
onClick = navigateBack
7574
) {
76-
Icon(imageVector = Icons.AutoMirrored.Default.KeyboardArrowLeft, null)
75+
Icon(painter = painterResource(id = R.drawable.ic_keyboard_arrow_left), null)
7776
}
7877
})
7978
}) { paddingValues ->

‎app/src/main/java/net/rpcsx/ui/drivers/GpuDriversScreen.kt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ import androidx.compose.foundation.lazy.items
2222
import androidx.compose.foundation.rememberScrollState
2323
import androidx.compose.foundation.shape.RoundedCornerShape
2424
import androidx.compose.foundation.verticalScroll
25-
import androidx.compose.material.icons.Icons
26-
import androidx.compose.material.icons.automirrored.filled.KeyboardArrowLeft
27-
import androidx.compose.material.icons.filled.Add
2825
import androidx.compose.material3.AlertDialog
2926
import androidx.compose.material3.BasicAlertDialog
3027
import androidx.compose.material3.Button
@@ -61,6 +58,7 @@ import androidx.compose.ui.Alignment
6158
import androidx.compose.ui.Modifier
6259
import androidx.compose.ui.platform.LocalConfiguration
6360
import androidx.compose.ui.platform.LocalContext
61+
import androidx.compose.ui.res.painterResource
6462
import androidx.compose.ui.res.stringResource
6563
import androidx.compose.ui.text.font.FontWeight
6664
import androidx.compose.ui.unit.dp
@@ -173,7 +171,7 @@ fun GpuDriversScreen(navigateBack: () -> Unit) {
173171
IconButton(
174172
onClick = navigateBack
175173
) {
176-
Icon(imageVector = Icons.AutoMirrored.Default.KeyboardArrowLeft, null)
174+
Icon(painter = painterResource(id = R.drawable.ic_keyboard_arrow_left), null)
177175
}
178176
})
179177
}) { paddingValues ->
@@ -268,7 +266,7 @@ fun GpuDriversScreen(navigateBack: () -> Unit) {
268266
Text(stringResource(R.string.installing))
269267
} else {
270268
Icon(
271-
imageVector = Icons.Default.Add,
269+
painter = painterResource(id = R.drawable.ic_add),
272270
contentDescription = "Install Driver"
273271
)
274272
}

‎app/src/main/java/net/rpcsx/ui/games/GamesScreen.kt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ import androidx.compose.foundation.layout.width
2121
import androidx.compose.foundation.layout.wrapContentHeight
2222
import androidx.compose.foundation.lazy.grid.GridCells
2323
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
24-
import androidx.compose.material.icons.Icons
25-
import androidx.compose.material.icons.outlined.Delete
26-
import androidx.compose.material.icons.outlined.Lock
2724
import androidx.compose.material3.AlertDialog
2825
import androidx.compose.material3.Card
2926
import androidx.compose.material3.CircularProgressIndicator
@@ -54,6 +51,7 @@ import androidx.compose.ui.graphics.RectangleShape
5451
import androidx.compose.ui.graphics.vector.ImageVector
5552
import androidx.compose.ui.layout.ContentScale
5653
import androidx.compose.ui.platform.LocalContext
54+
import androidx.compose.ui.res.painterResource
5755
import androidx.compose.ui.res.stringResource
5856
import androidx.compose.ui.res.vectorResource
5957
import androidx.compose.ui.tooling.preview.Preview
@@ -137,7 +135,7 @@ fun GameItem(game: Game) {
137135
if (game.progressList.isEmpty()) {
138136
DropdownMenuItem(
139137
text = { Text(stringResource(R.string.delete)) },
140-
leadingIcon = { Icon(Icons.Outlined.Delete, contentDescription = null) },
138+
leadingIcon = { Icon(painter = painterResource(id = R.drawable.ic_delete), contentDescription = null) },
141139
onClick = {
142140
menuExpanded.value = false
143141
val deleteProgress = ProgressRepository.create(context, context.getString(R.string.deleting_game))
@@ -321,7 +319,7 @@ fun GameItem(game: Game) {
321319
}) {
322320

323321
Icon(
324-
Icons.Outlined.Lock,
322+
painter = painterResource(id = R.drawable.ic_lock),
325323
contentDescription = "Game is locked",
326324
modifier = Modifier
327325
.size(30.dp)

‎app/src/main/java/net/rpcsx/ui/navigation/AppNavHost.kt‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ import androidx.compose.foundation.layout.width
2626
import androidx.compose.foundation.layout.windowInsetsPadding
2727
import androidx.compose.foundation.rememberScrollState
2828
import androidx.compose.foundation.verticalScroll
29-
import androidx.compose.material.icons.Icons
30-
import androidx.compose.material.icons.filled.Add
31-
import androidx.compose.material.icons.filled.Menu
32-
import androidx.compose.material.icons.filled.Settings
33-
import androidx.compose.material.icons.outlined.Info
3429
import androidx.compose.material3.CenterAlignedTopAppBar
3530
import androidx.compose.material3.CircularProgressIndicator
3631
import androidx.compose.material3.DrawerValue
@@ -56,7 +51,6 @@ import androidx.compose.runtime.getValue
5651
import androidx.compose.runtime.mutableStateOf
5752
import androidx.compose.runtime.remember
5853
import androidx.compose.runtime.rememberCoroutineScope
59-
import androidx.compose.runtime.saveable.rememberSaveable
6054
import androidx.compose.runtime.setValue
6155
import androidx.compose.ui.Modifier
6256
import androidx.compose.ui.graphics.vector.ImageVector
@@ -593,7 +587,7 @@ fun GamesDestination(
593587
NavigationDrawerItem(
594588
label = { Text(stringResource(R.string.settings)) },
595589
selected = false,
596-
icon = { Icon(Icons.Default.Settings, null) },
590+
icon = { Icon(painter = painterResource(id = R.drawable.ic_settings), null) },
597591
onClick = navigateToSettings
598592
)
599593

@@ -649,7 +643,7 @@ fun GamesDestination(
649643
NavigationDrawerItem(
650644
label = { Text(stringResource(R.string.about)) },
651645
selected = false,
652-
icon = { Icon(Icons.Outlined.Info, contentDescription = null) },
646+
icon = { Icon(painter = painterResource(id = R.drawable.ic_info), contentDescription = null) },
653647
onClick = {
654648
val versionInfo = "UI: ${BuildConfig.Version}\nRPCSX: ${RpcsxUpdater.getCurrentVersion()}"
655649
AlertDialogQueue.showDialog(
@@ -705,7 +699,7 @@ fun GamesDestination(
705699
}
706700
}) {
707701
Icon(
708-
imageVector = Icons.Filled.Menu,
702+
painter = painterResource(id = R.drawable.ic_menu),
709703
contentDescription = "Open menu"
710704
)
711705
}
@@ -781,7 +775,7 @@ fun DropUpFloatingActionButton(
781775
FloatingActionButton(
782776
onClick = { expanded = !expanded }
783777
) {
784-
Icon(Icons.Filled.Add, contentDescription = "Add")
778+
Icon(painter = painterResource(id = R.drawable.ic_add), contentDescription = "Add")
785779
}
786780
}
787781
}

‎app/src/main/java/net/rpcsx/ui/settings/SettingsScreen.kt‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@ import androidx.compose.foundation.layout.padding
3333
import androidx.compose.foundation.layout.size
3434
import androidx.compose.foundation.lazy.LazyColumn
3535
import androidx.compose.foundation.lazy.items
36-
import androidx.compose.material.icons.Icons
37-
import androidx.compose.material.icons.automirrored.filled.KeyboardArrowLeft
38-
import androidx.compose.material.icons.filled.Close
39-
import androidx.compose.material.icons.filled.Person
40-
import androidx.compose.material.icons.filled.Search
41-
import androidx.compose.material.icons.filled.Share
4236
import androidx.compose.material3.Button
4337
import androidx.compose.material3.ExperimentalMaterial3Api
4438
import androidx.compose.material3.HorizontalDivider
@@ -201,7 +195,7 @@ fun AdvancedSettingsScreen(
201195
onSearch = { expanded = false },
202196
placeholder = { Text(stringResource(R.string.search)) },
203197
leadingIcon = {
204-
Icon(Icons.Default.Search, null)
198+
Icon(painter = painterResource(id = R.drawable.ic_search), null)
205199
},
206200
trailingIcon = {
207201
IconButton(onClick = {
@@ -211,7 +205,7 @@ fun AdvancedSettingsScreen(
211205
isSearching = false
212206
}
213207
}) {
214-
Icon(Icons.Default.Close, null)
208+
Icon(painter = painterResource(id = R.drawable.ic_close), null)
215209
}
216210
},
217211
expanded = expanded,
@@ -235,7 +229,7 @@ fun AdvancedSettingsScreen(
235229
modifier = Modifier.padding(0.dp)
236230
) {
237231
Icon(
238-
imageVector = Icons.AutoMirrored.Default.KeyboardArrowLeft,
232+
painter = painterResource(id = R.drawable.ic_keyboard_arrow_left),
239233
contentDescription = null
240234
)
241235
}
@@ -246,7 +240,7 @@ fun AdvancedSettingsScreen(
246240
onClick = { isSearching = true }
247241
) {
248242
Icon(
249-
imageVector = Icons.Default.Search,
243+
painter = painterResource(id = R.drawable.ic_search),
250244
contentDescription = "Search"
251245
)
252246
}
@@ -563,7 +557,7 @@ fun SettingsScreen(
563557
IconButton(
564558
onClick = navigateBack
565559
) {
566-
Icon(imageVector = Icons.AutoMirrored.Default.KeyboardArrowLeft, null)
560+
Icon(painter = painterResource(id = R.drawable.ic_keyboard_arrow_left), null)
567561
}
568562
})
569563
}
@@ -620,7 +614,7 @@ fun SettingsScreen(
620614
title = stringResource(R.string.users),
621615
description = "${stringResource(R.string.active_user)}: ${UserRepository.getUsername(activeUser)}",
622616
icon = {
623-
PreferenceIcon(icon = Icons.Default.Person)
617+
PreferenceIcon(icon = painterResource(id = R.drawable.ic_person))
624618
},
625619
onClick = {
626620
navigateTo("users")
@@ -697,7 +691,7 @@ fun SettingsScreen(
697691
item(key = "share_logs") {
698692
HomePreference(
699693
title = stringResource(R.string.share_log),
700-
icon = { Icon(imageVector = Icons.Default.Share, contentDescription = null) },
694+
icon = { Icon(painter = painterResource(id = R.drawable.ic_share), contentDescription = null) },
701695
description = stringResource(R.string.share_log_description),
702696
onClick = {
703697
val file = DocumentFile.fromSingleUri(
@@ -743,7 +737,7 @@ fun ControllerSettings(
743737
IconButton(
744738
onClick = navigateBack
745739
) {
746-
Icon(imageVector = Icons.AutoMirrored.Default.KeyboardArrowLeft, null)
740+
Icon(painter = painterResource(id = R.drawable.ic_keyboard_arrow_left), null)
747741
}
748742
}
749743
)

0 commit comments

Comments
 (0)