Skip to content

Refactor/re-design_shizuku-adb-screen-styles #5

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
Baidaidai-GFWD-origin merged 2 commits into from
Apr 9, 2026
Merged

Refactor/re-design_shizuku-adb-screen-styles #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c756db8
feat(ui): Add Shizuku action icons
Baidaidai-GFWD-origin Apr 9, 2026
928719f
refactor!: Restructure Shizuku ADB screen components
Baidaidai-GFWD-origin Apr 9, 2026
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
15 changes: 13 additions & 2 deletions app/src/main/java/com/baidaidai/rootless_store/ShizukuActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
Expand All @@ -21,7 +24,7 @@ import dagger.hilt.android.AndroidEntryPoint

@AndroidEntryPoint
class ShizukuActivity: ComponentActivity() {
@OptIn(ExperimentalMaterial3ExpressiveApi::class)
@OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class)
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
Expand All @@ -34,7 +37,15 @@ class ShizukuActivity: ComponentActivity() {
}
}
RootlessStoreTheme {
Scaffold { contentPadding ->
Scaffold(
topBar = {
TopAppBar(
title = {
Text("Shizuku Auth")
}
)
}
) { contentPadding ->
if (sharedEvent is RootlessStoreError){
StartScreenErrorDialog(shizukuAdbScreenViewModel, sharedEvent)
}
Expand Down
220 changes: 220 additions & 0 deletions ...idaidai/rootless_store/components/shizukuAdbScreen/ShizukuAdbScreenNecessaryComponents.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,220 @@
package com.baidaidai.rootless_store.components.shizukuAdbScreen

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.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material3.Button
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.ModalBottomSheet
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.OutlinedCard
import androidx.compose.material3.Text
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import com.baidaidai.rootless_store.R

object ShizukuAdbScreenNecessaryComponents {

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun ShizukuAdbScreenModelSheet(
remainderTime: Int,
onDismissRequest: ()-> Unit,
onCloseButtonClick: ()-> Unit,
onReturnButtonClick: ()-> Unit
){
ModalBottomSheet(
onDismissRequest = onDismissRequest,
sheetState = rememberModalBottomSheetState(),
) {
Column(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 24.dp)
.padding(top = 8.dp, bottom = 24.dp),
horizontalAlignment = Alignment.CenterHorizontally
) {
Box(
modifier = Modifier
.size(84.dp)
.clip(CircleShape)
.background(MaterialTheme.colorScheme.primaryContainer),
contentAlignment = Alignment.Center
) {
Icon(
painterResource(R.drawable.material_symbols_check),
contentDescription = null,
tint = MaterialTheme.colorScheme.onPrimaryContainer,
modifier = Modifier.size(40.dp)
)
}

Spacer(Modifier.height(16.dp))

Text(
text = "All done",
style = MaterialTheme.typography.headlineSmall,
color = MaterialTheme.colorScheme.onSurface,
textAlign = TextAlign.Center
)

Spacer(Modifier.height(8.dp))

Text(
text = "Returning to Home in $remainderTime s",
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
textAlign = TextAlign.Center
)

Spacer(Modifier.height(20.dp))

Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.spacedBy(12.dp)
) {
OutlinedButton(
onClick = onCloseButtonClick,
modifier = Modifier.weight(1f)
) {
Text("Close")
}
Button(
onClick = onReturnButtonClick,
modifier = Modifier.weight(1f)
) {
Text("Return now")
}
}
}
}
}

@OptIn(ExperimentalMaterial3ExpressiveApi::class)
@Composable
fun ShizukuAdbScreenActionCard(
step: String,
title: String,
description: String,
targetStatus: Boolean,
onClick: () -> Unit
){
Card(
modifier = Modifier
.fillMaxWidth(),
elevation = CardDefaults.cardElevation(),
colors = CardDefaults.cardColors(
containerColor = MaterialTheme.colorScheme.surfaceContainer
)
) {
Column(
modifier = Modifier
.padding(20.dp),
verticalArrangement = Arrangement.spacedBy(12.dp)
) {
Column{
Row(
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier
.fillMaxWidth()
.height(60.dp)
){
Column{
Text(
text = step,
style = MaterialTheme.typography.labelMedium,
color = MaterialTheme.colorScheme.primary
)
Text(
text = title,
style = MaterialTheme.typography.titleMediumEmphasized
)
}
Button(
onClick = onClick,
modifier = Modifier.size(48.dp),
contentPadding = PaddingValues(0.dp)
) {
Icon(
painter = if (targetStatus){
painterResource(R.drawable.material_symbols_check)
}else{
painterResource(R.drawable.material_symbols_play_arrow)
},
contentDescription = "Start",
modifier = Modifier.size(24.dp)
)
}
}
Spacer(modifier = Modifier.height(15.dp))
HorizontalDivider()
Spacer(modifier = Modifier.height(15.dp))
Text(
text = description,
style = MaterialTheme.typography.bodyMediumEmphasized
)
}
}
}
}

@OptIn(ExperimentalMaterial3ExpressiveApi::class)
@Composable
fun ShizukuAdbScreenOverviewCard(){
OutlinedCard(
modifier = Modifier
.fillMaxWidth(),
elevation = CardDefaults.cardElevation(),
) {
Column(
modifier = Modifier
.padding(24.dp),
verticalArrangement = Arrangement.spacedBy(12.dp)
) {
Row(
modifier = Modifier
.height(50.dp)
.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
){
Text(
text = "Shizuku Access",
style = MaterialTheme.typography.titleLargeEmphasized
)
Icon(
painterResource(R.drawable.material_shizuku_icon),
contentDescription = "Shizuku Icon",
tint = MaterialTheme.colorScheme.primary,
)
}
Text(
text = "Rootless Store uses Shizuku’s ADB shell for some features so please request ADB authorization.\nFirst then connect to Shizuku.",
style = MaterialTheme.typography.bodyMedium
)
}
}
}
}
Loading
Loading