Skip to content

Removes need for Horologist #197

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

Removes need for Horologist #197

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
2208174
Removes need for Horologist
garanj Feb 4, 2026
5582bb4
Remove accidental gradle-daemon-jvm.properties
garanj Feb 4, 2026
ba1de43
Fix component use
garanj Feb 4, 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
12 changes: 6 additions & 6 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ guava = "33.5.0-android"
hiltAndroid = "2.59"
hiltLifecycleViewmodel = "1.0.0-alpha03"
hiltNavigationCompose = "1.3.0"
horologist = "0.7.15"
junit = "4.13.2"
junitVersion = "1.3.0"
kotlin = "2.3.0"
Expand Down Expand Up @@ -67,11 +66,11 @@ runner = "1.7.0"
uiTextGoogleFonts = "1.9.3"
uiautomator = "2.4.0-alpha07"
uiTooling = "1.10.0"
validatorPush = "1.0.0-alpha08"
watchFacePush = "1.0.0-alpha01"
validatorPush = "1.0.0-alpha09"
watchFacePush = "1.0.0-beta01"
wear = "1.3.0"
wearCompose = "1.5.0"
wearComposeTooling = "1.4.1"
wearCompose = "1.6.0-alpha09"
wearComposeTooling = "1.5.6"
wearRemoteInteractions = "1.1.0"
window = "1.5.0"
lifecycleProcess = "2.9.4"
Expand Down Expand Up @@ -106,7 +105,9 @@ androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-co
androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "hiltNavigationCompose" }
androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycleRuntimeKtx" }
androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleRuntimeKtx" }
androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycleRuntimeKtx" }
androidx-lifecycle-viewmodel-navigation3 = { module = "androidx.lifecycle:lifecycle-viewmodel-navigation3", version.ref = "lifecycleViewmodelNavigation3" }
androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" }
androidx-media3-exoplayer = { group = "androidx.media3", name = "media3-exoplayer", version.ref = "media3" }
Expand Down Expand Up @@ -148,7 +149,6 @@ guava = { module = "com.google.guava:guava", version.ref = "guava" }
hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hiltAndroid" }
hilt-android-testing = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "hiltAndroid" }
hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "hiltAndroid" }
horologist-compose-layout = { module = "com.google.android.horologist:horologist-compose-layout", version.ref = "horologist" }
junit = { group = "junit", name = "junit", version.ref = "junit" }
kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin"}
kotlinx-coroutines-play-services = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-play-services", version.ref = "kotlinxCoroutines"}
Expand Down
7 changes: 6 additions & 1 deletion wear/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ dependencies {
implementation(libs.androidx.wear.compose.material)
implementation(libs.androidx.wear.compose.ui.tooling)
implementation(libs.androidx.activity.compose)
implementation(libs.androidx.lifecycle.runtime.compose)
implementation(libs.androidx.lifecycle.viewmodel.compose)
implementation(libs.play.services.wearable)
implementation(libs.kotlinx.coroutines.play.services)
implementation(libs.watchface.push)
Expand All @@ -76,10 +78,13 @@ dependencies {
implementation(libs.kotlinx.serialization.protobuf)
implementation(libs.androidx.wear)
implementation(libs.androidx.wear.remote.interactions)
implementation(libs.horologist.compose.layout)
implementation(libs.accompanist.permissions)
implementation(libs.androidx.work.runtime.ktx)

// Added for Compose Preview support
debugImplementation(libs.androidx.ui.tooling)
implementation(libs.androidx.ui.tooling.preview)

"cliToolConfiguration"(libs.validator.push.cli)
}

Expand Down
11 changes: 2 additions & 9 deletions wear/src/main/java/com/android/developers/androidify/ui/CallToActionScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,14 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.wear.compose.foundation.lazy.TransformingLazyColumn
import androidx.wear.compose.foundation.lazy.rememberTransformingLazyColumnState
import androidx.wear.compose.material3.MaterialTheme
import androidx.wear.compose.material3.ScreenScaffold
import androidx.wear.compose.material3.Text
import androidx.wear.compose.material3.lazy.ResponsiveTransformingLazyColumn
import androidx.wear.compose.ui.tooling.preview.WearPreviewDevices
import com.android.developers.androidify.R
import com.android.developers.androidify.ui.theme.AndroidifyWearTheme
import com.google.android.horologist.compose.layout.ColumnItemType
import com.google.android.horologist.compose.layout.rememberResponsiveColumnPadding

@Composable
fun CallToActionScreen(
Expand All @@ -44,13 +42,8 @@ fun CallToActionScreen(
val listState = rememberTransformingLazyColumnState()
ScreenScaffold(
scrollState = listState,
// Use Horologist for now to get correct top and bottom padding in list.
contentPadding = rememberResponsiveColumnPadding(
first = ColumnItemType.IconButton,
last = ColumnItemType.Button,
),
) { contentPadding ->
TransformingLazyColumn(
ResponsiveTransformingLazyColumn(
state = listState,
contentPadding = contentPadding,
) {
Expand Down
29 changes: 13 additions & 16 deletions wear/src/main/java/com/android/developers/androidify/ui/TransmissionScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,21 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.wear.compose.foundation.lazy.TransformingLazyColumn
import androidx.wear.compose.foundation.lazy.rememberTransformingLazyColumnState
import androidx.wear.compose.material.CircularProgressIndicator
import androidx.wear.compose.material3.CircularProgressIndicator
import androidx.wear.compose.material3.MaterialTheme
import androidx.wear.compose.material3.ProgressIndicatorDefaults
import androidx.wear.compose.material3.ScreenScaffold
import androidx.wear.compose.material3.Text
import androidx.wear.compose.material3.lazy.ResponsiveItemType
import androidx.wear.compose.material3.lazy.ResponsiveTransformingLazyColumn
import androidx.wear.compose.ui.tooling.preview.WearPreviewDevices
import com.android.developers.androidify.R
import com.android.developers.androidify.ui.theme.AndroidifyWearTheme
import com.android.developers.androidify.ui.theme.Blue
import com.android.developers.androidify.ui.theme.LimeGreen
import com.android.developers.androidify.ui.theme.Primary80
import com.android.developers.androidify.ui.theme.Primary90
import com.google.android.horologist.compose.layout.ColumnItemType
import com.google.android.horologist.compose.layout.rememberResponsiveColumnPadding
import kotlin.math.floor

@Composable
Expand All @@ -60,33 +60,28 @@ fun TransmissionScreen(modifier: Modifier = Modifier) {
ScreenScaffold(
modifier = modifier.keepScreenOn(),
scrollState = listState,
// Use Horologist for now to get correct top and bottom padding in list.
contentPadding = rememberResponsiveColumnPadding(
first = ColumnItemType.IconButton,
last = ColumnItemType.Button,
),
) { contentPadding ->
TransformingLazyColumn(
ResponsiveTransformingLazyColumn(
state = listState,
contentPadding = contentPadding,
) {
item {
item(itemType = ResponsiveItemType.IconButton) {
Image(
modifier = Modifier.fillMaxWidth(0.3f),
painter = painterResource(id = R.drawable.logo),
contentDescription = stringResource(R.string.logo_description),
)
}
item {
item(itemType = ResponsiveItemType.Default) {
Spacer(modifier = Modifier.height(4.dp))
}
item {
item(itemType = ResponsiveItemType.IconButton) {
FourColorProgressIndicator()
}
item {
item(itemType = ResponsiveItemType.Default) {
Spacer(modifier = Modifier.height(4.dp))
}
item {
item(itemType = ResponsiveItemType.Text) {
Text(
modifier = Modifier.fillMaxWidth(),
textAlign = TextAlign.Center,
Expand Down Expand Up @@ -130,7 +125,9 @@ fun FourColorProgressIndicator() {
contentAlignment = Alignment.Center,
modifier = Modifier.fillMaxSize(),
) {
CircularProgressIndicator(indicatorColor = animatedColor)
CircularProgressIndicator(
colors = ProgressIndicatorDefaults.colors().copy(indicatorColor = animatedColor),
)
}
}

Expand Down
Loading