Merge pull request #1 from tapptitude/develop

Some polish + testing framework setup.

Author: radudorin

app/build.gradle

@@ -7,15 +7,18 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
+    testOptions.unitTests.includeAndroidResources true
+
     defaultConfig {
         applicationId "com.tapptitude.mvp_kotlin_sample_android"
         minSdkVersion 21
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -24,36 +27,61 @@ android {
     }
 }
 
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+ext {
+    // Support
+    supportVersion = '28.0.0'
+    // End Support
 
-    def dependencies = rootProject.ext.dependencies
-    def testDependencies = rootProject.ext.testDependencies
+    androidSupportTestVersion = '1.0.2'
+    retrofitVersion = '2.4.0'
+    daggerVersion = '2.16'
+    rxAndroidVersion = '2.0.2'
+    rxBindingKotlinVersion = '2.1.1'
+    loggingInterceptorVersion = '3.11.0'
+    jUnitVersion = '4.12'
+    mockitoKotlinVersion = '1.5.0'
+    mockitoInlineVersion = '2.13.0'
+    glideVersion = '4.8.0'
+    robolectricVersion = '4.0'
+    robolectricShadowsSupportVersion = '3.3.2'
+}
 
-    implementation dependencies.kotlin
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     // Android Support
-    implementation dependencies.supportAppCompat
-    implementation dependencies.supportRecyclerView
-    implementation dependencies.constraintLayout
+    implementation "com.android.support:appcompat-v7:$supportVersion"
+    implementation "com.android.support:support-v4:$supportVersion"
+    implementation "com.android.support:recyclerview-v7:$supportVersion"
+    implementation "com.android.support:cardview-v7:$supportVersion"
+    implementation "com.android.support:design:$supportVersion"
 
     // Reactive
-    implementation dependencies.rxAndroid
-    implementation dependencies.rxBinding
+    implementation "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion"
+    implementation "com.jakewharton.rxbinding2:rxbinding-kotlin:$rxBindingKotlinVersion"
 
     // Networking
-    implementation dependencies.retrofit
-    implementation dependencies.retrofitGsonConverter
-    implementation dependencies.retrofitRxJavaAdapter
-    implementation dependencies.retrofitInterceptor
+    implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"
+    implementation "com.squareup.retrofit2:converter-gson:$retrofitVersion"
+    implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofitVersion"
+    implementation "com.squareup.okhttp3:logging-interceptor:$loggingInterceptorVersion"
+    implementation "com.github.bumptech.glide:glide:$glideVersion"
+    annotationProcessor "com.github.bumptech.glide:compiler:$glideVersion"
 
     // Dependency Injection
-    implementation dependencies.dagger
-    implementation dependencies.daggerSupport
-    kapt dependencies.daggerCompiler
-    kapt dependencies.daggerProcessor
+    implementation "com.google.dagger:dagger:$daggerVersion"
+    implementation "com.google.dagger:dagger-android-support:$daggerVersion"
+    kapt "com.google.dagger:dagger-android-processor:$daggerVersion"
+    kapt "com.google.dagger:dagger-compiler:$daggerVersion"
 
     // Tests
-    testImplementation testDependencies.jUnit
-    testImplementation testDependencies.mockito
+    testImplementation "junit:junit:$jUnitVersion"
+    testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
+    testImplementation "com.nhaarman:mockito-kotlin-kt1.1:$mockitoKotlinVersion"
+    testImplementation "org.mockito:mockito-core:$mockitoInlineVersion"
+    testImplementation "org.mockito:mockito-inline:$mockitoInlineVersion"
+    androidTestImplementation "com.android.support.test:runner:$androidSupportTestVersion"
+    androidTestImplementation "com.android.support.test:rules:$androidSupportTestVersion"
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
+    testImplementation "org.robolectric:shadows-support-v4:$robolectricShadowsSupportVersion"
 }

app/src/main/java/com/tapptitude/mvpsample/data/model/User.kt

@@ -0,0 +1,8 @@
+package com.tapptitude.mvpsample.data.model
+
+import com.google.gson.annotations.SerializedName
+
+class User(
+        @SerializedName("id")
+        var id: String? = null
+)

app/src/main/java/com/tapptitude/mvpsample/data/persistence/datetime/DateTimeNetworkRepository.kt

@@ -2,13 +2,16 @@ package com.tapptitude.mvpsample.data.persistence.datetime
 
 import com.tapptitude.mvpsample.data.network.DateTimeApi
 import com.tapptitude.mvpsample.data.network.models.DateTime
