Merge pull request #143 from d4rken-org/gplay_wear_policies_fml

Fix "Missing show time"

app-wear/src/main/java/eu/darken/capod/wear/core/UserTime.kt

@@ -0,0 +1,18 @@
+package eu.darken.capod.wear.core
+
+import android.content.Context
+import java.time.Instant
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+import java.time.format.FormatStyle
+import java.util.Locale
+
+data class UserTime(
+    val time: Instant = Instant.now(),
+) {
+    fun toFormatted(context: Context): String = DateTimeFormatter
+        .ofLocalizedTime(FormatStyle.SHORT)
+        .withLocale(Locale.getDefault())
+        .withZone(ZoneId.systemDefault())
+        .format(time)
+}

app-wear/src/main/java/eu/darken/capod/wear/ui/overview/OverviewFragmentVM.kt

@@ -17,6 +17,7 @@ import eu.darken.capod.main.core.PermissionTool
 import eu.darken.capod.monitor.core.PodMonitor
 import eu.darken.capod.pods.core.DualPodDevice
 import eu.darken.capod.pods.core.SinglePodDevice
+import eu.darken.capod.wear.core.UserTime
 import eu.darken.capod.wear.ui.overview.cards.BluetoothDisabledVH
 import eu.darken.capod.wear.ui.overview.cards.MissingMainDeviceVH
 import eu.darken.capod.wear.ui.overview.cards.PermissionCardVH
@@ -86,14 +87,20 @@ class OverviewFragmentVM @Inject constructor(
                 device = podToShow,
                 showDebug = isDebugMode,
                 isMainPod = true,
+                userTime = UserTime(),
             )
+
             is SinglePodDevice -> SinglePodsCardVH.Item(
                 now = now,
                 device = podToShow,
                 showDebug = isDebugMode,
                 isMainPod = true,
+                userTime = UserTime(),
+            )
+
+            else -> MissingMainDeviceVH.Item(
+                userTime = UserTime(),
             )
-            else -> MissingMainDeviceVH.Item
         }
         items.add(pod)
 

app-wear/src/main/java/eu/darken/capod/wear/ui/overview/cards/MissingMainDeviceVH.kt

@@ -5,6 +5,7 @@ import eu.darken.capod.R
 import eu.darken.capod.common.lists.binding
 import eu.darken.capod.common.lists.differ.DifferItem
 import eu.darken.capod.databinding.OverviewNomaindeviceItemBinding
+import eu.darken.capod.wear.core.UserTime
 import eu.darken.capod.wear.ui.overview.OverviewAdapter
 
 class MissingMainDeviceVH(parent: ViewGroup) :
@@ -21,11 +22,14 @@ class MissingMainDeviceVH(parent: ViewGroup) :
         item: Item,
         payloads: List<Any>
     ) -> Unit = binding(payload = true) { item ->
+        userTime.text = item.userTime.toFormatted(context)
 
     }
 
