Skip to content

Rewrite ProxyDesign #83

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
Goooler merged 18 commits into from
Apr 21, 2026
Merged

Rewrite ProxyDesign #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
509d932
Rewrite ProxyDesign
Goooler Apr 20, 2026
fefc367
Update design/src/main/java/com/github/kr328/clash/design/ProxyDesign.kt
Goooler Apr 21, 2026
097ef91
Update design/src/main/java/com/github/kr328/clash/design/AccessContr…
Goooler Apr 21, 2026
78c6922
Update design/src/main/java/com/github/kr328/clash/design/ProxyDesign.kt
Goooler Apr 21, 2026
5e559aa
Update design/src/main/java/com/github/kr328/clash/design/ProxyDesign.kt
Goooler Apr 21, 2026
da4022d
Fix build
Goooler Apr 21, 2026
8fa7a5b
12.dp for contentPadding
Goooler Apr 21, 2026
d0a52c6
Improve Proxy menu accessibility semantics
Copilot Apr 21, 2026
4bdd23e
Apply suggestions from code review
Goooler Apr 21, 2026
a3ee604
Optimize Proxy group refresh to visible-item updates
Copilot Apr 21, 2026
7ae0886
Cache visible proxy item updates per refresh cycle
Copilot Apr 21, 2026
d798b86
Stabilize Proxy grid item source snapshot
Copilot Apr 21, 2026
d1df817
Key visible proxy cache by proxy identity
Copilot Apr 21, 2026
52459f5
Use effect-driven visible proxy UI state updates
Copilot Apr 21, 2026
ef62963
Key remembered proxy item state by refresh version
Copilot Apr 21, 2026
229b4ec
Avoid unnecessary remember state recreation
Copilot Apr 21, 2026
b4fea46
Mark private
Goooler Apr 21, 2026
306ad35
Fix first frame
Goooler Apr 21, 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
4 changes: 1 addition & 3 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,7 @@
android:exported="false" />
<activity
android:name=".ProxyActivity"
Comment thread
Goooler marked this conversation as resolved.
android:configChanges="uiMode"
android:exported="false"
android:label="@string/proxy" />
android:exported="false" />
Comment thread
Goooler marked this conversation as resolved.
<activity
android:name=".ProvidersActivity"
android:exported="false" />
Expand Down
233 changes: 98 additions & 135 deletions design/src/main/java/com/github/kr328/clash/design/AccessControlDesign.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
Expand All @@ -27,6 +28,7 @@ import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.ModalBottomSheet
import androidx.compose.material3.RadioButton
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.material3.TextField
import androidx.compose.material3.TextFieldDefaults
Expand Down Expand Up @@ -158,53 +160,61 @@ private fun AccessControlScreen(
var showMenu by remember { mutableStateOf(false) }

if (showMenu) {
AccessControlMenuSheet(
sort = sort,
reverse = reverse,
showSystemApps = showSystemApps,
onDismiss = { showMenu = false },
onSelectAll = {
showMenu = false
onSelectAll()
},
onSelectNone = {
showMenu = false
onSelectNone()
},
onSelectInvert = {
showMenu = false
onSelectInvert()
},
onImport = {
showMenu = false
onImport()
},
onExport = {
showMenu = false
onExport()
},
onUpdateSort = {
sort = it
onUpdateSort(it)
},
onUpdateReverse = {
reverse = it
onUpdateReverse(it)
},
onUpdateShowSystemApps = {
showSystemApps = it
onUpdateShowSystemApps(it)
},
)
ModalBottomSheet(
onDismissRequest = { showMenu = false },
sheetState = rememberModalBottomSheetState(),
) {
AccessControlMenuContent(
sort = sort,
reverse = reverse,
showSystemApps = showSystemApps,
onSelectAll = {
showMenu = false
onSelectAll()
},
onSelectNone = {
showMenu = false
onSelectNone()
},
onSelectInvert = {
showMenu = false
onSelectInvert()
},
onImport = {
showMenu = false
onImport()
},
onExport = {
showMenu = false
onExport()
},
onUpdateSort = {
sort = it
showMenu = false
onUpdateSort(it)
},
onUpdateReverse = {
reverse = it
showMenu = false
onUpdateReverse(it)
},
onUpdateShowSystemApps = {
Comment thread
Goooler marked this conversation as resolved.
showSystemApps = it
showMenu = false
onUpdateShowSystemApps(it)
},
)
Spacer(modifier = Modifier.height(16.dp))
}
}

if (showSearch) {
AccessControlSearchSheet(
apps = apps,
selected = selected,
onToggleApp = onToggleApp,
onDismiss = { showSearch = false },
)
ModalBottomSheet(
onDismissRequest = { showSearch = false },
sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),
) {
AccessControlSearchContent(apps = apps, selected = selected, onToggleApp = onToggleApp)
}
}

