add wear loaders

Author: Razeeman

README.md

@@ -104,8 +104,9 @@ Simple app that helps track how much time you spend on all the useless activitie
     ├── data_local                            # Database.
     ├── domain                                # Business logic.
     ├── navigation                            # Navigation interfaces and screen params.
+    ├── resources                             # Common resources between phone and watch apps.
     ├── wear                                  # WearOS app.
-    ├── wear_api                              # Mobile - WearOS communication
+    ├── wear_api                              # Mobile - WearOS communication contracts.
     ├── features
     │   ├── feature_archive                   # Screen for archived data.
     │   ├── feature_base_adapter              # Shared recycler adapters.
@@ -130,6 +131,7 @@ Simple app that helps track how much time you spend on all the useless activitie
     │   ├── feature_statistics_detail         # Screen showing detailed statistics.
     │   ├── feature_tag_selection             # Screen for selecting tags.
     │   ├── feature_views                     # Custom views.
+    │   ├── feature_wear                      # Phone app logic to connect to wear app.
     │   └── feature_widget                    # Widgets.
 
 ## License

wear/src/main/java/com/example/util/simpletimetracker/presentation/components/ActivitiesList.kt

@@ -7,10 +7,12 @@ package com.example.util.simpletimetracker.presentation.components
 
 import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.wear.compose.material.CircularProgressIndicator
 import androidx.wear.compose.material.ScalingLazyListScope
 import androidx.wear.compose.material.Text
 import androidx.wear.tooling.preview.devices.WearDevices
@@ -61,8 +63,12 @@ fun ActivitiesList(
     }
 }
 
-private fun renderLoading() {
-    // Show nothing until data is loaded.
+private fun ScalingLazyListScope.renderLoading() {
+    item {
+        CircularProgressIndicator(
+            modifier = Modifier.width(64.dp),
+        )
+    }
 }
 
 private fun ScalingLazyListScope.renderEmpty(
@@ -108,6 +114,14 @@ private fun ScalingLazyListScope.renderRefreshButton(
     item { RefreshButton(onClick = onRefresh) }
 }
 
+@Preview(device = WearDevices.LARGE_ROUND)
+@Composable
+private fun Loading() {
+    ActivitiesList(
+        state = ActivitiesListState.Loading,
+    )
+}
+
 @Preview(device = WearDevices.LARGE_ROUND)
 @Composable
 private fun NoActivities() {

wear/src/main/java/com/example/util/simpletimetracker/presentation/components/RefreshButton.kt

@@ -15,30 +15,28 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.rotate
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.wear.compose.material.Icon
 import androidx.wear.compose.material.OutlinedButton
-import com.example.util.simpletimetracker.R
 import com.example.util.simpletimetracker.presentation.remember.rememberAnimationRotation
 
 @Composable
-fun RefreshButton(onClick: () -> Unit, contentDescription: String? = null) {
-    val context = LocalContext.current
+fun RefreshButton(
+    onClick: () -> Unit = {},
+) {
     var pressCount by remember { mutableIntStateOf(0) }
     val targetRotation = rememberAnimationRotation(key = pressCount)
+
     OutlinedButton(
         onClick = {
             pressCount++
             onClick()
         },
         content = {
             Icon(
-                Icons.Rounded.Refresh,
-                contentDescription = contentDescription ?: context.getString(
-                    R.string.refresh_button_default_content_description,
-                ),
+                imageVector = Icons.Rounded.Refresh,
+                contentDescription = null,
             )
         },
         modifier = Modifier
@@ -50,7 +48,5 @@ fun RefreshButton(onClick: () -> Unit, contentDescription: String? = null) {
 @Preview
 @Composable
 private fun Preview() {
-    RefreshButton(
-        onClick = { /* Log.i("Preview", "Refresh Button clicked!") */ },
-    )
+    RefreshButton()
 }

wear/src/main/java/com/example/util/simpletimetracker/presentation/components/TagList.kt

@@ -7,11 +7,13 @@ package com.example.util.simpletimetracker.presentation.components
 
 import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.wear.compose.material.CircularProgressIndicator
 import androidx.wear.compose.material.ScalingLazyListScope
 import androidx.wear.compose.material.Text
 import androidx.wear.tooling.preview.devices.WearDevices
@@ -73,8 +75,12 @@ fun TagList(
     }
 }
 
-private fun renderLoadingState() {
-    // Show nothing until data is loded.
+private fun ScalingLazyListScope.renderLoadingState() {
+    item {
+        CircularProgressIndicator(
+            modifier = Modifier.width(64.dp),
+        )
+    }
 }
 
 private fun ScalingLazyListScope.renderEmptyState(
@@ -116,6 +122,14 @@ private fun ScalingLazyListScope.renderContentState(
     }
 }
 
+@Preview(device = WearDevices.LARGE_ROUND)
+@Composable
+private fun Loading() {
+    TagList(
+        state = TagListState.Loading,
+    )
+}
+
 @Preview(device = WearDevices.LARGE_ROUND)
 @Composable
 private fun NoTags() {

wear/src/main/java/com/example/util/simpletimetracker/presentation/layout/ScrollingColumn.kt

@@ -43,7 +43,7 @@ fun ScrollingColumn(
             state = scrollState,
         ),
         autoCentering = AutoCenteringParams(
-            itemIndex = 0,
+            itemIndex = 1,
         ),
         contentPadding = PaddingValues(10.dp),
         verticalArrangement = Arrangement.Center,

wear/src/main/res/values-es/strings.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="refresh_button_default_content_description">Actualizar</string>
     <string name="no_tags">Sin etiquetas</string>
     <string name="no_activities">Sin actividades</string>
 </resources>

wear/src/main/res/values/strings.xml

@@ -1,5 +1,4 @@
 <resources>
-    <string name="refresh_button_default_content_description">Refresh</string>
     <string name="no_tags">No tags</string>
     <string name="no_activities">No activities</string>
     <string name="untagged">Untagged</string>

wear_api/src/main/java/com/example/util/simpletimetracker/wear_api/WearRequests.kt

@@ -8,11 +8,15 @@ package com.example.util.simpletimetracker.wear_api
 object WearRequests {
     const val PATH = "/stt"
 
+    // From wear to app.
+    // Same strings are set in the android_wear_capabilities manifest
     const val PING = "$PATH//GET/ping"
     const val QUERY_ACTIVITIES = "$PATH//GET/activities"
     const val QUERY_CURRENT_ACTIVITIES = "$PATH//GET/activities/current"
     const val SET_CURRENT_ACTIVITIES = "$PATH//PUT/activities/current"
     const val QUERY_TAGS_FOR_ACTIVITY = "$PATH//GET/activities/:ID/tags"
     const val QUERY_SETTINGS = "$PATH//GET/settings"
+
+    // From app to wear.
     const val DATA_UPDATED = "$PATH//data/updated"
 }