From cafadd461bab52069f99a6bf240cefbdddedf28b Mon Sep 17 00:00:00 2001
From: Melendez <markmelendez2008@outlook.com>
Date: Tue, 7 Jul 2026 21:33:40 +0800
Subject: [PATCH 1/2] Bump Android toolchain and update UI APIs

Upgrade Android build toolchain and libraries, and adapt code to updated APIs.

Key changes:
- Gradle wrapper -> 9.6.1; AGP and plugin version bumps (AGP 9.4.0-alpha03, kotlin/plugin.serialization 2.4.0, ksp 2.3.6, google-services 4.5.0).
- libs.versions.toml: many library version updates (Compose, Material3, lifecycle, Firebase, Play Services, Room, Tiles, protolayout, etc.).
- Android module: compileSdk 36->37 and app versionName 1.0.12->1.0.13; disabled android.dependency.useConstraints.
- Code adaptations for new APIs: MainActivity navigation startRoute logic simplified and NavDisplay uses sceneStrategies; Screens sealed objects now implement NavKey; Detail UI refactored (removed BottomAppBar, added HorizontalFloatingToolbar, nested-scroll/floating toolbar integration, rememberSaveable for expanded state); About previews updated imports.
- Minor .idea XML metadata updates.

These changes align the project with updated toolchain and library APIs and adjust UI/navigation code accordingly.
---
 Android/.idea/deploymentTargetSelector.xml    |   2 +-
 Android/.idea/misc.xml                        |   1 +
 Android/build.gradle.kts                      |   6 +-
 Android/gradle.properties                     |   2 +-
 Android/gradle/libs.versions.toml             |  66 ++++-----
 .../gradle/wrapper/gradle-wrapper.properties  |   4 +-
 Android/mobile/build.gradle.kts               |   6 +-
 .../java/com/melendez/known/MainActivity.kt   |  15 +-
 .../com/melendez/known/ui/screens/Detail.kt   | 138 +++++-------------
 .../com/melendez/known/ui/screens/Screens.kt  |  38 +++--
 .../melendez/known/ui/screens/about/About.kt  |   5 +-
 11 files changed, 118 insertions(+), 165 deletions(-)

diff --git a/Android/.idea/deploymentTargetSelector.xml b/Android/.idea/deploymentTargetSelector.xml
index 1708ff8..ea1cb32 100644
--- a/Android/.idea/deploymentTargetSelector.xml
+++ b/Android/.idea/deploymentTargetSelector.xml
@@ -15,7 +15,7 @@
       </SelectionState>
       <SelectionState runConfigName="mobile">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-06-06T15:33:08.406123800Z">
+        <DropdownSelection timestamp="2026-06-27T14:19:41.893496800Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\Melendez\.android\avd\Pixel_9_Pro_Fold.avd" />
diff --git a/Android/.idea/misc.xml b/Android/.idea/misc.xml
index 59043d2..db1b096 100644
--- a/Android/.idea/misc.xml
+++ b/Android/.idea/misc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="NullableNotNullManager">
diff --git a/Android/build.gradle.kts b/Android/build.gradle.kts
index 73cca34..3cb2000 100644
--- a/Android/build.gradle.kts
+++ b/Android/build.gradle.kts
@@ -1,9 +1,9 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "9.1.0-alpha07" apply false
+    id("com.android.application") version "9.4.0-alpha03" apply false
     id("org.jetbrains.kotlin.plugin.compose") version "2.3.0" apply false