+import com.tapptitude.mvpsample.providers.SchedulerProvider
 import io.reactivex.Observable
-import io.reactivex.schedulers.Schedulers
 
-class DateTimeNetworkRepository(private val dateTimeApi: DateTimeApi) : DateTimeRepository {
+class DateTimeNetworkRepository(
+        private val dateTimeApi: DateTimeApi,
+        private val schedulerProvider: SchedulerProvider
+) : DateTimeRepository {
 
     override fun loadDateTime(): Observable<DateTime> {
         return dateTimeApi.getDateTime()
-                .subscribeOn(Schedulers.io())
+                .subscribeOn(schedulerProvider.io())
     }
 }

app/src/main/java/com/tapptitude/mvpsample/data/persistence/ip/IpNetworkRepository.kt

@@ -2,13 +2,16 @@ package com.tapptitude.mvpsample.data.persistence.ip
 
 import com.tapptitude.mvpsample.data.network.IpApi
 import com.tapptitude.mvpsample.data.network.models.IpAddress
+import com.tapptitude.mvpsample.providers.SchedulerProvider
 import io.reactivex.Observable
-import io.reactivex.schedulers.Schedulers
 
-class IpNetworkRepository(private val ipApi: IpApi) : IpRepository {
+class IpNetworkRepository(
+        private val ipApi: IpApi,
+        private val schedulerProvider: SchedulerProvider
+) : IpRepository {
 
     override fun loadIpAddress(): Observable<IpAddress> {
         return ipApi.getIpAddress()
-                .subscribeOn(Schedulers.io())
+                .subscribeOn(schedulerProvider.io())
     }
 }

app/src/main/java/com/tapptitude/mvpsample/di/builders/ActivityBuilder.kt

@@ -1,13 +1,12 @@
 package com.tapptitude.mvpsample.di.builders
 
 import com.tapptitude.mvpsample.presentation.home.activities.HomeActivity
-import com.tapptitude.mvpsample.di.modules.AppModule
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
 @Module
 abstract class ActivityBuilder {
 
-    @ContributesAndroidInjector(modules = [(AppModule::class)])
+    @ContributesAndroidInjector
     abstract fun bindMainActivity(): HomeActivity
 }

app/src/main/java/com/tapptitude/mvpsample/di/builders/FragmentBuilder.kt

@@ -1,13 +1,12 @@
 package com.tapptitude.mvpsample.di.builders
 
-import com.tapptitude.mvpsample.di.modules.AppModule
 import com.tapptitude.mvpsample.presentation.home.fragments.SampleFragment
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
 @Module
 abstract class FragmentBuilder {
 
-    @ContributesAndroidInjector(modules = [(AppModule::class)])
+    @ContributesAndroidInjector
     abstract fun bindQuestionFragment(): SampleFragment
 }

app/src/main/java/com/tapptitude/mvpsample/di/modules/AppModule.kt

@@ -2,14 +2,42 @@ package com.tapptitude.mvpsample.di.modules
 
 import android.app.Application
 import android.content.Context
+import com.google.gson.Gson
+import com.tapptitude.mvpsample.preferance.UserSessionManager
+import com.tapptitude.mvpsample.providers.RuntimeSchedulerProvider
+import com.tapptitude.mvpsample.providers.SchedulerProvider
 import dagger.Module
 import dagger.Provides
 import javax.inject.Singleton
 
+private const val USER_PREFS = "user_sh_preferences"
+
 @Module
 class AppModule {
 
     @Provides
     @Singleton
     internal fun provideContext(application: Application): Context = application
+
+    @Provides
+    @Singleton
+    fun provideAppGson(): Gson {
+        return Gson()
+    }
+
+    @Provides
+    @Singleton
+    fun provideUserSessionManager(
+            context: Context,
+            gson: Gson
+    ): UserSessionManager {
+        val sharedPrefs = context.applicationContext.getSharedPreferences(USER_PREFS, Context.MODE_PRIVATE)
+        return UserSessionManager(gson, sharedPrefs)
+    }
+
+    @Provides
+    @Singleton
+    fun provideSchedulerProvider(): SchedulerProvider {
+        return RuntimeSchedulerProvider()
+    }
 }

app/src/main/java/com/tapptitude/mvpsample/di/modules/NetworkModule.kt

@@ -16,6 +16,8 @@ import retrofit2.converter.gson.GsonConverterFactory
 import java.io.File
 import javax.inject.Singleton
 
+private const val CACHE_MAX_SIZE = (10 * 1024 * 1024).toLong()
+
 @Module
 class NetworkModule {
 
@@ -39,10 +41,10 @@ class NetworkModule {
 
     @Provides
     @Singleton
-    fun provideRetrofit(client: OkHttpClient): Retrofit.Builder {
+    fun provideRetrofit(client: OkHttpClient, gson: Gson): Retrofit.Builder {
         return Retrofit.Builder()
                 .client(client)
-                .addConverterFactory(GsonConverterFactory.create(Gson()))
+                .addConverterFactory(GsonConverterFactory.create(gson))
                 .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
     }
 
@@ -58,7 +60,7 @@ class NetworkModule {
         }
 
         val cacheDir = File(application.cacheDir.absolutePath, application.packageName)
-        okHttpBuilder.cache(okhttp3.Cache(cacheDir, (10 * 1024 * 1024).toLong()))
+        okHttpBuilder.cache(okhttp3.Cache(cacheDir, CACHE_MAX_SIZE))
         return okHttpBuilder.build()
     }
 

app/src/main/java/com/tapptitude/mvpsample/di/modules/RepositoryModule.kt

@@ -6,6 +6,7 @@ import com.tapptitude.mvpsample.data.persistence.datetime.DateTimeNetworkReposit
 import com.tapptitude.mvpsample.data.persistence.datetime.DateTimeRepository
 import com.tapptitude.mvpsample.data.persistence.ip.IpNetworkRepository
 import com.tapptitude.mvpsample.data.persistence.ip.IpRepository
+import com.tapptitude.mvpsample.providers.SchedulerProvider
 import dagger.Module
 import dagger.Provides
 import javax.inject.Singleton
@@ -15,13 +16,19 @@ class RepositoryModule {
 
     @Provides
     @Singleton
-    internal fun provideDateTimeRepository(dateTimeApi: DateTimeApi): DateTimeRepository {
-        return DateTimeNetworkRepository(dateTimeApi)
+    internal fun provideDateTimeRepository(
+            dateTimeApi: DateTimeApi,
+            schedulerProvider: SchedulerProvider
+    ): DateTimeRepository {
+        return DateTimeNetworkRepository(dateTimeApi, schedulerProvider)
     }
 
     @Provides
     @Singleton
-    internal fun provideIpRepository(ipApi: IpApi): IpRepository {
-        return IpNetworkRepository(ipApi)
+    internal fun provideIpRepository(
+            ipApi: IpApi,
+            schedulerProvider: SchedulerProvider
+    ): IpRepository {
+        return IpNetworkRepository(ipApi, schedulerProvider)
     }
 }

app/src/main/java/com/tapptitude/mvpsample/preferance/UserSessionManager.kt

@@ -0,0 +1,57 @@
+package com.tapptitude.mvpsample.preferance
+
+import android.content.SharedPreferences
+import android.text.TextUtils
+import com.google.gson.Gson
+import com.tapptitude.mvpsample.data.model.User
+import javax.inject.Inject
+
+private const val USER_DATA_KEY = "USER_DATA_KEY"
+private const val SESSION_TOKEN_KEY = "SESSION_TOKEN_KEY"
+private const val IP_INFO_KEY = "IP_INFO_KEY"
+
+class UserSessionManager @Inject constructor(
+        private val gson: Gson,
+        private val userPreference: SharedPreferences
+) {
+
+    fun getUser(): User? {
+        val stringUserData = userPreference.getString(USER_DATA_KEY, "")
+
+        if (TextUtils.isEmpty(stringUserData)) {
+            return null
+        }
+
+        return gson.fromJson(stringUserData, User::class.java)
+    }
+
+    fun saveUser(user: User) {
+        val stringUserData = gson.toJson(user)
+
+        userPreference.edit()
+                .putString(USER_DATA_KEY, stringUserData)
+                .apply()
+    }
+
+    fun saveIp(ip: String) {
+        userPreference.edit().putString(IP_INFO_KEY, ip).apply()
+    }
+
+    fun isUserLoggedIn(): Boolean {
+        return getSessionToken() != null
+    }
+
+    fun saveSessionToken(newSessionToken: String) {
+        userPreference.edit().putString(SESSION_TOKEN_KEY, newSessionToken).apply()
+    }
+
+    fun getSessionToken(): String? {
+        return userPreference.getString(SESSION_TOKEN_KEY, null)
+    }
+
+    fun clearSession() {
+        userPreference.edit()
+                .clear()
+                .apply()
+    }
+}