Small changes and refactoring

build.gradle.kts

@@ -6,12 +6,12 @@ buildscript {
     dependencies {
         classpath(libs.android.gradle.plugin)
         classpath(libs.kotlin.gradle.plugin)
-        classpath(libs.androidx.navigation.safeArgsGradlePlugin)
     }
 }
 
 plugins {
     alias(libs.plugins.detekt)
+    alias(libs.plugins.navigation.safeargs.kotlin).apply(false)
 }
 
 allprojects {

convention-plugin-android-library/build.gradle.kts

@@ -0,0 +1,13 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    google()
+    mavenCentral()
+}
+
+dependencies {
+    implementation(libs.android.gradle.plugin)
+    implementation(libs.kotlin.gradle.plugin)
+}

buildSrc/settings.gradle.kts → convention-plugin-android-library/settings.gradle.kts

@@ -1,6 +1,6 @@
 dependencyResolutionManagement {
     versionCatalogs {
-        create("buildSrcLibs") {
+        create("libs") {
             from(files("../gradle/libs.versions.toml"))
         }
     }

dialog-fragment/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    androidApplicationConvention
+    id("androidApplicationConvention")
 }
 
 android {

dialog-fragment/src/main/AndroidManifest.xml

@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
-        android:allowBackup="true"
         android:icon="@drawable/ic_android"
         android:label="DialogFragment"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar"
-        tools:ignore="AllowBackup,GoogleAppIndexingWarning">
+        android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar">
 
         <activity
             android:name="siarhei.luskanau.example.dialogfragment.AppActivity"

dialog-fragment/src/main/java/siarhei/luskanau/example/dialogfragment/FragmentWithId.kt

@@ -16,7 +16,7 @@ class FragmentWithId :
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? = FragmentWithIdBinding.inflate(inflater, container, false)
+    ): View = FragmentWithIdBinding.inflate(inflater, container, false)
         .also { binding ->
             binding.fragmentWithIdDialogButton.setOnClickListener {
                 AppDialogFragment.Builder(

dialog-fragment/src/main/java/siarhei/luskanau/example/dialogfragment/FragmentWithTag.kt

@@ -16,7 +16,7 @@ class FragmentWithTag :
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? = FragmentWithTagBinding.inflate(inflater, container, false)
+    ): View = FragmentWithTagBinding.inflate(inflater, container, false)
         .also { binding ->
             binding.fragmentWithTagDialogButton.setOnClickListener {
                 AppDialogFragment.Builder(

fileprovider-camera/app/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    androidApplicationConvention
+    id("androidApplicationConvention")
 }
 
 android {
@@ -8,7 +8,6 @@ android {
         applicationId = "siarhei.luskanau.example.camera.app"
         versionCode = 1
         versionName = "1.0"
-        vectorDrawables.useSupportLibrary = true
     }
 
     buildTypes {
@@ -35,7 +34,6 @@ android {
 
 dependencies {
     implementation(project(":fileprovider-camera:camera"))
-
     implementation(libs.android.material)
     implementation(libs.androidx.activity.ktx)
     implementation(libs.androidx.fragment.ktx)

fileprovider-camera/app/src/main/AndroidManifest.xml

@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
-        android:allowBackup="true"
         android:icon="@drawable/ic_android_24dp"
         android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar"
-        tools:ignore="AllowBackup,GoogleAppIndexingWarning">
+        android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar">
 
         <activity
             android:name="siarhei.luskanau.example.camera.app.MainActivity"
-            android:exported="true"
-            android:label="@string/app_name">
+            android:exported="true">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

fileprovider-camera/camera/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    androidLibraryConvention
+    id("androidLibraryConvention")
 }
 
 android {

fonts/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    androidApplicationConvention
+    id("androidApplicationConvention")
 }
 
 android {

fonts/src/main/AndroidManifest.xml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:icon="@drawable/ic_android"
         android:label="@string/app_name"
-        android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar"
-        tools:ignore="AllowBackup,GoogleAppIndexingWarning,MissingApplicationIcon">
+        android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar">
 
         <activity
             android:name="siarhei.luskanau.example.fonts.AppActivity"

fonts/src/main/java/siarhei/luskanau/example/fonts/AppActivity.kt

@@ -1,17 +1,5 @@
 package siarhei.luskanau.example.fonts
 
-import android.os.Bundle
-import android.view.LayoutInflater
 import androidx.appcompat.app.AppCompatActivity
-import siarhei.luskanau.example.fonts.databinding.ActivityAppBinding
 
-class AppActivity : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        ActivityAppBinding.inflate(LayoutInflater.from(this))
-            .also { binding ->
-                setContentView(binding.root)
-            }
-    }
-}
+class AppActivity : AppCompatActivity(R.layout.activity_app)

gradle/libs.versions.toml

@@ -23,7 +23,6 @@ androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref
 androidx-core = { module = "androidx.core:core", version.ref = "androidx-core" }
 androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "androidx-fragment" }
 androidx-navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "androidx-navigation" }
-androidx-navigation-safeArgsGradlePlugin = { module = "androidx.navigation:navigation-safe-args-gradle-plugin", version.ref = "androidx-navigation" }
 androidx-navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "androidx-navigation" }
 androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "androidx-work" }
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
@@ -32,3 +31,4 @@ timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }
 
 [plugins]
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
+navigation-safeargs-kotlin = { id = "androidx.navigation.safeargs.kotlin", version.ref = "androidx-navigation" }

navigation/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    androidApplicationConvention
-    id("androidx.navigation.safeargs.kotlin")
+    id("androidApplicationConvention")
+    alias(libs.plugins.navigation.safeargs.kotlin)
 }
 
 android {

navigation/src/main/AndroidManifest.xml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:icon="@drawable/ic_android"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme"
-        tools:ignore="AllowBackup,GoogleAppIndexingWarning,MissingApplicationIcon">
+        android:theme="@style/AppTheme">
 
         <activity
             android:name="siarhei.luskanau.example.navigation.AppActivity"

navigation/src/main/kotlin/siarhei/luskanau/example/navigation/Feature1Fragment.kt

@@ -13,7 +13,7 @@ class Feature1Fragment : Fragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         val binding = FragmentFeature1Binding.inflate(inflater, container, false)
 
         return binding.root

navigation/src/main/kotlin/siarhei/luskanau/example/navigation/Feature2DetailFragment.kt

@@ -14,7 +14,7 @@ class Feature2DetailFragment : Fragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         val binding = FragmentFeature2DetailBinding.inflate(inflater, container, false)
 
         val args = Feature2DetailFragmentArgs.fromBundle(arguments ?: Bundle())

navigation/src/main/kotlin/siarhei/luskanau/example/navigation/Feature2ListFragment.kt

@@ -14,7 +14,7 @@ class Feature2ListFragment : Fragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         val binding = FragmentFeature2ListBinding.inflate(inflater, container, false)
 
         binding.feature2DetailListItem.setOnClickListener {

settings.gradle.kts

@@ -1,4 +1,5 @@
 pluginManagement {
+    includeBuild("convention-plugin-android-library")
     repositories {
         google()
         gradlePluginPortal()
@@ -10,7 +11,6 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
-        maven(url = "https://jitpack.io")
     }
 }
 

workmanager/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    androidApplicationConvention
-    id("androidx.navigation.safeargs.kotlin")
+    id("androidApplicationConvention")
+    alias(libs.plugins.navigation.safeargs.kotlin)
 }
 
 android {

workmanager/src/main/AndroidManifest.xml

@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:name="siarhei.luskanau.example.workmanager.AppApplication"
-        android:allowBackup="false"
         android:icon="@drawable/ic_android"
         android:label="WorkManager"
-        android:theme="@style/Theme.MaterialComponents.Light.NoActionBar"
-        tools:ignore="GoogleAppIndexingWarning">
+        android:theme="@style/Theme.MaterialComponents.Light.NoActionBar">
 
         <activity
             android:name="siarhei.luskanau.example.workmanager.AppActivity"

workmanager/src/main/java/siarhei/luskanau/example/workmanager/AppActivity.kt

@@ -20,10 +20,8 @@ class AppActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val binding =
-            ActivityAppBinding.inflate(LayoutInflater.from(this)).also { binding ->
-                setContentView(binding.root)
-            }
+        val binding = ActivityAppBinding.inflate(LayoutInflater.from(this))
+            .also { binding -> setContentView(binding.root) }
 
         navController = Navigation.findNavController(this, R.id.navHostFragment)
         appBarConfiguration = AppBarConfiguration(navController.graph, binding.drawerLayout)

workmanager/src/main/java/siarhei/luskanau/example/workmanager/BaseBeginCancelWorkFragment.kt

@@ -13,7 +13,7 @@ abstract class BaseBeginCancelWorkFragment : Fragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         val binding = FragmentBeginCancelWorkBinding.inflate(inflater, container, false)
 
         binding.beginWorkButton.setOnClickListener { onBeginButtonPressed() }

workmanager/src/main/java/siarhei/luskanau/example/workmanager/monitor/WorkManagerMonitorFragment.kt

@@ -6,17 +6,20 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout.VERTICAL
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.DividerItemDecoration
+import kotlinx.coroutines.launch
 import siarhei.luskanau.example.workmanager.databinding.FragmentWorkManagerMonitorBinding
 
 class WorkManagerMonitorFragment : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         val binding = FragmentWorkManagerMonitorBinding.inflate(inflater, container, false)
 
         val adapter = WorkInfoAdapter()
@@ -30,9 +33,14 @@ class WorkManagerMonitorFragment : Fragment() {
         )
 
         val workManagerMonitorViewModel =
-            ViewModelProvider(this).get(WorkManagerMonitorViewModel::class.java)
-        workManagerMonitorViewModel.getWorkStatusListLiveData(requireContext())
-            .observe(viewLifecycleOwner, Observer { adapter.submitList(it) })
+            ViewModelProvider(this)[WorkManagerMonitorViewModel::class.java]
+        lifecycleScope.launch {
+            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.RESUMED) {
+                workManagerMonitorViewModel.getWorkStatusListFlow(binding.root.context).collect {
+                    adapter.submitList(it)
+                }
+            }
+        }
 
         return binding.root
     }

workmanager/src/main/java/siarhei/luskanau/example/workmanager/monitor/WorkManagerMonitorViewModel.kt

@@ -1,12 +1,12 @@
 package siarhei.luskanau.example.workmanager.monitor
 
 import android.content.Context
-import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
+import kotlinx.coroutines.flow.Flow
 
 class WorkManagerMonitorViewModel : ViewModel() {
-    fun getWorkStatusListLiveData(context: Context): LiveData<List<WorkInfo>> =
-        WorkManager.getInstance(context).getWorkInfosByTagLiveData(WorkManagerConstants.TAG_ALL)
+    fun getWorkStatusListFlow(context: Context): Flow<List<WorkInfo>> =
+        WorkManager.getInstance(context).getWorkInfosByTagFlow(WorkManagerConstants.TAG_ALL)
 }