diff --git a/respect-app-compose/src/commonMain/kotlin/world/respect/app/app/App.kt b/respect-app-compose/src/commonMain/kotlin/world/respect/app/app/App.kt index f335d5146..e96fd5dab 100644 --- a/respect-app-compose/src/commonMain/kotlin/world/respect/app/app/App.kt +++ b/respect-app-compose/src/commonMain/kotlin/world/respect/app/app/App.kt @@ -31,6 +31,7 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.platform.testTag import kotlin.Boolean import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.BarChart import androidx.compose.runtime.collectAsState import androidx.compose.runtime.rememberCoroutineScope import androidx.navigation.compose.rememberNavController @@ -58,12 +59,14 @@ import world.respect.shared.generated.resources.cancel import world.respect.shared.generated.resources.classes import world.respect.shared.generated.resources.continue_using_fingerprint_or import world.respect.shared.generated.resources.people +import world.respect.shared.generated.resources.reports import world.respect.shared.navigation.AccountList import world.respect.shared.navigation.AssignmentList import world.respect.shared.navigation.ClazzList import world.respect.shared.navigation.Home import world.respect.shared.navigation.NavCommand import world.respect.shared.navigation.PersonList +import world.respect.shared.navigation.Report import world.respect.shared.navigation.RespectComposeNavController import world.respect.shared.resources.getUiTextString import world.respect.shared.viewmodel.app.appstate.AppUiState @@ -114,6 +117,13 @@ val APP_TOP_LEVEL_NAV_ITEMS = listOf( routeName = "$routeNamePrefix.PersonList", testTag = "nav_people", ), + TopNavigationItem( + destRoute = Report, + icon = Icons.Filled.BarChart, + label = Res.string.reports, + routeName = "$routeNamePrefix.Report", + testTag = "nav_reports", + ), ) val APP_TOP_LEVEL_NAV_ITEMS_FOR_CHILD = listOf( TopNavigationItem( diff --git a/respect-lib-shared/src/commonMain/kotlin/world/respect/shared/viewmodel/report/list/ReportListViewModel.kt b/respect-lib-shared/src/commonMain/kotlin/world/respect/shared/viewmodel/report/list/ReportListViewModel.kt index 3f9eda200..08e9ea0d1 100644 --- a/respect-lib-shared/src/commonMain/kotlin/world/respect/shared/viewmodel/report/list/ReportListViewModel.kt +++ b/respect-lib-shared/src/commonMain/kotlin/world/respect/shared/viewmodel/report/list/ReportListViewModel.kt @@ -26,6 +26,7 @@ import world.respect.shared.generated.resources.report import world.respect.shared.generated.resources.reports import world.respect.shared.navigation.NavCommand import world.respect.shared.navigation.ReportDetail +import world.respect.shared.navigation.ReportTemplateList import world.respect.shared.util.ext.asUiText import world.respect.shared.viewmodel.RespectViewModel import world.respect.shared.viewmodel.app.appstate.FabUiState @@ -111,11 +112,11 @@ class ReportListViewModel( } fun onClickAdd() { -// _navCommandFlow.tryEmit( -// NavCommand.Navigate( -// ReportTemplateList -// ) -// ) + _navCommandFlow.tryEmit( + NavCommand.Navigate( + ReportTemplateList + ) + ) } fun onClickEntry(entry: Report) {