Merge branch 'main' into feature/snack

Author: johsoe

app/src/main/java/com/monstarlab/arch/extensions/ViewExtensions.kt

@@ -1,6 +1,7 @@
 package com.monstarlab.arch.extensions
 
 import android.view.View
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
@@ -16,6 +17,12 @@ fun Fragment.snackErrorFlow(targetFlow: SharedFlow<ViewError>, root: View, lengt
     }
 }
 
+fun Fragment.visibilityFlow(targetFlow: Flow<Boolean>, vararg view: View) {
+    collectFlow(targetFlow) { loading ->
+        view.forEach { it.isVisible = loading }
+    }
+}
+
 fun <T> Fragment.collectFlow(targetFlow: Flow<T>, collectBlock: ((T) -> Unit)) {
     safeViewCollect {
         viewLifecycleOwner.lifecycleScope.launchWhenCreated {
@@ -93,5 +100,5 @@ fun View.clicks(throttleTime: Long = 400): Flow<Unit> = callbackFlow {
     awaitClose { this@clicks.setOnClickListener(null) }
 }.throttleFirst(throttleTime)
 
-fun View.onClick(listenerBlock: (View) -> Unit) =
-    setOnClickListener(DebounceOnClickListener(listenerBlock =  listenerBlock))
+fun View.onClick(interval: Long = 400L, listenerBlock: (View) -> Unit) =
+    setOnClickListener(DebounceOnClickListener(interval, listenerBlock))

app/src/main/java/com/monstarlab/features/login/LoginFragment.kt

@@ -2,22 +2,20 @@ package com.monstarlab.features.login
 
 import android.os.Bundle
 import android.view.View
+import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.viewModelScope
 import androidx.navigation.fragment.findNavController
 import androidx.transition.TransitionManager
 import com.google.android.material.snackbar.Snackbar
 import com.monstarlab.R
 import com.monstarlab.arch.base.BaseFragment
-import com.monstarlab.arch.extensions.clicks
 import com.monstarlab.arch.extensions.collectFlow
 import com.monstarlab.arch.extensions.combineFlows
 import com.monstarlab.arch.extensions.snackErrorFlow
+import com.monstarlab.arch.extensions.onClick
 import com.monstarlab.arch.extensions.viewBinding
+import com.monstarlab.arch.extensions.visibilityFlow
 import com.monstarlab.databinding.FragmentLoginBinding
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.launch
 
 class LoginFragment : BaseFragment(R.layout.fragment_login) {
 
@@ -27,25 +25,26 @@ class LoginFragment : BaseFragment(R.layout.fragment_login) {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        binding.loginButton.clicks().onEach {
+        binding.loginButton.onClick {
             viewModel.login(
-                    binding.loginEmailEditText.text.toString(),
-                    binding.loginPasswordEditText.text.toString()
+                binding.loginEmailEditText.text.toString(),
+                binding.loginPasswordEditText.text.toString()
             )
-        }.launchIn(lifecycleScope)
+        }
 
         collectFlow(viewModel.loginResultFlow) {
             findNavController().navigate(R.id.resourceFragment)
         }
 
         snackErrorFlow(viewModel.errorFlow, view)
 
+        visibilityFlow(viewModel.loadingFlow, binding.loginProgressBar)
+
         collectFlow(viewModel.loadingFlow) { loading ->
             TransitionManager.beginDelayedTransition(binding.root)
             binding.loginEmailEditText.isEnabled = !loading
             binding.loginPasswordEditText.isEnabled = !loading
-            binding.loginButton.visibility = if(loading) View.GONE else View.VISIBLE
-            binding.loginProgressBar.visibility = if(loading) View.VISIBLE else View.GONE
+            binding.loginButton.isVisible = !loading
         }
     }
 }

app/src/main/java/com/monstarlab/injection/components/AppComponent.kt

@@ -5,7 +5,6 @@ import com.monstarlab.injection.modules.*
 import dagger.Component
 import dagger.android.AndroidInjector
 import dagger.android.support.AndroidSupportInjectionModule
-import dk.nodes.template.injection.modules.*
 import javax.inject.Singleton
 
 @Component(

build.gradle

@@ -49,13 +49,23 @@ buildscript {
     }
 }
 
+plugins {
+    id "com.diffplug.spotless" version "5.9.0"
+}
+
 allprojects {
     repositories {
         google()
         jcenter()
     }
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+subprojects {
+    apply plugin: 'com.diffplug.spotless'
+    spotless {
+        kotlin {
+            target "**/*.kt"
+            ktlint('0.40.0')
+        }
+    }
 }