-    id("com.google.gms.google-services") version "4.4.4" apply false
-    id("com.google.devtools.ksp") version "2.3.4" apply false
+    id("com.google.gms.google-services") version "4.5.0" apply false
+    id("com.google.devtools.ksp") version "2.3.6" apply false
 }
 buildscript {
     repositories {
diff --git a/Android/gradle.properties b/Android/gradle.properties
index 2e73c9f..eb85a05 100644
--- a/Android/gradle.properties
+++ b/Android/gradle.properties
@@ -17,5 +17,5 @@ ksp.use.kotlin.incremental=false
 ksp.use.kotlin.incremental.java=false
 ksp.use.kotlin.incremental.kapt=false
 android.uniquePackageNames=false
-android.dependency.useConstraints=true
+android.dependency.useConstraints=false
 android.r8.strictFullModeForKeepRules=false
diff --git a/Android/gradle/libs.versions.toml b/Android/gradle/libs.versions.toml
index 6b651ab..9d1683f 100644
--- a/Android/gradle/libs.versions.toml
+++ b/Android/gradle/libs.versions.toml
@@ -1,53 +1,53 @@
 [versions]
 accompanist = "0.36.0"
-activity = "1.12.3"
+activity = "1.13.0"
 androidxComposeUi = "ui-test-junit4"
 androidxComposeUiX2 = "ui-test-manifest"
-animation = "1.10.2"
-coilCompose = "3.3.0"
-compose = "1.5.6"
-composeBom = "2026.01.01"
+animation = "1.12.0-beta02 "
+coilCompose = "3.5.0"
+compose = "1.6.2"
+composeBom = "2026.06.01"
 composeUi = "ui-tooling"
-coreKtx = "1.17.0"
+coreKtx = "1.19.0"
 coreSplashscreen = "1.2.0"
 espressoCore = "3.7.0"
-firebaseAnalytics = "23.0.0"
+firebaseAnalytics = "23.2.0"
 firebaseAuthKtx = "23.2.1"
-firebaseFirestore = "26.1.0"
+firebaseFirestore = "26.4.0"
 firebaseMessagingKtx = "24.1.2"
 firebaseUiAuth = "9.1.1"
 generativeai = "0.9.0"
-googleServices = "4.4.4"
+googleServices = "4.5.0"
 horologist = "0.7.15"
 junit = "1.3.0"
-junitJupiterApi = "6.0.2"
-lifecycle = "2.10.0"
-material = "1.13.0"
-material3 = "1.4.0"
+junitJupiterApi = "6.1.0"
+lifecycle = "2.11.0"
+material = "1.14.0"
+material3 = "1.5.0-alpha23"
 materialIconsExtended = "1.7.8"
-navigationCompose = "2.9.7"
-nav3Core = "1.0.0"
-lifecycleViewmodelNav3 = "2.10.0"
-playServicesAds = "24.9.0"
-playServicesAuth = "21.5.0"
-playServicesWearable = "19.0.0"
+navigationCompose = "2.9.8"
+nav3Core = "1.1.4"
+lifecycleViewmodelNav3 = "2.11.0"
+playServicesAds = "25.4.0"
+playServicesAuth = "21.6.0"
+playServicesWearable = "20.0.1"
 room = "2.8.4"
-runtimeLivedata = "1.10.2"
-tiles = "1.5.0"
-ui = "1.10.2"
+runtimeLivedata = "1.11.4"
+tiles = "1.6.1"
+ui = "1.11.4"
 volley = "1.2.1"
-watchfaceComplicationsDataSourceKtx = "1.3.0-rc01"
-agp = "9.1.0-alpha07"
-kotlin = "2.0.21"
-composeMaterial3 = "1.5.6"
-composeUiTooling = "1.5.6"
+watchfaceComplicationsDataSourceKtx = "1.3.0"
+agp = "9.4.0-alpha03"
+kotlin = "2.4.0"
+composeMaterial3 = "1.6.2"
+composeUiTooling = "1.6.2"
 wearToolingPreview = "1.0.0"
-tilesRenderer = "1.5.0"
-protolayout = "1.3.0"
-protolayoutMaterial3 = "1.3.0"
-guava = "33.2.1-android"
-tilesTooling = "1.5.0"
-tilesToolingPreview = "1.5.0"
+tilesRenderer = "1.6.1"
+protolayout = "1.4.1"
+protolayoutMaterial3 = "1.4.1"
+guava = "33.6.0-android"
+tilesTooling = "1.6.1"
+tilesToolingPreview = "1.6.1"
 
 [libraries]
 accompanist-pager = { group = "com.google.accompanist", name = "accompanist-pager", version.ref = "accompanist" }
diff --git a/Android/gradle/wrapper/gradle-wrapper.properties b/Android/gradle/wrapper/gradle-wrapper.properties
index 6c74be2..a95bc17 100644
--- a/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Sep 21 11:37:00 CST 2025
+#Sat Jun 27 22:20:45 CST 2026
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/Android/mobile/build.gradle.kts b/Android/mobile/build.gradle.kts
index f4ff620..de5b53a 100644
--- a/Android/mobile/build.gradle.kts
+++ b/Android/mobile/build.gradle.kts
@@ -3,18 +3,18 @@ plugins {
     id("com.google.gms.google-services")
     id("org.jetbrains.kotlin.plugin.compose")
     id("com.google.devtools.ksp")
-    id("org.jetbrains.kotlin.plugin.serialization") version "2.3.0"
+    id("org.jetbrains.kotlin.plugin.serialization") version "2.4.0"
 }
 android {
     namespace = "com.melendez.known"
-    compileSdk = 36
+    compileSdk = 37
 
     defaultConfig {
         applicationId = "com.melendez.known"
         minSdk = 29
         targetSdk = 36
         versionCode = 1
-        versionName = "1.0.12"
+        versionName = "1.0.13"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
diff --git a/Android/mobile/src/main/java/com/melendez/known/MainActivity.kt b/Android/mobile/src/main/java/com/melendez/known/MainActivity.kt
index eb163b8..6d4d567 100644
--- a/Android/mobile/src/main/java/com/melendez/known/MainActivity.kt
+++ b/Android/mobile/src/main/java/com/melendez/known/MainActivity.kt
@@ -148,14 +148,13 @@ class MainActivity : ComponentActivity() {
 
                         if (settings != null) {
                             key(settings.isFirstLogin) {
-                                val startDestination = if (settings.isFirstLogin) {
-                                    Screens.Guide
-                                } else {
-                                    Screens.Main
-                                }
-
                                 val navigationState = rememberNavigationState(
-                                    startRoute = startDestination,
+                                    startRoute =
+                                        if (settings.isFirstLogin) {
+                                            Screens.Guide
+                                        } else {
+                                            Screens.Main
+                                        },
                                     topLevelRoutes = setOf(
                                         Screens.Main,
                                         Screens.Settings,
@@ -215,7 +214,7 @@ class MainActivity : ComponentActivity() {
                                 NavDisplay(
                                     entries = navigationState.toEntries(entryProvider),
                                     onBack = { navigator.goBack() },
-                                    sceneStrategy = remember { DialogSceneStrategy() }
+                                    sceneStrategies = remember { listOf(DialogSceneStrategy()) }
                                 )
                             }
                         }
diff --git a/Android/mobile/src/main/java/com/melendez/known/ui/screens/Detail.kt b/Android/mobile/src/main/java/com/melendez/known/ui/screens/Detail.kt
index bf150ca..a0e5183 100644
--- a/Android/mobile/src/main/java/com/melendez/known/ui/screens/Detail.kt
+++ b/Android/mobile/src/main/java/com/melendez/known/ui/screens/Detail.kt
@@ -1,27 +1,19 @@
 package com.melendez.known.ui.screens
 
 import android.annotation.SuppressLint
-import android.content.Intent
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.rounded.ArrowBack
-import androidx.compose.material.icons.automirrored.rounded.Chat
-import androidx.compose.material.icons.rounded.Delete
-import androidx.compose.material.icons.rounded.Edit
-import androidx.compose.material.icons.rounded.Favorite
-import androidx.compose.material.icons.rounded.FavoriteBorder
-import androidx.compose.material.icons.rounded.Print
-import androidx.compose.material.icons.rounded.Share
-import androidx.compose.material3.BottomAppBar
 import androidx.compose.material3.BottomAppBarDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.FloatingActionButton
-import androidx.compose.material3.FloatingActionButtonDefaults
+import androidx.compose.material3.FloatingToolbarDefaults.floatingToolbarVerticalNestedScroll
+import androidx.compose.material3.HorizontalFloatingToolbar
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.Scaffold
@@ -35,13 +27,15 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import com.melendez.known.R
-import com.melendez.known.ui.components.Tip
+import com.melendez.known.ui.navigation.NavigationState
 import com.melendez.known.ui.navigation.Navigator
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -56,6 +50,7 @@ fun Detail(navigator: Navigator) {
 
     var isFavorite by remember { mutableStateOf(false) }
     val behaviorTop = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()
+    var expanded by rememberSaveable { mutableStateOf(true) }
     val scrollBehavior = BottomAppBarDefaults.exitAlwaysScrollBehavior()
 
     Scaffold(
@@ -73,75 +68,8 @@ fun Detail(navigator: Navigator) {
                 },
                 scrollBehavior = behaviorTop
             )
-        },
-        bottomBar = {
-            BottomAppBar(
-                actions = {
-                    Tip(text = stringResource(R.string.share)) {
-                        IconButton(onClick = {
-                            val shareIntent = Intent(Intent.ACTION_SEND).apply {
-                                type = "text/plain"
-                                putExtra(
-                                    Intent.EXTRA_TEXT,
-                                    "Known"
-                                )//TODO: replace Known with detail info
-                            }
-                            launcher.launch(shareIntent)
-                        }) {
-                            Icon(
-                                imageVector = Icons.Rounded.Share,
-                                contentDescription = stringResource(R.string.share)
-                            )
-                        }
-                    }
-                    Tip(text = stringResource(R.string.edit)) {
-                        IconButton(onClick = { navigator.navigate(Screens.DRP) }) {
-                            Icon(
-                                imageVector = Icons.Rounded.Edit,
-                                contentDescription = stringResource(R.string.edit)
-                            )
-                        }
-                    }
-                    Tip(text = stringResource(R.string.add_favourite)) {
-                        IconButton(onClick = { isFavorite = !isFavorite }) {
-                            Icon(
-                                imageVector = if (!isFavorite) Icons.Rounded.FavoriteBorder else Icons.Rounded.Favorite,
-                                contentDescription = stringResource(R.string.add_favourite)
-                            )
-                        }
-                    }
-                    Tip(text = stringResource(R.string.delete)) {
-                        IconButton(onClick = { /*TODO*/ }) {
-                            Icon(
-                                imageVector = Icons.Rounded.Delete,
-                                contentDescription = stringResource(R.string.delete)
-                            )
-                        }
-                    }
-                    Tip(text = stringResource(R.string.print)) {
-                        IconButton(onClick = { /*TODO*/ }) {
-                            Icon(
-                                imageVector = Icons.Rounded.Print,
-                                contentDescription = stringResource(R.string.print)
-                            )
-                        }
-                    }
-                },
-                scrollBehavior = scrollBehavior,
-                floatingActionButton = {
-                    FloatingActionButton(
-                        onClick = { navigator.navigate(Screens.Prophets) },
-                        elevation = FloatingActionButtonDefaults.bottomAppBarFabElevation()
-                    ) {
-                        Icon(
-                            imageVector = Icons.AutoMirrored.Rounded.Chat,
-                            contentDescription = stringResource(R.string.ai_analyse)
-                        )
-                    }
-                }
-            )
         }
-    ) {
+    ) { innerPadding ->
         val courseList = listOf(
             stringResource(R.string.all),
             stringResource(id = R.string.chinese),
@@ -157,29 +85,41 @@ fun Detail(navigator: Navigator) {
         )
         var course by remember { mutableIntStateOf(0) }
 
-        Column {
-            SecondaryScrollableTabRow(
-                selectedTabIndex = course,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(top = it.calculateTopPadding())
+        Box(Modifier.padding(innerPadding)) {
+
+
+            HorizontalFloatingToolbar(
+                modifier = Modifier.align(Alignment.BottomCenter),
+                expanded = expanded
             ) {
-                courseList.forEachIndexed { index, title ->
-                    Tab(
-                        selected = course == index,
-                        onClick = { course = index },
-                        text = { Text(text = title) }
-                    )
-                }
+
             }
-            LazyColumn(
+            Column(
                 modifier = Modifier
-                    .padding(bottom = it.calculateBottomPadding())
                     .fillMaxWidth()
-                    .nestedScroll(behaviorTop.nestedScrollConnection)
+                    .padding(top = innerPadding.calculateTopPadding())
             ) {
-                items(50) { count ->
-                    Text(text = "$count")
+                SecondaryScrollableTabRow(selectedTabIndex = course) {
+                    courseList.forEachIndexed { index, title ->
+                        Tab(
+                            selected = course == index,
+                            onClick = { course = index },
+                            text = { Text(text = title) }
+                        )
+                    }
+                }
+                LazyColumn(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .nestedScroll(behaviorTop.nestedScrollConnection)
+                        .floatingToolbarVerticalNestedScroll(
+                            expanded = expanded,
+                            onExpand = { expanded = true },
+                            onCollapse = { expanded = false })
+                ) {
+                    items(100) { count ->
+                        Text(text = "$count")
+                    }
                 }
             }
         }
@@ -190,7 +130,7 @@ fun Detail(navigator: Navigator) {
 @Composable
 fun Detail_Preview() {
     val navigationState = remember {
-        com.melendez.known.ui.navigation.NavigationState(
+        NavigationState(
             startRoute = Screens.Main,
             topLevelRoute = mutableStateOf(Screens.Main),
             backStacks = emptyMap()
diff --git a/Android/mobile/src/main/java/com/melendez/known/ui/screens/Screens.kt b/Android/mobile/src/main/java/com/melendez/known/ui/screens/Screens.kt
index 7ba5caf..33085c7 100644
--- a/Android/mobile/src/main/java/com/melendez/known/ui/screens/Screens.kt
+++ b/Android/mobile/src/main/java/com/melendez/known/ui/screens/Screens.kt
@@ -6,29 +6,41 @@ import kotlinx.serialization.Serializable
 @Serializable
 sealed class Screens : NavKey {
     @Serializable
-    data object Main : Screens()
+    data object Main : NavKey
+
     @Serializable
-    data object Settings : Screens()
+    data object Settings : NavKey
+
     @Serializable
-    data object Appearance : Screens()
+    data object Appearance : NavKey
+
     @Serializable
-    data object Dark : Screens()
+    data object Dark : NavKey
+
     @Serializable
-    data object Language : Screens()
+    data object Language : NavKey
+
     @Serializable
-    data object DRP : Screens()
+    data object DRP : NavKey
+
     @Serializable
-    data object Inputting : Screens()
+    data object Inputting : NavKey
+
     @Serializable
-    data object About : Screens()
+    data object About : NavKey
+
     @Serializable
-    data object Signin : Screens()
+    data object Signin : NavKey
+
     @Serializable
-    data object Detail : Screens()
+    data object Detail : NavKey
+
     @Serializable
-    data object Prophets : Screens()
+    data object Prophets : NavKey
+
     @Serializable
-    data object Credits : Screens()
+    data object Credits : NavKey
+
     @Serializable
-    data object Guide : Screens()
+    data object Guide : NavKey
 }
\ No newline at end of file
diff --git a/Android/mobile/src/main/java/com/melendez/known/ui/screens/about/About.kt b/Android/mobile/src/main/java/com/melendez/known/ui/screens/about/About.kt
index 90f11f3..f02de28 100644
--- a/Android/mobile/src/main/java/com/melendez/known/ui/screens/about/About.kt
+++ b/Android/mobile/src/main/java/com/melendez/known/ui/screens/about/About.kt
@@ -34,6 +34,7 @@ import com.melendez.known.R
 import com.melendez.known.ui.components.LocalScreenType
 import com.melendez.known.ui.components.PreferenceItem
 import com.melendez.known.ui.components.SharedTopBar
+import com.melendez.known.ui.navigation.NavigationState
 import com.melendez.known.ui.navigation.Navigator
 import com.melendez.known.ui.screens.Screens
 
@@ -163,7 +164,7 @@ fun openUrl(url: String, context: Context) {
 @Composable
 private fun AboutContentPreview() {
     val navigationState = remember {
-        com.melendez.known.ui.navigation.NavigationState(
+        NavigationState(
             startRoute = Screens.Main,
             topLevelRoute = mutableStateOf(Screens.Main),
             backStacks = emptyMap()
@@ -176,7 +177,7 @@ private fun AboutContentPreview() {
 @Composable
 private fun AboutScreenPreview() {
     val navigationState = remember {
-        com.melendez.known.ui.navigation.NavigationState(
+        NavigationState(
             startRoute = Screens.Main,
             topLevelRoute = mutableStateOf(Screens.Main),
             backStacks = emptyMap()

From fad64cb2a394c6204d4499645f0d1f2346fc15b2 Mon Sep 17 00:00:00 2001
From: Melendez <markmelendez2008@outlook.com>
Date: Sat, 25 Jul 2026 22:35:56 +0800
Subject: [PATCH 2/2] Improve Tip and Detail UI

- Bump Android Gradle Plugin to 9.4.0-alpha06
-  Add Material3 (androidx.compose.material3) with material3Version. - Refactor Tip composable to accept positioning, use the new tooltip position provider and add accessibility semantics (liveRegion, paneTitle).
- Revamp Detail screen: switch to CenterAlignedTopAppBar, enhance HorizontalFloatingToolbar with share/print/edit/favorite/delete actions (share uses Intent), adjust toolbar offset/zIndex, integrate nested scrolling and replace Column with LazyColumn + stickyHeader for tabs.
---
 Android/.idea/deploymentTargetSelector.xml    |   4 +-
 Android/build.gradle.kts                      |   2 +-
 Android/gradle/libs.versions.toml             |   4 +-
 Android/mobile/build.gradle.kts               |   1 +
 .../com/melendez/known/ui/components/Tip.kt   |  25 +++-
 .../com/melendez/known/ui/screens/Detail.kt   | 134 ++++++++++++++----
 6 files changed, 133 insertions(+), 37 deletions(-)

diff --git a/Android/.idea/deploymentTargetSelector.xml b/Android/.idea/deploymentTargetSelector.xml
index ea1cb32..53506d9 100644
--- a/Android/.idea/deploymentTargetSelector.xml
+++ b/Android/.idea/deploymentTargetSelector.xml
@@ -15,10 +15,10 @@
       </SelectionState>
       <SelectionState runConfigName="mobile">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-06-27T14:19:41.893496800Z">
+        <DropdownSelection timestamp="2026-07-25T13:45:44.635371700Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\Melendez\.android\avd\Pixel_9_Pro_Fold.avd" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=e39fc191" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/Android/build.gradle.kts b/Android/build.gradle.kts
index 3cb2000..f3c86d8 100644
--- a/Android/build.gradle.kts
+++ b/Android/build.gradle.kts
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "9.4.0-alpha03" apply false
+    id("com.android.application") version "9.4.0-alpha06" apply false
     id("org.jetbrains.kotlin.plugin.compose") version "2.3.0" apply false
     id("com.google.gms.google-services") version "4.5.0" apply false
     id("com.google.devtools.ksp") version "2.3.6" apply false
diff --git a/Android/gradle/libs.versions.toml b/Android/gradle/libs.versions.toml
index 9d1683f..50f376b 100644
--- a/Android/gradle/libs.versions.toml
+++ b/Android/gradle/libs.versions.toml
@@ -37,7 +37,7 @@ tiles = "1.6.1"
 ui = "1.11.4"
 volley = "1.2.1"
 watchfaceComplicationsDataSourceKtx = "1.3.0"
-agp = "9.4.0-alpha03"
+agp = "9.4.0-alpha06"
 kotlin = "2.4.0"
 composeMaterial3 = "1.6.2"
 composeUiTooling = "1.6.2"
@@ -48,6 +48,7 @@ protolayoutMaterial3 = "1.4.1"
 guava = "33.6.0-android"
 tilesTooling = "1.6.1"
 tilesToolingPreview = "1.6.1"
+material3Version = "1.4.0"
 
 [libraries]
 accompanist-pager = { group = "com.google.accompanist", name = "accompanist-pager", version.ref = "accompanist" }
@@ -112,6 +113,7 @@ androidx-protolayout-material3 = { group = "androidx.wear.protolayout", name = "
 guava = { group = "com.google.guava", name = "guava", version.ref = "guava" }
 androidx-tiles-tooling = { group = "androidx.wear.tiles", name = "tiles-tooling", version.ref = "tilesTooling" }
 androidx-tiles-tooling-preview = { group = "androidx.wear.tiles", name = "tiles-tooling-preview", version.ref = "tilesToolingPreview" }
+androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3Version" }
 
 [plugins]
 androidx-compose-ui = { id = "androidx.compose.ui", version.ref = "composeUi" }
diff --git a/Android/mobile/build.gradle.kts b/Android/mobile/build.gradle.kts
index de5b53a..5c37285 100644
--- a/Android/mobile/build.gradle.kts
+++ b/Android/mobile/build.gradle.kts
@@ -58,6 +58,7 @@ kotlin {
 
 dependencies {
 
+    implementation(libs.androidx.material3)
     implementation(libs.core.ktx)
     implementation(libs.coil.compose)
     implementation(libs.volley)
diff --git a/Android/mobile/src/main/java/com/melendez/known/ui/components/Tip.kt b/Android/mobile/src/main/java/com/melendez/known/ui/components/Tip.kt
index 555a986..f37bcbb 100644
--- a/Android/mobile/src/main/java/com/melendez/known/ui/components/Tip.kt
+++ b/Android/mobile/src/main/java/com/melendez/known/ui/components/Tip.kt
@@ -3,20 +3,35 @@ package com.melendez.known.ui.components
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.PlainTooltip
 import androidx.compose.material3.Text
+import androidx.compose.material3.TooltipAnchorPosition
 import androidx.compose.material3.TooltipBox
 import androidx.compose.material3.TooltipDefaults
 import androidx.compose.material3.rememberTooltipState
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.LiveRegionMode
+import androidx.compose.ui.semantics.liveRegion
+import androidx.compose.ui.semantics.paneTitle
+import androidx.compose.ui.semantics.semantics
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun Tip(text: String, content: @Composable () -> Unit) {
+fun Tip(
+    positioning: TooltipAnchorPosition? = TooltipAnchorPosition.Above,
+    text: String,
+    content: @Composable () -> Unit
+) {
     TooltipBox(
-        positionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
+        positionProvider = TooltipDefaults.rememberTooltipPositionProvider(
+            positioning = positioning ?: TooltipAnchorPosition.Above
+        ),
         tooltip = {
-            PlainTooltip {
-                Text(text = text)
-            }
+            PlainTooltip(
+                modifier = Modifier.semantics {
+                    liveRegion = LiveRegionMode.Assertive
+                    paneTitle = text
+                }
+            ) { Text(text = text) }
         },
         state = rememberTooltipState(),
         content = content
diff --git a/Android/mobile/src/main/java/com/melendez/known/ui/screens/Detail.kt b/Android/mobile/src/main/java/com/melendez/known/ui/screens/Detail.kt
index a0e5183..450a9cc 100644
--- a/Android/mobile/src/main/java/com/melendez/known/ui/screens/Detail.kt
+++ b/Android/mobile/src/main/java/com/melendez/known/ui/screens/Detail.kt
@@ -1,17 +1,29 @@
 package com.melendez.known.ui.screens
 
 import android.annotation.SuppressLint
+import android.content.Intent
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.rounded.ArrowBack
+import androidx.compose.material.icons.automirrored.rounded.Message
+import androidx.compose.material.icons.rounded.Delete
+import androidx.compose.material.icons.rounded.Edit
+import androidx.compose.material.icons.rounded.Favorite
+import androidx.compose.material.icons.rounded.FavoriteBorder
+import androidx.compose.material.icons.rounded.Print
+import androidx.compose.material.icons.rounded.Share
 import androidx.compose.material3.BottomAppBarDefaults
+import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.FilledIconButton
+import androidx.compose.material3.FloatingToolbarDefaults.ScreenOffset
 import androidx.compose.material3.FloatingToolbarDefaults.floatingToolbarVerticalNestedScroll
 import androidx.compose.material3.HorizontalFloatingToolbar
 import androidx.compose.material3.Icon
@@ -20,7 +32,6 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SecondaryScrollableTabRow
 import androidx.compose.material3.Tab
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -34,7 +45,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.zIndex
 import com.melendez.known.R
+import com.melendez.known.ui.components.Tip
 import com.melendez.known.ui.navigation.NavigationState
 import com.melendez.known.ui.navigation.Navigator
 
@@ -56,7 +70,7 @@ fun Detail(navigator: Navigator) {
     Scaffold(
         modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
         topBar = {
-            TopAppBar(
+            CenterAlignedTopAppBar(
                 title = { Text(text = stringResource(id = R.string.exam)) },
                 navigationIcon = {
                     IconButton(onClick = { navigator.goBack() }) {
@@ -87,39 +101,103 @@ fun Detail(navigator: Navigator) {
 
         Box(Modifier.padding(innerPadding)) {
 
-
             HorizontalFloatingToolbar(
-                modifier = Modifier.align(Alignment.BottomCenter),
-                expanded = expanded
-            ) {
+                expanded = expanded,
+                modifier = Modifier
+                    .align(Alignment.BottomCenter)
+                    .offset(y = -ScreenOffset)
+                    .zIndex(1f),
+                leadingContent = {
+                    Tip(null, text = stringResource(R.string.share)) {
+                        IconButton(
+                            onClick = {
+                                val shareIntent = Intent(Intent.ACTION_SEND).apply {
+                                    type = "text/plain"
+                                    putExtra(
+                                        Intent.EXTRA_TEXT,
+                                        "Known"
+                                    )//TODO: replace Known with detail info
+                                }
+                                launcher.launch(shareIntent)
+                            }
+                        ) {
+                            Icon(
+                                imageVector = Icons.Rounded.Share,
+                                contentDescription = stringResource(R.string.share)
+                            )
+                        }
+                    }
+                    Tip(text = stringResource(R.string.print)) {
+                        IconButton(onClick = { /*TODO*/ }) {
+                            Icon(
+                                imageVector = Icons.Rounded.Print,
+                                contentDescription = stringResource(R.string.print)
+                            )
+                        }
+                    }
+                },
+                trailingContent = {
+                    Tip(text = stringResource(R.string.edit)) {
+                        IconButton(onClick = { navigator.navigate(Screens.DRP) }) {
+                            Icon(
+                                imageVector = Icons.Rounded.Edit,
+                                contentDescription = stringResource(R.string.edit)
+                            )
+                        }
+                    }
+                    Tip(text = stringResource(R.string.add_favourite)) {
+                        IconButton(onClick = { isFavorite = !isFavorite }) {
+                            Icon(
+                                imageVector = if (!isFavorite) Icons.Rounded.FavoriteBorder else Icons.Rounded.Favorite,
+                                contentDescription = stringResource(R.string.add_favourite)
+                            )
+                        }
+                    }
+                    Tip(text = stringResource(R.string.delete)) {
+                        IconButton(onClick = { /*TODO*/ }) {
+                            Icon(
+                                imageVector = Icons.Rounded.Delete,
+                                contentDescription = stringResource(R.string.delete)
+                            )
+                        }
+                    }
 
+                }
+            ) {
+                FilledIconButton(
+                    modifier = Modifier.width(64.dp),
+                    onClick = { navigator.navigate(Screens.Prophets) }
+                ) {
+                    Icon(
+                        Icons.AutoMirrored.Rounded.Message,
+                        stringResource(R.string.prophets)
+                    )
+                }
             }
-            Column(
+
+            LazyColumn(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .padding(top = innerPadding.calculateTopPadding())
+                    .nestedScroll(behaviorTop.nestedScrollConnection)
+                    .floatingToolbarVerticalNestedScroll(
+                        expanded = expanded,
+                        onExpand = { expanded = true },
+                        onCollapse = { expanded = false }
+                    )
             ) {
-                SecondaryScrollableTabRow(selectedTabIndex = course) {
-                    courseList.forEachIndexed { index, title ->
-                        Tab(
-                            selected = course == index,
-                            onClick = { course = index },
-                            text = { Text(text = title) }
-                        )
+                stickyHeader {
+                    SecondaryScrollableTabRow(selectedTabIndex = course) {
+                        courseList.forEachIndexed { index, title ->
+                            Tab(
+                                selected = course == index,
+                                onClick = { course = index },
+                                text = { Text(text = title) }
+                            )
+                        }
                     }
                 }
-                LazyColumn(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .nestedScroll(behaviorTop.nestedScrollConnection)
-                        .floatingToolbarVerticalNestedScroll(
-                            expanded = expanded,
-                            onExpand = { expanded = true },
-                            onCollapse = { expanded = false })
-                ) {
-                    items(100) { count ->
-                        Text(text = "$count")
-                    }
+                items(100) { count ->
+                    Text(text = "$count")
                 }
             }
         }