MihomoScaffold(
Expand Down Expand Up @@ -237,63 +247,8 @@ private fun AccessControlScreen(
}
}

@OptIn(ExperimentalMaterial3Api::class)
@Composable
private fun AccessControlMenuSheet(
sort: AppInfoSort,
reverse: Boolean,
showSystemApps: Boolean,
modifier: Modifier = Modifier,
onDismiss: () -> Unit,
onSelectAll: () -> Unit,
onSelectNone: () -> Unit,
onSelectInvert: () -> Unit,
onImport: () -> Unit,
onExport: () -> Unit,
onUpdateSort: (AppInfoSort) -> Unit,
onUpdateReverse: (Boolean) -> Unit,
onUpdateShowSystemApps: (Boolean) -> Unit,
) {
ModalBottomSheet(
modifier = modifier,
onDismissRequest = onDismiss,
sheetState = rememberModalBottomSheetState(),
) {
AccessControlMenuContent(
sort = sort,
reverse = reverse,
showSystemApps = showSystemApps,
onSelectAll = onSelectAll,
onSelectNone = onSelectNone,
onSelectInvert = onSelectInvert,
onImport = onImport,
onExport = onExport,
onUpdateSort = onUpdateSort,
onUpdateReverse = onUpdateReverse,
onUpdateShowSystemApps = onUpdateShowSystemApps,
)
Spacer(modifier = Modifier.height(16.dp))
}
}

@OptIn(ExperimentalMaterial3Api::class)
@Composable
private fun AccessControlSearchSheet(
apps: List<AppInfo>,
selected: Set<String>,
onToggleApp: (String) -> Unit,
onDismiss: () -> Unit,
) {
ModalBottomSheet(
onDismissRequest = onDismiss,
sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),
) {
AccessControlSearchContent(apps = apps, selected = selected, onToggleApp = onToggleApp)
}
}

@Composable
private fun AccessControlSearchContent(
private fun ColumnScope.AccessControlSearchContent(
apps: List<AppInfo>,
selected: Set<String>,
onToggleApp: (String) -> Unit,
Expand Down Expand Up @@ -346,7 +301,7 @@ private fun AccessControlSearchContent(
}

@Composable
private fun AccessControlMenuContent(
private fun ColumnScope.AccessControlMenuContent(
sort: AppInfoSort,
reverse: Boolean,
showSystemApps: Boolean,
Expand Down Expand Up @@ -543,43 +498,51 @@ private fun AccessControlScreenPreview() = MihomoTheme {
@PreviewMihomo
@Composable
private fun AccessControlMenuSheetPreview() = MihomoTheme {
AccessControlMenuContent(
sort = AppInfoSort.Label,
reverse = false,
showSystemApps = true,
onSelectAll = {},
onSelectNone = {},
onSelectInvert = {},
onImport = {},
onExport = {},
onUpdateSort = {},
onUpdateReverse = {},
onUpdateShowSystemApps = {},
)
Surface {
Column {
AccessControlMenuContent(
sort = AppInfoSort.Label,
reverse = false,
showSystemApps = true,
onSelectAll = {},
onSelectNone = {},
onSelectInvert = {},
onImport = {},
onExport = {},
onUpdateSort = {},
onUpdateReverse = {},
onUpdateShowSystemApps = {},
)
}
}
}

@PreviewMihomo
@Composable
private fun AccessControlSearchSheetPreview() = MihomoTheme {
AccessControlSearchContent(
apps =
listOf(
AppInfo(
packageName = "com.example.alpha",
label = "Alpha",
icon = Color.Gray.toArgb().toDrawable(),
installTime = 1_700_000_000_000,
updateDate = 1_710_000_000_000,
),
AppInfo(
packageName = "com.example.beta",
label = "Beta",
icon = Color.DarkGray.toArgb().toDrawable(),
installTime = 1_690_000_000_000,
updateDate = 1_715_000_000_000,
),
),
selected = setOf("com.example.alpha"),
onToggleApp = {},
)
Surface {
Column {
AccessControlSearchContent(
apps =
listOf(
AppInfo(
packageName = "com.example.alpha",
label = "Alpha",
icon = Color.Gray.toArgb().toDrawable(),
installTime = 1_700_000_000_000,
updateDate = 1_710_000_000_000,
),
AppInfo(
packageName = "com.example.beta",
label = "Beta",
icon = Color.DarkGray.toArgb().toDrawable(),
installTime = 1_690_000_000_000,
updateDate = 1_715_000_000_000,
),
),
selected = setOf("com.example.alpha"),
onToggleApp = {},
)
}
}
}
Loading