Merge pull request #21 from lucassales2/feature/dep-updates

Dependencies update + spotless apply

Author: johsoe

app/build.gradle

@@ -14,7 +14,7 @@ translation {
 
 android {
     compileSdkVersion 30
-    buildToolsVersion "30.0.2"
+    buildToolsVersion "30.0.3"
     flavorDimensions "default"
 
     defaultConfig {
@@ -91,9 +91,9 @@ dependencies {
 
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
@@ -106,13 +106,12 @@ dependencies {
     implementation("com.squareup.retrofit2:retrofit:2.9.0")
     implementation("com.squareup.okhttp3:logging-interceptor:4.9.0")
 
-    implementation("androidx.navigation:navigation-fragment-ktx:2.3.2")
-    implementation("androidx.navigation:navigation-ui-ktx:2.3.2")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.3.3")
+    implementation("androidx.navigation:navigation-ui-ktx:2.3.3")
 
     implementation("androidx.lifecycle:lifecycle-livedata-core-ktx:${versions.lifecycle}")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:${versions.lifecycle}")
     implementation("androidx.lifecycle:lifecycle-common-java8:${versions.lifecycle}")
-    implementation("androidx.lifecycle:lifecycle-extensions:${versions.lifecycle}")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:${versions.lifecycle}")
     implementation("androidx.lifecycle:lifecycle-livedata-ktx:${versions.lifecycle}")
 

app/src/androidTest/java/com/monstarlab/ExampleInstrumentedTest.kt

@@ -1,13 +1,11 @@
 package com.monstarlab
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
@@ -21,4 +19,4 @@ class ExampleInstrumentedTest {
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         assertEquals("com.monstarlab", appContext.packageName)
     }
-}
+}

app/src/main/java/com/monstarlab/App.kt

@@ -21,4 +21,4 @@ class App : DaggerApplication() {
     override fun applicationInjector(): AndroidInjector<out DaggerApplication> {
         return DaggerAppComponent.factory().create(this)
     }
-}
+}

app/src/main/java/com/monstarlab/arch/base/BaseFragment.kt

@@ -6,13 +6,13 @@ import androidx.annotation.LayoutRes
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import dagger.android.DispatchingAndroidInjector
-import dagger.android.HasAndroidInjector
-import dagger.android.support.AndroidSupportInjection
 import com.google.android.material.transition.MaterialFadeThrough
 import com.monstarlab.arch.extensions.getSharedViewModel
 import com.monstarlab.arch.extensions.getViewModel
 import com.monstarlab.arch.extensions.lifecycleAwareLazy
+import dagger.android.DispatchingAndroidInjector
+import dagger.android.HasAndroidInjector
+import dagger.android.support.AndroidSupportInjection
 import javax.inject.Inject
 
 abstract class BaseFragment : Fragment, HasAndroidInjector {
@@ -54,4 +54,4 @@ abstract class BaseFragment : Fragment, HasAndroidInjector {
     }
 
     override fun androidInjector() = androidInjector
-}
+}

app/src/main/java/com/monstarlab/arch/data/DataSource.kt

@@ -5,4 +5,4 @@ interface DataSource<T> {
     fun add(item: T)
     fun addAll(items: List<T>)
     fun clear()
-}
+}

app/src/main/java/com/monstarlab/arch/data/Repository.kt

@@ -1,11 +1,6 @@
 package com.monstarlab.arch.data
 
-
 /**
  * Empty for now, but could allow us to add cache helpers etc
  */
-abstract class Repository constructor(
-
-) {
-
-}
+abstract class Repository constructor()

app/src/main/java/com/monstarlab/arch/data/SharedPreferenceDataStore.kt

@@ -8,7 +8,7 @@ import kotlinx.serialization.json.Json
 abstract class SharedPreferenceDataStore<T> constructor(
     private val sharedPreferences: SharedPreferences,
     private val serializer: KSerializer<T>
-): DataSource<T> {
+) : DataSource<T> {
 
     private val key = this.javaClass.simpleName
 
@@ -31,4 +31,4 @@ abstract class SharedPreferenceDataStore<T> constructor(
     override fun clear() {
         sharedPreferences.edit().remove(key).apply()
     }
-}
+}

app/src/main/java/com/monstarlab/arch/data/SingleDataSource.kt

@@ -4,4 +4,4 @@ interface SingleDataSource<T> {
     fun get(): T?
     fun add(item: T)
     fun clear()
-}
+}

app/src/main/java/com/monstarlab/arch/data/SingleSharedPreferenceDataStore.kt

@@ -1,19 +1,17 @@
 package com.monstarlab.arch.data
 
 import android.content.SharedPreferences
-import kotlinx.serialization.*
+import kotlinx.serialization.KSerializer
 import kotlinx.serialization.json.Json
-import java.lang.Exception
-import kotlin.reflect.KClass
 
 abstract class SingleSharedPreferenceDataStore<T> constructor(
     private val sharedPreferences: SharedPreferences,
     private val serializer: KSerializer<T>
-): SingleDataSource<T> {
+) : SingleDataSource<T> {
 
     private val key = this.javaClass.simpleName
 
-    override fun  get(): T? {
+    override fun get(): T? {
         return try {
             val json = sharedPreferences.getString(key, "") ?: ""
             val entries = Json.decodeFromString(serializer, json)
@@ -23,17 +21,15 @@ abstract class SingleSharedPreferenceDataStore<T> constructor(
         }
     }
 
-
     override fun add(item: T) {
         try {
             val json = Json.encodeToString(serializer, item)
             sharedPreferences.edit().putString(key, json).apply()
         } catch (e: Exception) {
-
         }
     }
 
     override fun clear() {
         sharedPreferences.edit().remove(key).apply()
     }
-}
+}

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

@@ -14,4 +14,4 @@ class DebounceOnClickListener(
             listenerBlock(v)
         }
     }
-}
+}