diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/bottombars/NavBarItem.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/bottombars/NavBarItem.kt index 3c4fcef1d3..2050b16fcf 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/bottombars/NavBarItem.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/bottombars/NavBarItem.kt @@ -40,6 +40,7 @@ enum class NavBarItem { DISCOVER, NOTIFICATIONS, PROFILE, + MY_FITNESS, MY_LISTS, BOOKMARKS, WEB_BOOKMARKS, @@ -255,6 +256,13 @@ val NavBarCatalog: Map = icon = MaterialSymbols.DirectionsRun, resolveRoute = { Route.Workouts }, ), + NavBarItem.MY_FITNESS to + NavBarItemDef( + id = NavBarItem.MY_FITNESS, + labelRes = R.string.my_fitness, + icon = MaterialSymbols.AutoMirrored.ShowChart, + resolveRoute = { Route.MyFitness }, + ), NavBarItem.GIT_REPOSITORIES to NavBarItemDef( id = NavBarItem.GIT_REPOSITORIES, @@ -505,6 +513,7 @@ val BottomBarCategories: List = MaterialSymbols.AccountCircle, listOf( NavBarItem.PROFILE, + NavBarItem.MY_FITNESS, NavBarItem.MY_LISTS, NavBarItem.BOOKMARKS, NavBarItem.WEB_BOOKMARKS, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/drawer/DrawerSections.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/drawer/DrawerSections.kt index 17014d4dd4..3bb35a47a2 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/drawer/DrawerSections.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/drawer/DrawerSections.kt @@ -107,6 +107,7 @@ private val DrawerNavigateItems: List = private val DrawerYouItems: List = listOf( NavBarItem.PROFILE, + NavBarItem.MY_FITNESS, NavBarItem.MY_LISTS, NavBarItem.BOOKMARKS, NavBarItem.WEB_BOOKMARKS, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/BottomBarFeedPreloaders.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/BottomBarFeedPreloaders.kt index 809f89d5da..5575fdf25b 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/BottomBarFeedPreloaders.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/BottomBarFeedPreloaders.kt @@ -117,6 +117,10 @@ private fun PreloadFor( // Favorite apps is a device-local launcher grid — nothing to preload from relays. NavBarItem.FAVORITE_APPS -> {} + // My Fitness summarises the user's own Health Connect data on the device. It issues no + // REQs, so there is nothing to warm up from relays. + NavBarItem.MY_FITNESS -> {} + NavBarItem.CALENDARS, NavBarItem.CALENDAR_COLLECTIONS, -> CalendarsFilterAssemblerSubscription(accountViewModel) diff --git a/amethyst/src/main/res/values/strings.xml b/amethyst/src/main/res/values/strings.xml index a67ef65287..eb7f3259d4 100644 --- a/amethyst/src/main/res/values/strings.xml +++ b/amethyst/src/main/res/values/strings.xml @@ -2771,4 +2771,8 @@ rationale screen. Needs to be an Android resource (not a commons Compose resource) because android:label on the manifest entry can only reference @string/. --> Health Connect and Amethyst + + + My Fitness