Icon and reintroduce splash screen

app-common/src/main/res/drawable/splash_screen.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:bottom="20dp"
+        android:bottom="40dp"
         android:drawable="@drawable/splash_graphic"
-        android:left="20dp"
-        android:right="20dp"
-        android:top="20dp" />
+        android:left="40dp"
+        android:right="40dp"
+        android:top="40dp" />
 
 </layer-list>

app-wear/src/main/AndroidManifest.xml

@@ -29,6 +29,7 @@
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:name=".App"
@@ -44,6 +45,7 @@
         <activity
             android:name=".wear.ui.MainActivity"
             android:exported="true"
+            android:theme="@style/AppThemeSplash"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

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

@@ -2,6 +2,7 @@ package eu.darken.capod.wear.ui
 
 import android.os.Bundle
 import androidx.activity.viewModels
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.wear.widget.SwipeDismissFrameLayout
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.capod.R
@@ -17,6 +18,8 @@ class MainActivity : Activity2() {
     private val navController by lazy { supportFragmentManager.findNavController(R.id.nav_host) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        installSplashScreen()
+
         super.onCreate(savedInstanceState)
 
         ui = MainActivityBinding.inflate(layoutInflater)

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

@@ -8,11 +8,12 @@ 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
 import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.lists.differ.update
-import eu.darken.capod.common.lists.setupDefaults
 import eu.darken.capod.common.permissions.Permission
 import eu.darken.capod.common.uix.Fragment3
 import eu.darken.capod.common.viewbinding.viewBinding
@@ -27,7 +28,7 @@ class OverviewFragment : Fragment3(R.layout.main_fragment) {
     override val ui: MainFragmentBinding by viewBinding()
 
     @Inject
-    lateinit var adapter: OverviewAdapter
+    lateinit var overviewAdapter: OverviewAdapter
 
     lateinit var permissionLauncher: ActivityResultLauncher<String>
     var awaitingPermission = false
@@ -43,11 +44,14 @@ class OverviewFragment : Fragment3(R.layout.main_fragment) {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        ui.apply {
-            list.setupDefaults(adapter)
+        ui.list.apply {
+            isEdgeItemsCenteringEnabled = true
+            layoutManager = LinearLayoutManager(context)
+            addItemDecoration(DividerItemDecoration(context, DividerItemDecoration.VERTICAL))
+            this.adapter = overviewAdapter
         }
 
-        vm.listItems.observe2(ui) { adapter.update(it) }
+        vm.listItems.observe2(ui) { overviewAdapter.update(it) }
 
         vm.requestPermissionEvent.observe2(ui) {
             when (it) {

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

@@ -5,14 +5,13 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.recyclerview.widget.RecyclerView
+    <androidx.wear.widget.WearableRecyclerView
         android:id="@+id/list"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:paddingBottom="48dp"
-        android:clipToPadding="false"
+        android:scrollbars="vertical"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:listitem="@layout/overview_pods_dual_item" />

app-wear/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_launcher_background" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+</adaptive-icon>

app-wear/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_launcher_background" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+</adaptive-icon>

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

@@ -29,4 +29,10 @@
         <item name="colorPrimaryInverse">@color/md_theme_dark_primaryInverse</item>
     </style>
 
+    <style name="AppThemeSplash" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">#3f7aff</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/splash_screen</item>
+        <item name="postSplashScreenTheme">@style/AppTheme</item>
+    </style>
+
 </resources>

app/build.gradle.kts

@@ -143,8 +143,6 @@ dependencies {
     addBaseAndroid()
     addBaseAndroidUi()
 
-    implementation("androidx.core:core-splashscreen:1.0.0-alpha02")
-
     addNavigation()
     addBaseWorkManager()
 

app/src/main/AndroidManifest.xml

@@ -37,8 +37,8 @@
         android:name=".App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
+        android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
 

buildSrc/src/main/java/Dependencies.kt

@@ -107,6 +107,8 @@ fun DependencyHandlerScope.addBaseAndroidUi() {
     implementation("androidx.lifecycle:lifecycle-common-java8:$lifecycleVers")
     implementation("androidx.lifecycle:lifecycle-process:$lifecycleVers")
     implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVers")
+
+    implementation("androidx.core:core-splashscreen:1.0.0-alpha02")
 }
 
 fun DependencyHandlerScope.addTesting(junit: Boolean = true, instrumentation: Boolean = true) {