Rebase Re-Rethink fork onto upstream celzero/rethink-app#2813
Rebase Re-Rethink fork onto upstream celzero/rethink-app#2813Mayanknishad9 wants to merge 1 commit into
Conversation
Squashed Material 3 Expressive / Jetpack Compose UI rewrite and related fork changes onto latest upstream main. UI/adapters/themes prefer the fork; core VPN, firewall, database, and wireguard services prefer upstream where histories diverged.
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| val scope = rememberCoroutineScope() | ||
| val explanation = | ||
| rememberDnsStatusExplanation( | ||
| key = "${endpoint.url}:${endpoint.blocklistCount}", |
| val isLastInGroup = nextInitial == null || currentInitial != nextInitial | ||
|
|
||
| if (isFirstInGroup) { | ||
| stickyHeader(key = "proxy_header_$currentInitial") { |
| } | ||
| } | ||
|
|
||
| item(key = "proxy_app_${item.uid}_${item.packageName}") { |
| } | ||
|
|
||
| if (index == 0 || isFirstInGroup) { | ||
| stickyHeader(key = "header_$currentInitial") { |
| } | ||
| } | ||
|
|
||
| item(key = "app_${item.uid}_${item.packageName}") { |
| verticalArrangement = Arrangement.spacedBy(2.dp) | ||
| ) { | ||
| if (isLoading) { | ||
| item(key = "logs_loading") { |
| LogsLoadingState() | ||
| } | ||
| } else if (isEmpty) { | ||
| item(key = "logs_empty") { |
| LogsEmptyState() | ||
| } | ||
| } else if (hasLoadError) { | ||
| item(key = "logs_load_error") { |
|
@Mayanknishad9, Thanks for the pull request!! I added two comments that caught my attention. I will get back to you after we wrap up the upcoming release. |
@hussainmohd-a |
Meanwhile, could you please address the MobSF scan findings, build failures, and the review comments? Also, just curious which AI agent(s) did you use for reviewing/coding for this PR. |
|
@hussainmohd-a |
3 participants
Summary
celzero/rethink-appmainTest plan