jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More work on Material3 colors migration

Browse Source
This commit is contained in:
Juha Heinanen
2025-10-20 17:48:40 +03:00
parent 80c75eda64
commit 2a50a192d5
18 changed files with 300 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/CallDetailsScreen.kt
+6 -12
View File
@@ -71,12 +71,12 @@ private fun CallDetailsScreen(navController: NavController, callRow: CallRow) {
Scaffold(
modifier = Modifier.fillMaxSize().imePadding(),
containerColor = LocalCustomColors.current.background,
containerColor = MaterialTheme.colorScheme.background,
topBar = {
Column(
modifier = Modifier
.fillMaxWidth()
.background(LocalCustomColors.current.background)
.background(MaterialTheme.colorScheme.background)
.padding(top = WindowInsets.statusBars.asPaddingValues().calculateTopPadding())
) {
TopAppBar(
@@ -132,7 +132,6 @@ private fun Peer(ctx: Context, callRow: CallRow) {
modifier = Modifier.fillMaxWidth(),
fontSize = 18.sp,
fontWeight = FontWeight.SemiBold,
color = LocalCustomColors.current.itemText,
textAlign = TextAlign.Center
)
}
@@ -141,21 +140,18 @@ private fun Peer(ctx: Context, callRow: CallRow) {
private fun Details(ctx: Context, details: ArrayList<Details>) {
Row(verticalAlignment = Alignment.CenterVertically) {
Text(text = stringResource(R.string.direction),
color = LocalCustomColors.current.itemText,
fontSize = 16.sp,
fontWeight = FontWeight.SemiBold,
modifier = Modifier.width(96.dp)
)
Spacer(modifier = Modifier.width(6.dp))
Text(text = stringResource(R.string.time),
color = LocalCustomColors.current.itemText,
fontSize = 16.sp,
fontWeight = FontWeight.SemiBold
)
Spacer(modifier = Modifier.weight(1f))
Text(text = stringResource(R.string.calls_duration),
modifier = Modifier.padding(end = 12.dp),
color = LocalCustomColors.current.itemText,
fontSize = 16.sp,
fontWeight = FontWeight.SemiBold
)
@@ -167,7 +163,7 @@ private fun Details(ctx: Context, details: ArrayList<Details>) {
state = lazyListState,
width = 4.dp
)
.background(LocalCustomColors.current.background),
.background(MaterialTheme.colorScheme.background),
state = lazyListState,
verticalArrangement = Arrangement.spacedBy(12.dp),
) {
@@ -235,7 +231,7 @@ private fun startTime(detail: Details): String {
durationText = DateUtils.formatElapsedTime(duration)
}
}
Text(text = startTimeText, color = LocalCustomColors.current.itemText)
Text(text = startTimeText)
return durationText
}
@@ -256,7 +252,7 @@ private fun Duration(ctx: Context, detail: Details, durationText: String) {
if (recording[0] != "") {
Text(
text = durationText,
color = LocalCustomColors.current.accent,
color = MaterialTheme.colorScheme.error,
modifier = Modifier.padding(end = 12.dp)
.clickable(onClick = {
if (!decPlayer.isPlaying && !encPlayer.isPlaying) {
@@ -334,9 +330,7 @@ private fun Duration(ctx: Context, detail: Details, durationText: String) {
})
)
} else {
Text(text = durationText,
modifier = Modifier.padding(end = 12.dp),
color = LocalCustomColors.current.itemText)
Text(text = durationText, modifier = Modifier.padding(end = 12.dp))
}
}