Skip to content

Commit e41ed96

Browse files
committed
Wear changes
1 parent 0b9a4ee commit e41ed96

File tree

69 files changed

+106
-10
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+106
-10
lines changed

β€Žandroid/wear/build.gradle.ktsβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ dependencies {
9999
implementation("androidx.wear.compose:compose-ui-tooling")
100100
implementation("androidx.wear.compose:compose-navigation")
101101
implementation("androidx.compose.ui:ui-tooling-preview")
102-
implementation("androidx.wear.compose:compose-material3:1.0.0-alpha32")
102+
implementation("androidx.wear.compose:compose-material3:1.0.0-alpha34")
103103
implementation("androidx.wear.compose:compose-foundation")
104104
implementation("androidx.compose.foundation:foundation:1.7.8")
105105
implementation("androidx.activity:activity-compose:1.10.1")
@@ -111,7 +111,7 @@ dependencies {
111111
implementation("androidx.wear.watchface:watchface-complications-data-source-ktx:1.2.1")
112112
implementation("com.google.code.gson:gson:2.12.1")
113113
implementation("androidx.compose.runtime:runtime-livedata:1.7.8")
114-
114+
115115
androidTestImplementation(platform("androidx.compose:compose-bom:2025.03.00"))
116116
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
117117
debugImplementation("androidx.compose.ui:ui-tooling")

β€Žandroid/wear/src/main/java/com/codel1417/tail_App/json/WearData.ktβ€Ž

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ package com.codel1417.tail_App.json
22

33
data class WearActionData(val name: String, val uuid: String)
44
data class WearTriggerData(val name: String, val uuid: String, val enabled: Boolean)
5-
data class WearLocalizationData(val triggersPage: String, val actionsPage: String)
5+
data class WearLocalizationData(
6+
val triggersPage: String,
7+
val actionsPage: String,
8+
val favoriteActionsDescription: String
9+
)
10+
611
data class WearGearData(
712
val name: String,
813
val uuid: String,

β€Žandroid/wear/src/main/java/com/codel1417/tail_App/presentation/MainActivity.ktβ€Ž

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ import android.R
1010
import android.os.Bundle
1111
import androidx.activity.ComponentActivity
1212
import androidx.activity.compose.setContent
13+
import androidx.compose.foundation.layout.Box
1314
import androidx.compose.foundation.layout.fillMaxSize
1415
import androidx.compose.foundation.layout.fillMaxWidth
1516
import androidx.compose.foundation.layout.padding
1617
import androidx.compose.runtime.Composable
1718
import androidx.compose.runtime.State
1819
import androidx.compose.runtime.livedata.observeAsState
20+
import androidx.compose.ui.Alignment
1921
import androidx.compose.ui.Modifier
2022
import androidx.compose.ui.graphics.Color
2123
import androidx.compose.ui.platform.LocalContext
@@ -29,13 +31,15 @@ import androidx.wear.compose.foundation.lazy.AutoCenteringParams
2931
import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
3032
import androidx.wear.compose.foundation.lazy.ScalingLazyColumnDefaults
3133
import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
34+
import androidx.wear.compose.material.Card
3235
import androidx.wear.compose.material.Chip
3336
import androidx.wear.compose.material.ChipDefaults
3437
import androidx.wear.compose.material.PositionIndicator
3538
import androidx.wear.compose.material.Scaffold
3639
import androidx.wear.compose.material.Text
3740
import androidx.wear.compose.material.Vignette
3841
import androidx.wear.compose.material.VignettePosition
42+
import androidx.wear.compose.material3.Card
3943
import androidx.wear.compose.material3.CircularProgressIndicator
4044
import androidx.wear.compose.material3.SwitchButton
4145
import androidx.wear.compose.material3.TimeText
@@ -235,7 +239,14 @@ class MainActivity : ComponentActivity(), DataClient.OnDataChangedListener,
235239
}) {
236240

237241
if (state.value == null) {
238-
CircularProgressIndicator()
242+
Box( modifier = Modifier.fillMaxSize(),
243+
) {
244+
CircularProgressIndicator(
245+
modifier = Modifier
246+
.align(alignment = Alignment.Center)
247+
.fillMaxSize(0.6f)
248+
)
249+
}
239250
} else {
240251
ScalingLazyColumn(
241252
modifier = Modifier.fillMaxSize(),
@@ -269,7 +280,17 @@ class MainActivity : ComponentActivity(), DataClient.OnDataChangedListener,
269280
)
270281
}
271282
}
272-
283+
item { Text(text = state.value!!.localization.triggersPage) }
284+
state.value!!.knownGear.map {
285+
item {
286+
GearButton(
287+
contentModifier,
288+
it.name,
289+
it.batteryLevel.toInt(),
290+
it.color
291+
)
292+
}
293+
}
273294
}
274295
}
275296
}
@@ -330,7 +351,21 @@ class MainActivity : ComponentActivity(), DataClient.OnDataChangedListener,
330351
},
331352
)
332353
}
333-
354+
@Composable
355+
fun GearButton(
356+
modifier: Modifier = Modifier,
357+
name: String,
358+
battery: Int,
359+
color: Long
360+
) {
361+
Chip(
362+
modifier = modifier,
363+
colors = ChipDefaults.chipColors(backgroundColor = Color(color)),
364+
label = { Text(text = name, textAlign = TextAlign.Center) },
365+
onClick = {},
366+
secondaryLabel = { Text(text = "$battery%", textAlign = TextAlign.Center) },
367+
)
368+
}
334369
override fun onMessageReceived(p0: MessageEvent) {
335370
println("onMessageReceived() ${p0.path} ${p0.data}")
336371
}
61.3 KB
1.42 KB
61.3 KB
33.9 KB
1.11 KB
33.9 KB
58 KB

0 commit comments

Comments
Β (0)