Skip to content
This repository was archived by the owner on Apr 9, 2025. It is now read-only.

Refactor AlertDialogQueue's ui #324

Merged
DHrpcs3 merged 1 commit into from
Apr 1, 2025
Merged

Refactor AlertDialogQueue's ui #324

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
112 changes: 91 additions & 21 deletions app/src/main/java/net/rpcs3/dialogs/AlertDialogQueue.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,31 @@

package net.rpcs3.dialogs

import androidx.compose.material3.AlertDialog
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.BasicAlertDialog
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.material3.Divider
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.runtime.Composable
import androidx.compose.runtime.mutableStateListOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.derivedStateOf
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp

object AlertDialogQueue {
val dialogs = mutableStateListOf<DialogData>()
Expand All @@ -26,6 +47,7 @@ object AlertDialogQueue {
}
}

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun AlertDialog() {
if (dialogs.isEmpty()) {
Expand All @@ -35,29 +57,77 @@ object AlertDialogQueue {
val dialog = dialogs.first()
val onDismiss = dialog.onDismiss

AlertDialog(
onDismissRequest = {
dialog.onDismiss?.invoke()
val scrollState = rememberScrollState()
val hasScrolled = remember { derivedStateOf { scrollState.value > 0 } }

BasicAlertDialog(
onDismissRequest = {
onDismiss?.invoke()
dismissDialog()
},
title = { Text(dialog.title) },
text = { Text(dialog.message) },
confirmButton = {
TextButton(onClick = {
dialog.onConfirm()
dismissDialog()
}) {
Text(dialog.confirmText)
}
},
dismissButton = if (onDismiss == null) null else ({
TextButton(onClick = {
onDismiss()
dismissDialog()
}) {
Text(dialog.dismissText)
content = {
Surface(
shape = RoundedCornerShape(28.dp),
tonalElevation = 6.dp,
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 16.dp)
) {
Column(modifier = Modifier.padding(vertical = 16.dp)) {
Text(
dialog.title,
modifier = Modifier.padding(horizontal = 16.dp),
style = MaterialTheme.typography.headlineSmall,
color = MaterialTheme.colorScheme.onSurface
)
Spacer(modifier = Modifier.height(8.dp))

if (hasScrolled.value) {
Divider()
}

Text(
text = dialog.message,
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier
.heightIn(max = 200.dp)
.verticalScroll(scrollState)
.padding(vertical = 4.dp, horizontal = 16.dp)
)

if (hasScrolled.value) {
Divider()
}

Spacer(modifier = Modifier.height(16.dp))
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.End
) {
TextButton(
onClick = {
onDismiss?.invoke()
dismissDialog()
}
) {
Text(text = dialog.dismissText)
}
Spacer(modifier = Modifier.width(8.dp))
TextButton(
onClick = {
dialog.onConfirm()
onDismiss?.invoke()
dismissDialog()
},
modifier = Modifier.padding(end = 16.dp)
) {
Text(text = dialog.confirmText)
}
}
}
}
})
}
)
}
}
Expand Down
14 changes: 13 additions & 1 deletion app/src/main/java/net/rpcs3/ui/drivers/GpuDriversScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,15 @@ import androidx.compose.material3.TextButton
import androidx.compose.material3.LinearProgressIndicator
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Surface
import androidx.compose.material3.Divider
import androidx.compose.foundation.layout.width
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
Expand Down Expand Up @@ -466,6 +468,8 @@ fun fetchAndShowDrivers(
var fetchResult by remember { mutableStateOf<FetchResult?>(null) }
var fetchedDrivers by remember { mutableStateOf<List<Pair<String, String?>>>(emptyList()) }
var chosenIndex by remember { mutableStateOf(0) }
val scrollState = rememberScrollState()
val hasScrolled = remember { derivedStateOf { scrollState.value > 0 } }

LaunchedEffect(Unit) {
val fetchOutput = DriversFetcher.fetchReleases(repoUrl, bypassValidation)
Expand Down Expand Up @@ -534,11 +538,15 @@ fun fetchAndShowDrivers(
Text("Drivers", modifier = Modifier.padding(horizontal = 16.dp), style = MaterialTheme.typography.headlineSmall)
Spacer(modifier = Modifier.height(8.dp))

if (hasScrolled.value) {
Divider()
}

Column(
modifier = Modifier
.fillMaxWidth()
.heightIn(max = maxHeight)
.verticalScroll(rememberScrollState())
.verticalScroll(scrollState)
) {
fetchedDrivers.forEachIndexed { index, driver ->
Row(
Expand All @@ -557,6 +565,10 @@ fun fetchAndShowDrivers(
}
}

if (hasScrolled.value) {
Divider()
}

Spacer(modifier = Modifier.height(16.dp))
Row(
modifier = Modifier.fillMaxWidth(),
Expand Down