diff --git a/app-common/src/main/res/drawable/splash_screen.xml b/app-common/src/main/res/drawable/splash_screen.xml index bed02168..810daa0c 100644 --- a/app-common/src/main/res/drawable/splash_screen.xml +++ b/app-common/src/main/res/drawable/splash_screen.xml @@ -1,10 +1,10 @@ + android:left="40dp" + android:right="40dp" + android:top="40dp" /> \ No newline at end of file diff --git a/app-wear/src/main/AndroidManifest.xml b/app-wear/src/main/AndroidManifest.xml index c07226cf..f1b3083e 100644 --- a/app-wear/src/main/AndroidManifest.xml +++ b/app-wear/src/main/AndroidManifest.xml @@ -29,6 +29,7 @@ diff --git a/app-wear/src/main/java/eu/darken/capod/wear/ui/MainActivity.kt b/app-wear/src/main/java/eu/darken/capod/wear/ui/MainActivity.kt index 1a12aba7..6e73b924 100644 --- a/app-wear/src/main/java/eu/darken/capod/wear/ui/MainActivity.kt +++ b/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) 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 8685807e..9e52e7a8 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,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 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) { diff --git a/app-wear/src/main/res/layout/main_fragment.xml b/app-wear/src/main/res/layout/main_fragment.xml index 99014d53..c4c217f0 100644 --- a/app-wear/src/main/res/layout/main_fragment.xml +++ b/app-wear/src/main/res/layout/main_fragment.xml @@ -5,14 +5,13 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - diff --git a/app-wear/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app-wear/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..be316184 --- /dev/null +++ b/app-wear/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app-wear/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app-wear/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000..be316184 --- /dev/null +++ b/app-wear/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app-wear/src/main/res/mipmap-hdpi/ic_launcher.png b/app-wear/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 00000000..2919cd5a Binary files /dev/null and b/app-wear/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app-wear/src/main/res/mipmap-hdpi/ic_launcher.webp b/app-wear/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78e..00000000 Binary files a/app-wear/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ diff --git a/app-wear/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app-wear/src/main/res/mipmap-hdpi/ic_launcher_background.png new file mode 100644 index 00000000..35e76e30 Binary files /dev/null and b/app-wear/src/main/res/mipmap-hdpi/ic_launcher_background.png differ diff --git a/app-wear/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app-wear/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..cd9679c6 Binary files /dev/null and b/app-wear/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/app-wear/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app-wear/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 00000000..8d0a6dbc Binary files /dev/null and b/app-wear/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app-wear/src/main/res/mipmap-mdpi/ic_launcher.png b/app-wear/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 00000000..440f5384 Binary files /dev/null and b/app-wear/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app-wear/src/main/res/mipmap-mdpi/ic_launcher.webp b/app-wear/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d64..00000000 Binary files a/app-wear/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ diff --git a/app-wear/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app-wear/src/main/res/mipmap-mdpi/ic_launcher_background.png new file mode 100644 index 00000000..3a32174e Binary files /dev/null and b/app-wear/src/main/res/mipmap-mdpi/ic_launcher_background.png differ diff --git a/app-wear/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app-wear/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..361ac8a0 Binary files /dev/null and b/app-wear/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/app-wear/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app-wear/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 00000000..8e86f61f Binary files /dev/null and b/app-wear/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app-wear/src/main/res/mipmap-xhdpi/ic_launcher.png b/app-wear/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 00000000..5a2ca739 Binary files /dev/null and b/app-wear/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app-wear/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app-wear/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a3070..00000000 Binary files a/app-wear/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ diff --git a/app-wear/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app-wear/src/main/res/mipmap-xhdpi/ic_launcher_background.png new file mode 100644 index 00000000..169f394d Binary files /dev/null and b/app-wear/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ diff --git a/app-wear/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app-wear/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..f94e8f28 Binary files /dev/null and b/app-wear/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/app-wear/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app-wear/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 00000000..9efc8ea0 Binary files /dev/null and b/app-wear/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app-wear/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app-wear/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 00000000..aeb41411 Binary files /dev/null and b/app-wear/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app-wear/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app-wear/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77f..00000000 Binary files a/app-wear/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app-wear/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app-wear/src/main/res/mipmap-xxhdpi/ic_launcher_background.png new file mode 100644 index 00000000..909fd2e1 Binary files /dev/null and b/app-wear/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ diff --git a/app-wear/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app-wear/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..d3ee90d5 Binary files /dev/null and b/app-wear/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/app-wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app-wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..39cabb78 Binary files /dev/null and b/app-wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app-wear/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app-wear/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 00000000..f840622a Binary files /dev/null and b/app-wear/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app-wear/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app-wear/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d6427..00000000 Binary files a/app-wear/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app-wear/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app-wear/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png new file mode 100644 index 00000000..bb71e0e1 Binary files /dev/null and b/app-wear/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ diff --git a/app-wear/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app-wear/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..253c9c16 Binary files /dev/null and b/app-wear/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/app-wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app-wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..12bc8cfa Binary files /dev/null and b/app-wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app-wear/src/main/res/values/themes.xml b/app-wear/src/main/res/values/themes.xml index d69a4b5b..1fbe7094 100644 --- a/app-wear/src/main/res/values/themes.xml +++ b/app-wear/src/main/res/values/themes.xml @@ -29,4 +29,10 @@ @color/md_theme_dark_primaryInverse + + \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 24bb8e2f..2753772a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -143,8 +143,6 @@ dependencies { addBaseAndroid() addBaseAndroidUi() - implementation("androidx.core:core-splashscreen:1.0.0-alpha02") - addNavigation() addBaseWorkManager() diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7b5ec653..aceda8cb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/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"> diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index d6be1d74..4ce55509 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/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) {