Skip to content

[WIP] Unified home screen #180

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

Draft
wpmed92 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[WIP] Unified home screen #180

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
17 changes: 9 additions & 8 deletions dashpilot-android/app/src/main/java/com/softwiredtech/dashpilot/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import com.softwiredtech.dashpilot.navigation.ControlsRoute
import com.softwiredtech.dashpilot.navigation.DashboardRoute
import com.softwiredtech.dashpilot.navigation.OnboardingRoute
import com.softwiredtech.dashpilot.navigation.SettingsRoute
import com.softwiredtech.dashpilot.navigation.SetupRoute
import com.softwiredtech.dashpilot.navigation.HomeRoute
import com.softwiredtech.dashpilot.navigation.ThemePickerRoute
import com.softwiredtech.dashpilot.ui.AutomationsScreen
import com.softwiredtech.dashpilot.ui.ControlScreen
Expand Down Expand Up @@ -179,7 +179,7 @@ class MainActivity : ComponentActivity() {
?.contains("OnboardingRoute") == true
if (!onOnboarding) {
navController.navigate(OnboardingRoute) {
popUpTo(SetupRoute) { inclusive = true }
popUpTo(HomeRoute) { inclusive = true }
}
}
}
Expand All @@ -206,7 +206,7 @@ class MainActivity : ComponentActivity() {
Scaffold(modifier = Modifier.fillMaxSize()) { _ ->
NavHost(
navController = navController,
startDestination = SetupRoute,
startDestination = HomeRoute,
enterTransition = { EnterTransition.None },
exitTransition = { ExitTransition.None },
popEnterTransition = { EnterTransition.None },
Expand All @@ -217,22 +217,23 @@ class MainActivity : ComponentActivity() {
connectionVM = connectionVM,
onFinish = {
setOnboardingCompleted(context, true)
navController.navigate(SetupRoute) {
navController.navigate(HomeRoute) {
popUpTo(OnboardingRoute) { inclusive = true }
}
},
onSkip = {
connectionVM.disconnect()
setOnboardingCompleted(context, true)
navController.navigate(SetupRoute) {
navController.navigate(HomeRoute) {
popUpTo(OnboardingRoute) { inclusive = true }
}
}
)
}
composable<SetupRoute> {
composable<HomeRoute> {
val manager by connectionVM.bleManager.collectAsState()
val dashStateFlow by connectionVM.dashState.collectAsState()
val activeDataSource by connectionVM.activeDataSource.collectAsState()
val toDashboard = {
val dashboard = getSelectedDashboard(context)
navController.navigate(DashboardRoute(
Expand All @@ -242,6 +243,7 @@ class MainActivity : ComponentActivity() {
}
HomeScreen(
connectionStatus = connectionStatus,
dataSourceType = activeDataSource,
bleManager = manager,
dashState = dashStateFlow,
pinnedControlId = pinnedControl,
Expand All @@ -254,7 +256,6 @@ class MainActivity : ComponentActivity() {
onDisconnect = {
connectionVM.disconnect()
},
onNext = toDashboard,
onAutomations = {
navController.navigate(AutomationsRoute)
},
Expand Down Expand Up @@ -306,7 +307,7 @@ class MainActivity : ComponentActivity() {
connectionVM.disconnect()
setOnboardingCompleted(context, false)
navController.navigate(OnboardingRoute) {
popUpTo(SetupRoute) { inclusive = false }
popUpTo(HomeRoute) { inclusive = false }
}
},
onThemeClick = {
Expand Down
2 changes: 1 addition & 1 deletion dashpilot-android/app/src/main/java/com/softwiredtech/dashpilot/navigation/Routes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import kotlinx.serialization.Serializable
object OnboardingRoute

@Serializable
object SetupRoute
object HomeRoute

@Serializable
object SettingsRoute
Expand Down
3 changes: 0 additions & 3 deletions dashpilot-android/app/src/main/java/com/softwiredtech/dashpilot/ui/DebugDataSourceMenu.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ private val debugSources = buildList {
@Composable
fun DebugDataSourceMenu(
connectionStatus: ConnectionStatus,
onSelectDataSource: (String) -> Unit,
onConnect: (serverAddress: String, dataSourceType: String) -> Unit,
onDisconnect: () -> Unit
) {
Expand Down Expand Up @@ -80,7 +79,6 @@ fun DebugDataSourceMenu(
if (key == DataSourceType.WEBSOCKET) {
showIpDialog = true
} else {
onSelectDataSource(key)
onConnect("", key)
}
}
Expand Down Expand Up @@ -124,7 +122,6 @@ fun DebugDataSourceMenu(
onClick = {
showIpDialog = false
setLastWebsocketAddress(context, address)
onSelectDataSource(DataSourceType.WEBSOCKET)
onConnect(address.trim(), DataSourceType.WEBSOCKET)
}
) { Text("Connect") }
Expand Down
Loading
Loading