Skip to content

Feat/navigation improvements #100

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
tzebrowski merged 3 commits into from
Feb 1, 2026
Merged

Feat/navigation improvements #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd08413
fix: update navigation links
tzebrowski Feb 1, 2026
9882aa6
fix: fix label of trip info
tzebrowski Feb 1, 2026
ab7e78a
refactor: Navigation refactoring
tzebrowski Feb 1, 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
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ android {
resValue "string", "DEFAULT_PROFILE", "profile_8"
resValue "string", "applicationId", "org.obd.graphs.my.giulia.aa"
applicationId "org.obd.graphs.my.giulia.aa"
versionCode 198
versionCode 199
}

giuliaPerformanceMonitor {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/obd/graphs/activity/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@ class MainActivity :
this.appBarConfiguration = getAppBarConfiguration()

setupNavigationBar()
setupNavigationBarButtons()
setupBottomBarNavigation()
setupNavigationViewNavigation()
registerReceiver()

setupExceptionHandler()
Expand All @@ -154,7 +155,6 @@ class MainActivity :
}

setupLockScreenDialog()
setupLeftNavigationPanel()
supportActionBar?.hide()
setupMetricsProcessors()
backupManager = BackupManager(this)
Expand Down
209 changes: 21 additions & 188 deletions app/src/main/java/org/obd/graphs/activity/Navigation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,33 +21,20 @@ import android.text.style.ForegroundColorSpan
import android.util.Log
import androidx.core.os.bundleOf
import androidx.core.view.GravityCompat
import androidx.navigation.fragment.NavHostFragment
import androidx.navigation.ui.NavigationUI
import org.obd.graphs.R
import org.obd.graphs.bl.datalogger.dataLogger
import org.obd.graphs.bl.trip.RESERVED_SCREEN_ID
import org.obd.graphs.bl.trip.tripVirtualScreenManager
import org.obd.graphs.getContext
import org.obd.graphs.preferences.PREFERENCE_SCREEN_KEY
import org.obd.graphs.preferences.PREFERENCE_SCREEN_KEY_DASH
import org.obd.graphs.preferences.PREFERENCE_SCREEN_KEY_GAUGE
import org.obd.graphs.preferences.PREFERENCE_SCREEN_KEY_GIULIA
import org.obd.graphs.preferences.PREFERENCE_SCREEN_KEY_GRAPH
import org.obd.graphs.preferences.PREF_GAUGE_TRIPS
import org.obd.graphs.preferences.PREF_LOGS
import org.obd.graphs.preferences.Prefs
import org.obd.graphs.preferences.getS
import org.obd.graphs.preferences.getStringSet
import org.obd.graphs.preferences.isEnabled
import org.obd.graphs.preferences.updateInt
import org.obd.graphs.ui.common.COLOR_CARDINAL
import org.obd.graphs.ui.common.COLOR_PHILIPPINE_GREEN
import org.obd.graphs.ui.gauge.gaugeVirtualScreen
import org.obd.graphs.ui.giulia.giuliaVirtualScreen

internal const val NAVIGATION_BUTTONS_VISIBILITY_CHANGED = "navigation.buttons.changes.event"
private const val PREF_NAVIGATION_LAST_VISITED_SCREEN = "pref.navigation.last_visited.screen"
private const val PREF_NAVIGATION_LAST_VISITED_SCREEN_ENABLED = "pref.views.navigation.navigate_last_visited_view"
internal const val PREF_NAVIGATION_LAST_VISITED_SCREEN = "pref.navigation.last_visited.screen"
internal const val PREF_NAVIGATION_LAST_VISITED_SCREEN_ENABLED = "pref.views.navigation.navigate_last_visited_view"

