Skip to content

Add G2 rounded-corner support #101

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

Open
ItosEO wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add G2 rounded-corner support #101

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
6 changes: 5 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,8 @@ local.properties
.idea
/manager/signing.properties
/out
/signing.properties
/signing.properties
/CLAUDE.md
/AGENTS.md
/CLAUDE.md
/AGENTS.md
3 changes: 3 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ appcompat = "1.7.1"
junit = "4.13.2"
junitVersion = "1.3.0"
espressoCore = "3.7.0"
capsule = "2.1.3"

[libraries]
androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "annotation" }
Expand Down Expand Up @@ -100,6 +101,8 @@ sheet-compose-dialogs-core = { group = "com.maxkeppeler.sheets-compose-dialogs",
sheet-compose-dialogs-list = { group = "com.maxkeppeler.sheets-compose-dialogs", name = "list", version.ref = "sheets-compose-dialogs" }
sheet-compose-dialogs-input = { group = "com.maxkeppeler.sheets-compose-dialogs", name = "input", version.ref = "sheets-compose-dialogs" }

capsule = { module = "io.github.kyant0:capsule", version.ref = "capsule" }


[plugins]
android-application = { id = "com.android.application", version.ref = "agp" }
Expand Down
2 changes: 2 additions & 0 deletions manager/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,6 @@ dependencies {
implementation(libs.sheet.compose.dialogs.core)
implementation(libs.sheet.compose.dialogs.list)
implementation(libs.sheet.compose.dialogs.input)

implementation(libs.capsule)
}
6 changes: 3 additions & 3 deletions manager/src/main/java/frb/axeron/manager/ui/AxActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import androidx.compose.animation.slideOutVertically
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import frb.axeron.manager.ui.theme.AppShape
import androidx.compose.material3.Badge
import androidx.compose.material3.BadgedBox
import androidx.compose.material3.Card
Expand Down Expand Up @@ -275,7 +275,7 @@ class AxActivity : ComponentActivity() {
containerColor = MaterialTheme.colorScheme.surfaceContainer
),
elevation = CardDefaults.cardElevation(0.dp),
shape = RoundedCornerShape(topStart = 15.dp, topEnd = 15.dp)
shape = AppShape.Top15
) {
NavigationBar(
containerColor = Color.Transparent,
Expand Down Expand Up @@ -337,4 +337,4 @@ class AxActivity : ComponentActivity() {
}
}
}
}
}
14 changes: 7 additions & 7 deletions manager/src/main/java/frb/axeron/manager/ui/RequestPermissionActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
import frb.axeron.manager.ui.theme.AppShape
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.ExperimentalMaterial3Api
Expand Down Expand Up @@ -165,7 +165,7 @@ fun RequestPermissionDialog(
onDismissRequest = { onDeny() },
sheetState = sheetState,
containerColor = MaterialTheme.colorScheme.surface,
shape = RoundedCornerShape(topStart = 28.dp, topEnd = 28.dp),
shape = AppShape.Top28,
dragHandle = { }
) {
Column(
Expand All @@ -185,7 +185,7 @@ fun RequestPermissionDialog(
pm = pm,
modifier = Modifier
.size(56.dp)
.clip(RoundedCornerShape(12.dp))
.clip(AppShape.R12)
)

Spacer(Modifier.width(12.dp))
Expand Down Expand Up @@ -231,7 +231,7 @@ fun RequestPermissionDialog(
onClick = {
scope.launch { sheetState.hide() }.invokeOnCompletion { onAllow(false) }
},
shape = RoundedCornerShape(12.dp)
shape = AppShape.R12
) {
Text(stringResource(R.string.permission_allow_all_time))
}
Expand All @@ -240,7 +240,7 @@ fun RequestPermissionDialog(
onClick = {
scope.launch { sheetState.hide() }.invokeOnCompletion { onAllow(true) }
},
shape = RoundedCornerShape(12.dp),
shape = AppShape.R12,
colors = ButtonDefaults.buttonColors(
containerColor = MaterialTheme.colorScheme.surfaceVariant,
contentColor = MaterialTheme.colorScheme.onSurfaceVariant
Expand All @@ -253,7 +253,7 @@ fun RequestPermissionDialog(
onClick = {
scope.launch { sheetState.hide() }.invokeOnCompletion { onDeny() }
},
shape = RoundedCornerShape(12.dp),
shape = AppShape.R12,
colors = ButtonDefaults.buttonColors(
containerColor = Color.Transparent,
contentColor = MaterialTheme.colorScheme.error
Expand Down Expand Up @@ -289,4 +289,4 @@ fun AppIcon(
},
modifier = modifier
)
}
}
6 changes: 5 additions & 1 deletion manager/src/main/java/frb/axeron/manager/ui/component/Card.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
import frb.axeron.manager.R
import frb.axeron.manager.ui.theme.AppShape
import frb.axeron.manager.ui.viewmodel.PluginViewModel
import frb.axeron.manager.ui.viewmodel.PrivilegeViewModel

Expand All @@ -48,6 +49,7 @@ fun StatusCard() {
}

ElevatedCard(
shape = AppShape.R12,
modifier = Modifier
.fillMaxWidth()
.height(IntrinsicSize.Max)
Expand Down Expand Up @@ -139,6 +141,7 @@ fun PluginCard(

ElevatedCard(
colors = CardDefaults.cardColors(),
shape = AppShape.R12,
modifier = modifier
.fillMaxWidth()
.height(IntrinsicSize.Max)
Expand Down Expand Up @@ -208,6 +211,7 @@ fun PrivilegeCard(
val containerColor = colorScheme.surfaceVariant
ElevatedCard(
colors = CardDefaults.cardColors(),
shape = AppShape.R12,
modifier = modifier
.fillMaxWidth()
.height(IntrinsicSize.Max)
Expand Down Expand Up @@ -265,4 +269,4 @@ fun PrivilegeCard(
}

}
}
}
6 changes: 3 additions & 3 deletions manager/src/main/java/frb/axeron/manager/ui/component/Dialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.shape.RoundedCornerShape
import frb.axeron.manager.ui.theme.AppShape
import androidx.compose.material3.BottomSheetDefaults
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3Api
Expand Down Expand Up @@ -469,7 +469,7 @@ private fun LoadingDialog() {
properties = DialogProperties(dismissOnClickOutside = false, dismissOnBackPress = false)
) {
Surface(
modifier = Modifier.size(100.dp), shape = RoundedCornerShape(8.dp)
modifier = Modifier.size(100.dp), shape = AppShape.R8
) {
Box(
contentAlignment = Alignment.Center,
Expand Down Expand Up @@ -586,4 +586,4 @@ private fun MarkdownContent(content: String) {
it.setTextColor(contentColor.toArgb())
}
)
}
}
8 changes: 4 additions & 4 deletions manager/src/main/java/frb/axeron/manager/ui/component/ExtraLabel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.layout.wrapContentWidth
import androidx.compose.foundation.shape.RoundedCornerShape
import frb.axeron.manager.ui.theme.AppShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Tune
import androidx.compose.material3.Card
Expand Down Expand Up @@ -39,7 +39,7 @@ fun LabelPreview() {
@Composable
fun ExtraLabel() {
Card(
shape = RoundedCornerShape(3.dp),
shape = AppShape.R3,
) {
Row(
modifier = Modifier
Expand Down Expand Up @@ -112,7 +112,7 @@ object ExtraLabelDefaults {
@Composable get() = ExtraLabelStyle(
containerColor = MaterialTheme.colorScheme.primary,
contentColor = MaterialTheme.colorScheme.onPrimary,
shape = RoundedCornerShape(3.dp),
shape = AppShape.R3,
textStyle = TextStyle(
fontSize = 8.sp,
fontWeight = FontWeight.Medium,
Expand All @@ -138,7 +138,7 @@ fun ExtraLabel(
.then(
if (onClick != null) Modifier.clickable { onClick() } else Modifier
),
shape = RoundedCornerShape(3.dp),
shape = AppShape.R3,
colors = CardDefaults.cardColors().copy(
containerColor = style.containerColor,
contentColor = style.contentColor
Expand Down
6 changes: 3 additions & 3 deletions manager/src/main/java/frb/axeron/manager/ui/component/MaterialDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import frb.axeron.manager.ui.theme.AppShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.BottomSheetDefaults
import androidx.compose.material3.CardDefaults
Expand Down Expand Up @@ -42,7 +42,7 @@ fun MaterialDialog(
)
) {
ElevatedCard(
shape = RoundedCornerShape(24.dp),
shape = AppShape.R24,
elevation = CardDefaults.cardElevation(8.dp),
modifier = Modifier
.fillMaxWidth()
Expand Down Expand Up @@ -112,7 +112,7 @@ fun MaterialBottomSheet(
containerColor = MaterialTheme.colorScheme.surfaceContainerLowest,
onDismissRequest = { onDismissRequest() },
sheetState = sheetState,
shape = RoundedCornerShape(topStart = 24.dp, topEnd = 24.dp),
shape = AppShape.Top24,
tonalElevation = 8.dp,
dragHandle = dragHandle
) {
Expand Down
8 changes: 4 additions & 4 deletions manager/src/main/java/frb/axeron/manager/ui/component/PaletteDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import androidx.compose.foundation.layout.height
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 frb.axeron.manager.ui.theme.AppShape
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.ExperimentalMaterial3Api
Expand Down Expand Up @@ -184,9 +184,9 @@ fun PaletteDialog(
modifier = Modifier
.fillMaxWidth()
.height(48.dp)
.clip(RoundedCornerShape(8.dp))
.clip(AppShape.R8)
.background(selectedColor)
.border(1.dp, MaterialTheme.colorScheme.outline, RoundedCornerShape(8.dp))
.border(1.dp, MaterialTheme.colorScheme.outline, AppShape.R8)
)
}
},
Expand Down Expand Up @@ -239,4 +239,4 @@ private fun SliderRow(
}
}

// aaaa
// aaaa
Copy link

Copilot AI Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stray placeholder comment (// aaaa) at the end of the file doesn’t add useful context and should be removed to keep the source clean.

Copilot uses AI. Check for mistakes.
6 changes: 3 additions & 3 deletions manager/src/main/java/frb/axeron/manager/ui/component/PowerDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import androidx.compose.foundation.layout.padding
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 frb.axeron.manager.ui.theme.AppShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ExpandLess
import androidx.compose.material.icons.filled.ExpandMore
Expand Down Expand Up @@ -56,7 +56,7 @@ fun VerticalSlideSeekbar(
modifier = Modifier
.width(65.dp)
.height(height)
.background(Color(0xFF303030), RoundedCornerShape(46.dp))
.background(Color(0xFF303030), AppShape.R46)
.pointerInput(Unit) {
detectVerticalDragGestures(
onVerticalDrag = { _, dragAmount ->
Expand Down Expand Up @@ -204,4 +204,4 @@ fun PowerDialog(
}
}
}
}
}
4 changes: 2 additions & 2 deletions manager/src/main/java/frb/axeron/manager/ui/component/SearchBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import androidx.compose.animation.fadeOut
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import frb.axeron.manager.ui.theme.AppShape
import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material.icons.Icons
Expand Down Expand Up @@ -119,7 +119,7 @@ fun SearchAppBar(
unfocusedIndicatorColor = Color.Transparent, // garis saat tidak fokus
disabledIndicatorColor = Color.Transparent // garis saat disabled
),
shape = RoundedCornerShape(12.dp),
shape = AppShape.R12,
keyboardOptions = KeyboardOptions.Default.copy(imeAction = ImeAction.Done),
keyboardActions = KeyboardActions(onDone = {
keyboardController?.hide()
Expand Down
12 changes: 6 additions & 6 deletions manager/src/main/java/frb/axeron/manager/ui/component/SettingsItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
import frb.axeron.manager.ui.theme.AppShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ExpandMore
import androidx.compose.material3.Card
Expand Down Expand Up @@ -73,8 +73,8 @@ fun SettingsItem(
contentColor = contentColor
),
shape = when (type) {
SettingsItemType.PARENT -> CardDefaults.elevatedShape
SettingsItemType.CHILD -> RoundedCornerShape(0.dp)
SettingsItemType.PARENT -> AppShape.R12
SettingsItemType.CHILD -> AppShape.R0
},
elevation = when (type) {
SettingsItemType.PARENT -> CardDefaults.elevatedCardElevation()
Expand Down Expand Up @@ -204,8 +204,8 @@ fun SettingsItemExpanded(
contentColor = contentColor
),
shape = when (type) {
SettingsItemType.PARENT -> CardDefaults.elevatedShape
SettingsItemType.CHILD -> RoundedCornerShape(0.dp)
SettingsItemType.PARENT -> AppShape.R12
SettingsItemType.CHILD -> AppShape.R0
},
elevation = when (type) {
SettingsItemType.PARENT -> CardDefaults.elevatedCardElevation()
Expand Down Expand Up @@ -295,7 +295,7 @@ fun CheckBoxText(
.height(36.dp)
.fillMaxWidth()
.padding(horizontal = 12.dp, vertical = 2.dp),
shape = RoundedCornerShape(5.dp),
shape = AppShape.R5,
onClick = {
onCheckedChange(!checked)
}
Expand Down
Loading