Skip to content

Add reset button to navbar corner radius slider #160

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
theovilardo merged 1 commit into from
Sep 21, 2025
Merged

Add reset button to navbar corner radius slider #160

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
84 changes: 66 additions & 18 deletions app/src/main/java/com/theveloper/pixelplay/presentation/screens/NavBarCornerRadiusScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,32 @@
package com.theveloper.pixelplay.presentation.screens

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.History
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Slider
import androidx.compose.material3.SliderDefaults
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableFloatStateOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
Expand All @@ -32,34 +39,40 @@ import androidx.navigation.NavController
import com.theveloper.pixelplay.presentation.viewmodel.SettingsViewModel
import racra.compose.smooth_corner_rect_library.AbsoluteSmoothCornerShape

const val DEFAULT_NAV_BAR_CORNER_RADIUS = 32f

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun NavBarCornerRadiusScreen(
navController: NavController,
settingsViewModel: SettingsViewModel = hiltViewModel()
navController: NavController, settingsViewModel: SettingsViewModel = hiltViewModel()
) {
val uiState by settingsViewModel.uiState.collectAsState()
var sliderValue by remember { mutableStateOf(uiState.navBarCornerRadius.toFloat()) }
var sliderValue by remember { mutableFloatStateOf(uiState.navBarCornerRadius.toFloat()) }
var hasBeenAdjusted by remember { mutableStateOf(sliderValue != DEFAULT_NAV_BAR_CORNER_RADIUS) }

LaunchedEffect(uiState.navBarCornerRadius) {
sliderValue = uiState.navBarCornerRadius.toFloat()
}

Scaffold(
topBar = {
TopAppBar(
title = { Text("NavBar Corner Radius") },
actions = {
TextButton(onClick = {
settingsViewModel.setNavBarCornerRadius(sliderValue.toInt())
navController.popBackStack()
}) {
TopAppBar(title = { Text("NavBar Corner Radius") }, actions = {
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp),
modifier = Modifier.padding(end = 8.dp)
) {
Button(
onClick = {
settingsViewModel.setNavBarCornerRadius(sliderValue.toInt())
navController.popBackStack()
},
) {
Text("Done")
}
}
)
}
) { paddingValues ->
})
}) { paddingValues ->
Box(
modifier = Modifier
.fillMaxSize()
Expand All @@ -68,7 +81,7 @@ fun NavBarCornerRadiusScreen(
.padding(bottom = paddingValues.calculateBottomPadding())
) {
Text(
text = "Match the black area's corners with your device's corners",
text = "Match the navbar shape's corners with your device's corners",
style = MaterialTheme.typography.headlineSmall,
textAlign = TextAlign.Center,
color = MaterialTheme.colorScheme.onBackground,
Expand All @@ -78,14 +91,49 @@ fun NavBarCornerRadiusScreen(
.padding(top = 32.dp)
)


Column(
modifier = Modifier
.align(Alignment.BottomCenter),
modifier = Modifier.align(Alignment.BottomCenter),
horizontalAlignment = Alignment.CenterHorizontally
) {
if (hasBeenAdjusted) {
Row(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 32.dp)
.padding(bottom = 16.dp), horizontalArrangement = Arrangement.End
) {
Button(
onClick = {
sliderValue = DEFAULT_NAV_BAR_CORNER_RADIUS
hasBeenAdjusted = false
}, colors = ButtonDefaults.buttonColors(
containerColor = MaterialTheme.colorScheme.secondaryContainer,
contentColor = MaterialTheme.colorScheme.onSecondaryContainer
)
) {
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(6.dp)
) {
Icon(
imageVector = Icons.Rounded.History,
contentDescription = "Reset",
)
Text("Reset")
}
}
}
}

Slider(
value = sliderValue,
onValueChange = { sliderValue = it },
onValueChange = {
sliderValue = it
if (!hasBeenAdjusted) {
hasBeenAdjusted = true
}
},
valueRange = 0f..50f,
colors = SliderDefaults.colors(
thumbColor = MaterialTheme.colorScheme.primary,
Expand Down