-    object Item : OverviewAdapter.Item {
-        override val stableId: Long = Item::class.hashCode().toLong()
+    data class Item(
+        val userTime: UserTime,
+    ) : OverviewAdapter.Item {
+        override val stableId: Long = this.hashCode().toLong()
 
         override val payloadProvider: ((DifferItem, DifferItem) -> DifferItem?)
             get() = { old, new -> if (new::class.isInstance(old)) new else null }

app-wear/src/main/java/eu/darken/capod/wear/ui/overview/cards/pods/DualPodsCardVH.kt

@@ -9,6 +9,7 @@ import eu.darken.capod.common.lists.binding
 import eu.darken.capod.databinding.OverviewPodsDualItemBinding
 import eu.darken.capod.pods.core.*
 import eu.darken.capod.pods.core.apple.DualApplePods
+import eu.darken.capod.wear.core.UserTime
 import java.time.Instant
 
 class DualPodsCardVH(parent: ViewGroup) :
@@ -20,7 +21,10 @@ class DualPodsCardVH(parent: ViewGroup) :
     override val viewBinding = lazy { OverviewPodsDualItemBinding.bind(itemView) }
 
     override val onBindData = binding(payload = true) { item: Item ->
+        userTime.text = item.userTime.toFormatted(context)
+
         val device = item.device
+
         name.apply {
             val sb = StringBuilder(device.getLabel(context))
             if (device is HasPodStyle && item.showDebug) {
@@ -127,5 +131,6 @@ class DualPodsCardVH(parent: ViewGroup) :
         override val device: DualPodDevice,
         override val showDebug: Boolean,
         override val isMainPod: Boolean,
+        val userTime: UserTime,
     ) : PodDeviceVH.Item
 }

app-wear/src/main/java/eu/darken/capod/wear/ui/overview/cards/pods/SinglePodsCardVH.kt

@@ -8,6 +8,7 @@ import eu.darken.capod.R
 import eu.darken.capod.common.lists.binding
 import eu.darken.capod.databinding.OverviewPodsSingleItemBinding
 import eu.darken.capod.pods.core.*
+import eu.darken.capod.wear.core.UserTime
 import java.time.Instant
 
 class SinglePodsCardVH(parent: ViewGroup) :
@@ -19,6 +20,8 @@ class SinglePodsCardVH(parent: ViewGroup) :
     override val viewBinding = lazy { OverviewPodsSingleItemBinding.bind(itemView) }
 
     override val onBindData = binding(payload = true) { item: Item ->
+        userTime.text = item.userTime.toFormatted(context)
+
         val device = item.device
 
         name.apply {
@@ -75,5 +78,6 @@ class SinglePodsCardVH(parent: ViewGroup) :
         override val device: SinglePodDevice,
         override val showDebug: Boolean,
         override val isMainPod: Boolean,
+        val userTime: UserTime,
     ) : PodDeviceVH.Item
 }

app-wear/src/main/res/layout/overview_nomaindevice_item.xml

@@ -1,34 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="16dp">
 
     <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/permission_label"
+        android:id="@+id/user_time"
+        style="@style/UserTimeStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="12:23" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/title"
         style="@style/TextAppearance.MaterialComponents.Body1"
         android:layout_width="match_parent"
-        android:layout_marginTop="32dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
         android:text="@string/overview_nomaindevice_label"
-        app:layout_constraintBottom_toTopOf="@id/permission_description"
+        app:layout_constraintBottom_toTopOf="@id/body"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed" />
 
     <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/permission_description"
+        android:id="@+id/body"
         style="@style/TextAppearance.MaterialComponents.Body2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="32dp"
         android:layout_marginTop="4dp"
+        android:layout_marginBottom="32dp"
         android:text="@string/overview_nomaindevice_description"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/permission_label" />
+        app:layout_constraintTop_toBottomOf="@id/title" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app-wear/src/main/res/layout/overview_pods_dual_item.xml

@@ -7,14 +7,23 @@
     android:layout_margin="8dp"
     tools:context=".wear.ui.MainActivity">
 
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/user_time"
+        style="@style/UserTimeStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="12:23" />
+
     <ImageView
         android:id="@+id/device_icon"
         android:layout_width="16dp"
         android:layout_height="16dp"
-        app:layout_constraintBottom_toTopOf="@+id/name"
+        android:visibility="invisible"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:layout_marginBottom="2dp"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/devic_airpods_gen1_both" />
 
@@ -36,15 +45,15 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="8dp"
-        android:gravity="center"
-        app:lineHeight="14sp"
         android:layout_marginBottom="4dp"
+        android:gravity="center"
         android:lines="2"
         android:maxLines="2"
         app:layout_constraintBottom_toTopOf="@id/barrier_top"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/name"
+        app:lineHeight="14sp"
         tools:text="Music Active, Case Closed" />
 
     <androidx.constraintlayout.widget.Barrier
@@ -267,7 +276,7 @@
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/last_seen"
-        style="@style/TextAppearance.Material3.BodySmall"
+        style="@style/TextAppearance.Material3.LabelSmall"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="32dp"

app-wear/src/main/res/layout/overview_pods_single_item.xml

@@ -7,10 +7,21 @@
     android:layout_margin="8dp"
     tools:context=".wear.ui.MainActivity">
 
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/user_time"
+        style="@style/UserTimeStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="12:23" />
+
     <ImageView
         android:id="@+id/device_icon"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:visibility="invisible"
         app:layout_constraintBottom_toTopOf="@+id/name"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

app-wear/src/main/res/values/styles.xml

@@ -15,4 +15,10 @@
         <item name="android:gravity">center</item>
         <item name="android:ellipsize">end</item>
     </style>
+
+    <style name="UserTimeStyle" parent="TextAppearance.Material3.LabelMedium">
+        <item name="android:singleLine">true</item>
+        <item name="android:gravity">center</item>
+        <item name="android:ellipsize">marquee</item>
+    </style>
 </resources>