Tweak main overview

This commit is contained in:
darken
2022-09-14 18:00:18 +02:00
committed by Matthias Urhahn
parent 62afb7a130
commit d7808009dc
4 changed files with 23 additions and 10 deletions
@@ -8,7 +8,6 @@ import android.view.View
import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import androidx.fragment.app.viewModels import androidx.fragment.app.viewModels
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import eu.darken.capod.R import eu.darken.capod.R
@@ -47,7 +46,6 @@ class OverviewFragment : Fragment3(R.layout.main_fragment) {
ui.list.apply { ui.list.apply {
isEdgeItemsCenteringEnabled = true isEdgeItemsCenteringEnabled = true
layoutManager = LinearLayoutManager(context) layoutManager = LinearLayoutManager(context)
addItemDecoration(DividerItemDecoration(context, DividerItemDecoration.VERTICAL))
this.adapter = overviewAdapter this.adapter = overviewAdapter
} }
@@ -113,13 +113,14 @@ class OverviewFragmentVM @Inject constructor(
}.run { items.addAll(this) } }.run { items.addAll(this) }
} }
items.add(0, AppTitleVH.Item())
SettingsButtonVH.Item( SettingsButtonVH.Item(
onClick = { onClick = {
OverviewFragmentDirections.actionOverviewFragmentToSettingsFragment().navVia(this@OverviewFragmentVM) OverviewFragmentDirections.actionOverviewFragmentToSettingsFragment().navVia(this@OverviewFragmentVM)
} }
).run { items.add(this) } ).run { items.add(this) }
items.add(AppTitleVH.Item())
items items
} }
.catch { errorEvents.postValue(it) } .catch { errorEvents.postValue(it) }
@@ -2,6 +2,7 @@ package eu.darken.capod.wear.ui.overview.cards
import android.view.ViewGroup import android.view.ViewGroup
import eu.darken.capod.R import eu.darken.capod.R
import eu.darken.capod.common.BuildConfigWrap
import eu.darken.capod.common.lists.binding import eu.darken.capod.common.lists.binding
import eu.darken.capod.common.lists.differ.DifferItem import eu.darken.capod.common.lists.differ.DifferItem
import eu.darken.capod.common.upgrade.UpgradeRepo import eu.darken.capod.common.upgrade.UpgradeRepo
@@ -22,7 +23,7 @@ class AppTitleVH(parent: ViewGroup) :
item: Item, item: Item,
payloads: List<Any> payloads: List<Any>
) -> Unit = binding(payload = true) { item -> ) -> Unit = binding(payload = true) { item ->
appVersion.text = BuildConfigWrap.VERSION_DESCRIPTION_TINY
} }
data class Item( data class Item(
@@ -1,23 +1,36 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" 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 <com.google.android.material.textview.MaterialTextView
android:id="@+id/bluetooth_description" android:id="@+id/title"
style="@style/TextAppearance.Material3.HeadlineMedium" style="@style/TextAppearance.Material3.HeadlineMedium"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?colorPrimary"
android:gravity="center" android:gravity="center"
android:paddingHorizontal="16dp"
android:paddingVertical="8dp"
android:text="@string/app_name" android:text="@string/app_name"
android:textColor="?colorOnPrimary" android:textColor="?colorOnPrimary"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toTopOf="@+id/app_version"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="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> </androidx.constraintlayout.widget.ConstraintLayout>