From d7808009dcbb6153a13d468bdf26ea65d7a97bf8 Mon Sep 17 00:00:00 2001
From: darken <darken@darken.eu>
Date: Tue, 13 Sep 2022 20:20:34 +0200
Subject: [PATCH] Tweak main overview

---
 .../wear/ui/overview/OverviewFragment.kt      |  2 --
 .../wear/ui/overview/OverviewFragmentVM.kt    |  3 ++-
 .../wear/ui/overview/cards/AppTitleVH.kt      |  3 ++-
 .../res/layout/overview_apptitle_item.xml     | 25 ++++++++++++++-----
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/app-wear/src/main/java/eu/darken/capod/wear/ui/overview/OverviewFragment.kt b/app-wear/src/main/java/eu/darken/capod/wear/ui/overview/OverviewFragment.kt
index 9e52e7a8..f5c537b9 100644
--- a/app-wear/src/main/java/eu/darken/capod/wear/ui/overview/OverviewFragment.kt
+++ b/app-wear/src/main/java/eu/darken/capod/wear/ui/overview/OverviewFragment.kt
@@ -8,7 +8,6 @@ import android.view.View
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.fragment.app.viewModels
-import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.capod.R
@@ -47,7 +46,6 @@ class OverviewFragment : Fragment3(R.layout.main_fragment) {
         ui.list.apply {
             isEdgeItemsCenteringEnabled = true
             layoutManager = LinearLayoutManager(context)
-            addItemDecoration(DividerItemDecoration(context, DividerItemDecoration.VERTICAL))
             this.adapter = overviewAdapter
         }
 
diff --git a/app-wear/src/main/java/eu/darken/capod/wear/ui/overview/OverviewFragmentVM.kt b/app-wear/src/main/java/eu/darken/capod/wear/ui/overview/OverviewFragmentVM.kt
index 34d983b0..bd6f4eff 100644
--- a/app-wear/src/main/java/eu/darken/capod/wear/ui/overview/OverviewFragmentVM.kt
+++ b/app-wear/src/main/java/eu/darken/capod/wear/ui/overview/OverviewFragmentVM.kt
@@ -113,13 +113,14 @@ class OverviewFragmentVM @Inject constructor(
             }.run { items.addAll(this) }
         }
 
-        items.add(0, AppTitleVH.Item())
         SettingsButtonVH.Item(
             onClick = {
                 OverviewFragmentDirections.actionOverviewFragmentToSettingsFragment().navVia(this@OverviewFragmentVM)
             }
         ).run { items.add(this) }
 
+        items.add(AppTitleVH.Item())
+
         items
     }
         .catch { errorEvents.postValue(it) }
diff --git a/app-wear/src/main/java/eu/darken/capod/wear/ui/overview/cards/AppTitleVH.kt b/app-wear/src/main/java/eu/darken/capod/wear/ui/overview/cards/AppTitleVH.kt
index f1c06d64..e7ad1f63 100644
--- a/app-wear/src/main/java/eu/darken/capod/wear/ui/overview/cards/AppTitleVH.kt
+++ b/app-wear/src/main/java/eu/darken/capod/wear/ui/overview/cards/AppTitleVH.kt
@@ -2,6 +2,7 @@ package eu.darken.capod.wear.ui.overview.cards
 
 import android.view.ViewGroup
 import eu.darken.capod.R
+import eu.darken.capod.common.BuildConfigWrap
 import eu.darken.capod.common.lists.binding
 import eu.darken.capod.common.lists.differ.DifferItem
 import eu.darken.capod.common.upgrade.UpgradeRepo
@@ -22,7 +23,7 @@ class AppTitleVH(parent: ViewGroup) :
         item: Item,
         payloads: List<Any>
     ) -> Unit = binding(payload = true) { item ->
-
+        appVersion.text = BuildConfigWrap.VERSION_DESCRIPTION_TINY
     }
 
     data class Item(
diff --git a/app-wear/src/main/res/layout/overview_apptitle_item.xml b/app-wear/src/main/res/layout/overview_apptitle_item.xml
index 4d92c840..9be883c4 100644
--- a/app-wear/src/main/res/layout/overview_apptitle_item.xml
+++ b/app-wear/src/main/res/layout/overview_apptitle_item.xml
@@ -1,23 +1,36 @@
 <?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:padding="4dp"
+    android:layout_height="wrap_content"
+    android:background="?colorPrimary">
 
     <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/bluetooth_description"
+        android:id="@+id/title"
         style="@style/TextAppearance.Material3.HeadlineMedium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?colorPrimary"
         android:gravity="center"
-        android:paddingHorizontal="16dp"
-        android:paddingVertical="8dp"
         android:text="@string/app_name"
         android:textColor="?colorOnPrimary"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/app_version"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/app_version"
+        style="@style/TextAppearance.Material3.LabelMedium"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:maxLines="1"
+        android:textColor="?colorOnPrimary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        tools:text="v1.0.0" />
 </androidx.constraintlayout.widget.ConstraintLayout>