fun navigateToPreferencesScreen(navigateToPrefKey: String) {
(getContext() as MainActivity).navController {
Expand All @@ -66,60 +53,23 @@ fun navigateToScreen(id: Int) {
}
}

internal fun MainActivity.setupLeftNavigationPanel() {
internal fun MainActivity.setupBottomBarNavigation() {
bottomAppBar {
it.setOnMenuItemClickListener { item ->
NavigationRouter.navigate(this, item.itemId)
true
}
}
}

internal fun MainActivity.setupNavigationViewNavigation() {
leftAppBar { navigationView ->
navigationView.setNavigationItemSelectedListener { item ->
when (item.itemId) {
R.id.navigation_preferences_alerts -> navigateToPreferencesScreen("pref.alerts.settings")
R.id.navigation_performance_prefs -> navigateToPreferencesScreen("pref.title_performance_screen")
R.id.navigation_performance_pids_list_prefs -> navigateToPreferencesScreen("pref.performance.displayed_parameter_ids")

R.id.navigation_trip_info_prefs -> navigateToPreferencesScreen("pref.title_trip_info")
R.id.navigation_trip_info_pids_list_prefs -> navigateToPreferencesScreen("pref.trip_info.displayed_parameter_ids")
R.id.navigation_drag_racing_prefs -> navigateToPreferencesScreen("pref.title_drag_racing")
R.id.navigation_graph_prefs -> navigateToPreferencesScreen("pref.graph")
R.id.navigation_dashboard_prefs -> navigateToPreferencesScreen("pref.dashboard")
R.id.navigation_giulia_prefs -> navigateToPreferencesScreen("pref.giulia")
R.id.navigation_gauge_prefs -> navigateToPreferencesScreen("pref.gauge")
R.id.ctx_menu_android_auto -> navigateToPreferencesScreen("pref.aa")
R.id.ctx_menu_vehicle_properties -> navigateToPreferencesScreen("pref.vehicle.properties")
R.id.ctx_menu_about -> navigateToPreferencesScreen("pref.about")
R.id.ctx_menu_view_profiles -> navigateToPreferencesScreen("pref.profiles")
R.id.ctx_menu_dtc -> navigateToPreferencesScreen("pref.dtc")

R.id.navigation_android_giulia_auto_pids -> navigateToPreferencesScreen("pref.aa.displayed.pids")
R.id.navigation_android_gauge_auto_pids -> navigateToPreferencesScreen("pref.aa.gauge.displayed.pids")

R.id.navigation_android_giulia_auto_font_size -> navigateToPreferencesScreen("pref.aa.screen.font_size.category")
R.id.navigation_android_gauge_auto_font_size -> navigateToPreferencesScreen("pref.aa.gauge.screen.font_size.category")

R.id.navigation_gauge_pids -> navigateToPreferencesScreen(PREFERENCE_SCREEN_KEY_GAUGE)
R.id.navigation_graph_pids -> navigateToPreferencesScreen(PREFERENCE_SCREEN_KEY_GRAPH)
R.id.navigation_giulia_pids -> navigateToPreferencesScreen(PREFERENCE_SCREEN_KEY_GIULIA)
R.id.navigation_giulia_font_size -> navigateToPreferencesScreen("pref.giulia.screen.font_size.category")
R.id.navigation_giulia_number_of_columns -> navigateToPreferencesScreen("pref.aa.number_of_items_in_column.category")

R.id.navigation_dashboard_pids -> navigateToPreferencesScreen(PREFERENCE_SCREEN_KEY_DASH)
R.id.navigation_graph_tripe -> navigateToPreferencesScreen(PREF_GAUGE_TRIPS)
R.id.ctx_menu_pids_to_query -> navigateToPreferencesScreen("pref.registry")
R.id.nav_preferences -> navigateToPreferencesScreen("pref.root")
R.id.navigation_preferences_adapter -> navigateToPreferencesScreen("pref.adapter.connection")
R.id.navigation_adapter_dri -> navigateToPreferencesScreen("pref.init")
R.id.navigation_trip_logs -> navigateToPreferencesScreen(PREF_LOGS)

R.id.navigation_giulia -> navigateToScreen(R.id.nav_giulia)
R.id.navigation_graph -> navigateToScreen(R.id.nav_graph)
R.id.navigation_gauge -> navigateToScreen(R.id.nav_gauge)
R.id.navigation_dashboard -> navigateToScreen(R.id.nav_dashboard)
R.id.navigation_preferences -> navigateToScreen(R.id.nav_preferences)
R.id.navigation_drag_racing -> navigateToScreen(R.id.nav_drag_racing)
R.id.navigation_trip_info -> navigateToScreen(R.id.nav_trip_info)
R.id.navigation_performance -> navigateToScreen(R.id.nav_performance)

else -> Log.e(LOG_TAG, "Unknown Navigation menu item ${item.itemId}")
if (NavigationRouter.navigate(this, item.itemId)) {
getDrawer().closeDrawer(GravityCompat.START)
} else {
Log.e(LOG_TAG, "Unknown Navigation menu item ${item.itemId}")
}

getDrawer().closeDrawer(GravityCompat.START)
true
}
}
Expand Down Expand Up @@ -151,7 +101,7 @@ internal fun MainActivity.setupNavigationBar() {
bottomAppBar {
it.menu.findItem(R.id.ctx_menu_dtc).isVisible = dataLogger.isDTCEnabled()
it.menu.findItem(R.id.ctx_menu_android_auto)?.let {
if (isAndroidAutoEnabled()) {
if (NavigationRouter.isAndroidAutoEnabled(this)) {
val spanString = SpannableString(it.title.toString())
spanString.setSpan(ForegroundColorSpan(COLOR_PHILIPPINE_GREEN), 0, spanString.length, 0)
it.title = spanString
Expand All @@ -176,7 +126,9 @@ internal fun MainActivity.setupNavigationBar() {
it.menu.findItem(R.id.ctx_menu_submenu_filters).isVisible = true

val spanString =
SpannableString("${resources.getString(R.string.pref_graph_view_filters)} (${getGraphFilterSource()})")
SpannableString(
"${resources.getString(R.string.pref_graph_view_filters)} (${NavigationRouter.getGraphFilterSource()})",
)
spanString.setSpan(ForegroundColorSpan(COLOR_PHILIPPINE_GREEN), 0, spanString.length, 0)
it.menu.findItem(R.id.ctx_menu_submenu_filters).title = spanString
}
Expand All @@ -197,129 +149,10 @@ internal fun MainActivity.setupNavigationBar() {
}
}

internal fun MainActivity.navigateToLastVisitedScreen() {
internal fun navigateToLastVisitedScreen() {
val lastVisitedScreen = Prefs.getInt(PREF_NAVIGATION_LAST_VISITED_SCREEN, -1)
if (lastVisitedScreen != -1 && Prefs.isEnabled(PREF_NAVIGATION_LAST_VISITED_SCREEN_ENABLED)) {
Log.i(LOG_TAG, "Loading last visited view: $lastVisitedScreen")
navigateToScreen(lastVisitedScreen)
}
}

internal fun MainActivity.setupNavigationBarButtons() {
bottomAppBar {
it.setOnMenuItemClickListener { item ->
when (item.itemId) {
R.id.navigation_giulia -> navigateToScreen(R.id.nav_giulia)
R.id.navigation_graph -> navigateToScreen(R.id.nav_graph)
R.id.navigation_gauge -> navigateToScreen(R.id.nav_gauge)
R.id.navigation_dashboard -> navigateToScreen(R.id.nav_dashboard)
R.id.navigation_preferences -> navigateToScreen(R.id.nav_preferences)

R.id.ctx_menu_trip_info_view -> navigateToScreen(R.id.nav_trip_info)
R.id.ctx_menu_performance_view -> navigateToScreen(R.id.nav_performance)
R.id.ctx_menu_drag_racing_view -> navigateToScreen(R.id.nav_drag_racing)

R.id.ctx_menu_vehicle_properties -> navigateToPreferencesScreen("pref.vehicle.properties")
R.id.ctx_menu_about -> navigateToPreferencesScreen("pref.about")
R.id.ctx_menu_pids_to_query -> navigateToPreferencesScreen("pref.registry")
R.id.ctx_menu_view_profiles -> navigateToPreferencesScreen("pref.profiles")
R.id.ctx_menu_dtc -> navigateToPreferencesScreen("pref.dtc")
R.id.ctx_menu_android_auto -> navigateToPreferencesScreen("pref.aa")

R.id.ctx_menu_submenu_filters_filter_1 -> applyGraphViewFilter(1)
R.id.ctx_menu_submenu_filters_filter_2 -> applyGraphViewFilter(2)
R.id.ctx_menu_submenu_filters_filter_3 -> applyGraphViewFilter(3)
R.id.ctx_menu_submenu_filters_filter_4 -> applyGraphViewFilter(4)
R.id.ctx_menu_submenu_filters_filter_5 -> applyGraphViewFilter(5)
R.id.ctx_menu_submenu_filters_filter_6 -> applyGraphViewFilter(6)
R.id.ctx_menu_submenu_filters_filter_7 -> applyGraphViewFilter(7)

R.id.ctx_menu_view_custom_action_1 -> {
when (getCurrentScreenId()) {
R.id.nav_graph -> {
navigateToPreferencesScreen(PREF_GAUGE_TRIPS)
}

R.id.nav_giulia -> {
tripVirtualScreenManager.updateReservedVirtualScreen(
Prefs.getStringSet(giuliaVirtualScreen.getVirtualScreenPrefKey()).toList(),
)
tripVirtualScreenManager.updateScreenId(RESERVED_SCREEN_ID)
navigateToScreen(R.id.nav_graph)
}

else -> {}
}
}

R.id.ctx_menu_pids_to_display -> {
val screenId =
when (getCurrentScreenId()) {
R.id.nav_gauge -> PREFERENCE_SCREEN_KEY_GAUGE
R.id.nav_graph -> PREFERENCE_SCREEN_KEY_GRAPH
R.id.nav_giulia -> PREFERENCE_SCREEN_KEY_GIULIA
R.id.nav_dashboard -> PREFERENCE_SCREEN_KEY_DASH
else -> null
}

Log.d(LOG_TAG, "Jumping to preference screen for current screen $screenId ${getCurrentScreenId()}")
screenId?.apply {
navigateToPreferencesScreen(this)
}
}

R.id.ctx_menu_view_configuration -> {
navigateToPreferencesScreen(
when (getCurrentScreenId()) {
R.id.nav_giulia -> "pref.giulia"
R.id.navigation_gauge -> "pref.gauge"
R.id.nav_graph -> "pref.graph"
R.id.nav_dashboard -> "pref.dashboard"
else -> "pref.root"
},
)
}
}
true
}
}
}

private fun MainActivity.applyGraphViewFilter(screenId: Int) {
val propertyId: String? =
when (getGraphFilterSource()) {
"Giulia" -> giuliaVirtualScreen.getVirtualScreenPrefKey("$screenId")
"Gauge" -> gaugeVirtualScreen.getVirtualScreenPrefKey("$screenId")
"AA" -> {
if (isAndroidAutoEnabled()) {
"pref.aa.pids.profile_$screenId"
} else {
null
}
}

else -> giuliaVirtualScreen.getVirtualScreenPrefKey("$screenId")
}

Log.i(LOG_TAG, "Applying graph view filter for property.id=$propertyId")

propertyId?.let {
val filter = Prefs.getStringSet(propertyId).toList()
Log.i(LOG_TAG, "Applying graph view filter=$filter")
tripVirtualScreenManager.updateReservedVirtualScreen(filter)
tripVirtualScreenManager.updateScreenId()

navigateToScreen(R.id.nav_graph)
}
}

private fun getGraphFilterSource() = Prefs.getS("pref.graph.filter.source", "Giulia")

private fun MainActivity.isAndroidAutoEnabled() = resources.getBoolean(R.bool.MODULE_ANDROID_AUTO_ENABLED)

private fun MainActivity.getCurrentScreenId(): Int {
val navHostFragment =
supportFragmentManager
.findFragmentById(R.id.nav_host_fragment) as? NavHostFragment
return navHostFragment?.navController?.currentDestination?.id ?: -1
}
Loading
Loading