Skip to content

feat(ui): redesign Design hub and refactor navigation structure #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
D4vidDf merged 1 commit into from
Jan 1, 2026
Merged

feat(ui): redesign Design hub and refactor navigation structure #83

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
2 changes: 1 addition & 1 deletion app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ android {
minSdk = 35
targetSdk = 36
versionCode = 10
versionName = "0.4.0-dev08"
versionName = "0.4.0-dev09"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
665 changes: 492 additions & 173 deletions app/src/main/java/com/d4viddf/hyperbridge/ui/screens/design/DesignScreen.kt
View file
Open in desktop

Large diffs are not rendered by default.

161 changes: 99 additions & 62 deletions app/src/main/java/com/d4viddf/hyperbridge/ui/screens/home/ActiveAppsPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,43 @@
package com.d4viddf.hyperbridge.ui.screens.home

import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.statusBars
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.NotificationsOff
import androidx.compose.material.icons.rounded.Settings
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.LoadingIndicator
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.pulltorefresh.PullToRefreshBox
import androidx.compose.material3.pulltorefresh.PullToRefreshDefaults
import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import com.d4viddf.hyperbridge.R
import com.d4viddf.hyperbridge.ui.AppInfo
Expand All @@ -38,83 +52,106 @@ fun ActiveAppsPage(
apps: List<AppInfo>,
isLoading: Boolean,
viewModel: AppListViewModel,
onConfig: (AppInfo) -> Unit
onConfig: (AppInfo) -> Unit,
onSettingsClick: () -> Unit
) {
val searchQuery = viewModel.activeSearch.collectAsState().value
val selectedCategory = viewModel.activeCategory.collectAsState().value
val sortOption = viewModel.activeSort.collectAsState().value

// [LOGIC] Hide pull indicator on first load
val isRefreshing = isLoading && apps.isNotEmpty()
val pullState = rememberPullToRefreshState()

Column(modifier = Modifier.fillMaxSize()) {
Scaffold(
// [FIX] Only respect Status Bars here. The bottom nav bar space is handled by the parent HomeScreen.
contentWindowInsets = WindowInsets.statusBars,
topBar = {
TopAppBar(
title = { Text(stringResource(R.string.app_name),style = MaterialTheme.typography.headlineMedium, fontWeight = FontWeight.Bold) },
actions = {Surface(
modifier = Modifier
.size(40.dp)
.clip(CircleShape) // Ensure ripple is circular
.clickable(onClick = onSettingsClick), // [NEW] Added Clickable here
color = MaterialTheme.colorScheme.surfaceContainerHigh
) {
Box(contentAlignment = Alignment.Center) {
Icon(Icons.Rounded.Settings, stringResource(R.string.settings), modifier = Modifier.size(20.dp))
}
}
},
colors = TopAppBarDefaults.topAppBarColors(containerColor = MaterialTheme.colorScheme.surface)
)
}
) { padding ->
Column(modifier = Modifier.padding(padding).fillMaxSize()) {

AppListFilterSection(
searchQuery = searchQuery,
onSearchChange = { viewModel.activeSearch.value = it },
selectedCategory = selectedCategory,
onCategoryChange = { viewModel.activeCategory.value = it },
sortOption = sortOption,
onSortChange = { viewModel.activeSort.value = it }
)
AppListFilterSection(
searchQuery = searchQuery,
onSearchChange = { viewModel.activeSearch.value = it },
selectedCategory = selectedCategory,
onCategoryChange = { viewModel.activeCategory.value = it },
sortOption = sortOption,
onSortChange = { viewModel.activeSort.value = it }
)

Box(
modifier = Modifier
.weight(1f)
.fillMaxWidth()
) {
PullToRefreshBox(
isRefreshing = isRefreshing,
onRefresh = { viewModel.refreshApps() },
state = pullState,
modifier = Modifier.fillMaxSize(),
contentAlignment = Alignment.TopCenter, // Updated
indicator = {
PullToRefreshDefaults.LoadingIndicator(
state = pullState,
isRefreshing = isRefreshing,
modifier = Modifier.align(Alignment.TopCenter),
)
}
Box(
modifier = Modifier
.weight(1f)
.fillMaxWidth()
) {
if (apps.isEmpty() && isLoading) {
Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
LoadingIndicator()
}
} else if (apps.isEmpty()) {
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
EmptyState(
title = stringResource(R.string.no_active_bridges),
description = stringResource(R.string.no_active_bridges_desc),
icon = Icons.Outlined.NotificationsOff
PullToRefreshBox(
isRefreshing = isRefreshing,
onRefresh = { viewModel.refreshApps() },
state = pullState,
modifier = Modifier.fillMaxSize(),
contentAlignment = Alignment.TopCenter,
indicator = {
PullToRefreshDefaults.LoadingIndicator(
state = pullState,
isRefreshing = isRefreshing,
modifier = Modifier.align(Alignment.TopCenter),
)
}
} else {
LazyColumn(
modifier = Modifier.fillMaxSize(),
contentPadding = PaddingValues(bottom = 80.dp)
) {
items(apps, key = { it.packageName }) { app ->
Column(modifier = Modifier.animateItem()) {
AppListItem(
app = app,
onToggle = { viewModel.toggleApp(app.packageName, false) },
onSettingsClick = { onConfig(app) },
)
HorizontalDivider(
color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f)
)
}
) {
if (apps.isEmpty() && isLoading) {
Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
LoadingIndicator()
}
} else if (apps.isEmpty()) {
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
EmptyState(
title = stringResource(R.string.no_active_bridges),
description = stringResource(R.string.no_active_bridges_desc),
icon = Icons.Outlined.NotificationsOff
)
}
} else {
LazyColumn(
modifier = Modifier.fillMaxSize(),
contentPadding = PaddingValues(bottom = 80.dp)
) {
items(apps, key = { it.packageName }) { app ->
Column(modifier = Modifier.animateItem()) {
AppListItem(
app = app,
onToggle = { viewModel.toggleApp(app.packageName, false) },
onSettingsClick = { onConfig(app) },
)
HorizontalDivider(
color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f)
)
}
}

if (isLoading) {
item {
Box(
modifier = Modifier.fillMaxWidth().padding(vertical = 24.dp),
contentAlignment = Alignment.Center
) {
LoadingIndicator(modifier = Modifier.width(40.dp))
if (isLoading) {
item {
Box(
modifier = Modifier.fillMaxWidth().padding(vertical = 24.dp),
contentAlignment = Alignment.Center
) {
LoadingIndicator(modifier = Modifier.width(40.dp))
}
}
}
}
Expand Down
Loading