Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Android/.idea/deploymentTargetSelector.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Android/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Android/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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-alpha06" 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 {
Expand Down
2 changes: 1 addition & 1 deletion Android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
68 changes: 35 additions & 33 deletions Android/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,53 +1,54 @@
[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-alpha06"
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"
material3Version = "1.4.0"

[libraries]
accompanist-pager = { group = "com.google.accompanist", name = "accompanist-pager", version.ref = "accompanist" }
Expand Down Expand Up @@ -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" }
Expand Down
4 changes: 2 additions & 2 deletions Android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
7 changes: 4 additions & 3 deletions Android/mobile/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -58,6 +58,7 @@ kotlin {

dependencies {

implementation(libs.androidx.material3)
implementation(libs.core.ktx)
implementation(libs.coil.compose)
implementation(libs.volley)
Expand Down
15 changes: 7 additions & 8 deletions Android/mobile/src/main/java/com/melendez/known/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -215,7 +214,7 @@ class MainActivity : ComponentActivity() {
NavDisplay(
entries = navigationState.toEntries(entryProvider),
onBack = { navigator.goBack() },
sceneStrategy = remember { DialogSceneStrategy() }
sceneStrategies = remember { listOf(DialogSceneStrategy()) }
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading