Skip to content

update dependencies #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ishan09811 merged 1 commit into from
Mar 19, 2026
Merged

update dependencies #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,10 @@ android {
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = "11"
kotlin {
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
}
}

externalNativeBuild {
Expand Down Expand Up @@ -115,7 +117,7 @@ base.archivesName = "rpcsx"
dependencies {
implementation(libs.androidx.navigation.compose)
implementation(libs.androidx.ui.tooling.preview.android)
val composeBom = platform("androidx.compose:compose-bom:2025.02.00")
val composeBom = platform("androidx.compose:compose-bom:2026.02.01")
implementation(composeBom)
implementation(libs.androidx.material3)
implementation(libs.androidx.core.ktx)
Expand All @@ -131,4 +133,6 @@ dependencies {
implementation(libs.kotlinx.serialization.json)
implementation(libs.coil.compose)
implementation(libs.squareup.okhttp3)
implementation(libs.androidx.documentfile)
implementation(libs.com.github.ishan09811.materialswitch)
}
20 changes: 7 additions & 13 deletions app/src/main/java/net/rpcsx/overlay/OverlayEditActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.KeyboardArrowLeft
import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
import androidx.compose.material.icons.filled.Close
import androidx.compose.material.icons.filled.KeyboardArrowDown
import androidx.compose.material.icons.filled.KeyboardArrowUp
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Checkbox
import androidx.compose.material3.CheckboxDefaults
Expand Down Expand Up @@ -173,7 +167,7 @@ fun OverlayEditScreen() {
containerColor = MaterialTheme.colorScheme.primary,
contentColor = Color.White
) {
Icon(Icons.Default.KeyboardArrowDown, contentDescription = "Open Control Panel")
Icon(painter = painterResource(id = R.drawable.ic_keyboard_arrow_down), contentDescription = "Open Control Panel")
}
}

Expand Down Expand Up @@ -275,7 +269,7 @@ fun ControlPanel(
verticalAlignment = Alignment.CenterVertically
) {
IconButton(onClick = {}, modifier = Modifier.alpha(0f)) {
Icon(Icons.Default.Close, contentDescription = "Disabled Button")
Icon(painter = painterResource(id = R.drawable.ic_close), contentDescription = "Disabled Button")
}
Text(
text = stringResource(R.string.control_panel),
Expand All @@ -285,7 +279,7 @@ fun ControlPanel(
color = MaterialTheme.colorScheme.onSurface
)
IconButton(onClick = onCloseClick) {
Icon(Icons.Default.Close, contentDescription = "Close", tint = MaterialTheme.colorScheme.error)
Icon(painter = painterResource(id = R.drawable.ic_close), contentDescription = "Close", tint = MaterialTheme.colorScheme.error)
}
}

Expand All @@ -310,7 +304,7 @@ fun ControlPanel(
) {
IconButton(onClick = onMoveUp) {
Icon(
imageVector = Icons.Default.KeyboardArrowUp,
painter = painterResource(id = R.drawable.ic_keyboard_arrow_up),
contentDescription = "Move Up",
tint = MaterialTheme.colorScheme.primary
)
Expand All @@ -321,7 +315,7 @@ fun ControlPanel(
) {
IconButton(onClick = onMoveLeft) {
Icon(
imageVector = Icons.AutoMirrored.Filled.KeyboardArrowLeft,
painter = painterResource(id = R.drawable.ic_keyboard_arrow_left),
contentDescription = "Move Left",
tint = MaterialTheme.colorScheme.primary
)
Expand All @@ -340,7 +334,7 @@ fun ControlPanel(

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

IconButton(onClick = onMoveDown) {
Icon(
imageVector = Icons.Default.KeyboardArrowDown,
painter = painterResource(id = R.drawable.ic_keyboard_arrow_down),
contentDescription = "Move Down",
tint = MaterialTheme.colorScheme.primary
)
Expand Down
9 changes: 3 additions & 6 deletions app/src/main/java/net/rpcsx/ui/channels/UpdateChannelListScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package net.rpcsx.ui.channels

import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.Spacer
Expand All @@ -11,9 +10,6 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.KeyboardArrowLeft
import androidx.compose.material.icons.filled.Add
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
Expand All @@ -37,6 +33,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
Expand Down Expand Up @@ -108,7 +105,7 @@ fun UpdateChannelListScreen(
IconButton(
onClick = navigateBack
) {
Icon(imageVector = Icons.AutoMirrored.Default.KeyboardArrowLeft, null)
Icon(painter = painterResource(id = R.drawable.ic_keyboard_arrow_left), null)
}
},
actions = actions
Expand Down Expand Up @@ -178,7 +175,7 @@ fun UpdateChannelListScreen(
elevation = ButtonDefaults.elevatedButtonElevation(defaultElevation = 4.dp)
) {
Icon(
imageVector = Icons.Default.Add, contentDescription = "Add Source"
painter = painterResource(id = R.drawable.ic_add), contentDescription = "Add Source"
)
}
}
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/java/net/rpcsx/ui/channels/UpdateChannelsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import android.content.Context
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.KeyboardArrowLeft
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
Expand All @@ -19,6 +17,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
Expand Down Expand Up @@ -73,7 +72,7 @@ fun UpdateChannelsScreen(
IconButton(
onClick = navigateBack
) {
Icon(imageVector = Icons.AutoMirrored.Default.KeyboardArrowLeft, null)
Icon(painter = painterResource(id = R.drawable.ic_keyboard_arrow_left), null)
}
})
}) { paddingValues ->
Expand Down
8 changes: 3 additions & 5 deletions app/src/main/java/net/rpcsx/ui/drivers/GpuDriversScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.KeyboardArrowLeft
import androidx.compose.material.icons.filled.Add
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.BasicAlertDialog
import androidx.compose.material3.Button
Expand Down Expand Up @@ -61,6 +58,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
Expand Down Expand Up @@ -173,7 +171,7 @@ fun GpuDriversScreen(navigateBack: () -> Unit) {
IconButton(
onClick = navigateBack
) {
Icon(imageVector = Icons.AutoMirrored.Default.KeyboardArrowLeft, null)
Icon(painter = painterResource(id = R.drawable.ic_keyboard_arrow_left), null)
}
})
}) { paddingValues ->
Expand Down Expand Up @@ -268,7 +266,7 @@ fun GpuDriversScreen(navigateBack: () -> Unit) {
Text(stringResource(R.string.installing))
} else {
Icon(
imageVector = Icons.Default.Add,
painter = painterResource(id = R.drawable.ic_add),
contentDescription = "Install Driver"
)
}
Expand Down
8 changes: 3 additions & 5 deletions app/src/main/java/net/rpcsx/ui/games/GamesScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Delete
import androidx.compose.material.icons.outlined.Lock
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Card
import androidx.compose.material3.CircularProgressIndicator
Expand Down Expand Up @@ -54,6 +51,7 @@ import androidx.compose.ui.graphics.RectangleShape
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.tooling.preview.Preview
Expand Down Expand Up @@ -137,7 +135,7 @@ fun GameItem(game: Game) {
if (game.progressList.isEmpty()) {
DropdownMenuItem(
text = { Text(stringResource(R.string.delete)) },
leadingIcon = { Icon(Icons.Outlined.Delete, contentDescription = null) },
leadingIcon = { Icon(painter = painterResource(id = R.drawable.ic_delete), contentDescription = null) },
onClick = {
menuExpanded.value = false
val deleteProgress = ProgressRepository.create(context, context.getString(R.string.deleting_game))
Expand Down Expand Up @@ -321,7 +319,7 @@ fun GameItem(game: Game) {
}) {

Icon(
Icons.Outlined.Lock,
painter = painterResource(id = R.drawable.ic_lock),
contentDescription = "Game is locked",
modifier = Modifier
.size(30.dp)
Expand Down
14 changes: 4 additions & 10 deletions app/src/main/java/net/rpcsx/ui/navigation/AppNavHost.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@ import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.windowInsetsPadding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.Menu
import androidx.compose.material.icons.filled.Settings
import androidx.compose.material.icons.outlined.Info
import androidx.compose.material3.CenterAlignedTopAppBar
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.DrawerValue
Expand All @@ -56,7 +51,6 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector
Expand Down Expand Up @@ -593,7 +587,7 @@ fun GamesDestination(
NavigationDrawerItem(
label = { Text(stringResource(R.string.settings)) },
selected = false,
icon = { Icon(Icons.Default.Settings, null) },
icon = { Icon(painter = painterResource(id = R.drawable.ic_settings), null) },
onClick = navigateToSettings
)

Expand Down Expand Up @@ -649,7 +643,7 @@ fun GamesDestination(
NavigationDrawerItem(
label = { Text(stringResource(R.string.about)) },
selected = false,
icon = { Icon(Icons.Outlined.Info, contentDescription = null) },
icon = { Icon(painter = painterResource(id = R.drawable.ic_info), contentDescription = null) },
onClick = {
val versionInfo = "UI: ${BuildConfig.Version}\nRPCSX: ${RpcsxUpdater.getCurrentVersion()}"
AlertDialogQueue.showDialog(
Expand Down Expand Up @@ -705,7 +699,7 @@ fun GamesDestination(
}
}) {
Icon(
imageVector = Icons.Filled.Menu,
painter = painterResource(id = R.drawable.ic_menu),
contentDescription = "Open menu"
)
}
Expand Down Expand Up @@ -781,7 +775,7 @@ fun DropUpFloatingActionButton(
FloatingActionButton(
onClick = { expanded = !expanded }
) {
Icon(Icons.Filled.Add, contentDescription = "Add")
Icon(painter = painterResource(id = R.drawable.ic_add), contentDescription = "Add")
}
}
}
Expand Down
22 changes: 8 additions & 14 deletions app/src/main/java/net/rpcsx/ui/settings/SettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,6 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.KeyboardArrowLeft
import androidx.compose.material.icons.filled.Close
import androidx.compose.material.icons.filled.Person
import androidx.compose.material.icons.filled.Search
import androidx.compose.material.icons.filled.Share
import androidx.compose.material3.Button
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
Expand Down Expand Up @@ -201,7 +195,7 @@ fun AdvancedSettingsScreen(
onSearch = { expanded = false },
placeholder = { Text(stringResource(R.string.search)) },
leadingIcon = {
Icon(Icons.Default.Search, null)
Icon(painter = painterResource(id = R.drawable.ic_search), null)
},
trailingIcon = {
IconButton(onClick = {
Expand All @@ -211,7 +205,7 @@ fun AdvancedSettingsScreen(
isSearching = false
}
}) {
Icon(Icons.Default.Close, null)
Icon(painter = painterResource(id = R.drawable.ic_close), null)
}
},
expanded = expanded,
Expand All @@ -235,7 +229,7 @@ fun AdvancedSettingsScreen(
modifier = Modifier.padding(0.dp)
) {
Icon(
imageVector = Icons.AutoMirrored.Default.KeyboardArrowLeft,
painter = painterResource(id = R.drawable.ic_keyboard_arrow_left),
contentDescription = null
)
}
Expand All @@ -246,7 +240,7 @@ fun AdvancedSettingsScreen(
onClick = { isSearching = true }
) {
Icon(
imageVector = Icons.Default.Search,
painter = painterResource(id = R.drawable.ic_search),
contentDescription = "Search"
)
}
Expand Down Expand Up @@ -563,7 +557,7 @@ fun SettingsScreen(
IconButton(
onClick = navigateBack
) {
Icon(imageVector = Icons.AutoMirrored.Default.KeyboardArrowLeft, null)
Icon(painter = painterResource(id = R.drawable.ic_keyboard_arrow_left), null)
}
})
}
Expand Down Expand Up @@ -620,7 +614,7 @@ fun SettingsScreen(
title = stringResource(R.string.users),
description = "${stringResource(R.string.active_user)}: ${UserRepository.getUsername(activeUser)}",
icon = {
PreferenceIcon(icon = Icons.Default.Person)
PreferenceIcon(icon = painterResource(id = R.drawable.ic_person))
},
onClick = {
navigateTo("users")
Expand Down Expand Up @@ -697,7 +691,7 @@ fun SettingsScreen(
item(key = "share_logs") {
HomePreference(
title = stringResource(R.string.share_log),
icon = { Icon(imageVector = Icons.Default.Share, contentDescription = null) },
icon = { Icon(painter = painterResource(id = R.drawable.ic_share), contentDescription = null) },
description = stringResource(R.string.share_log_description),
onClick = {
val file = DocumentFile.fromSingleUri(
Expand Down Expand Up @@ -743,7 +737,7 @@ fun ControllerSettings(
IconButton(
onClick = navigateBack
) {
Icon(imageVector = Icons.AutoMirrored.Default.KeyboardArrowLeft, null)
Icon(painter = painterResource(id = R.drawable.ic_keyboard_arrow_left), null)
}
}
)
Expand Down
Loading
Loading