From 4480c94eff8e6cee5b7cfa940c564f467993a047 Mon Sep 17 00:00:00 2001
From: Marcos Salto <marcosasalto@gmail.com>
Date: Mon, 13 Dec 2021 16:25:01 -0300
Subject: [PATCH 01/16] Add clean architecture

---
 .idea/gradle.xml              |   4 +
 build.gradle                  |   6 +-
 buildSrc/.gitignore           |   1 +
 buildSrc/build.gradle.kts     |   6 ++
 buildSrc/java/Dependencies.kt | 148 ++++++++++++++++++++++++++++++++++
 data/.gitignore               |   1 +
 data/build.gradle             |   9 +++
 domain/.gitignore             |   1 +
 domain/build.gradle           |   9 +++
 settings.gradle               |   3 +
 usecases/.gitignore           |   1 +
 usecases/build.gradle         |   9 +++
 12 files changed, 195 insertions(+), 3 deletions(-)
 create mode 100644 buildSrc/.gitignore
 create mode 100644 buildSrc/build.gradle.kts
 create mode 100644 buildSrc/java/Dependencies.kt
 create mode 100644 data/.gitignore
 create mode 100644 data/build.gradle
 create mode 100644 domain/.gitignore
 create mode 100644 domain/build.gradle
 create mode 100644 usecases/.gitignore
 create mode 100644 usecases/build.gradle

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 4404972..ea63707 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -12,6 +12,10 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/buildSrc" />
+            <option value="$PROJECT_DIR$/data" />
+            <option value="$PROJECT_DIR$/domain" />
+            <option value="$PROJECT_DIR$/usecases" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
diff --git a/build.gradle b/build.gradle
index ea46473..db85af3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     ext.hilt_version = '2.39.1'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven {
             url 'https://maven.fabric.io/public'
         }
@@ -13,7 +13,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0"
         classpath 'com.google.gms:google-services:4.3.10'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.0'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
@@ -33,7 +33,7 @@ detekt {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven { url 'https://jitpack.io' }
     }
 }
diff --git a/buildSrc/.gitignore b/buildSrc/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/buildSrc/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
new file mode 100644
index 0000000..ca013c3
--- /dev/null
+++ b/buildSrc/build.gradle.kts
@@ -0,0 +1,6 @@
+repositories {
+    jcenter()
+}
+plugins {
+    `kotlin-dsl`
+}
diff --git a/buildSrc/java/Dependencies.kt b/buildSrc/java/Dependencies.kt
new file mode 100644
index 0000000..d7b50dd
--- /dev/null
+++ b/buildSrc/java/Dependencies.kt
@@ -0,0 +1,148 @@
+object Versions {
+    const val appCompat = "1.3.1"
+    const val constraintLayout = "2.1.1"
+    const val core = "1.6.0"
+    const val coroutines = "1.5.2-native-mt"
+    const val legacySupportV4 = "1.0.0"
+    const val preference = "1.1.1"
+    const val recyclerview = "1.1.0"
+    const val gson = "2.8.7"
+    const val playServicesMaps = "17.0.1"
+    const val playServicesLocation = "18.0.0"
+    const val dexter = "6.2.2"
+    const val amplitude = "2.32.1"
+    const val firebaseBom = "26.1.0"
+    const val navigation = "2.3.5"
+    const val glide = "4.12.0"
+    const val kotlin = "1.6.0"
+    const val koin = "3.1.2"
+    const val lifecycle = "2.4.0"
+    const val lifecycleCommon = "1.1.1"
+    const val lifecycleExtension = "2.2.0"
+    const val materialDesign = "1.4.0"
+    const val moshi = "1.12.0"
+    const val converterMoshi = "2.5.0"
+    const val converterGson = "2.9.0"
+    const val okhttp = "4.9.0"
+    const val otto = "1.3.8"
+    const val ktlint = "0.35.0"
+    const val hiltViewModel = "1.0.0-alpha03"
+    const val securityCrypto = "1.1.0-alpha03"
+    const val retrofit = "2.9.0"
+    const val room = "1.1.1"
+    const val junit = "4.13.2"
+    const val mockitoCore = "2.28.2"
+    const val mockk = "1.12.0"
+    const val espresso = "3.4.0"
+    const val extJunit = "1.1.3"
+    const val uiautomator = "2.2.0"
+    const val rules = "1.4.0"
+    const val mockwebserver = "4.9.0"
+    const val testRunner = "1.4.0"
+    const val flexbox = "3.0.0"
+    const val paging = "3.1.0"
+}
+
+object Libs {
+    // Kotlin
+    const val kotlinStdLib = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${Versions.kotlin}"
+    const val coroutinesAndroid = "org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.coroutines}"
+    const val reflect = "org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlin}"
+
+    const val appCompat = "androidx.appcompat:appcompat:${Versions.appCompat}"
+    const val core = "androidx.core:core-ktx:${Versions.core}"
+    const val constraintlayout = "androidx.constraintlayout:constraintlayout:${Versions.constraintLayout}"
+    const val legacySupportV4 = "androidx.legacy:legacy-support-v4:${Versions.legacySupportV4}"
+    const val preference = "androidx.preference:preference-ktx:${Versions.preference}"
+    const val recyclerview = "androidx.recyclerview:recyclerview:${Versions.recyclerview}"
+
+    // Material
+    const val material = "com.google.android.material:material:${Versions.materialDesign}"
+
+    // Paging
+    const val paging = "androidx.paging:paging-runtime:${Versions.paging}"
+
+    // Room
+    const val roomRuntime = "android.arch.persistence.room:runtime:${Versions.room}"
+    const val roomKapt = "android.arch.persistence.room:compiler:${Versions.room}"
+
+    // Lifecycle
+    const val lifecycleCommon = "android.arch.lifecycle:common-java8:${Versions.lifecycleCommon}"
+    const val lifecycleKapt = "android.arch.lifecycle:compiler:${Versions.lifecycleCommon}"
+    const val lifecycleRuntime = "androidx.lifecycle:lifecycle-runtime-ktx:${Versions.lifecycle}"
+    const val lifecycleLivedata = "androidx.lifecycle:lifecycle-livedata-ktx:${Versions.lifecycle}"
+    const val lifecycleExtensions = "androidx.lifecycle:lifecycle-extensions:${Versions.lifecycleExtension}"
+    const val lifecycleViewModel = "androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.lifecycle}"
+
+    // Navigation
+    const val navigationFragment = "androidx.navigation:navigation-fragment-ktx:${Versions.navigation}"
+    const val navigationUi = "androidx.navigation:navigation-ui-ktx:${Versions.navigation}"
+
+    // Google JSON serializer/deserializer
+    const val gson = "com.google.code.gson:gson:${Versions.gson}"
+
+    // Google Maps
+    const val playServicesMaps = "com.google.android.gms:play-services-maps:${Versions.playServicesMaps}"
+
+    // Location
+    const val playServicesLocation = "com.google.android.gms:play-services-location:${Versions.playServicesLocation}"
+    const val dexter = "com.karumi:dexter:${Versions.dexter}"
+
+    // Amplitude
+    const val amplitude = "com.amplitude:android-sdk:${Versions.amplitude}"
+
+    // Firebase
+    const val firebaseBom = "com.google.firebase:firebase-bom:${Versions.firebaseBom}"
+    const val firebaseCore = "com.google.firebase:firebase-core"
+    const val firebaseAnalytics = "com.google.firebase:firebase-analytics-ktx"
+    const val firebaseCrashlytics = "com.google.firebase:firebase-crashlytics-ktx"
+
+    // Image
+    const val glide = "com.github.bumptech.glide:glide:${Versions.glide}"
+    const val glideKapt = "com.github.bumptech.glide:compiler:${Versions.glide}"
+
+    // Network
+    const val retrofit = "com.squareup.retrofit2:retrofit:${Versions.retrofit}"
+    const val retrofitGsonConverter = "com.squareup.retrofit2:converter-gson:${Versions.converterGson}"
+    const val moshi = "com.squareup.moshi:moshi-kotlin:${Versions.moshi}"
+    const val converterMoshi = "com.squareup.retrofit2:converter-moshi:${Versions.converterMoshi}"
+    const val loggingInterceptor = "com.squareup.okhttp3:logging-interceptor:${Versions.okhttp}"
+    const val okhttp = "com.squareup.okhttp3:okhttp:${Versions.okhttp}"
+
+    // Events
+    const val otto = "com.squareup:otto:${Versions.otto}"
+
+    // Linters
+    const val ktlint = "com.pinterest:ktlint:${Versions.ktlint}"
+
+    // Hilt
+    const val hiltViewModel= "androidx.hilt:hilt-lifecycle-viewmodel:${Versions.hiltViewModel}"
+
+    // Koin
+    const val koinCore = "io.insert-koin:koin-core:${Versions.koin}"
+    const val koinAndroid = "io.insert-koin:koin-android:${Versions.koin}"
+    const val koinAndroidNavigation = "io.insert-koin:koin-androidx-navigation:${Versions.koin}"
+    const val koinAndroidCompat = "io.insert-koin:koin-android-compat:${Versions.koin}"
+    const val koinWorkManager = "io.insert-koin:koin-androidx-workmanager:${Versions.koin}"
+    const val koinCompose = "io.insert-koin:koin-androidx-compose:${Versions.koin}"
+
+    // Security crypto
+    const val securityCrypto = "androidx.security:security-crypto:${Versions.securityCrypto}"
+
+    // Flexbox
+    const val flexbox = "com.google.android.flexbox:flexbox:${Versions.flexbox}"
+
+    // Testing
+    const val junit = "junit:junit:${Versions.junit}"
+    const val mockitoCore = "org.mockito:mockito-core:${Versions.mockitoCore}"
+    const val mockk = "io.mockk:mockk:${Versions.mockk}"
+    const val mockkAndroid = "io.mockk:mockk-android:${Versions.mockk}"
+    const val testRunner = "androidx.test:runner:${Versions.testRunner}"
+    const val espressoCore = "androidx.test.espresso:espresso-core:${Versions.espresso}"
+    const val espressoIntents = "androidx.test.espresso:espresso-intents:${Versions.espresso}"
+    const val extJunit = "androidx.test.ext:junit:${Versions.extJunit}"
+    const val koinTest = "io.insert-koin:koin-test:${Versions.koin}"
+    const val uiautomator = "androidx.test.uiautomator:uiautomator:${Versions.uiautomator}"
+    const val rules = "androidx.test:rules:${Versions.rules}"
+    const val mockwebserver = "com.squareup.okhttp3:mockwebserver:${Versions.mockwebserver}"
+}
diff --git a/data/.gitignore b/data/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/data/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/data/build.gradle b/data/build.gradle
new file mode 100644
index 0000000..c5e3111
--- /dev/null
+++ b/data/build.gradle
@@ -0,0 +1,9 @@
+plugins {
+    id 'java-library'
+    id 'kotlin'
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+}
diff --git a/domain/.gitignore b/domain/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/domain/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/domain/build.gradle b/domain/build.gradle
new file mode 100644
index 0000000..c5e3111
--- /dev/null
+++ b/domain/build.gradle
@@ -0,0 +1,9 @@
+plugins {
+    id 'java-library'
+    id 'kotlin'
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+}
diff --git a/settings.gradle b/settings.gradle
index e7b4def..dd1098d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,4 @@
 include ':app'
+include ':domain'
+include ':data'
+include ':usecases'
diff --git a/usecases/.gitignore b/usecases/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/usecases/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/usecases/build.gradle b/usecases/build.gradle
new file mode 100644
index 0000000..c5e3111
--- /dev/null
+++ b/usecases/build.gradle
@@ -0,0 +1,9 @@
+plugins {
+    id 'java-library'
+    id 'kotlin'
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+}

From 93f55cacd223ee433834134d2f55ea777621453a Mon Sep 17 00:00:00 2001
From: Marcos Salto <marcosasalto@gmail.com>
Date: Mon, 13 Dec 2021 17:19:49 -0300
Subject: [PATCH 02/16] Update gradle

Remove flavors from gradle
---
 app/build.gradle                             | 148 +++++--------------
 build.gradle                                 |  91 +++++++++++-
 buildSrc/{ => src/main}/java/Dependencies.kt |  26 ----
 gradle/wrapper/gradle-wrapper.properties     |   6 +-
 4 files changed, 125 insertions(+), 146 deletions(-)
 rename buildSrc/{ => src/main}/java/Dependencies.kt (86%)

diff --git a/app/build.gradle b/app/build.gradle
index 576eec3..a9f297f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,11 @@
-apply plugin: 'com.android.application'
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "kotlin-kapt"
+    id "com.google.gms.google-services"
+    id "com.google.firebase.crashlytics"
 
-apply plugin: 'kotlin-android'
-
-apply plugin: 'kotlin-kapt'
-
-apply plugin: 'dagger.hilt.android.plugin'
-
-apply plugin: 'com.google.gms.google-services'
-
-apply plugin: 'com.google.firebase.crashlytics'
+}
 
 android {
     compileSdkVersion 31
@@ -18,7 +15,7 @@ android {
         targetSdkVersion 31
         versionCode 42
         versionName "1.0"
-        testInstrumentationRunner 'com.rootstrap.android.CustomTestRunner'
+        testInstrumentationRunner "com.rootstrap.android.CustomTestRunner"
     }
 
     compileOptions {
@@ -32,7 +29,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = "1.8"
     }
 
     signingConfigs {
@@ -45,50 +42,37 @@ android {
     }
 
     buildTypes {
-        debug {
+        getByName("debug") {
+            applicationIdSuffix = ".debug"
+            versionNameSuffix "-debug"
             minifyEnabled false
-        }
-
-        release {
-            signingConfig signingConfigs.releaseConfig
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    kapt {
-        correctErrorTypes true
-    }
-
-    flavorDimensions "server"
-
-    productFlavors {
-        dev {
-            dimension "server"
-            applicationIdSuffix ".dev"
-            versionNameSuffix "-dev"
             buildConfigField("String", "API_URL", "\"https://rails5-api-base.herokuapp.com/api/v1/\"")
             buildConfigField("String", "SECURE_KEY_ALIAS", "\"$projectKeyAlias\"")
             buildConfigField("String", "SECURE_FILE_NAME", "\"appPreferencesDev\"")
         }
 
-        staging {
-            dimension "server"
-            applicationIdSuffix ".staging"
-            versionNameSuffix "-staging"
+        create("staging") {
+            initWith(getByName("debug"))
+            applicationIdSuffix = ".staging"
+            initWith(getByName("debug"))
             buildConfigField("String", "API_URL", "\"https://proj-staging.herokuapp.com/api/\"")
-            buildConfigField("String", "SECURE_KEY_ALIAS", "\"$projectKeyAlias\"")
             buildConfigField("String", "SECURE_FILE_NAME", "\"appPreferencesStaging\"")
         }
 
-        prod {
-            dimension "server"
+        getByName("release") {
+            signingConfig signingConfigs.releaseConfig
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             buildConfigField("String", "API_URL", "\"https://proj-production.herokuapp.com/api/\"")
             buildConfigField("String", "SECURE_KEY_ALIAS", "\"$projectKeyAlias\"")
             buildConfigField("String", "SECURE_FILE_NAME", "\"appPreferences\"")
         }
     }
 
+    kapt {
+        correctErrorTypes true
+    }
+
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
             def apk = output.outputFile
@@ -139,75 +123,21 @@ android {
 }
 
 dependencies {
-    def room_version = "2.3.0"
-    def lifecycle_version = "2.4.0"
+
+    implementation project(":data")
+    implementation project(":domain")
+    implementation project(":usecases")
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0'
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation "androidx.preference:preference-ktx:1.1.1"
-    implementation 'com.google.android.material:material:1.4.0'
-    testImplementation 'junit:junit:4.13.1'
-    testImplementation 'org.mockito:mockito-core:2.28.2'
-    androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
-    androidTestImplementation 'androidx.test:rules:1.4.0'
-    androidTestImplementation 'com.squareup.okhttp3:mockwebserver:4.3.1'
-
-    //---- ROOM ----
-    implementation "androidx.room:room-runtime:$room_version"
-    kapt "androidx.room:room-compiler:$room_version"
-    // Kotlin Extensions and Coroutines support for Room
-    implementation "androidx.room:room-ktx:$room_version"
-
-    //---- LIFECYCLE ----]
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
-
-    //---- GOOGLE JSON SERIALIZER/DESERIALIZER ----
-    implementation 'com.google.code.gson:gson:2.8.6'
-
-    //---- MixPanel ----
-    implementation 'com.mixpanel.android:mixpanel-android:5.6.1'
-
-    //---- Firebase ----
-    implementation platform('com.google.firebase:firebase-bom:28.4.2')
-    implementation 'com.google.firebase:firebase-core:20.0.0'
-    implementation 'com.google.firebase:firebase-analytics-ktx'
-    implementation 'com.google.firebase:firebase-crashlytics-ktx'
-    implementation 'org.jetbrains.kotlin:kotlin-reflect:1.5.31'
-
-    //---- Image ----
-    implementation group: 'com.github.bumptech.glide', name: 'glide', version: '4.10.0'
-
-    //---- Network ----
-    implementation 'com.squareup.retrofit2:retrofit:2.6.2'
-    implementation 'com.squareup.moshi:moshi-kotlin:1.12.0'
-    implementation 'com.squareup.retrofit2:converter-moshi:2.5.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.3.1'
-
-    //---- Events ----
-    implementation 'com.squareup:otto:1.3.8'
-
-    //---- Linters ----
-    ktlint "com.pinterest:ktlint:0.35.0"
-
-    //---- Hilt ----
-    implementation "com.google.dagger:hilt-android:$hilt_version"
-    kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
-    kapt 'androidx.hilt:hilt-compiler:1.0.0'
-    androidTestImplementation "com.google.dagger:hilt-android-testing:$hilt_version"
-    kaptAndroidTest "com.google.dagger:hilt-android-compiler:$hilt_version"
-
-    //security crypto
-    implementation "androidx.security:security-crypto:1.1.0-alpha03"
+
+    implementation androidLibs.values()
+    implementation androidDataLibs.values()
+    implementation kotlinLibs.values()
+    implementation platform(Libs.firebaseBom)
+    implementation libs.values()
+    kapt androidKaptLibs.values()
+    ktlint ktlintLibs.values()
+
+    testImplementation testLibs.values()
+    androidTestImplementation androidTestLibs.values()
 }
diff --git a/build.gradle b/build.gradle
index db85af3..237fe0a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,22 +1,19 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.5.31'
-    ext.hilt_version = '2.39.1'
     repositories {
         google()
         mavenCentral()
         maven {
             url 'https://maven.fabric.io/public'
         }
-        
     }
+
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0"
-        classpath 'com.google.gms:google-services:4.3.10'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.0'
-        classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
+        classpath "com.android.tools.build:gradle:7.0.3"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$Versions.kotlin"
+        classpath "com.google.gms:google-services:4.3.10"
+        classpath "com.google.firebase:firebase-crashlytics-gradle:2.8.1"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -36,6 +33,84 @@ allprojects {
         mavenCentral()
         maven { url 'https://jitpack.io' }
     }
+
+    ext {
+        androidLibs = [
+                appcompat           : Libs.appCompat,
+                legacySupportV4     : Libs.legacySupportV4,
+                recyclerview        : Libs.recyclerview,
+                constraintlayout    : Libs.constraintlayout,
+                androidxCore        : Libs.core,
+                lifecycleCommon     : Libs.lifecycleCommon,
+                lifecycleRuntime    : Libs.lifecycleRuntime,
+                lifecycleLivedata   : Libs.lifecycleLivedata,
+                lifecycleExtensions : Libs.lifecycleExtensions,
+                lifecycleViewModel  : Libs.lifecycleViewModel,
+                material            : Libs.material,
+                roomRuntime         : Libs.roomRuntime,
+                glide               : Libs.glide,
+                navigationFragment  : Libs.navigationFragment,
+                navigationUi        : Libs.navigationUi
+        ]
+
+        androidDataLibs = [
+                preference          : Libs.preference
+        ]
+
+        androidKaptLibs = [
+                roomCompiler : Libs.roomKapt,
+                lifecycleKapt : Libs.lifecycleKapt,
+                glideCompiler: Libs.glideKapt
+        ]
+
+        ktlintLibs = [
+                ktlint  : Libs.ktlint
+        ]
+
+        kotlinLibs = [
+                kotlinStdLib    : Libs.kotlinStdLib,
+                reflect         : Libs.reflect,
+                coroutines      : Libs.coroutinesAndroid
+        ]
+
+        libs = [
+                okhttpLoginInterceptor  : Libs.loggingInterceptor,
+                retrofit                : Libs.retrofit,
+                retrofitGsonConverter   : Libs.retrofitGsonConverter,
+                koinCore                : Libs.koinCore,
+                koinAndroid             : Libs.koinAndroid,
+                koinAndroidCompat       : Libs.koinAndroidCompat,
+                koinWorkManager         : Libs.koinWorkManager,
+                koinCompose             : Libs.koinCompose,
+                otto                    : Libs.otto,
+                gson                    : Libs.gson,
+                okhttp                  : Libs.okhttp,
+                moshi                   : Libs.moshi,
+                converterMoshi          : Libs.converterMoshi,
+                securityCrypto          : Libs.securityCrypto,
+                firebaseCore            : Libs.firebaseCore,
+                firebaseAnalytics       : Libs.firebaseAnalytics,
+                firebaseCrashlytics     : Libs.firebaseCrashlytics
+        ]
+
+        testLibs = [
+                junit           : Libs.junit,
+                mockitoCore     : Libs.mockitoCore,
+                mockk           : Libs.mockk
+        ]
+
+        androidTestLibs = [
+                testRunner      : Libs.testRunner,
+                espressoCore    : Libs.espressoCore,
+                espressoIntents : Libs.espressoIntents,
+                rules           : Libs.rules,
+                extJunit        : Libs.extJunit,
+                koinTest        : Libs.koinTest,
+                mockWebServer   : Libs.mockwebserver,
+                mockkAndroid    : Libs.mockkAndroid,
+                uiautomator     : Libs.uiautomator
+        ]
+    }
 }
 
 task installGitHook(type: Copy) {
diff --git a/buildSrc/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
similarity index 86%
rename from buildSrc/java/Dependencies.kt
rename to buildSrc/src/main/java/Dependencies.kt
index d7b50dd..de9ce91 100644
--- a/buildSrc/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -7,10 +7,6 @@ object Versions {
     const val preference = "1.1.1"
     const val recyclerview = "1.1.0"
     const val gson = "2.8.7"
-    const val playServicesMaps = "17.0.1"
-    const val playServicesLocation = "18.0.0"
-    const val dexter = "6.2.2"
-    const val amplitude = "2.32.1"
     const val firebaseBom = "26.1.0"
     const val navigation = "2.3.5"
     const val glide = "4.12.0"
@@ -26,7 +22,6 @@ object Versions {
     const val okhttp = "4.9.0"
     const val otto = "1.3.8"
     const val ktlint = "0.35.0"
-    const val hiltViewModel = "1.0.0-alpha03"
     const val securityCrypto = "1.1.0-alpha03"
     const val retrofit = "2.9.0"
     const val room = "1.1.1"
@@ -39,8 +34,6 @@ object Versions {
     const val rules = "1.4.0"
     const val mockwebserver = "4.9.0"
     const val testRunner = "1.4.0"
-    const val flexbox = "3.0.0"
-    const val paging = "3.1.0"
 }
 
 object Libs {
@@ -59,9 +52,6 @@ object Libs {
     // Material
     const val material = "com.google.android.material:material:${Versions.materialDesign}"
 
-    // Paging
-    const val paging = "androidx.paging:paging-runtime:${Versions.paging}"
-
     // Room
     const val roomRuntime = "android.arch.persistence.room:runtime:${Versions.room}"
     const val roomKapt = "android.arch.persistence.room:compiler:${Versions.room}"
@@ -81,16 +71,6 @@ object Libs {
     // Google JSON serializer/deserializer
     const val gson = "com.google.code.gson:gson:${Versions.gson}"
 
-    // Google Maps
-    const val playServicesMaps = "com.google.android.gms:play-services-maps:${Versions.playServicesMaps}"
-
-    // Location
-    const val playServicesLocation = "com.google.android.gms:play-services-location:${Versions.playServicesLocation}"
-    const val dexter = "com.karumi:dexter:${Versions.dexter}"
-
-    // Amplitude
-    const val amplitude = "com.amplitude:android-sdk:${Versions.amplitude}"
-
     // Firebase
     const val firebaseBom = "com.google.firebase:firebase-bom:${Versions.firebaseBom}"
     const val firebaseCore = "com.google.firebase:firebase-core"
@@ -115,9 +95,6 @@ object Libs {
     // Linters
     const val ktlint = "com.pinterest:ktlint:${Versions.ktlint}"
 
-    // Hilt
-    const val hiltViewModel= "androidx.hilt:hilt-lifecycle-viewmodel:${Versions.hiltViewModel}"
-
     // Koin
     const val koinCore = "io.insert-koin:koin-core:${Versions.koin}"
     const val koinAndroid = "io.insert-koin:koin-android:${Versions.koin}"
@@ -129,9 +106,6 @@ object Libs {
     // Security crypto
     const val securityCrypto = "androidx.security:security-crypto:${Versions.securityCrypto}"
 
-    // Flexbox
-    const val flexbox = "com.google.android.flexbox:flexbox:${Versions.flexbox}"
-
     // Testing
     const val junit = "junit:junit:${Versions.junit}"
     const val mockitoCore = "org.mockito:mockito-core:${Versions.mockitoCore}"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e7b189d..0aeb7fd 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jan 18 09:20:52 ART 2021
+#Mon Dec 13 17:15:09 ART 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+zipStoreBase=GRADLE_USER_HOME

From 6cff9c87352d6d37ec4d4adb772a3020c24303c4 Mon Sep 17 00:00:00 2001
From: Marcos Salto <marcosasalto@gmail.com>
Date: Fri, 7 Jan 2022 11:19:44 -0300
Subject: [PATCH 03/16] Add clean architecture

Add Koin
Add uses cases
---
 .idea/gradle.xml                              |  2 +-
 app/google-services.json                      |  2 +-
 .../android/tests/SignInActivityTest.kt       |  2 +-
 .../android/tests/SignUpActivityTest.kt       |  2 +-
 .../android/tests/utils/PrefTests.kt          |  2 +-
 .../com/rootstrap/android/utils/BaseTests.kt  |  8 +--
 .../main/java/com/rootstrap/android/App.kt    | 13 ++++-
 .../main/java/com/rootstrap/android/di/DI.kt  | 51 +++++++++++++++++
 .../com/rootstrap/android/models/Model.kt     |  3 -
 .../android/network/managers/ManagerModule.kt | 24 --------
 .../network/managers/user/UserManager.kt      | 11 ----
 .../network/managers/user/UserManagerImpl.kt  | 23 --------
 .../rootstrap/android/network/models/User.kt  | 15 -----
 .../providers/ServiceProviderModule.kt        | 57 -------------------
 .../android/network/services/ApiModule.kt     | 17 ------
 .../android/network/services/ApiService.kt    | 19 -------
 .../ui/activity/main/ProfileActivity.kt       |  4 +-
 .../activity/main/ProfileActivityViewModel.kt | 11 ++--
 .../ui/activity/main/SignInActivity.kt        |  4 +-
 .../activity/main/SignInActivityViewModel.kt  | 13 ++---
 .../ui/activity/main/SignUpActivity.kt        |  4 +-
 .../activity/main/SignUpActivityViewModel.kt  | 13 ++---
 .../com/rootstrap/android/util/ErrorUtil.kt   |  2 +-
 .../com/rootstrap/android/util/UtilModule.kt  | 51 -----------------
 .../rootstrap/android/util/extensions/Gson.kt |  6 --
 build.gradle                                  |  2 +-
 data/build.gradle                             | 53 +++++++++++++++--
 data/consumer-rules.pro                       |  0
 data/proguard-rules.pro                       | 21 +++++++
 data/src/main/AndroidManifest.xml             |  5 ++
 .../com/rootstrap/data/api/ApiException.kt    | 19 +++++++
 .../com/rootstrap/data/api/ApiProvider.kt     | 10 ++++
 .../rootstrap/data/api/ApiServiceFactory.kt   | 41 +++++++++++++
 .../rootstrap/data/api/endpoints/UserApi.kt   | 21 +++++++
 .../AuthenticationInterceptor.kt              | 13 ++---
 .../interceptors/ConnectivityInterceptor.kt   | 15 +++++
 .../api/interceptors}/HeadersInterceptor.kt   |  2 +-
 .../api/interceptors}/ResponseInterceptor.kt  | 21 ++++---
 .../data/api/interceptors/WifiService.kt      | 33 +++++++++++
 .../request/UserSignInRequestSerializer.kt    |  8 +++
 .../request/UserSignUpRequestSerializer.kt    | 13 +++++
 .../rootstrap/data/dto/response/DataResult.kt | 10 ++++
 .../data/dto/response}/ErrorModel.kt          |  2 +-
 .../dto/response/UserResponseSerializer.kt    | 17 ++++++
 .../data}/managers/session/SessionManager.kt  |  4 +-
 .../managers/session/SessionManagerImpl.kt    |  6 +-
 .../data/repository/UserRepository.kt         | 23 ++++++++
 .../rootstrap/data/source/RemoteDataSource.kt | 15 +++++
 .../java/com/rootstrap/data}/util/Prefs.kt    | 25 ++++----
 .../data}/util/extensions/ActionCallback.kt   | 30 ++++------
 .../rootstrap/data/util/extensions/Gson.kt    |  7 +++
 .../main/java/com/rootstrap/domain/User.kt    | 11 ++++
 usecases/build.gradle                         | 47 +++++++++++++--
 .../java/com/rootstrap/usecases/SignIn.kt     | 12 ++++
 .../java/com/rootstrap/usecases/SignOut.kt    | 10 ++++
 .../java/com/rootstrap/usecases/SignUp.kt     | 12 ++++
 56 files changed, 528 insertions(+), 339 deletions(-)
 create mode 100644 app/src/main/java/com/rootstrap/android/di/DI.kt
 delete mode 100644 app/src/main/java/com/rootstrap/android/models/Model.kt
 delete mode 100644 app/src/main/java/com/rootstrap/android/network/managers/ManagerModule.kt
 delete mode 100644 app/src/main/java/com/rootstrap/android/network/managers/user/UserManager.kt
 delete mode 100644 app/src/main/java/com/rootstrap/android/network/managers/user/UserManagerImpl.kt
 delete mode 100644 app/src/main/java/com/rootstrap/android/network/models/User.kt
 delete mode 100644 app/src/main/java/com/rootstrap/android/network/providers/ServiceProviderModule.kt
 delete mode 100644 app/src/main/java/com/rootstrap/android/network/services/ApiModule.kt
 delete mode 100644 app/src/main/java/com/rootstrap/android/network/services/ApiService.kt
 delete mode 100644 app/src/main/java/com/rootstrap/android/util/UtilModule.kt
 delete mode 100644 app/src/main/java/com/rootstrap/android/util/extensions/Gson.kt
 create mode 100644 data/consumer-rules.pro
 create mode 100644 data/proguard-rules.pro
 create mode 100644 data/src/main/AndroidManifest.xml
 create mode 100644 data/src/main/java/com/rootstrap/data/api/ApiException.kt
 create mode 100644 data/src/main/java/com/rootstrap/data/api/ApiProvider.kt
 create mode 100644 data/src/main/java/com/rootstrap/data/api/ApiServiceFactory.kt
 create mode 100644 data/src/main/java/com/rootstrap/data/api/endpoints/UserApi.kt
 rename {app/src/main/java/com/rootstrap/android/network/services => data/src/main/java/com/rootstrap/data/api/interceptors}/AuthenticationInterceptor.kt (57%)
 create mode 100644 data/src/main/java/com/rootstrap/data/api/interceptors/ConnectivityInterceptor.kt
 rename {app/src/main/java/com/rootstrap/android/network/services => data/src/main/java/com/rootstrap/data/api/interceptors}/HeadersInterceptor.kt (91%)
 rename {app/src/main/java/com/rootstrap/android/network/services => data/src/main/java/com/rootstrap/data/api/interceptors}/ResponseInterceptor.kt (54%)
 create mode 100644 data/src/main/java/com/rootstrap/data/api/interceptors/WifiService.kt
 create mode 100644 data/src/main/java/com/rootstrap/data/dto/request/UserSignInRequestSerializer.kt
 create mode 100644 data/src/main/java/com/rootstrap/data/dto/request/UserSignUpRequestSerializer.kt
 create mode 100644 data/src/main/java/com/rootstrap/data/dto/response/DataResult.kt
 rename {app/src/main/java/com/rootstrap/android/network/models => data/src/main/java/com/rootstrap/data/dto/response}/ErrorModel.kt (81%)
 create mode 100644 data/src/main/java/com/rootstrap/data/dto/response/UserResponseSerializer.kt
 rename {app/src/main/java/com/rootstrap/android/network => data/src/main/java/com/rootstrap/data}/managers/session/SessionManager.kt (67%)
 rename {app/src/main/java/com/rootstrap/android/network => data/src/main/java/com/rootstrap/data}/managers/session/SessionManagerImpl.kt (83%)
 create mode 100644 data/src/main/java/com/rootstrap/data/repository/UserRepository.kt
 create mode 100644 data/src/main/java/com/rootstrap/data/source/RemoteDataSource.kt
 rename {app/src/main/java/com/rootstrap/android => data/src/main/java/com/rootstrap/data}/util/Prefs.kt (63%)
 rename {app/src/main/java/com/rootstrap/android => data/src/main/java/com/rootstrap/data}/util/extensions/ActionCallback.kt (57%)
 create mode 100644 data/src/main/java/com/rootstrap/data/util/extensions/Gson.kt
 create mode 100644 domain/src/main/java/com/rootstrap/domain/User.kt
 create mode 100644 usecases/src/main/java/com/rootstrap/usecases/SignIn.kt
 create mode 100644 usecases/src/main/java/com/rootstrap/usecases/SignOut.kt
 create mode 100644 usecases/src/main/java/com/rootstrap/usecases/SignUp.kt

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ea63707..30de1d6 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,10 +4,10 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="delegatedBuild" value="false" />
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/google-services.json b/app/google-services.json
index 3ebdcd7..8d0a5b6 100644
--- a/app/google-services.json
+++ b/app/google-services.json
@@ -39,7 +39,7 @@
       "client_info": {
         "mobilesdk_app_id": "1:289773649665:android:d4cfc41fd5630d4bf1e500",
         "android_client_info": {
-          "package_name": "com.rootstrap.android.dev"
+          "package_name": "com.rootstrap.android.debug"
         }
       },
       "oauth_client": [
diff --git a/app/src/androidTest/java/com/rootstrap/android/tests/SignInActivityTest.kt b/app/src/androidTest/java/com/rootstrap/android/tests/SignInActivityTest.kt
index b36cfab..d39c60b 100644
--- a/app/src/androidTest/java/com/rootstrap/android/tests/SignInActivityTest.kt
+++ b/app/src/androidTest/java/com/rootstrap/android/tests/SignInActivityTest.kt
@@ -3,7 +3,7 @@ package com.rootstrap.android.tests
 import androidx.test.core.app.ActivityScenario
 import com.google.gson.Gson
 import com.rootstrap.android.R
-import com.rootstrap.android.network.models.UserSerializer
+import com.rootstrap.data.dto.response.UserSerializer
 import com.rootstrap.android.ui.activity.main.ProfileActivity
 import com.rootstrap.android.ui.activity.main.SignInActivity
 import com.rootstrap.android.utils.BaseTests
diff --git a/app/src/androidTest/java/com/rootstrap/android/tests/SignUpActivityTest.kt b/app/src/androidTest/java/com/rootstrap/android/tests/SignUpActivityTest.kt
index 8409a87..09dae1c 100644
--- a/app/src/androidTest/java/com/rootstrap/android/tests/SignUpActivityTest.kt
+++ b/app/src/androidTest/java/com/rootstrap/android/tests/SignUpActivityTest.kt
@@ -3,7 +3,7 @@ package com.rootstrap.android.tests
 import androidx.test.core.app.ActivityScenario
 import com.google.gson.Gson
 import com.rootstrap.android.R
-import com.rootstrap.android.network.models.UserSerializer
+import com.rootstrap.data.dto.response.UserSerializer
 import com.rootstrap.android.ui.activity.main.ProfileActivity
 import com.rootstrap.android.ui.activity.main.SignInActivity
 import com.rootstrap.android.ui.activity.main.SignUpActivity
diff --git a/app/src/androidTest/java/com/rootstrap/android/tests/utils/PrefTests.kt b/app/src/androidTest/java/com/rootstrap/android/tests/utils/PrefTests.kt
index fb06073..6e4f674 100644
--- a/app/src/androidTest/java/com/rootstrap/android/tests/utils/PrefTests.kt
+++ b/app/src/androidTest/java/com/rootstrap/android/tests/utils/PrefTests.kt
@@ -2,7 +2,7 @@ package com.rootstrap.android.tests.utils
 
 import android.content.SharedPreferences
 import androidx.security.crypto.EncryptedSharedPreferences
-import com.rootstrap.android.util.Prefs
+import com.rootstrap.data.util.Prefs
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.Assert
diff --git a/app/src/androidTest/java/com/rootstrap/android/utils/BaseTests.kt b/app/src/androidTest/java/com/rootstrap/android/utils/BaseTests.kt
index 2be338b..96dd335 100644
--- a/app/src/androidTest/java/com/rootstrap/android/utils/BaseTests.kt
+++ b/app/src/androidTest/java/com/rootstrap/android/utils/BaseTests.kt
@@ -13,9 +13,9 @@ import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry
 import androidx.test.runner.lifecycle.Stage
-import com.rootstrap.android.network.managers.session.SessionManager
-import com.rootstrap.android.network.models.User
-import com.rootstrap.android.network.providers.ServiceProviderModule
+import com.rootstrap.data.managers.session.SessionManager
+import com.rootstrap.data.dto.response.User
+import com.rootstrap.data.api.ApiServiceFactory
 import dagger.hilt.android.testing.HiltAndroidRule
 import okhttp3.mockwebserver.Dispatcher
 import org.junit.Rule
@@ -38,7 +38,7 @@ open class BaseTests {
 
     open fun before() {
         mockServer.startServer()
-        ServiceProviderModule.URL_API = mockServer.server().url("/").toString()
+        ApiServiceFactory.URL_API = mockServer.server().url("/").toString()
         hiltRule.inject()
     }
 
diff --git a/app/src/main/java/com/rootstrap/android/App.kt b/app/src/main/java/com/rootstrap/android/App.kt
index 7ca19b3..034c806 100644
--- a/app/src/main/java/com/rootstrap/android/App.kt
+++ b/app/src/main/java/com/rootstrap/android/App.kt
@@ -1,18 +1,25 @@
 package com.rootstrap.android
 
 import android.app.Application
+import com.rootstrap.android.di.initDI
 import com.rootstrap.android.metrics.Analytics
 import com.rootstrap.android.metrics.GoogleAnalytics
-import dagger.hilt.android.HiltAndroidApp
+import com.rootstrap.data.api.interceptors.WifiService
+import org.koin.core.KoinExperimentalAPI
 
-@HiltAndroidApp
+@KoinExperimentalAPI
 class App : Application() {
 
     override fun onCreate() {
         super.onCreate()
-
+        initDI()
+        setupServices()
         Analytics.addProvider(GoogleAnalytics(this))
         // You need the api key in order to use MixPanel
         // Analytics.addProvider(MixPanelAnalytics(this))
     }
+
+    private fun setupServices() {
+        WifiService.instance.initializeWithApplicationContext(applicationContext)
+    }
 }
diff --git a/app/src/main/java/com/rootstrap/android/di/DI.kt b/app/src/main/java/com/rootstrap/android/di/DI.kt
new file mode 100644
index 0000000..588d68a
--- /dev/null
+++ b/app/src/main/java/com/rootstrap/android/di/DI.kt
@@ -0,0 +1,51 @@
+package com.rootstrap.android.di
+
+import android.app.Application
+import com.rootstrap.android.BuildConfig
+import com.rootstrap.data.api.ApiServiceFactory
+import com.rootstrap.data.api.interceptors.AuthenticationInterceptor
+import com.rootstrap.data.api.interceptors.ConnectivityInterceptor
+import com.rootstrap.data.api.interceptors.HeadersInterceptor
+import com.rootstrap.data.api.interceptors.ResponseInterceptor
+import com.rootstrap.data.repository.UserRepository
+import com.rootstrap.data.util.Prefs
+import com.rootstrap.usecases.SignIn
+import com.rootstrap.usecases.SignOut
+import com.rootstrap.usecases.SignUp
+import org.koin.android.ext.koin.androidContext
+import org.koin.android.ext.koin.androidLogger
+import org.koin.androidx.fragment.koin.fragmentFactory
+import org.koin.core.KoinExperimentalAPI
+import org.koin.core.context.startKoin
+import org.koin.core.logger.Level
+import org.koin.dsl.module
+
+@KoinExperimentalAPI
+fun Application.initDI() {
+    startKoin {
+        androidLogger(if (BuildConfig.DEBUG) Level.ERROR else Level.NONE)
+        androidContext(this@initDI)
+        fragmentFactory()
+        modules(appModule, dataModule, scopesModule)
+    }
+}
+
+val appModule = module {
+    single { SignUp(get()) }
+    single { SignIn(get()) }
+    single { SignOut(get()) }
+}
+
+val dataModule = module {
+    single { ApiServiceFactory(get(), get(), get()) }
+    single { HeadersInterceptor() }
+    single { ConnectivityInterceptor() }
+    single { AuthenticationInterceptor(get()) }
+    single { ResponseInterceptor(get(), get()) }
+
+    factory { Prefs(get()) }
+    factory { UserRepository(get()) }
+}
+
+private val scopesModule = module {
+}
diff --git a/app/src/main/java/com/rootstrap/android/models/Model.kt b/app/src/main/java/com/rootstrap/android/models/Model.kt
deleted file mode 100644
index 1a19f2d..0000000
--- a/app/src/main/java/com/rootstrap/android/models/Model.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.rootstrap.android.models
-
-class Model
diff --git a/app/src/main/java/com/rootstrap/android/network/managers/ManagerModule.kt b/app/src/main/java/com/rootstrap/android/network/managers/ManagerModule.kt
deleted file mode 100644
index 2da2571..0000000
--- a/app/src/main/java/com/rootstrap/android/network/managers/ManagerModule.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.rootstrap.android.network.managers
-
-import com.rootstrap.android.network.managers.session.SessionManager
-import com.rootstrap.android.network.managers.session.SessionManagerImpl
-import com.rootstrap.android.network.managers.user.UserManager
-import com.rootstrap.android.network.managers.user.UserManagerImpl
-import dagger.Binds
-import dagger.Module
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-abstract class ManagerModule {
-
-    @Binds
-    @Singleton
-    abstract fun bindSessionManager(sessionManagerImpl: SessionManagerImpl): SessionManager
-
-    @Binds
-    @Singleton
-    abstract fun bindUserManager(userManagerImplImpl: UserManagerImpl): UserManager
-}
diff --git a/app/src/main/java/com/rootstrap/android/network/managers/user/UserManager.kt b/app/src/main/java/com/rootstrap/android/network/managers/user/UserManager.kt
deleted file mode 100644
index a8e487a..0000000
--- a/app/src/main/java/com/rootstrap/android/network/managers/user/UserManager.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.rootstrap.android.network.managers.user
-
-import com.rootstrap.android.network.models.User
-import com.rootstrap.android.network.models.UserSerializer
-import com.rootstrap.android.util.extensions.Data
-
-interface UserManager {
-    suspend fun signUp(user: User): Result<Data<UserSerializer>>
-    suspend fun signIn(user: User): Result<Data<UserSerializer>>
-    suspend fun signOut(): Result<Data<Void>>
-}
diff --git a/app/src/main/java/com/rootstrap/android/network/managers/user/UserManagerImpl.kt b/app/src/main/java/com/rootstrap/android/network/managers/user/UserManagerImpl.kt
deleted file mode 100644
index 6c048d2..0000000
--- a/app/src/main/java/com/rootstrap/android/network/managers/user/UserManagerImpl.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.rootstrap.android.network.managers.user
-
-import com.rootstrap.android.network.models.User
-import com.rootstrap.android.network.models.UserSerializer
-import com.rootstrap.android.network.services.ApiService
-import com.rootstrap.android.util.extensions.ActionCallback
-import com.rootstrap.android.util.extensions.Data
-import javax.inject.Inject
-
-/**
- * Singleton class
- * */
-class UserManagerImpl @Inject constructor(private val service: ApiService) : UserManager {
-
-    override suspend fun signUp(user: User): Result<Data<UserSerializer>> =
-        ActionCallback.call(service.signUp(UserSerializer(user)))
-
-    override suspend fun signIn(user: User): Result<Data<UserSerializer>> =
-        ActionCallback.call(service.signIn(UserSerializer(user)))
-
-    override suspend fun signOut(): Result<Data<Void>> =
-        ActionCallback.call(service.signOut())
-}
diff --git a/app/src/main/java/com/rootstrap/android/network/models/User.kt b/app/src/main/java/com/rootstrap/android/network/models/User.kt
deleted file mode 100644
index 99185e8..0000000
--- a/app/src/main/java/com/rootstrap/android/network/models/User.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.rootstrap.android.network.models
-
-import com.squareup.moshi.Json
-
-data class User(
-    @Json(name = "id") val id: String = "",
-    @Json(name = "email") var email: String = "",
-    @Json(name = "first_name") var firstName: String = "",
-    @Json(name = "last_name") var lastName: String = "",
-    @Json(name = "phone_number") var phone: String = "",
-    @Json(name = "password") val password: String = "",
-    @Json(name = "username") val username: String = ""
-)
-
-data class UserSerializer(@Json(name = "user") val user: User)
diff --git a/app/src/main/java/com/rootstrap/android/network/providers/ServiceProviderModule.kt b/app/src/main/java/com/rootstrap/android/network/providers/ServiceProviderModule.kt
deleted file mode 100644
index c7bc33c..0000000
--- a/app/src/main/java/com/rootstrap/android/network/providers/ServiceProviderModule.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.rootstrap.android.network.providers
-
-import com.rootstrap.android.BuildConfig
-import com.rootstrap.android.network.services.AuthenticationInterceptor
-import com.rootstrap.android.network.services.HeadersInterceptor
-import com.rootstrap.android.network.services.ResponseInterceptor
-import com.squareup.moshi.Moshi
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
-import dagger.hilt.components.SingletonComponent
-import okhttp3.OkHttpClient
-import okhttp3.logging.HttpLoggingInterceptor
-import retrofit2.Retrofit
-import retrofit2.converter.moshi.MoshiConverterFactory
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-class ServiceProviderModule {
-
-    @Provides
-    @Singleton
-    fun provideOkHttpClient(
-        authenticationInterceptor: AuthenticationInterceptor,
-        responseInterceptor: ResponseInterceptor
-    ): OkHttpClient {
-        val httpInterceptorLevel = if (BuildConfig.DEBUG) HttpLoggingInterceptor.Level.BODY
-            else HttpLoggingInterceptor.Level.BASIC
-
-        return OkHttpClient.Builder()
-                .addInterceptor(HeadersInterceptor())
-                .addInterceptor(authenticationInterceptor)
-                .addInterceptor(responseInterceptor)
-                .addInterceptor(HttpLoggingInterceptor().setLevel(httpInterceptorLevel))
-                .build()
-    }
-
-    @Provides
-    @Singleton
-    fun provideRetrofit(okHttpClient: OkHttpClient): Retrofit {
-        val url = URL_API ?: BuildConfig.API_URL
-        val moshi = Moshi.Builder()
-            .add(KotlinJsonAdapterFactory())
-            .build()
-        return Retrofit.Builder()
-                .baseUrl(url)
-                .addConverterFactory(MoshiConverterFactory.create(moshi).withNullSerialization())
-                .client(okHttpClient)
-                .build()
-    }
-
-    companion object {
-        var URL_API: String? = null
-    }
-}
diff --git a/app/src/main/java/com/rootstrap/android/network/services/ApiModule.kt b/app/src/main/java/com/rootstrap/android/network/services/ApiModule.kt
deleted file mode 100644
index 66b0593..0000000
--- a/app/src/main/java/com/rootstrap/android/network/services/ApiModule.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.rootstrap.android.network.services
-
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import retrofit2.Retrofit
-
-@Module
-@InstallIn(SingletonComponent::class)
-class ApiModule {
-
-    @Provides
-    fun provideApiService(retrofit: Retrofit): ApiService {
-        return retrofit.create(ApiService::class.java)
-    }
-}
diff --git a/app/src/main/java/com/rootstrap/android/network/services/ApiService.kt b/app/src/main/java/com/rootstrap/android/network/services/ApiService.kt
deleted file mode 100644
index 2a832fd..0000000
--- a/app/src/main/java/com/rootstrap/android/network/services/ApiService.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.rootstrap.android.network.services
-
-import com.rootstrap.android.network.models.UserSerializer
-import retrofit2.Call
-import retrofit2.http.Body
-import retrofit2.http.DELETE
-import retrofit2.http.POST
-
-interface ApiService {
-
-    @POST("users/")
-    fun signUp(@Body user: UserSerializer): Call<UserSerializer>
-
-    @POST("users/sign_in")
-    fun signIn(@Body user: UserSerializer): Call<UserSerializer>
-
-    @DELETE("users/sign_out")
-    fun signOut(): Call<Void>
-}
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivity.kt b/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivity.kt
index 3999b3b..656bd2d 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivity.kt
@@ -8,14 +8,12 @@ import com.rootstrap.android.databinding.ActivityProfileBinding
 import com.rootstrap.android.metrics.Analytics
 import com.rootstrap.android.metrics.PageEvents
 import com.rootstrap.android.metrics.VISIT_PROFILE
-import com.rootstrap.android.network.managers.session.SessionManager
+import com.rootstrap.data.managers.session.SessionManager
 import com.rootstrap.android.ui.base.BaseActivity
 import com.rootstrap.android.ui.view.ProfileView
 import com.rootstrap.android.util.NetworkState
-import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class ProfileActivity : BaseActivity(), ProfileView {
 
     @Inject lateinit var sessionManager: SessionManager
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivityViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivityViewModel.kt
index e8a7a04..eae9e03 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivityViewModel.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivityViewModel.kt
@@ -3,18 +3,15 @@ package com.rootstrap.android.ui.activity.main
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
-import com.rootstrap.android.network.managers.session.SessionManager
 import com.rootstrap.android.network.managers.user.UserManager
 import com.rootstrap.android.ui.base.BaseViewModel
 import com.rootstrap.android.util.NetworkState
-import com.rootstrap.android.util.extensions.ApiErrorType
-import com.rootstrap.android.util.extensions.ApiException
-import dagger.hilt.android.lifecycle.HiltViewModel
+import com.rootstrap.data.util.extensions.ApiErrorType
+import com.rootstrap.data.util.extensions.ApiException
+import com.rootstrap.data.managers.session.SessionManager
 import kotlinx.coroutines.launch
-import javax.inject.Inject
 
-@HiltViewModel
-open class ProfileActivityViewModel @Inject constructor(
+open class ProfileActivityViewModel(
     private val sessionManager: SessionManager,
     private val userManager: UserManager
 ) : BaseViewModel() {
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivity.kt b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivity.kt
index 964581c..a2efeff 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivity.kt
@@ -9,15 +9,13 @@ import com.rootstrap.android.databinding.ActivitySignInBinding
 import com.rootstrap.android.metrics.Analytics
 import com.rootstrap.android.metrics.PageEvents
 import com.rootstrap.android.metrics.VISIT_SIGN_IN
-import com.rootstrap.android.network.models.User
+import com.rootstrap.data.dto.response.User
 import com.rootstrap.android.ui.view.AuthView
 import com.rootstrap.android.util.NetworkState
 import com.rootstrap.android.util.extensions.value
 import com.rootstrap.android.util.permissions.PermissionActivity
 import com.rootstrap.android.util.permissions.PermissionResponse
-import dagger.hilt.android.AndroidEntryPoint
 
-@AndroidEntryPoint
 class SignInActivity : PermissionActivity(), AuthView {
 
     private val viewModel: SignInActivityViewModel by viewModels()
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivityViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivityViewModel.kt
index d8b16a6..f72f776 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivityViewModel.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivityViewModel.kt
@@ -3,19 +3,16 @@ package com.rootstrap.android.ui.activity.main
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
-import com.rootstrap.android.network.managers.session.SessionManager
 import com.rootstrap.android.network.managers.user.UserManager
-import com.rootstrap.android.network.models.User
 import com.rootstrap.android.ui.base.BaseViewModel
 import com.rootstrap.android.util.NetworkState
-import com.rootstrap.android.util.extensions.ApiErrorType
-import com.rootstrap.android.util.extensions.ApiException
-import dagger.hilt.android.lifecycle.HiltViewModel
+import com.rootstrap.data.util.extensions.ApiErrorType
+import com.rootstrap.data.util.extensions.ApiException
+import com.rootstrap.data.dto.response.User
+import com.rootstrap.data.managers.session.SessionManager
 import kotlinx.coroutines.launch
-import javax.inject.Inject
 
-@HiltViewModel
-open class SignInActivityViewModel @Inject constructor(
+open class SignInActivityViewModel(
     private val sessionManager: SessionManager,
     private val userManager: UserManager
 ) : BaseViewModel() {
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivity.kt b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivity.kt
index 8f75729..9aa61a0 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivity.kt
@@ -9,14 +9,12 @@ import com.rootstrap.android.databinding.ActivitySignUpBinding
 import com.rootstrap.android.metrics.Analytics
 import com.rootstrap.android.metrics.PageEvents
 import com.rootstrap.android.metrics.VISIT_SIGN_UP
-import com.rootstrap.android.network.models.User
+import com.rootstrap.data.dto.response.User
 import com.rootstrap.android.ui.base.BaseActivity
 import com.rootstrap.android.ui.view.AuthView
 import com.rootstrap.android.util.NetworkState
 import com.rootstrap.android.util.extensions.value
-import dagger.hilt.android.AndroidEntryPoint
 
-@AndroidEntryPoint
 class SignUpActivity : BaseActivity(), AuthView {
 
     private val viewModel: SignUpActivityViewModel by viewModels()
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivityViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivityViewModel.kt
index c571d58..77cab9d 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivityViewModel.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivityViewModel.kt
@@ -3,19 +3,16 @@ package com.rootstrap.android.ui.activity.main
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
-import com.rootstrap.android.network.managers.session.SessionManager
 import com.rootstrap.android.network.managers.user.UserManager
-import com.rootstrap.android.network.models.User
 import com.rootstrap.android.ui.base.BaseViewModel
 import com.rootstrap.android.util.NetworkState
-import com.rootstrap.android.util.extensions.ApiErrorType
-import com.rootstrap.android.util.extensions.ApiException
-import dagger.hilt.android.lifecycle.HiltViewModel
+import com.rootstrap.data.util.extensions.ApiErrorType
+import com.rootstrap.data.util.extensions.ApiException
+import com.rootstrap.data.dto.response.User
+import com.rootstrap.data.managers.session.SessionManager
 import kotlinx.coroutines.launch
-import javax.inject.Inject
 
-@HiltViewModel
-open class SignUpActivityViewModel @Inject constructor(
+open class SignUpActivityViewModel(
     private val sessionManager: SessionManager,
     private val userManager: UserManager
 ) : BaseViewModel() {
diff --git a/app/src/main/java/com/rootstrap/android/util/ErrorUtil.kt b/app/src/main/java/com/rootstrap/android/util/ErrorUtil.kt
index 88e7c6b..a82f8de 100644
--- a/app/src/main/java/com/rootstrap/android/util/ErrorUtil.kt
+++ b/app/src/main/java/com/rootstrap/android/util/ErrorUtil.kt
@@ -1,7 +1,7 @@
 package com.rootstrap.android.util
 
 import com.google.android.material.textfield.TextInputLayout
-import com.rootstrap.android.network.models.ErrorModel
+import com.rootstrap.data.dto.response.ErrorModel
 
 class ErrorUtil {
 
diff --git a/app/src/main/java/com/rootstrap/android/util/UtilModule.kt b/app/src/main/java/com/rootstrap/android/util/UtilModule.kt
deleted file mode 100644
index 39a1245..0000000
--- a/app/src/main/java/com/rootstrap/android/util/UtilModule.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.rootstrap.android.util
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.security.keystore.KeyGenParameterSpec
-import android.security.keystore.KeyProperties
-import androidx.security.crypto.EncryptedSharedPreferences
-import androidx.security.crypto.MasterKey
-import com.rootstrap.android.BuildConfig
-import com.squareup.otto.Bus
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-class UtilModule {
-
-    @Provides
-    @Singleton
-    fun provideSharedPreferences(@ApplicationContext context: Context): SharedPreferences {
-
-        val spec = KeyGenParameterSpec.Builder(
-            BuildConfig.SECURE_KEY_ALIAS,
-            KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT
-            )
-            .setBlockModes(KeyProperties.BLOCK_MODE_GCM)
-            .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
-            .setKeySize(256)
-            .build()
-
-        val masterKey = MasterKey.Builder(context, BuildConfig.SECURE_KEY_ALIAS)
-            .setKeyGenParameterSpec(spec)
-            .build()
-
-        return EncryptedSharedPreferences.create(
-            context,
-            BuildConfig.SECURE_FILE_NAME,
-            masterKey,
-            EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
-            EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
-        )
-    }
-
-    @Provides
-    @Singleton
-    fun provideBus(): Bus = Bus()
-}
diff --git a/app/src/main/java/com/rootstrap/android/util/extensions/Gson.kt b/app/src/main/java/com/rootstrap/android/util/extensions/Gson.kt
deleted file mode 100644
index 56e1292..0000000
--- a/app/src/main/java/com/rootstrap/android/util/extensions/Gson.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.rootstrap.android.util.extensions
-
-import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
-
-inline fun <reified T> Gson.fromJson(json: String) = this.fromJson<T>(json, object : TypeToken<T>() {}.type)
diff --git a/build.gradle b/build.gradle
index 237fe0a..b6882dc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:7.0.3"
+        classpath 'com.android.tools.build:gradle:7.0.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$Versions.kotlin"
         classpath "com.google.gms:google-services:4.3.10"
         classpath "com.google.firebase:firebase-crashlytics-gradle:2.8.1"
diff --git a/data/build.gradle b/data/build.gradle
index c5e3111..adb3772 100644
--- a/data/build.gradle
+++ b/data/build.gradle
@@ -1,9 +1,52 @@
 plugins {
-    id 'java-library'
-    id 'kotlin'
+    id "com.android.library"
+    id "kotlin-android"
+    id "kotlin-parcelize"
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
+android {
+    compileSdkVersion 31
+
+    defaultConfig {
+        minSdkVersion 23
+        targetSdkVersion 31
+
+        testInstrumentationRunner "com.rootstrap.android.CustomTestRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        getByName("debug") {
+            minifyEnabled false
+            buildConfigField("String", "API_URL", "\"https://rails5-api-base.herokuapp.com/api/v1/\"")
+        }
+
+        create("staging") {
+            initWith(getByName("debug"))
+            buildConfigField("String", "API_URL", "\"https://proj-staging.herokuapp.com/api/\"")
+        }
+
+        getByName("release") {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            buildConfigField("String", "API_URL", "\"https://proj-production.herokuapp.com/api/\"")
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+dependencies {
+    implementation project(":domain")
+    implementation androidDataLibs.values()
+    implementation kotlinLibs.values()
+    implementation platform(Libs.firebaseBom)
+    implementation libs.values()
+    testImplementation testLibs.values()
 }
diff --git a/data/consumer-rules.pro b/data/consumer-rules.pro
new file mode 100644
index 0000000..e69de29
diff --git a/data/proguard-rules.pro b/data/proguard-rules.pro
new file mode 100644
index 0000000..f1b4245
--- /dev/null
+++ b/data/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/data/src/main/AndroidManifest.xml b/data/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..cc9be91
--- /dev/null
+++ b/data/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.rootstrap.android.data" >
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+</manifest>
diff --git a/data/src/main/java/com/rootstrap/data/api/ApiException.kt b/data/src/main/java/com/rootstrap/data/api/ApiException.kt
new file mode 100644
index 0000000..d6e07f9
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/api/ApiException.kt
@@ -0,0 +1,19 @@
+package com.rootstrap.data.api
+
+class ApiException(
+    private val errorMessage: String? = null,
+    val errorType: ApiErrorType = ApiErrorType.API_ERROR,
+) : Exception() {
+    override val message: String?
+        get() = errorMessage
+
+    override fun toString(): String {
+        return errorType.name + " - " + message
+    }
+}
+
+enum class ApiErrorType {
+    API_ERROR,
+    SOCKET_TIME_OUT,
+    GENERIC_IO_ERROR,
+}
diff --git a/data/src/main/java/com/rootstrap/data/api/ApiProvider.kt b/data/src/main/java/com/rootstrap/data/api/ApiProvider.kt
new file mode 100644
index 0000000..3a054ab
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/api/ApiProvider.kt
@@ -0,0 +1,10 @@
+package com.rootstrap.data.api
+
+import com.rootstrap.data.api.endpoints.UserApi
+import retrofit2.Retrofit
+
+class ApiProvider {
+    fun getUserApiService(retrofit: Retrofit): UserApi {
+        return retrofit.create(UserApi::class.java)
+    }
+}
diff --git a/data/src/main/java/com/rootstrap/data/api/ApiServiceFactory.kt b/data/src/main/java/com/rootstrap/data/api/ApiServiceFactory.kt
new file mode 100644
index 0000000..e47b478
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/api/ApiServiceFactory.kt
@@ -0,0 +1,41 @@
+package com.rootstrap.data.api
+
+import com.rootstrap.android.data.BuildConfig
+import com.rootstrap.data.api.interceptors.AuthenticationInterceptor
+import com.rootstrap.data.api.interceptors.HeadersInterceptor
+import com.rootstrap.data.api.interceptors.ResponseInterceptor
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+
+class ApiServiceFactory(
+    private val authenticationInterceptor: AuthenticationInterceptor,
+    private val headersInterceptor: HeadersInterceptor,
+    private val responseInterceptor: ResponseInterceptor
+) {
+
+    fun getOkHttpClient(): OkHttpClient {
+        val httpInterceptorLevel = if (BuildConfig.DEBUG) HttpLoggingInterceptor.Level.BODY
+            else HttpLoggingInterceptor.Level.NONE
+
+        return OkHttpClient.Builder()
+                .addInterceptor(authenticationInterceptor)
+                .addInterceptor(headersInterceptor)
+                .addInterceptor(responseInterceptor)
+                .addInterceptor(HttpLoggingInterceptor().setLevel(httpInterceptorLevel))
+                .build()
+    }
+
+    fun getRetrofit(okHttpClient: OkHttpClient): Retrofit {
+        return Retrofit.Builder()
+                .baseUrl(BuildConfig.API_URL)
+                .addConverterFactory(GsonConverterFactory.create())
+                .client(okHttpClient)
+                .build()
+    }
+
+    companion object {
+        var URL_API: String? = null
+    }
+}
diff --git a/data/src/main/java/com/rootstrap/data/api/endpoints/UserApi.kt b/data/src/main/java/com/rootstrap/data/api/endpoints/UserApi.kt
new file mode 100644
index 0000000..2b76eaf
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/api/endpoints/UserApi.kt
@@ -0,0 +1,21 @@
+package com.rootstrap.data.api.endpoints
+
+import com.rootstrap.data.dto.request.UserSignInRequestSerializer
+import com.rootstrap.data.dto.request.UserSignUpRequestSerializer
+import com.rootstrap.data.dto.response.UserResponseSerializer
+import retrofit2.Call
+import retrofit2.http.Body
+import retrofit2.http.DELETE
+import retrofit2.http.POST
+
+interface UserApi {
+
+    @POST("users/")
+    fun signUp(@Body user: UserSignUpRequestSerializer): Call<UserResponseSerializer>
+
+    @POST("users/sign_in")
+    fun signIn(@Body user: UserSignInRequestSerializer): Call<UserResponseSerializer>
+
+    @DELETE("users/sign_out")
+    fun signOut(): Call<Void>
+}
diff --git a/app/src/main/java/com/rootstrap/android/network/services/AuthenticationInterceptor.kt b/data/src/main/java/com/rootstrap/data/api/interceptors/AuthenticationInterceptor.kt
similarity index 57%
rename from app/src/main/java/com/rootstrap/android/network/services/AuthenticationInterceptor.kt
rename to data/src/main/java/com/rootstrap/data/api/interceptors/AuthenticationInterceptor.kt
index af7666b..1b568fe 100644
--- a/app/src/main/java/com/rootstrap/android/network/services/AuthenticationInterceptor.kt
+++ b/data/src/main/java/com/rootstrap/data/api/interceptors/AuthenticationInterceptor.kt
@@ -1,12 +1,11 @@
-package com.rootstrap.android.network.services
+package com.rootstrap.data.api.interceptors
 
-import com.rootstrap.android.util.Prefs
+import com.rootstrap.data.util.Prefs
 import okhttp3.Interceptor
 import okhttp3.Response
 import java.io.IOException
-import javax.inject.Inject
 
-class AuthenticationInterceptor @Inject constructor(private val prefs: Prefs) : Interceptor {
+class AuthenticationInterceptor(private val prefs: Prefs) : Interceptor {
 
     @Throws(IOException::class)
     override fun intercept(chain: Interceptor.Chain): Response {
@@ -14,9 +13,9 @@ class AuthenticationInterceptor @Inject constructor(private val prefs: Prefs) :
 
         if (hasHeaders()) {
             builder
-                .addHeader(prefs.ACCESS_TOKEN, prefs.accessToken)
-                .addHeader(prefs.CLIENT, prefs.client)
-                .addHeader(prefs.UID, prefs.uid)
+                .addHeader(Prefs.ACCESS_TOKEN, prefs.accessToken)
+                .addHeader(Prefs.CLIENT, prefs.client)
+                .addHeader(Prefs.UID, prefs.uid)
         }
 
         return chain.proceed(builder.build())
diff --git a/data/src/main/java/com/rootstrap/data/api/interceptors/ConnectivityInterceptor.kt b/data/src/main/java/com/rootstrap/data/api/interceptors/ConnectivityInterceptor.kt
new file mode 100644
index 0000000..40af3cd
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/api/interceptors/ConnectivityInterceptor.kt
@@ -0,0 +1,15 @@
+package com.rootstrap.data.api.interceptors
+
+import okhttp3.Interceptor
+import okhttp3.Response
+import java.io.IOException
+
+class ConnectivityInterceptor: Interceptor {
+    override fun intercept(chain: Interceptor.Chain): Response {
+        if (!WifiService.instance.isOnline()) {
+            throw IOException("No internet connection")
+        } else {
+            return chain.proceed(chain.request())
+        }
+    }
+}
diff --git a/app/src/main/java/com/rootstrap/android/network/services/HeadersInterceptor.kt b/data/src/main/java/com/rootstrap/data/api/interceptors/HeadersInterceptor.kt
similarity index 91%
rename from app/src/main/java/com/rootstrap/android/network/services/HeadersInterceptor.kt
rename to data/src/main/java/com/rootstrap/data/api/interceptors/HeadersInterceptor.kt
index 0a39482..90c0e52 100644
--- a/app/src/main/java/com/rootstrap/android/network/services/HeadersInterceptor.kt
+++ b/data/src/main/java/com/rootstrap/data/api/interceptors/HeadersInterceptor.kt
@@ -1,4 +1,4 @@
-package com.rootstrap.android.network.services
+package com.rootstrap.data.api.interceptors
 
 import okhttp3.Interceptor
 import okhttp3.Response
diff --git a/app/src/main/java/com/rootstrap/android/network/services/ResponseInterceptor.kt b/data/src/main/java/com/rootstrap/data/api/interceptors/ResponseInterceptor.kt
similarity index 54%
rename from app/src/main/java/com/rootstrap/android/network/services/ResponseInterceptor.kt
rename to data/src/main/java/com/rootstrap/data/api/interceptors/ResponseInterceptor.kt
index 9d7e252..5f6a91b 100644
--- a/app/src/main/java/com/rootstrap/android/network/services/ResponseInterceptor.kt
+++ b/data/src/main/java/com/rootstrap/data/api/interceptors/ResponseInterceptor.kt
@@ -1,13 +1,12 @@
-package com.rootstrap.android.network.services
+package com.rootstrap.data.api.interceptors
 
-import com.rootstrap.android.network.managers.session.SessionManager
-import com.rootstrap.android.util.Prefs
+import com.rootstrap.data.managers.session.SessionManager
+import com.rootstrap.data.util.Prefs
 import okhttp3.Interceptor
 import okhttp3.Response
 import java.io.IOException
-import javax.inject.Inject
 
-class ResponseInterceptor @Inject constructor(
+class ResponseInterceptor(
     private val prefs: Prefs,
     private val sessionManager: SessionManager
 ) : Interceptor {
@@ -20,16 +19,16 @@ class ResponseInterceptor @Inject constructor(
     }
 
     private fun prefer(response: Response) {
-        val accessToken = response.header(prefs.ACCESS_TOKEN)
-        val client = response.header(prefs.CLIENT)
-        val uid = response.header(prefs.UID)
+        val accessToken = response.header(Prefs.ACCESS_TOKEN)
+        val client = response.header(Prefs.CLIENT)
+        val uid = response.header(Prefs.UID)
         if (preferValid(accessToken, client, uid))
             sessionManager.addAuthenticationHeaders(accessToken!!, client!!, uid!!)
     }
 
     private fun preferValid(accessToken: String?, client: String?, uid: String?): Boolean {
-        return accessToken != null && !accessToken.isEmpty() &&
-                client != null && !client.isEmpty() &&
-                uid != null && !uid.isEmpty()
+        return accessToken != null && accessToken.isNotEmpty() &&
+                client != null && client.isNotEmpty() &&
+                uid != null && uid.isNotEmpty()
     }
 }
diff --git a/data/src/main/java/com/rootstrap/data/api/interceptors/WifiService.kt b/data/src/main/java/com/rootstrap/data/api/interceptors/WifiService.kt
new file mode 100644
index 0000000..4576f3c
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/api/interceptors/WifiService.kt
@@ -0,0 +1,33 @@
+package com.rootstrap.data.api.interceptors
+
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
+import android.net.wifi.WifiManager
+
+class WifiService {
+    private lateinit var wifiManager: WifiManager
+    private lateinit var connectivityManager: ConnectivityManager
+
+    companion object {
+        val instance = WifiService()
+    }
+
+    fun initializeWithApplicationContext (context: Context) {
+        wifiManager = context.getSystemService(Context.WIFI_SERVICE) as WifiManager
+        connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+    }
+
+    // Helper that detects if online
+    fun isOnline(): Boolean {
+        val capabilities = connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork)
+        if (capabilities != null) {
+            when {
+                capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> return true
+                capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> return true
+                capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> return true
+            }
+        }
+        return false
+    }
+}
diff --git a/data/src/main/java/com/rootstrap/data/dto/request/UserSignInRequestSerializer.kt b/data/src/main/java/com/rootstrap/data/dto/request/UserSignInRequestSerializer.kt
new file mode 100644
index 0000000..3134784
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/dto/request/UserSignInRequestSerializer.kt
@@ -0,0 +1,8 @@
+package com.rootstrap.data.dto.request
+
+data class UserSignInRequest(
+    var email: String = "",
+    val password: String = ""
+)
+
+data class UserSignInRequestSerializer(val userSignInRequest: UserSignInRequest)
diff --git a/data/src/main/java/com/rootstrap/data/dto/request/UserSignUpRequestSerializer.kt b/data/src/main/java/com/rootstrap/data/dto/request/UserSignUpRequestSerializer.kt
new file mode 100644
index 0000000..2ea06c0
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/dto/request/UserSignUpRequestSerializer.kt
@@ -0,0 +1,13 @@
+package com.rootstrap.data.dto.request
+
+import com.google.gson.annotations.SerializedName
+
+data class UserSignUpRequest(
+    var email: String = "",
+    @SerializedName("first_name") var firstName: String = "",
+    @SerializedName("last_name") var lastName: String = "",
+    val username: String = "",
+    val password: String = ""
+)
+
+data class UserSignUpRequestSerializer(val UserSignUpRequest: UserSignUpRequest)
diff --git a/data/src/main/java/com/rootstrap/data/dto/response/DataResult.kt b/data/src/main/java/com/rootstrap/data/dto/response/DataResult.kt
new file mode 100644
index 0000000..cda0cce
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/dto/response/DataResult.kt
@@ -0,0 +1,10 @@
+package com.rootstrap.data.dto.response
+
+import com.rootstrap.data.api.ApiException
+
+sealed class DataResult<out R> {
+
+    data class Success<out T>(val data: T?) : DataResult<T>()
+
+    data class Error(val exception: ApiException) : DataResult<Nothing>()
+}
diff --git a/app/src/main/java/com/rootstrap/android/network/models/ErrorModel.kt b/data/src/main/java/com/rootstrap/data/dto/response/ErrorModel.kt
similarity index 81%
rename from app/src/main/java/com/rootstrap/android/network/models/ErrorModel.kt
rename to data/src/main/java/com/rootstrap/data/dto/response/ErrorModel.kt
index bc3172a..7e6136f 100644
--- a/app/src/main/java/com/rootstrap/android/network/models/ErrorModel.kt
+++ b/data/src/main/java/com/rootstrap/data/dto/response/ErrorModel.kt
@@ -1,4 +1,4 @@
-package com.rootstrap.android.network.models
+package com.rootstrap.data.dto.response
 
 import com.squareup.moshi.Json
 
diff --git a/data/src/main/java/com/rootstrap/data/dto/response/UserResponseSerializer.kt b/data/src/main/java/com/rootstrap/data/dto/response/UserResponseSerializer.kt
new file mode 100644
index 0000000..05b780f
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/dto/response/UserResponseSerializer.kt
@@ -0,0 +1,17 @@
+package com.rootstrap.data.dto.response
+
+import com.google.gson.annotations.SerializedName
+
+// TODO Discuss class name on Android Roundtable (UserDTO - DTO = Data Transfer Object as suffix)
+data class User(
+    val id: String = "",
+    var email: String = "",
+    @SerializedName("first_name") var firstName: String = "",
+    @SerializedName("last_name") var lastName: String = "",
+    @SerializedName("phone_number") var phoneNumber: String = "",
+    val password: String = "",
+    val username: String = "",
+    val uid: String?
+)
+
+data class UserResponseSerializer(val user: User)
diff --git a/app/src/main/java/com/rootstrap/android/network/managers/session/SessionManager.kt b/data/src/main/java/com/rootstrap/data/managers/session/SessionManager.kt
similarity index 67%
rename from app/src/main/java/com/rootstrap/android/network/managers/session/SessionManager.kt
rename to data/src/main/java/com/rootstrap/data/managers/session/SessionManager.kt
index be8ed7a..7fbf84a 100644
--- a/app/src/main/java/com/rootstrap/android/network/managers/session/SessionManager.kt
+++ b/data/src/main/java/com/rootstrap/data/managers/session/SessionManager.kt
@@ -1,6 +1,6 @@
-package com.rootstrap.android.network.managers.session
+package com.rootstrap.data.managers.session
 
-import com.rootstrap.android.network.models.User
+import com.rootstrap.data.dto.response.User
 
 interface SessionManager {
     var user: User?
diff --git a/app/src/main/java/com/rootstrap/android/network/managers/session/SessionManagerImpl.kt b/data/src/main/java/com/rootstrap/data/managers/session/SessionManagerImpl.kt
similarity index 83%
rename from app/src/main/java/com/rootstrap/android/network/managers/session/SessionManagerImpl.kt
rename to data/src/main/java/com/rootstrap/data/managers/session/SessionManagerImpl.kt
index adb674c..9df49a2 100644
--- a/app/src/main/java/com/rootstrap/android/network/managers/session/SessionManagerImpl.kt
+++ b/data/src/main/java/com/rootstrap/data/managers/session/SessionManagerImpl.kt
@@ -1,7 +1,7 @@
-package com.rootstrap.android.network.managers.session
+package com.rootstrap.data.managers.session
 
-import com.rootstrap.android.network.models.User
-import com.rootstrap.android.util.Prefs
+import com.rootstrap.data.dto.response.User
+import com.rootstrap.data.util.Prefs
 import javax.inject.Inject
 
 class SessionManagerImpl @Inject constructor(private val prefs: Prefs) : SessionManager {
diff --git a/data/src/main/java/com/rootstrap/data/repository/UserRepository.kt b/data/src/main/java/com/rootstrap/data/repository/UserRepository.kt
new file mode 100644
index 0000000..a9f635c
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/repository/UserRepository.kt
@@ -0,0 +1,23 @@
+package com.rootstrap.data.repository
+
+import com.rootstrap.data.dto.request.UserSignInRequestSerializer
+import com.rootstrap.data.dto.request.UserSignUpRequestSerializer
+import com.rootstrap.data.source.RemoteDataSource
+import com.rootstrap.data.util.extensions.ActionCallback
+
+class UserRepository(
+    private val remoteDataSource: RemoteDataSource
+) {
+
+    suspend fun signUp(userSignUpRequestSerializer: UserSignUpRequestSerializer) = ActionCallback.call(
+        remoteDataSource.signUp(userSignUpRequestSerializer)
+    )
+
+    suspend fun signIn(userSignInRequestSerializer: UserSignInRequestSerializer) = ActionCallback.call(
+        remoteDataSource.signIn(userSignInRequestSerializer)
+    )
+
+    suspend fun signOut() = ActionCallback.call(
+        remoteDataSource.signOut()
+    )
+}
diff --git a/data/src/main/java/com/rootstrap/data/source/RemoteDataSource.kt b/data/src/main/java/com/rootstrap/data/source/RemoteDataSource.kt
new file mode 100644
index 0000000..d1f2470
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/source/RemoteDataSource.kt
@@ -0,0 +1,15 @@
+package com.rootstrap.data.source
+
+import com.rootstrap.data.dto.request.UserSignInRequestSerializer
+import com.rootstrap.data.dto.request.UserSignUpRequestSerializer
+import com.rootstrap.data.dto.response.UserResponseSerializer
+import retrofit2.Call
+
+interface RemoteDataSource {
+
+    suspend fun signUp(user: UserSignUpRequestSerializer): Call<UserResponseSerializer>
+
+    suspend fun signIn(user: UserSignInRequestSerializer): Call<UserResponseSerializer>
+
+    suspend fun signOut(): Call<Void>
+}
diff --git a/app/src/main/java/com/rootstrap/android/util/Prefs.kt b/data/src/main/java/com/rootstrap/data/util/Prefs.kt
similarity index 63%
rename from app/src/main/java/com/rootstrap/android/util/Prefs.kt
rename to data/src/main/java/com/rootstrap/data/util/Prefs.kt
index 7230177..02ea6b4 100644
--- a/app/src/main/java/com/rootstrap/android/util/Prefs.kt
+++ b/data/src/main/java/com/rootstrap/data/util/Prefs.kt
@@ -1,18 +1,11 @@
-package com.rootstrap.android.util
+package com.rootstrap.data.util
 
 import android.content.SharedPreferences
 import com.google.gson.Gson
-import com.rootstrap.android.network.models.User
-import com.rootstrap.android.util.extensions.fromJson
-import javax.inject.Inject
+import com.rootstrap.data.util.extensions.fromJson
+import com.rootstrap.data.dto.response.User
 
-class Prefs @Inject constructor(private val prefs: SharedPreferences) {
-
-    val ACCESS_TOKEN = "access-token"
-    val CLIENT = "Client"
-    val UID = "uid"
-    val USER = "user"
-    val SIGNED_IN = "signed_in"
+class Prefs(private val prefs: SharedPreferences) {
 
     private val gson: Gson = Gson()
 
@@ -26,7 +19,7 @@ class Prefs @Inject constructor(private val prefs: SharedPreferences) {
 
     var uid: String
         get() = prefs.getString(UID, "")!!
-        set(value) = prefs.edit().putString(UID, value).apply()
+        set(value) = prefs.edit().putString(Companion.UID, value).apply()
 
     var user: User?
         get() = gson.fromJson<User>(prefs.getString(USER, "")!!)
@@ -37,4 +30,12 @@ class Prefs @Inject constructor(private val prefs: SharedPreferences) {
         set(value) = prefs.edit().putBoolean(SIGNED_IN, value).apply()
 
     fun clear() = prefs.edit().clear().apply()
+
+    companion object {
+        const val ACCESS_TOKEN = "access-token"
+        const val CLIENT = "Client"
+        const val UID = "uid"
+        const val USER = "user"
+        const val SIGNED_IN = "signed_in"
+    }
 }
diff --git a/app/src/main/java/com/rootstrap/android/util/extensions/ActionCallback.kt b/data/src/main/java/com/rootstrap/data/util/extensions/ActionCallback.kt
similarity index 57%
rename from app/src/main/java/com/rootstrap/android/util/extensions/ActionCallback.kt
rename to data/src/main/java/com/rootstrap/data/util/extensions/ActionCallback.kt
index ef22a27..1041f85 100644
--- a/app/src/main/java/com/rootstrap/android/util/extensions/ActionCallback.kt
+++ b/data/src/main/java/com/rootstrap/data/util/extensions/ActionCallback.kt
@@ -1,7 +1,10 @@
-package com.rootstrap.android.util.extensions
+package com.rootstrap.data.util.extensions
 
 import com.google.gson.Gson
-import com.rootstrap.android.network.models.ErrorModel
+import com.rootstrap.data.api.ApiErrorType
+import com.rootstrap.data.api.ApiException
+import com.rootstrap.data.dto.response.DataResult
+import com.rootstrap.data.dto.response.ErrorModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import retrofit2.Call
@@ -11,22 +14,22 @@ class ActionCallback {
 
     companion object {
 
-        suspend fun <T> call(apiCall: Call<T>): Result<Data<T>> =
+        suspend fun <T> call(apiCall: Call<T>): DataResult<Data<T>> =
             withContext(Dispatchers.IO) {
                 val response = apiCall.execute()
                 handleResponse(response)
             }
 
-        private fun <T> handleResponse(response: Response<T>): Result<Data<T>> {
+        private fun <T> handleResponse(response: Response<T>): DataResult<Data<T>> {
             if (response.isSuccessful) {
-                return Result.success(
+                return DataResult.Success(
                     Data(response.body())
                 )
             } else {
                 try {
                     response.errorBody()?.let {
                         val apiError = Gson().fromJson(it.charStream(), ErrorModel::class.java)
-                        return Result.failure(
+                        return DataResult.Error(
                             ApiException(
                                 errorMessage = apiError.error
                             )
@@ -36,22 +39,9 @@ class ActionCallback {
                 }
             }
 
-            return Result.failure(ApiException(errorType = ApiErrorType.unknownError))
+            return DataResult.Error(ApiException(errorType = ApiErrorType.GENERIC_IO_ERROR))
         }
     }
 }
 
 class Data<T>(val value: T?)
-
-class ApiException(
-    private val errorMessage: String? = null,
-    val errorType: ApiErrorType = ApiErrorType.apiError
-) : java.lang.Exception() {
-    override val message: String?
-        get() = errorMessage
-}
-
-enum class ApiErrorType {
-    apiError,
-    unknownError
-}
diff --git a/data/src/main/java/com/rootstrap/data/util/extensions/Gson.kt b/data/src/main/java/com/rootstrap/data/util/extensions/Gson.kt
new file mode 100644
index 0000000..8de60ca
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/util/extensions/Gson.kt
@@ -0,0 +1,7 @@
+package com.rootstrap.data.util.extensions
+
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+
+inline fun <reified T> Gson.fromJson(json: String): T =
+    this.fromJson(json, object : TypeToken<T>() {}.type)
diff --git a/domain/src/main/java/com/rootstrap/domain/User.kt b/domain/src/main/java/com/rootstrap/domain/User.kt
new file mode 100644
index 0000000..a58c773
--- /dev/null
+++ b/domain/src/main/java/com/rootstrap/domain/User.kt
@@ -0,0 +1,11 @@
+package com.rootstrap.domain
+
+data class User(
+    val id: String = "",
+    val email: String = "",
+    val firstName: String = "",
+    val lastName: String = "",
+    val phoneNumber: String = "",
+    val password: String = "",
+    val username: String = ""
+)
diff --git a/usecases/build.gradle b/usecases/build.gradle
index c5e3111..63d1a9f 100644
--- a/usecases/build.gradle
+++ b/usecases/build.gradle
@@ -1,9 +1,46 @@
 plugins {
-    id 'java-library'
-    id 'kotlin'
+    id 'com.android.library'
+    id 'kotlin-android'
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
+android {
+    compileSdkVersion 31
+
+    defaultConfig {
+        minSdkVersion 23
+        targetSdkVersion 31
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        getByName("debug") {
+            minifyEnabled false
+        }
+
+        create("staging") {
+            initWith(getByName("debug"))
+        }
+
+        getByName("release") {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+    implementation project(":data")
+    implementation project(":domain")
+
+    implementation kotlinLibs.values()
+    testImplementation testLibs.values()
 }
diff --git a/usecases/src/main/java/com/rootstrap/usecases/SignIn.kt b/usecases/src/main/java/com/rootstrap/usecases/SignIn.kt
new file mode 100644
index 0000000..046f05e
--- /dev/null
+++ b/usecases/src/main/java/com/rootstrap/usecases/SignIn.kt
@@ -0,0 +1,12 @@
+package com.rootstrap.usecases
+
+import com.rootstrap.data.dto.request.UserSignInRequestSerializer
+import com.rootstrap.data.dto.response.DataResult
+import com.rootstrap.data.dto.response.UserResponseSerializer
+import com.rootstrap.data.repository.UserRepository
+
+class SignIn(private val userRepository: UserRepository) {
+
+    suspend fun invoke(userSignInRequestSerializer: UserSignInRequestSerializer): DataResult<UserResponseSerializer> =
+        userRepository.signIn(userSignInRequestSerializer)
+}
diff --git a/usecases/src/main/java/com/rootstrap/usecases/SignOut.kt b/usecases/src/main/java/com/rootstrap/usecases/SignOut.kt
new file mode 100644
index 0000000..682d87d
--- /dev/null
+++ b/usecases/src/main/java/com/rootstrap/usecases/SignOut.kt
@@ -0,0 +1,10 @@
+package com.rootstrap.usecases
+
+import com.rootstrap.data.dto.response.DataResult
+import com.rootstrap.data.repository.UserRepository
+
+class SignOut(private val userRepository: UserRepository) {
+
+    suspend fun invoke(): DataResult<Void> =
+        userRepository.signOut()
+}
diff --git a/usecases/src/main/java/com/rootstrap/usecases/SignUp.kt b/usecases/src/main/java/com/rootstrap/usecases/SignUp.kt
new file mode 100644
index 0000000..7cf43e6
--- /dev/null
+++ b/usecases/src/main/java/com/rootstrap/usecases/SignUp.kt
@@ -0,0 +1,12 @@
+package com.rootstrap.usecases
+
+import com.rootstrap.data.dto.request.UserSignUpRequestSerializer
+import com.rootstrap.data.dto.response.DataResult
+import com.rootstrap.data.dto.response.UserResponseSerializer
+import com.rootstrap.data.repository.UserRepository
+
+class SignUp(private val userRepository: UserRepository) {
+
+    suspend fun invoke(userSignUpRequestSerializer: UserSignUpRequestSerializer): DataResult<UserResponseSerializer> =
+        userRepository.signUp(userSignUpRequestSerializer)
+}

From 6ec91eb590c60f37b0245f588962a627f4bce43c Mon Sep 17 00:00:00 2001
From: aguskoll <aguskoll@gmail.com>
Date: Mon, 10 Jan 2022 16:23:58 -0300
Subject: [PATCH 04/16] view models refactor

---
 app/build.gradle                              |   1 -
 .../main/java/com/rootstrap/android/di/DI.kt  |   9 ++
 .../android/metrics/MixPanelAnalytics.kt      |   1 -
 .../activity/main/ProfileActivityViewModel.kt |  32 +++---
 .../ui/activity/main/SignInActivity.kt        |  10 +-
 .../activity/main/SignInActivityViewModel.kt  |  40 ++++---
 .../ui/activity/main/SignUpActivity.kt        |   9 +-
 .../activity/main/SignUpActivityViewModel.kt  |  48 ++++-----
 .../com/rootstrap/android/util/ErrorUtil.kt   |  36 -------
 build.gradle                                  | 101 +++++++++---------
 buildSrc/src/main/java/Dependencies.kt        |   7 +-
 data/src/main/AndroidManifest.xml             |   2 +-
 .../rootstrap/data/api/ApiServiceFactory.kt   |   2 +-
 .../data/util/extensions/ActionCallback.kt    |   7 +-
 usecases/src/main/AndroidManifest.xml         |   4 +
 15 files changed, 142 insertions(+), 167 deletions(-)
 delete mode 100644 app/src/main/java/com/rootstrap/android/util/ErrorUtil.kt
 create mode 100644 usecases/src/main/AndroidManifest.xml

diff --git a/app/build.gradle b/app/build.gradle
index a9f297f..88b125b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -137,7 +137,6 @@ dependencies {
     implementation libs.values()
     kapt androidKaptLibs.values()
     ktlint ktlintLibs.values()
-
     testImplementation testLibs.values()
     androidTestImplementation androidTestLibs.values()
 }
diff --git a/app/src/main/java/com/rootstrap/android/di/DI.kt b/app/src/main/java/com/rootstrap/android/di/DI.kt
index 588d68a..8c756d6 100644
--- a/app/src/main/java/com/rootstrap/android/di/DI.kt
+++ b/app/src/main/java/com/rootstrap/android/di/DI.kt
@@ -2,6 +2,7 @@ package com.rootstrap.android.di
 
 import android.app.Application
 import com.rootstrap.android.BuildConfig
+import com.rootstrap.android.ui.activity.main.*
 import com.rootstrap.data.api.ApiServiceFactory
 import com.rootstrap.data.api.interceptors.AuthenticationInterceptor
 import com.rootstrap.data.api.interceptors.ConnectivityInterceptor
@@ -15,6 +16,7 @@ import com.rootstrap.usecases.SignUp
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.androidx.fragment.koin.fragmentFactory
+import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.core.KoinExperimentalAPI
 import org.koin.core.context.startKoin
 import org.koin.core.logger.Level
@@ -34,6 +36,10 @@ val appModule = module {
     single { SignUp(get()) }
     single { SignIn(get()) }
     single { SignOut(get()) }
+    
+    viewModel { SignUpActivityViewModel(get(), get()) }
+    viewModel { SignInActivityViewModel(get(), get()) }
+    viewModel { ProfileActivityViewModel(get(), get()) }
 }
 
 val dataModule = module {
@@ -48,4 +54,7 @@ val dataModule = module {
 }
 
 private val scopesModule = module {
+    scope<SignUpActivity> {}
+    scope<SignInActivity> {}
+    scope<ProfileActivity> { }
 }
diff --git a/app/src/main/java/com/rootstrap/android/metrics/MixPanelAnalytics.kt b/app/src/main/java/com/rootstrap/android/metrics/MixPanelAnalytics.kt
index ff59c10..283f096 100644
--- a/app/src/main/java/com/rootstrap/android/metrics/MixPanelAnalytics.kt
+++ b/app/src/main/java/com/rootstrap/android/metrics/MixPanelAnalytics.kt
@@ -1,7 +1,6 @@
 package com.rootstrap.android.metrics
 
 import android.content.Context
-
 import com.mixpanel.android.mpmetrics.MixpanelAPI
 import com.rootstrap.android.R
 import com.rootstrap.android.metrics.base.Provider
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivityViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivityViewModel.kt
index eae9e03..bef0ec5 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivityViewModel.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivityViewModel.kt
@@ -3,17 +3,17 @@ package com.rootstrap.android.ui.activity.main
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
-import com.rootstrap.android.network.managers.user.UserManager
 import com.rootstrap.android.ui.base.BaseViewModel
 import com.rootstrap.android.util.NetworkState
-import com.rootstrap.data.util.extensions.ApiErrorType
-import com.rootstrap.data.util.extensions.ApiException
+import com.rootstrap.data.api.ApiException
+import com.rootstrap.data.dto.response.DataResult
 import com.rootstrap.data.managers.session.SessionManager
+import com.rootstrap.usecases.SignOut
 import kotlinx.coroutines.launch
 
 open class ProfileActivityViewModel(
+    private val signOut: SignOut,
     private val sessionManager: SessionManager,
-    private val userManager: UserManager
 ) : BaseViewModel() {
 
     private val _state = MutableLiveData<ProfileState>()
@@ -23,23 +23,21 @@ open class ProfileActivityViewModel(
     fun signOut() {
         _networkState.value = NetworkState.loading
         viewModelScope.launch {
-            val result = userManager.signOut()
-            if (result.isSuccess) {
-                _networkState.value = NetworkState.idle
-                _state.value = ProfileState.signOutSuccess
-                sessionManager.signOut()
-            } else {
-                handleError(result.exceptionOrNull())
+            when (val result = signOut.invoke()) {
+                is DataResult.Success -> {
+                    _networkState.value = NetworkState.idle
+                    _state.value = ProfileState.signOutSuccess
+                    sessionManager.signOut()
+                }
+                is DataResult.Error -> {
+                    handleError(result.exception)
+                }
             }
         }
     }
 
-    private fun handleError(exception: Throwable?) {
-        error = if (exception is ApiException && exception.errorType == ApiErrorType.apiError) {
-            exception.message
-        } else null
-
-        _networkState.value = NetworkState.idle
+    private fun handleError(exception: ApiException?) {
+        error = exception?.message
         _networkState.value = NetworkState.error
         _state.value = ProfileState.signOutFailure
     }
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivity.kt b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivity.kt
index a2efeff..e3accb7 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivity.kt
@@ -9,23 +9,23 @@ import com.rootstrap.android.databinding.ActivitySignInBinding
 import com.rootstrap.android.metrics.Analytics
 import com.rootstrap.android.metrics.PageEvents
 import com.rootstrap.android.metrics.VISIT_SIGN_IN
-import com.rootstrap.data.dto.response.User
 import com.rootstrap.android.ui.view.AuthView
 import com.rootstrap.android.util.NetworkState
 import com.rootstrap.android.util.extensions.value
 import com.rootstrap.android.util.permissions.PermissionActivity
 import com.rootstrap.android.util.permissions.PermissionResponse
+import com.rootstrap.data.dto.request.UserSignInRequest
 
 class SignInActivity : PermissionActivity(), AuthView {
 
     private val viewModel: SignInActivityViewModel by viewModels()
-    private val binding: ActivitySignInBinding by lazy {
+    private lateinit var binding: ActivitySignInBinding /* by lazy {
         ActivitySignInBinding.inflate(layoutInflater)
-    }
+    } */
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
+        binding = ActivitySignInBinding.inflate(layoutInflater)
         setContentView(binding.root)
         Analytics.track(PageEvents.visit(VISIT_SIGN_IN))
 
@@ -43,7 +43,7 @@ class SignInActivity : PermissionActivity(), AuthView {
 
     private fun signIn() {
         with(binding) {
-            val user = User(
+            val user = UserSignInRequest(
                 email = emailEditText.value(),
                 password = passwordEditText.value()
             )
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivityViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivityViewModel.kt
index f72f776..b346069 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivityViewModel.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivityViewModel.kt
@@ -3,47 +3,45 @@ package com.rootstrap.android.ui.activity.main
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
-import com.rootstrap.android.network.managers.user.UserManager
 import com.rootstrap.android.ui.base.BaseViewModel
 import com.rootstrap.android.util.NetworkState
-import com.rootstrap.data.util.extensions.ApiErrorType
-import com.rootstrap.data.util.extensions.ApiException
-import com.rootstrap.data.dto.response.User
+import com.rootstrap.data.api.ApiException
+import com.rootstrap.data.dto.request.UserSignInRequest
+import com.rootstrap.data.dto.request.UserSignInRequestSerializer
+import com.rootstrap.data.dto.response.DataResult
 import com.rootstrap.data.managers.session.SessionManager
+import com.rootstrap.usecases.SignIn
 import kotlinx.coroutines.launch
 
 open class SignInActivityViewModel(
+    private val signIn: SignIn,
     private val sessionManager: SessionManager,
-    private val userManager: UserManager
 ) : BaseViewModel() {
 
     private val _state = MutableLiveData<SignInState>()
     val state: LiveData<SignInState>
         get() = _state
 
-    fun signIn(user: User) {
+    fun signIn(user: UserSignInRequest) {
         _networkState.value = NetworkState.loading
         viewModelScope.launch {
-            val result = userManager.signIn(user = user)
-            if (result.isSuccess) {
-                result.getOrNull()?.value?.user?.let { user ->
-                    sessionManager.signIn(user)
+            when (val result = signIn.invoke(UserSignInRequestSerializer(user))) {
+                is DataResult.Success -> {
+                    result.data?.user?.let { user ->
+                        sessionManager.signIn(user)
+                    }
+
+                    _networkState.value = NetworkState.idle
+                    _state.value = SignInState.signInSuccess
                 }
-
-                _networkState.value = NetworkState.idle
-                _state.value = SignInState.signInSuccess
-            } else {
-                handleError(result.exceptionOrNull())
+                is DataResult.Error ->
+                    handleError(result.exception)
             }
         }
     }
 
-    private fun handleError(exception: Throwable?) {
-        error = if (exception is ApiException && exception.errorType == ApiErrorType.apiError) {
-            exception.message
-        } else null
-
-        _networkState.value = NetworkState.idle
+    private fun handleError(exception: ApiException?) {
+        error = exception?.message
         _networkState.value = NetworkState.error
         _state.value = SignInState.signInFailure
     }
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivity.kt b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivity.kt
index 9aa61a0..a02ab37 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivity.kt
@@ -9,11 +9,11 @@ import com.rootstrap.android.databinding.ActivitySignUpBinding
 import com.rootstrap.android.metrics.Analytics
 import com.rootstrap.android.metrics.PageEvents
 import com.rootstrap.android.metrics.VISIT_SIGN_UP
-import com.rootstrap.data.dto.response.User
 import com.rootstrap.android.ui.base.BaseActivity
 import com.rootstrap.android.ui.view.AuthView
 import com.rootstrap.android.util.NetworkState
 import com.rootstrap.android.util.extensions.value
+import com.rootstrap.data.dto.request.UserSignUpRequest
 
 class SignUpActivity : BaseActivity(), AuthView {
 
@@ -24,7 +24,6 @@ class SignUpActivity : BaseActivity(), AuthView {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
         setContentView(binding.root)
         Analytics.track(PageEvents.visit(VISIT_SIGN_UP))
 
@@ -46,7 +45,7 @@ class SignUpActivity : BaseActivity(), AuthView {
 
     private fun signUp() {
         with(binding) {
-            val user = User(
+            val user = UserSignUpRequest(
                 email = emailEditText.value(),
                 firstName = firstNameEditText.value(),
                 lastName = lastNameEditText.value(),
@@ -59,8 +58,8 @@ class SignUpActivity : BaseActivity(), AuthView {
     private fun setObservers() {
         viewModel.state.observe(this, Observer {
             when (it) {
-                SignUpState.signUpFailure -> showError(viewModel.error)
-                SignUpState.signUpSuccess -> showProfile()
+                SignUpState.SIGN_UP_FAILURE -> showError(viewModel.error)
+                SignUpState.SIGN_UP_SUCCESS -> showProfile()
             }
         })
 
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivityViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivityViewModel.kt
index 77cab9d..bb2e0b7 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivityViewModel.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivityViewModel.kt
@@ -3,54 +3,54 @@ package com.rootstrap.android.ui.activity.main
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
-import com.rootstrap.android.network.managers.user.UserManager
 import com.rootstrap.android.ui.base.BaseViewModel
 import com.rootstrap.android.util.NetworkState
-import com.rootstrap.data.util.extensions.ApiErrorType
-import com.rootstrap.data.util.extensions.ApiException
-import com.rootstrap.data.dto.response.User
+import com.rootstrap.data.api.ApiException
+import com.rootstrap.data.dto.request.UserSignUpRequest
+import com.rootstrap.data.dto.request.UserSignUpRequestSerializer
+import com.rootstrap.data.dto.response.DataResult
 import com.rootstrap.data.managers.session.SessionManager
+
+import com.rootstrap.usecases.SignUp
 import kotlinx.coroutines.launch
 
 open class SignUpActivityViewModel(
+    private val signUp: SignUp,
     private val sessionManager: SessionManager,
-    private val userManager: UserManager
 ) : BaseViewModel() {
 
     private val _state = MutableLiveData<SignUpState>()
     val state: LiveData<SignUpState>
         get() = _state
 
-    fun signUp(user: User) {
+    fun signUp(userSignUpRequest: UserSignUpRequest) {
         _networkState.value = NetworkState.loading
         viewModelScope.launch {
-            val result = userManager.signUp(user = user)
 
-            if (result.isSuccess) {
-                result.getOrNull()?.value?.user?.let { user ->
-                    sessionManager.signIn(user)
-                }
+            when (val result = signUp.invoke(UserSignUpRequestSerializer(userSignUpRequest))) {
+                is DataResult.Success -> {
+                    result.data?.user?.let { user ->
+                        sessionManager.signIn(user)
+                    } ?: handleError(ApiException(null))
 
-                _networkState.value = NetworkState.idle
-                _state.value = SignUpState.signUpSuccess
-            } else {
-                handleError(result.exceptionOrNull())
+                    _networkState.value = NetworkState.idle
+                    _state.value = SignUpState.SIGN_UP_SUCCESS
+                }
+                is DataResult.Error -> {
+                    handleError(result.exception)
+                }
             }
         }
     }
 
-    private fun handleError(exception: Throwable?) {
-        error = if (exception is ApiException && exception.errorType == ApiErrorType.apiError) {
-            exception.message
-        } else null
-
-        _networkState.value = NetworkState.idle
+    private fun handleError(exception: ApiException?) {
+        error = exception?.message
         _networkState.value = NetworkState.error
-        _state.value = SignUpState.signUpFailure
+        _state.value = SignUpState.SIGN_UP_FAILURE
     }
 }
 
 enum class SignUpState {
-    signUpFailure,
-    signUpSuccess
+    SIGN_UP_FAILURE,
+    SIGN_UP_SUCCESS
 }
diff --git a/app/src/main/java/com/rootstrap/android/util/ErrorUtil.kt b/app/src/main/java/com/rootstrap/android/util/ErrorUtil.kt
deleted file mode 100644
index a82f8de..0000000
--- a/app/src/main/java/com/rootstrap/android/util/ErrorUtil.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.rootstrap.android.util
-
-import com.google.android.material.textfield.TextInputLayout
-import com.rootstrap.data.dto.response.ErrorModel
-
-class ErrorUtil {
-
-    companion object {
-        fun handleCustomError(error: ErrorModel): String {
-            var message = ""
-            if (error.errors != null) {
-                if (error.errors is List<*> && !error.errors.isEmpty()) {
-                    if (error.errors.first() is String) {
-                        message = error.errors.first() as String
-                    }
-                } else if (error.errors is Map<*, *> && error.errors.keys.first() is String &&
-                    error.errors.values.first() is List<*>
-                ) {
-                    val errors = error.errors as Map<String, List<String>>
-                    message = errors.getValue("full_messages").first()
-                }
-            } else if (error.error != null && !error.error.isEmpty()) {
-                message = error.error
-            }
-
-            return message
-        }
-
-        fun displayError(inputLayout: TextInputLayout, message: String) {
-            inputLayout.isErrorEnabled = true
-            inputLayout.error = message
-        }
-    }
-
-    class ErrorsEvent(val error: String)
-}
diff --git a/build.gradle b/build.gradle
index b6882dc..d479ccd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,79 +36,80 @@ allprojects {
 
     ext {
         androidLibs = [
-                appcompat           : Libs.appCompat,
-                legacySupportV4     : Libs.legacySupportV4,
-                recyclerview        : Libs.recyclerview,
-                constraintlayout    : Libs.constraintlayout,
-                androidxCore        : Libs.core,
-                lifecycleCommon     : Libs.lifecycleCommon,
-                lifecycleRuntime    : Libs.lifecycleRuntime,
-                lifecycleLivedata   : Libs.lifecycleLivedata,
-                lifecycleExtensions : Libs.lifecycleExtensions,
-                lifecycleViewModel  : Libs.lifecycleViewModel,
-                material            : Libs.material,
-                roomRuntime         : Libs.roomRuntime,
-                glide               : Libs.glide,
-                navigationFragment  : Libs.navigationFragment,
-                navigationUi        : Libs.navigationUi
+                appcompat          : Libs.appCompat,
+                legacySupportV4    : Libs.legacySupportV4,
+                recyclerview       : Libs.recyclerview,
+                constraintlayout   : Libs.constraintlayout,
+                androidxCore       : Libs.core,
+                lifecycleCommon    : Libs.lifecycleCommon,
+                lifecycleRuntime   : Libs.lifecycleRuntime,
+                lifecycleLivedata  : Libs.lifecycleLivedata,
+                lifecycleExtensions: Libs.lifecycleExtensions,
+                lifecycleViewModel : Libs.lifecycleViewModel,
+                material           : Libs.material,
+                roomRuntime        : Libs.roomRuntime,
+                glide              : Libs.glide,
+                navigationFragment : Libs.navigationFragment,
+                navigationUi       : Libs.navigationUi
         ]
 
         androidDataLibs = [
-                preference          : Libs.preference
+                preference: Libs.preference
         ]
 
         androidKaptLibs = [
                 roomCompiler : Libs.roomKapt,
-                lifecycleKapt : Libs.lifecycleKapt,
+                lifecycleKapt: Libs.lifecycleKapt,
                 glideCompiler: Libs.glideKapt
         ]
 
         ktlintLibs = [
-                ktlint  : Libs.ktlint
+                ktlint: Libs.ktlint
         ]
 
         kotlinLibs = [
-                kotlinStdLib    : Libs.kotlinStdLib,
-                reflect         : Libs.reflect,
-                coroutines      : Libs.coroutinesAndroid
+                kotlinStdLib: Libs.kotlinStdLib,
+                reflect     : Libs.reflect,
+                coroutines  : Libs.coroutinesAndroid
         ]
 
         libs = [
-                okhttpLoginInterceptor  : Libs.loggingInterceptor,
-                retrofit                : Libs.retrofit,
-                retrofitGsonConverter   : Libs.retrofitGsonConverter,
-                koinCore                : Libs.koinCore,
-                koinAndroid             : Libs.koinAndroid,
-                koinAndroidCompat       : Libs.koinAndroidCompat,
-                koinWorkManager         : Libs.koinWorkManager,
-                koinCompose             : Libs.koinCompose,
-                otto                    : Libs.otto,
-                gson                    : Libs.gson,
-                okhttp                  : Libs.okhttp,
-                moshi                   : Libs.moshi,
-                converterMoshi          : Libs.converterMoshi,
-                securityCrypto          : Libs.securityCrypto,
-                firebaseCore            : Libs.firebaseCore,
-                firebaseAnalytics       : Libs.firebaseAnalytics,
-                firebaseCrashlytics     : Libs.firebaseCrashlytics
+                okhttpLoginInterceptor: Libs.loggingInterceptor,
+                retrofit              : Libs.retrofit,
+                retrofitGsonConverter : Libs.retrofitGsonConverter,
+                koinCore              : Libs.koinCore,
+                koinAndroid           : Libs.koinAndroid,
+                koinAndroidCompat     : Libs.koinAndroidCompat,
+                koinWorkManager       : Libs.koinWorkManager,
+                koinCompose           : Libs.koinCompose,
+                otto                  : Libs.otto,
+                gson                  : Libs.gson,
+                okhttp                : Libs.okhttp,
+                moshi                 : Libs.moshi,
+                converterMoshi        : Libs.converterMoshi,
+                securityCrypto        : Libs.securityCrypto,
+                firebaseCore          : Libs.firebaseCore,
+                firebaseAnalytics     : Libs.firebaseAnalytics,
+                firebaseCrashlytics   : Libs.firebaseCrashlytics,
+                mixPanel              : Libs.mixPanel
         ]
 
         testLibs = [
-                junit           : Libs.junit,
-                mockitoCore     : Libs.mockitoCore,
-                mockk           : Libs.mockk
+                junit      : Libs.junit,
+                mockitoCore: Libs.mockitoCore,
+                mockk      : Libs.mockk
         ]
 
         androidTestLibs = [
-                testRunner      : Libs.testRunner,
-                espressoCore    : Libs.espressoCore,
-                espressoIntents : Libs.espressoIntents,
-                rules           : Libs.rules,
-                extJunit        : Libs.extJunit,
-                koinTest        : Libs.koinTest,
-                mockWebServer   : Libs.mockwebserver,
-                mockkAndroid    : Libs.mockkAndroid,
-                uiautomator     : Libs.uiautomator
+                testRunner     : Libs.testRunner,
+                espressoCore   : Libs.espressoCore,
+                espressoIntents: Libs.espressoIntents,
+                rules          : Libs.rules,
+                extJunit       : Libs.extJunit,
+                koinTest       : Libs.koinTest,
+                mockWebServer  : Libs.mockwebserver,
+                mockkAndroid   : Libs.mockkAndroid,
+                uiautomator    : Libs.uiautomator
         ]
     }
 }
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index de9ce91..387ee47 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -34,6 +34,7 @@ object Versions {
     const val rules = "1.4.0"
     const val mockwebserver = "4.9.0"
     const val testRunner = "1.4.0"
+    const val mixPanel = "5.6.1"
 }
 
 object Libs {
@@ -77,13 +78,17 @@ object Libs {
     const val firebaseAnalytics = "com.google.firebase:firebase-analytics-ktx"
     const val firebaseCrashlytics = "com.google.firebase:firebase-crashlytics-ktx"
 
+    //---- MixPanel ----
+    const val mixPanel = "com.mixpanel.android:mixpanel-android:${Versions.mixPanel}"
+
     // Image
     const val glide = "com.github.bumptech.glide:glide:${Versions.glide}"
     const val glideKapt = "com.github.bumptech.glide:compiler:${Versions.glide}"
 
     // Network
     const val retrofit = "com.squareup.retrofit2:retrofit:${Versions.retrofit}"
-    const val retrofitGsonConverter = "com.squareup.retrofit2:converter-gson:${Versions.converterGson}"
+    const val retrofitGsonConverter =
+        "com.squareup.retrofit2:converter-gson:${Versions.converterGson}"
     const val moshi = "com.squareup.moshi:moshi-kotlin:${Versions.moshi}"
     const val converterMoshi = "com.squareup.retrofit2:converter-moshi:${Versions.converterMoshi}"
     const val loggingInterceptor = "com.squareup.okhttp3:logging-interceptor:${Versions.okhttp}"
diff --git a/data/src/main/AndroidManifest.xml b/data/src/main/AndroidManifest.xml
index cc9be91..659e535 100644
--- a/data/src/main/AndroidManifest.xml
+++ b/data/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.rootstrap.android.data" >
+    package="com.rootstrap.data" >
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>
diff --git a/data/src/main/java/com/rootstrap/data/api/ApiServiceFactory.kt b/data/src/main/java/com/rootstrap/data/api/ApiServiceFactory.kt
index e47b478..c68d353 100644
--- a/data/src/main/java/com/rootstrap/data/api/ApiServiceFactory.kt
+++ b/data/src/main/java/com/rootstrap/data/api/ApiServiceFactory.kt
@@ -1,6 +1,6 @@
 package com.rootstrap.data.api
 
-import com.rootstrap.android.data.BuildConfig
+import com.rootstrap.data.BuildConfig
 import com.rootstrap.data.api.interceptors.AuthenticationInterceptor
 import com.rootstrap.data.api.interceptors.HeadersInterceptor
 import com.rootstrap.data.api.interceptors.ResponseInterceptor
diff --git a/data/src/main/java/com/rootstrap/data/util/extensions/ActionCallback.kt b/data/src/main/java/com/rootstrap/data/util/extensions/ActionCallback.kt
index 1041f85..413bd71 100644
--- a/data/src/main/java/com/rootstrap/data/util/extensions/ActionCallback.kt
+++ b/data/src/main/java/com/rootstrap/data/util/extensions/ActionCallback.kt
@@ -14,16 +14,16 @@ class ActionCallback {
 
     companion object {
 
-        suspend fun <T> call(apiCall: Call<T>): DataResult<Data<T>> =
+        suspend fun <T> call(apiCall: Call<T>): DataResult<T> =
             withContext(Dispatchers.IO) {
                 val response = apiCall.execute()
                 handleResponse(response)
             }
 
-        private fun <T> handleResponse(response: Response<T>): DataResult<Data<T>> {
+        private fun <T> handleResponse(response: Response<T>): DataResult<T> {
             if (response.isSuccessful) {
                 return DataResult.Success(
-                    Data(response.body())
+                    response.body()
                 )
             } else {
                 try {
@@ -44,4 +44,3 @@ class ActionCallback {
     }
 }
 
-class Data<T>(val value: T?)
diff --git a/usecases/src/main/AndroidManifest.xml b/usecases/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..fb0e648
--- /dev/null
+++ b/usecases/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.rootstrap.usecases" >
+
+</manifest>

From 6422aa2517886e42c9101383398295f1a84f73df Mon Sep 17 00:00:00 2001
From: aguskoll <aguskoll@gmail.com>
Date: Mon, 10 Jan 2022 16:57:46 -0300
Subject: [PATCH 05/16] get api refactor

---
 .../main/java/com/rootstrap/android/di/DI.kt  |  8 +++--
 .../com/rootstrap/data/api/ApiProvider.kt     |  7 ++--
 .../rootstrap/data/api/ApiServiceFactory.kt   | 35 +++++++++++--------
 .../data/repository/UserRepository.kt         | 20 ++++++-----
 .../rootstrap/data/source/RemoteDataSource.kt | 15 --------
 5 files changed, 41 insertions(+), 44 deletions(-)
 delete mode 100644 data/src/main/java/com/rootstrap/data/source/RemoteDataSource.kt

diff --git a/app/src/main/java/com/rootstrap/android/di/DI.kt b/app/src/main/java/com/rootstrap/android/di/DI.kt
index 8c756d6..23cc22c 100644
--- a/app/src/main/java/com/rootstrap/android/di/DI.kt
+++ b/app/src/main/java/com/rootstrap/android/di/DI.kt
@@ -3,11 +3,13 @@ package com.rootstrap.android.di
 import android.app.Application
 import com.rootstrap.android.BuildConfig
 import com.rootstrap.android.ui.activity.main.*
+import com.rootstrap.data.api.ApiProvider
 import com.rootstrap.data.api.ApiServiceFactory
 import com.rootstrap.data.api.interceptors.AuthenticationInterceptor
 import com.rootstrap.data.api.interceptors.ConnectivityInterceptor
 import com.rootstrap.data.api.interceptors.HeadersInterceptor
 import com.rootstrap.data.api.interceptors.ResponseInterceptor
+import com.rootstrap.data.managers.session.SessionManagerImpl
 import com.rootstrap.data.repository.UserRepository
 import com.rootstrap.data.util.Prefs
 import com.rootstrap.usecases.SignIn
@@ -36,7 +38,7 @@ val appModule = module {
     single { SignUp(get()) }
     single { SignIn(get()) }
     single { SignOut(get()) }
-    
+
     viewModel { SignUpActivityViewModel(get(), get()) }
     viewModel { SignInActivityViewModel(get(), get()) }
     viewModel { ProfileActivityViewModel(get(), get()) }
@@ -48,13 +50,15 @@ val dataModule = module {
     single { ConnectivityInterceptor() }
     single { AuthenticationInterceptor(get()) }
     single { ResponseInterceptor(get(), get()) }
+    single { ApiProvider(get()) }
 
     factory { Prefs(get()) }
     factory { UserRepository(get()) }
+    factory { SessionManagerImpl(get()) }
 }
 
 private val scopesModule = module {
     scope<SignUpActivity> {}
     scope<SignInActivity> {}
-    scope<ProfileActivity> { }
+    scope<ProfileActivity> {}
 }
diff --git a/data/src/main/java/com/rootstrap/data/api/ApiProvider.kt b/data/src/main/java/com/rootstrap/data/api/ApiProvider.kt
index 3a054ab..91b5364 100644
--- a/data/src/main/java/com/rootstrap/data/api/ApiProvider.kt
+++ b/data/src/main/java/com/rootstrap/data/api/ApiProvider.kt
@@ -1,10 +1,9 @@
 package com.rootstrap.data.api
 
 import com.rootstrap.data.api.endpoints.UserApi
-import retrofit2.Retrofit
 
-class ApiProvider {
-    fun getUserApiService(retrofit: Retrofit): UserApi {
-        return retrofit.create(UserApi::class.java)
+class ApiProvider(private val apiServiceFactory: ApiServiceFactory) {
+    fun getUserApiService(): UserApi {
+        return apiServiceFactory.getApi(UserApi::class.java)
     }
 }
diff --git a/data/src/main/java/com/rootstrap/data/api/ApiServiceFactory.kt b/data/src/main/java/com/rootstrap/data/api/ApiServiceFactory.kt
index c68d353..c7e4857 100644
--- a/data/src/main/java/com/rootstrap/data/api/ApiServiceFactory.kt
+++ b/data/src/main/java/com/rootstrap/data/api/ApiServiceFactory.kt
@@ -14,28 +14,35 @@ class ApiServiceFactory(
     private val headersInterceptor: HeadersInterceptor,
     private val responseInterceptor: ResponseInterceptor
 ) {
+    private var retrofit: Retrofit? = null
 
-    fun getOkHttpClient(): OkHttpClient {
+    fun <T> getApi(apiClass: Class<*>): T {
+        return initRetrofit().create(apiClass) as T
+    }
+
+    private fun getOkHttpClient(): OkHttpClient {
         val httpInterceptorLevel = if (BuildConfig.DEBUG) HttpLoggingInterceptor.Level.BODY
-            else HttpLoggingInterceptor.Level.NONE
+        else HttpLoggingInterceptor.Level.NONE
 
         return OkHttpClient.Builder()
-                .addInterceptor(authenticationInterceptor)
-                .addInterceptor(headersInterceptor)
-                .addInterceptor(responseInterceptor)
-                .addInterceptor(HttpLoggingInterceptor().setLevel(httpInterceptorLevel))
-                .build()
+            .addInterceptor(authenticationInterceptor)
+            .addInterceptor(headersInterceptor)
+            .addInterceptor(responseInterceptor)
+            .addInterceptor(HttpLoggingInterceptor().setLevel(httpInterceptorLevel))
+            .build()
     }
 
-    fun getRetrofit(okHttpClient: OkHttpClient): Retrofit {
+    private fun getRetrofit(): Retrofit {
         return Retrofit.Builder()
-                .baseUrl(BuildConfig.API_URL)
-                .addConverterFactory(GsonConverterFactory.create())
-                .client(okHttpClient)
-                .build()
+            .baseUrl(BuildConfig.API_URL)
+            .addConverterFactory(GsonConverterFactory.create())
+            .client(getOkHttpClient())
+            .build()
     }
 
-    companion object {
-        var URL_API: String? = null
+    private fun initRetrofit(): Retrofit {
+        if (retrofit == null)
+            retrofit = getRetrofit()
+        return retrofit!!
     }
 }
diff --git a/data/src/main/java/com/rootstrap/data/repository/UserRepository.kt b/data/src/main/java/com/rootstrap/data/repository/UserRepository.kt
index a9f635c..3c54506 100644
--- a/data/src/main/java/com/rootstrap/data/repository/UserRepository.kt
+++ b/data/src/main/java/com/rootstrap/data/repository/UserRepository.kt
@@ -1,23 +1,25 @@
 package com.rootstrap.data.repository
 
+import com.rootstrap.data.api.ApiProvider
 import com.rootstrap.data.dto.request.UserSignInRequestSerializer
 import com.rootstrap.data.dto.request.UserSignUpRequestSerializer
-import com.rootstrap.data.source.RemoteDataSource
 import com.rootstrap.data.util.extensions.ActionCallback
 
 class UserRepository(
-    private val remoteDataSource: RemoteDataSource
+    private val apiProvider: ApiProvider
 ) {
 
-    suspend fun signUp(userSignUpRequestSerializer: UserSignUpRequestSerializer) = ActionCallback.call(
-        remoteDataSource.signUp(userSignUpRequestSerializer)
-    )
+    suspend fun signUp(userSignUpRequestSerializer: UserSignUpRequestSerializer) =
+        ActionCallback.call(
+            apiProvider.getUserApiService().signUp(userSignUpRequestSerializer)
+        )
 
-    suspend fun signIn(userSignInRequestSerializer: UserSignInRequestSerializer) = ActionCallback.call(
-        remoteDataSource.signIn(userSignInRequestSerializer)
-    )
+    suspend fun signIn(userSignInRequestSerializer: UserSignInRequestSerializer) =
+        ActionCallback.call(
+            apiProvider.getUserApiService().signIn(userSignInRequestSerializer)
+        )
 
     suspend fun signOut() = ActionCallback.call(
-        remoteDataSource.signOut()
+        apiProvider.getUserApiService().signOut()
     )
 }
diff --git a/data/src/main/java/com/rootstrap/data/source/RemoteDataSource.kt b/data/src/main/java/com/rootstrap/data/source/RemoteDataSource.kt
deleted file mode 100644
index d1f2470..0000000
--- a/data/src/main/java/com/rootstrap/data/source/RemoteDataSource.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.rootstrap.data.source
-
-import com.rootstrap.data.dto.request.UserSignInRequestSerializer
-import com.rootstrap.data.dto.request.UserSignUpRequestSerializer
-import com.rootstrap.data.dto.response.UserResponseSerializer
-import retrofit2.Call
-
-interface RemoteDataSource {
-
-    suspend fun signUp(user: UserSignUpRequestSerializer): Call<UserResponseSerializer>
-
-    suspend fun signIn(user: UserSignInRequestSerializer): Call<UserResponseSerializer>
-
-    suspend fun signOut(): Call<Void>
-}

From 1fa4dd648cb100b3764567331f721ea2dd3d6d2e Mon Sep 17 00:00:00 2001
From: aguskoll <aguskoll@gmail.com>
Date: Mon, 10 Jan 2022 17:07:17 -0300
Subject: [PATCH 06/16] removed unused inject and added dependencies

---
 app/src/main/java/com/rootstrap/android/di/DI.kt           | 7 ++++++-
 .../rootstrap/android/ui/activity/main/ProfileActivity.kt  | 3 +--
 .../rootstrap/data/managers/session/SessionManagerImpl.kt  | 3 +--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/rootstrap/android/di/DI.kt b/app/src/main/java/com/rootstrap/android/di/DI.kt
index 23cc22c..19c6099 100644
--- a/app/src/main/java/com/rootstrap/android/di/DI.kt
+++ b/app/src/main/java/com/rootstrap/android/di/DI.kt
@@ -1,6 +1,8 @@
 package com.rootstrap.android.di
 
 import android.app.Application
+import android.content.Context
+import android.content.SharedPreferences
 import com.rootstrap.android.BuildConfig
 import com.rootstrap.android.ui.activity.main.*
 import com.rootstrap.data.api.ApiProvider
@@ -9,12 +11,14 @@ import com.rootstrap.data.api.interceptors.AuthenticationInterceptor
 import com.rootstrap.data.api.interceptors.ConnectivityInterceptor
 import com.rootstrap.data.api.interceptors.HeadersInterceptor
 import com.rootstrap.data.api.interceptors.ResponseInterceptor
+import com.rootstrap.data.managers.session.SessionManager
 import com.rootstrap.data.managers.session.SessionManagerImpl
 import com.rootstrap.data.repository.UserRepository
 import com.rootstrap.data.util.Prefs
 import com.rootstrap.usecases.SignIn
 import com.rootstrap.usecases.SignOut
 import com.rootstrap.usecases.SignUp
+import org.koin.android.ext.koin.androidApplication
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.androidx.fragment.koin.fragmentFactory
@@ -38,6 +42,8 @@ val appModule = module {
     single { SignUp(get()) }
     single { SignIn(get()) }
     single { SignOut(get()) }
+    single<SessionManager> { SessionManagerImpl(get()) }
+    single<SharedPreferences> { androidApplication().getSharedPreferences("userPreferences", Context.MODE_PRIVATE) }
 
     viewModel { SignUpActivityViewModel(get(), get()) }
     viewModel { SignInActivityViewModel(get(), get()) }
@@ -54,7 +60,6 @@ val dataModule = module {
 
     factory { Prefs(get()) }
     factory { UserRepository(get()) }
-    factory { SessionManagerImpl(get()) }
 }
 
 private val scopesModule = module {
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivity.kt b/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivity.kt
index 656bd2d..3d2759b 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivity.kt
@@ -12,11 +12,10 @@ import com.rootstrap.data.managers.session.SessionManager
 import com.rootstrap.android.ui.base.BaseActivity
 import com.rootstrap.android.ui.view.ProfileView
 import com.rootstrap.android.util.NetworkState
-import javax.inject.Inject
 
 class ProfileActivity : BaseActivity(), ProfileView {
 
-    @Inject lateinit var sessionManager: SessionManager
+    lateinit var sessionManager: SessionManager
 
     private val viewModel: ProfileActivityViewModel by viewModels()
     private val binding by lazy { ActivityProfileBinding.inflate(layoutInflater) }
diff --git a/data/src/main/java/com/rootstrap/data/managers/session/SessionManagerImpl.kt b/data/src/main/java/com/rootstrap/data/managers/session/SessionManagerImpl.kt
index 9df49a2..ae7f6a7 100644
--- a/data/src/main/java/com/rootstrap/data/managers/session/SessionManagerImpl.kt
+++ b/data/src/main/java/com/rootstrap/data/managers/session/SessionManagerImpl.kt
@@ -2,9 +2,8 @@ package com.rootstrap.data.managers.session
 
 import com.rootstrap.data.dto.response.User
 import com.rootstrap.data.util.Prefs
-import javax.inject.Inject
 
-class SessionManagerImpl @Inject constructor(private val prefs: Prefs) : SessionManager {
+class SessionManagerImpl (private val prefs: Prefs) : SessionManager {
 
     override var user: User? = prefs.user
         set(value) {

From 73f57c25a69d45a81fc9c3dec21f555ff170ea0d Mon Sep 17 00:00:00 2001
From: Marcos Salto <marcosasalto@gmail.com>
Date: Mon, 10 Jan 2022 19:38:08 -0300
Subject: [PATCH 07/16] Add Koin scopes

Update base activity and base view model
Handle API errors
---
 .editorconfig                                 |  2 +-
 .../main/java/com/rootstrap/android/di/DI.kt  | 21 +++++++++++---
 .../ui/activity/main/ProfileActivity.kt       | 18 ++++++------
 .../activity/main/ProfileActivityViewModel.kt | 23 +++++++++------
 .../ui/activity/main/SignInActivity.kt        | 16 +++++------
 .../activity/main/SignInActivityViewModel.kt  | 26 +++++++++++------
 .../ui/activity/main/SignUpActivity.kt        |  8 +++---
 .../activity/main/SignUpActivityViewModel.kt  | 15 +++++++---
 .../rootstrap/android/ui/base/BaseActivity.kt |  4 +--
 .../android/ui/base/BaseViewModel.kt          |  4 ++-
 .../com/rootstrap/android/ui/base/Scope.kt    | 28 +++++++++++++++++++
 .../android/ui/base/ScopedViewModel.kt        | 19 +++++++++++++
 .../rootstrap/android/util/NetworkState.kt    |  6 ++--
 .../request/UserSignInRequestSerializer.kt    |  2 +-
 .../managers/session/SessionManagerImpl.kt    |  3 +-
 15 files changed, 138 insertions(+), 57 deletions(-)
 create mode 100644 app/src/main/java/com/rootstrap/android/ui/base/Scope.kt
 create mode 100644 app/src/main/java/com/rootstrap/android/ui/base/ScopedViewModel.kt

diff --git a/.editorconfig b/.editorconfig
index 0861e13..448817d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -2,4 +2,4 @@
 # Comma-separated list of rules to disable (Since 0.34.0)
 # Note that rules in any ruleset other than the standard ruleset will need to be prefixed
 # by the ruleset identifier.
-disabled_rules=import-ordering,experimental:annotation
+disabled_rules=no-wildcard-imports,import-ordering,experimental:annotation
diff --git a/app/src/main/java/com/rootstrap/android/di/DI.kt b/app/src/main/java/com/rootstrap/android/di/DI.kt
index 23cc22c..f94d691 100644
--- a/app/src/main/java/com/rootstrap/android/di/DI.kt
+++ b/app/src/main/java/com/rootstrap/android/di/DI.kt
@@ -1,6 +1,8 @@
 package com.rootstrap.android.di
 
 import android.app.Application
+import android.content.Context
+import android.content.SharedPreferences
 import com.rootstrap.android.BuildConfig
 import com.rootstrap.android.ui.activity.main.*
 import com.rootstrap.data.api.ApiProvider
@@ -9,12 +11,16 @@ import com.rootstrap.data.api.interceptors.AuthenticationInterceptor
 import com.rootstrap.data.api.interceptors.ConnectivityInterceptor
 import com.rootstrap.data.api.interceptors.HeadersInterceptor
 import com.rootstrap.data.api.interceptors.ResponseInterceptor
+import com.rootstrap.data.managers.session.SessionManager
 import com.rootstrap.data.managers.session.SessionManagerImpl
 import com.rootstrap.data.repository.UserRepository
 import com.rootstrap.data.util.Prefs
 import com.rootstrap.usecases.SignIn
 import com.rootstrap.usecases.SignOut
 import com.rootstrap.usecases.SignUp
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import org.koin.android.ext.koin.androidApplication
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.androidx.fragment.koin.fragmentFactory
@@ -35,13 +41,14 @@ fun Application.initDI() {
 }
 
 val appModule = module {
+    single<CoroutineDispatcher> { Dispatchers.Main }
     single { SignUp(get()) }
     single { SignIn(get()) }
     single { SignOut(get()) }
 
-    viewModel { SignUpActivityViewModel(get(), get()) }
-    viewModel { SignInActivityViewModel(get(), get()) }
-    viewModel { ProfileActivityViewModel(get(), get()) }
+    viewModel { SignUpActivityViewModel(get(), get(), get()) }
+    viewModel { SignInActivityViewModel(get(), get(), get()) }
+    viewModel { ProfileActivityViewModel(get(), get(), get()) }
 }
 
 val dataModule = module {
@@ -51,10 +58,16 @@ val dataModule = module {
     single { AuthenticationInterceptor(get()) }
     single { ResponseInterceptor(get(), get()) }
     single { ApiProvider(get()) }
+    single<SharedPreferences> {
+        androidApplication().getSharedPreferences(
+            "prefs",
+            Context.MODE_PRIVATE
+        )
+    }
 
     factory { Prefs(get()) }
     factory { UserRepository(get()) }
-    factory { SessionManagerImpl(get()) }
+    single<SessionManager> { SessionManagerImpl(get()) }
 }
 
 private val scopesModule = module {
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivity.kt b/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivity.kt
index 656bd2d..e584a5a 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivity.kt
@@ -1,24 +1,24 @@
 package com.rootstrap.android.ui.activity.main
 
 import android.os.Bundle
-import androidx.activity.viewModels
 import androidx.lifecycle.Observer
 import com.rootstrap.android.R
 import com.rootstrap.android.databinding.ActivityProfileBinding
 import com.rootstrap.android.metrics.Analytics
 import com.rootstrap.android.metrics.PageEvents
 import com.rootstrap.android.metrics.VISIT_PROFILE
-import com.rootstrap.data.managers.session.SessionManager
 import com.rootstrap.android.ui.base.BaseActivity
 import com.rootstrap.android.ui.view.ProfileView
 import com.rootstrap.android.util.NetworkState
-import javax.inject.Inject
+import com.rootstrap.data.managers.session.SessionManager
+import org.koin.android.ext.android.inject
+import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class ProfileActivity : BaseActivity(), ProfileView {
 
-    @Inject lateinit var sessionManager: SessionManager
+    private val sessionManager: SessionManager by inject()
 
-    private val viewModel: ProfileActivityViewModel by viewModels()
+    private val viewModel: ProfileActivityViewModel by viewModel()
     private val binding by lazy { ActivityProfileBinding.inflate(layoutInflater) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -43,15 +43,15 @@ class ProfileActivity : BaseActivity(), ProfileView {
     private fun setObservers() {
         viewModel.state.observe(this, Observer {
             when (it) {
-                ProfileState.signOutFailure -> showError(viewModel.error)
-                ProfileState.signOutSuccess -> goToFirstScreen()
+                ProfileState.SIGN_OUT_FAILURE -> showError(viewModel.error)
+                ProfileState.SIGN_OUT_SUCCESS -> goToFirstScreen()
             }
         })
 
         viewModel.networkState.observe(this, Observer {
             when (it) {
-                NetworkState.loading -> showProgress()
-                NetworkState.idle -> hideProgress()
+                NetworkState.LOADING -> showProgress()
+                NetworkState.IDLE -> hideProgress()
                 else -> showError(viewModel.error ?: getString(R.string.default_error))
             }
         })
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivityViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivityViewModel.kt
index bef0ec5..1d1b669 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivityViewModel.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivityViewModel.kt
@@ -9,28 +9,31 @@ import com.rootstrap.data.api.ApiException
 import com.rootstrap.data.dto.response.DataResult
 import com.rootstrap.data.managers.session.SessionManager
 import com.rootstrap.usecases.SignOut
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.launch
 
 open class ProfileActivityViewModel(
     private val signOut: SignOut,
     private val sessionManager: SessionManager,
-) : BaseViewModel() {
+    uiDispatcher: CoroutineDispatcher
+) : BaseViewModel(uiDispatcher) {
 
     private val _state = MutableLiveData<ProfileState>()
     val state: LiveData<ProfileState>
         get() = _state
 
     fun signOut() {
-        _networkState.value = NetworkState.loading
+        _networkState.value = NetworkState.LOADING
         viewModelScope.launch {
             when (val result = signOut.invoke()) {
                 is DataResult.Success -> {
-                    _networkState.value = NetworkState.idle
-                    _state.value = ProfileState.signOutSuccess
+                    restoreNetworkState()
+                    _state.value = ProfileState.SIGN_OUT_SUCCESS
                     sessionManager.signOut()
                 }
                 is DataResult.Error -> {
                     handleError(result.exception)
+                    restoreNetworkState()
                 }
             }
         }
@@ -38,12 +41,16 @@ open class ProfileActivityViewModel(
 
     private fun handleError(exception: ApiException?) {
         error = exception?.message
-        _networkState.value = NetworkState.error
-        _state.value = ProfileState.signOutFailure
+        _networkState.value = NetworkState.ERROR
+        _state.value = ProfileState.SIGN_OUT_FAILURE
+    }
+
+    private fun restoreNetworkState() {
+        _networkState.value = NetworkState.IDLE
     }
 }
 
 enum class ProfileState {
-    signOutFailure,
-    signOutSuccess
+    SIGN_OUT_FAILURE,
+    SIGN_OUT_SUCCESS
 }
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivity.kt b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivity.kt
index e3accb7..4c5052f 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivity.kt
@@ -2,7 +2,6 @@ package com.rootstrap.android.ui.activity.main
 
 import android.Manifest
 import android.os.Bundle
-import androidx.activity.viewModels
 import androidx.lifecycle.Observer
 import com.rootstrap.android.R
 import com.rootstrap.android.databinding.ActivitySignInBinding
@@ -15,13 +14,12 @@ import com.rootstrap.android.util.extensions.value
 import com.rootstrap.android.util.permissions.PermissionActivity
 import com.rootstrap.android.util.permissions.PermissionResponse
 import com.rootstrap.data.dto.request.UserSignInRequest
+import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class SignInActivity : PermissionActivity(), AuthView {
 
-    private val viewModel: SignInActivityViewModel by viewModels()
-    private lateinit var binding: ActivitySignInBinding /* by lazy {
-        ActivitySignInBinding.inflate(layoutInflater)
-    } */
+    private val viewModel: SignInActivityViewModel by viewModel()
+    private lateinit var binding: ActivitySignInBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -54,15 +52,15 @@ class SignInActivity : PermissionActivity(), AuthView {
     private fun setObservers() {
         viewModel.state.observe(this, Observer {
             when (it) {
-                SignInState.signInFailure -> showError(viewModel.error)
-                SignInState.signInSuccess -> showProfile()
+                SignInState.SIGN_IN_FAILURE -> showError(viewModel.error)
+                SignInState.SIGN_IN_SUCCESS -> showProfile()
             }
         })
 
         viewModel.networkState.observe(this, Observer {
             when (it) {
-                NetworkState.loading -> showProgress()
-                NetworkState.idle -> hideProgress()
+                NetworkState.LOADING -> showProgress()
+                NetworkState.IDLE -> hideProgress()
                 else -> showError(viewModel.error ?: getString(R.string.default_error))
             }
         })
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivityViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivityViewModel.kt
index b346069..2253815 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivityViewModel.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivityViewModel.kt
@@ -11,19 +11,21 @@ import com.rootstrap.data.dto.request.UserSignInRequestSerializer
 import com.rootstrap.data.dto.response.DataResult
 import com.rootstrap.data.managers.session.SessionManager
 import com.rootstrap.usecases.SignIn
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.launch
 
 open class SignInActivityViewModel(
     private val signIn: SignIn,
     private val sessionManager: SessionManager,
-) : BaseViewModel() {
+    uiDispatcher: CoroutineDispatcher
+) : BaseViewModel(uiDispatcher) {
 
     private val _state = MutableLiveData<SignInState>()
     val state: LiveData<SignInState>
         get() = _state
 
     fun signIn(user: UserSignInRequest) {
-        _networkState.value = NetworkState.loading
+        _networkState.value = NetworkState.LOADING
         viewModelScope.launch {
             when (val result = signIn.invoke(UserSignInRequestSerializer(user))) {
                 is DataResult.Success -> {
@@ -31,23 +33,29 @@ open class SignInActivityViewModel(
                         sessionManager.signIn(user)
                     }
 
-                    _networkState.value = NetworkState.idle
-                    _state.value = SignInState.signInSuccess
+                    restoreNetworkState()
+                    _state.value = SignInState.SIGN_IN_SUCCESS
                 }
-                is DataResult.Error ->
+                is DataResult.Error -> {
                     handleError(result.exception)
+                    restoreNetworkState()
+                }
             }
         }
     }
 
     private fun handleError(exception: ApiException?) {
         error = exception?.message
-        _networkState.value = NetworkState.error
-        _state.value = SignInState.signInFailure
+        _networkState.value = NetworkState.ERROR
+        _state.value = SignInState.SIGN_IN_FAILURE
+    }
+
+    private fun restoreNetworkState() {
+        _networkState.value = NetworkState.IDLE
     }
 }
 
 enum class SignInState {
-    signInFailure,
-    signInSuccess
+    SIGN_IN_FAILURE,
+    SIGN_IN_SUCCESS
 }
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivity.kt b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivity.kt
index a02ab37..2a30036 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivity.kt
@@ -2,7 +2,6 @@ package com.rootstrap.android.ui.activity.main
 
 import android.content.Intent
 import android.os.Bundle
-import androidx.activity.viewModels
 import androidx.lifecycle.Observer
 import com.rootstrap.android.R
 import com.rootstrap.android.databinding.ActivitySignUpBinding
@@ -14,10 +13,11 @@ import com.rootstrap.android.ui.view.AuthView
 import com.rootstrap.android.util.NetworkState
 import com.rootstrap.android.util.extensions.value
 import com.rootstrap.data.dto.request.UserSignUpRequest
+import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class SignUpActivity : BaseActivity(), AuthView {
 
-    private val viewModel: SignUpActivityViewModel by viewModels()
+    private val viewModel: SignUpActivityViewModel by viewModel()
     private val binding: ActivitySignUpBinding by lazy {
         ActivitySignUpBinding.inflate(layoutInflater)
     }
@@ -65,8 +65,8 @@ class SignUpActivity : BaseActivity(), AuthView {
 
         viewModel.networkState.observe(this, Observer {
             when (it) {
-                NetworkState.loading -> showProgress()
-                NetworkState.idle -> hideProgress()
+                NetworkState.LOADING -> showProgress()
+                NetworkState.IDLE -> hideProgress()
                 else -> showError(viewModel.error ?: getString(R.string.default_error))
             }
         })
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivityViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivityViewModel.kt
index bb2e0b7..bd09428 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivityViewModel.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivityViewModel.kt
@@ -12,19 +12,21 @@ import com.rootstrap.data.dto.response.DataResult
 import com.rootstrap.data.managers.session.SessionManager
 
 import com.rootstrap.usecases.SignUp
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.launch
 
 open class SignUpActivityViewModel(
     private val signUp: SignUp,
     private val sessionManager: SessionManager,
-) : BaseViewModel() {
+    uiDispatcher: CoroutineDispatcher
+) : BaseViewModel(uiDispatcher) {
 
     private val _state = MutableLiveData<SignUpState>()
     val state: LiveData<SignUpState>
         get() = _state
 
     fun signUp(userSignUpRequest: UserSignUpRequest) {
-        _networkState.value = NetworkState.loading
+        _networkState.value = NetworkState.LOADING
         viewModelScope.launch {
 
             when (val result = signUp.invoke(UserSignUpRequestSerializer(userSignUpRequest))) {
@@ -33,11 +35,12 @@ open class SignUpActivityViewModel(
                         sessionManager.signIn(user)
                     } ?: handleError(ApiException(null))
 
-                    _networkState.value = NetworkState.idle
+                    restoreNetworkState()
                     _state.value = SignUpState.SIGN_UP_SUCCESS
                 }
                 is DataResult.Error -> {
                     handleError(result.exception)
+                    restoreNetworkState()
                 }
             }
         }
@@ -45,9 +48,13 @@ open class SignUpActivityViewModel(
 
     private fun handleError(exception: ApiException?) {
         error = exception?.message
-        _networkState.value = NetworkState.error
+        _networkState.value = NetworkState.ERROR
         _state.value = SignUpState.SIGN_UP_FAILURE
     }
+
+    private fun restoreNetworkState() {
+        _networkState.value = NetworkState.IDLE
+    }
 }
 
 enum class SignUpState {
diff --git a/app/src/main/java/com/rootstrap/android/ui/base/BaseActivity.kt b/app/src/main/java/com/rootstrap/android/ui/base/BaseActivity.kt
index 4b3765a..f630495 100644
--- a/app/src/main/java/com/rootstrap/android/ui/base/BaseActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/base/BaseActivity.kt
@@ -3,11 +3,11 @@ package com.rootstrap.android.ui.base
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
 import com.rootstrap.android.util.LoadingDialogUtil
+import org.koin.androidx.scope.ScopeActivity
 
 @SuppressLint("Registered")
-open class BaseActivity : AppCompatActivity(), BaseView {
+open class BaseActivity : ScopeActivity(), BaseView {
 
     override fun showProgress() {
         LoadingDialogUtil.showProgress(this)
diff --git a/app/src/main/java/com/rootstrap/android/ui/base/BaseViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/base/BaseViewModel.kt
index 5cda3e2..24294c4 100644
--- a/app/src/main/java/com/rootstrap/android/ui/base/BaseViewModel.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/base/BaseViewModel.kt
@@ -8,12 +8,14 @@ import androidx.lifecycle.OnLifecycleEvent
 import androidx.lifecycle.ViewModel
 import com.rootstrap.android.util.NetworkState
 import com.squareup.otto.Bus
+import kotlinx.coroutines.CoroutineDispatcher
 
 /**
  * A [ViewModel] base class
  * implement app general LiveData as Session or User
  * **/
-open class BaseViewModel : ViewModel(), LifecycleObserver {
+open class BaseViewModel(uiDispatcher: CoroutineDispatcher) : ScopedViewModel(uiDispatcher),
+    LifecycleObserver {
     var error: String? = null
 
     protected val _networkState = MutableLiveData<NetworkState>()
diff --git a/app/src/main/java/com/rootstrap/android/ui/base/Scope.kt b/app/src/main/java/com/rootstrap/android/ui/base/Scope.kt
new file mode 100644
index 0000000..1ea6fa8
--- /dev/null
+++ b/app/src/main/java/com/rootstrap/android/ui/base/Scope.kt
@@ -0,0 +1,28 @@
+package com.rootstrap.android.ui.base
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlin.coroutines.CoroutineContext
+
+interface Scope : CoroutineScope {
+
+    class Impl(override val uiDispatcher: CoroutineDispatcher) : Scope {
+        override lateinit var job: Job
+    }
+
+    var job: Job
+    val uiDispatcher: CoroutineDispatcher
+
+    override val coroutineContext: CoroutineContext
+        get() = uiDispatcher + job
+
+    fun initScope() {
+        job = SupervisorJob()
+    }
+
+    fun destroyScope() {
+        job.cancel()
+    }
+}
diff --git a/app/src/main/java/com/rootstrap/android/ui/base/ScopedViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/base/ScopedViewModel.kt
new file mode 100644
index 0000000..7e47777
--- /dev/null
+++ b/app/src/main/java/com/rootstrap/android/ui/base/ScopedViewModel.kt
@@ -0,0 +1,19 @@
+package com.rootstrap.android.ui.base
+
+import androidx.annotation.CallSuper
+import androidx.lifecycle.ViewModel
+import kotlinx.coroutines.CoroutineDispatcher
+
+abstract class ScopedViewModel(uiDispatcher: CoroutineDispatcher) : ViewModel(),
+    Scope by Scope.Impl(uiDispatcher) {
+
+    init {
+        initScope()
+    }
+
+    @CallSuper
+    override fun onCleared() {
+        destroyScope()
+        super.onCleared()
+    }
+}
diff --git a/app/src/main/java/com/rootstrap/android/util/NetworkState.kt b/app/src/main/java/com/rootstrap/android/util/NetworkState.kt
index fa41682..5d44aa8 100644
--- a/app/src/main/java/com/rootstrap/android/util/NetworkState.kt
+++ b/app/src/main/java/com/rootstrap/android/util/NetworkState.kt
@@ -1,7 +1,7 @@
 package com.rootstrap.android.util
 
 enum class NetworkState {
-    loading,
-    idle,
-    error
+    LOADING,
+    IDLE,
+    ERROR
 }
diff --git a/data/src/main/java/com/rootstrap/data/dto/request/UserSignInRequestSerializer.kt b/data/src/main/java/com/rootstrap/data/dto/request/UserSignInRequestSerializer.kt
index 3134784..4a205ad 100644
--- a/data/src/main/java/com/rootstrap/data/dto/request/UserSignInRequestSerializer.kt
+++ b/data/src/main/java/com/rootstrap/data/dto/request/UserSignInRequestSerializer.kt
@@ -5,4 +5,4 @@ data class UserSignInRequest(
     val password: String = ""
 )
 
-data class UserSignInRequestSerializer(val userSignInRequest: UserSignInRequest)
+data class UserSignInRequestSerializer(val user: UserSignInRequest)
diff --git a/data/src/main/java/com/rootstrap/data/managers/session/SessionManagerImpl.kt b/data/src/main/java/com/rootstrap/data/managers/session/SessionManagerImpl.kt
index 9df49a2..ae7f6a7 100644
--- a/data/src/main/java/com/rootstrap/data/managers/session/SessionManagerImpl.kt
+++ b/data/src/main/java/com/rootstrap/data/managers/session/SessionManagerImpl.kt
@@ -2,9 +2,8 @@ package com.rootstrap.data.managers.session
 
 import com.rootstrap.data.dto.response.User
 import com.rootstrap.data.util.Prefs
-import javax.inject.Inject
 
-class SessionManagerImpl @Inject constructor(private val prefs: Prefs) : SessionManager {
+class SessionManagerImpl (private val prefs: Prefs) : SessionManager {
 
     override var user: User? = prefs.user
         set(value) {

From 4e4e265b5374dfb77a2c584b8af1e3a69afc324d Mon Sep 17 00:00:00 2001
From: aguskoll <aguskoll@gmail.com>
Date: Tue, 11 Jan 2022 11:51:53 -0300
Subject: [PATCH 08/16] moved analytics into data and activities into packages

---
 .../rootstrap/android/tests/ProfileActivityTest.kt   |  4 ++--
 .../rootstrap/android/tests/SignInActivityTest.kt    |  4 ++--
 .../rootstrap/android/tests/SignUpActivityTest.kt    |  6 +++---
 app/src/main/AndroidManifest.xml                     |  6 +++---
 app/src/main/java/com/rootstrap/android/App.kt       |  4 ++--
 app/src/main/java/com/rootstrap/android/di/DI.kt     |  7 ++++++-
 .../java/com/rootstrap/android/ui/adapter/Adapter.kt |  3 ---
 .../ui/{activity/main => login}/SignInActivity.kt    |  9 +++++----
 .../main => login}/SignInActivityViewModel.kt        |  2 +-
 .../ui/{activity/main => login}/SignUpActivity.kt    |  9 +++++----
 .../main => login}/SignUpActivityViewModel.kt        |  2 +-
 .../ui/{activity/main => profile}/ProfileActivity.kt |  9 +++++----
 .../main => profile}/ProfileActivityViewModel.kt     |  2 +-
 app/src/main/res/layout/activity_sign_up.xml         |  2 +-
 data/build.gradle                                    |  3 +++
 .../java/com/rootstrap/data}/metrics/Analytics.kt    | 10 +++++-----
 .../main/java/com/rootstrap/data}/metrics/Events.kt  |  4 ++--
 .../com/rootstrap/data}/metrics/GoogleAnalytics.kt   |  8 ++++----
 .../com/rootstrap/data}/metrics/MetricsEvents.kt     |  2 +-
 .../com/rootstrap/data}/metrics/MixPanelAnalytics.kt | 12 ++++++------
 .../rootstrap/data}/metrics/base/BaseAnalytics.kt    |  2 +-
 .../com/rootstrap/data}/metrics/base/Provider.kt     |  2 +-
 22 files changed, 60 insertions(+), 52 deletions(-)
 delete mode 100644 app/src/main/java/com/rootstrap/android/ui/adapter/Adapter.kt
 rename app/src/main/java/com/rootstrap/android/ui/{activity/main => login}/SignInActivity.kt (91%)
 rename app/src/main/java/com/rootstrap/android/ui/{activity/main => login}/SignInActivityViewModel.kt (97%)
 rename app/src/main/java/com/rootstrap/android/ui/{activity/main => login}/SignUpActivity.kt (90%)
 rename app/src/main/java/com/rootstrap/android/ui/{activity/main => login}/SignUpActivityViewModel.kt (97%)
 rename app/src/main/java/com/rootstrap/android/ui/{activity/main => profile}/ProfileActivity.kt (89%)
 rename app/src/main/java/com/rootstrap/android/ui/{activity/main => profile}/ProfileActivityViewModel.kt (97%)
 rename {app/src/main/java/com/rootstrap/android => data/src/main/java/com/rootstrap/data}/metrics/Analytics.kt (78%)
 rename {app/src/main/java/com/rootstrap/android => data/src/main/java/com/rootstrap/data}/metrics/Events.kt (92%)
 rename {app/src/main/java/com/rootstrap/android => data/src/main/java/com/rootstrap/data}/metrics/GoogleAnalytics.kt (89%)
 rename {app/src/main/java/com/rootstrap/android => data/src/main/java/com/rootstrap/data}/metrics/MetricsEvents.kt (85%)
 rename {app/src/main/java/com/rootstrap/android => data/src/main/java/com/rootstrap/data}/metrics/MixPanelAnalytics.kt (85%)
 rename {app/src/main/java/com/rootstrap/android => data/src/main/java/com/rootstrap/data}/metrics/base/BaseAnalytics.kt (88%)
 rename {app/src/main/java/com/rootstrap/android => data/src/main/java/com/rootstrap/data}/metrics/base/Provider.kt (95%)

diff --git a/app/src/androidTest/java/com/rootstrap/android/tests/ProfileActivityTest.kt b/app/src/androidTest/java/com/rootstrap/android/tests/ProfileActivityTest.kt
index 54c03d4..8b94290 100644
--- a/app/src/androidTest/java/com/rootstrap/android/tests/ProfileActivityTest.kt
+++ b/app/src/androidTest/java/com/rootstrap/android/tests/ProfileActivityTest.kt
@@ -5,8 +5,8 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import com.rootstrap.android.R
-import com.rootstrap.android.ui.activity.main.ProfileActivity
-import com.rootstrap.android.ui.activity.main.SignUpActivity
+import com.rootstrap.android.ui.profile.ProfileActivity
+import com.rootstrap.android.ui.login.SignUpActivity
 import com.rootstrap.android.utils.BaseTests
 import dagger.hilt.android.testing.HiltAndroidTest
 import okhttp3.mockwebserver.Dispatcher
diff --git a/app/src/androidTest/java/com/rootstrap/android/tests/SignInActivityTest.kt b/app/src/androidTest/java/com/rootstrap/android/tests/SignInActivityTest.kt
index d39c60b..313e2e4 100644
--- a/app/src/androidTest/java/com/rootstrap/android/tests/SignInActivityTest.kt
+++ b/app/src/androidTest/java/com/rootstrap/android/tests/SignInActivityTest.kt
@@ -4,8 +4,8 @@ import androidx.test.core.app.ActivityScenario
 import com.google.gson.Gson
 import com.rootstrap.android.R
 import com.rootstrap.data.dto.response.UserSerializer
-import com.rootstrap.android.ui.activity.main.ProfileActivity
-import com.rootstrap.android.ui.activity.main.SignInActivity
+import com.rootstrap.android.ui.profile.ProfileActivity
+import com.rootstrap.android.ui.login.SignInActivity
 import com.rootstrap.android.utils.BaseTests
 import dagger.hilt.android.testing.HiltAndroidTest
 import okhttp3.mockwebserver.Dispatcher
diff --git a/app/src/androidTest/java/com/rootstrap/android/tests/SignUpActivityTest.kt b/app/src/androidTest/java/com/rootstrap/android/tests/SignUpActivityTest.kt
index 09dae1c..2c61dd1 100644
--- a/app/src/androidTest/java/com/rootstrap/android/tests/SignUpActivityTest.kt
+++ b/app/src/androidTest/java/com/rootstrap/android/tests/SignUpActivityTest.kt
@@ -4,9 +4,9 @@ import androidx.test.core.app.ActivityScenario
 import com.google.gson.Gson
 import com.rootstrap.android.R
 import com.rootstrap.data.dto.response.UserSerializer
-import com.rootstrap.android.ui.activity.main.ProfileActivity
-import com.rootstrap.android.ui.activity.main.SignInActivity
-import com.rootstrap.android.ui.activity.main.SignUpActivity
+import com.rootstrap.android.ui.profile.ProfileActivity
+import com.rootstrap.android.ui.login.SignInActivity
+import com.rootstrap.android.ui.login.SignUpActivity
 import com.rootstrap.android.utils.BaseTests
 import dagger.hilt.android.testing.HiltAndroidTest
 import okhttp3.mockwebserver.Dispatcher
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9f08fae..2d525cb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
         android:theme="@style/AppTheme">
 
         <activity
-            android:name=".ui.activity.main.SignUpActivity"
+            android:name=".ui.login.SignUpActivity"
             android:screenOrientation="portrait"
             android:exported="true">
             <intent-filter>
@@ -26,11 +26,11 @@
         </activity>
 
         <activity
-            android:name=".ui.activity.main.ProfileActivity"
+            android:name=".ui.profile.ProfileActivity"
             android:screenOrientation="portrait" />
 
         <activity
-            android:name=".ui.activity.main.SignInActivity"
+            android:name=".ui.login.SignInActivity"
             android:screenOrientation="portrait" />
 
     </application>
diff --git a/app/src/main/java/com/rootstrap/android/App.kt b/app/src/main/java/com/rootstrap/android/App.kt
index 034c806..9603c11 100644
--- a/app/src/main/java/com/rootstrap/android/App.kt
+++ b/app/src/main/java/com/rootstrap/android/App.kt
@@ -2,8 +2,8 @@ package com.rootstrap.android
 
 import android.app.Application
 import com.rootstrap.android.di.initDI
-import com.rootstrap.android.metrics.Analytics
-import com.rootstrap.android.metrics.GoogleAnalytics
+import com.rootstrap.data.metrics.Analytics
+import com.rootstrap.data.metrics.GoogleAnalytics
 import com.rootstrap.data.api.interceptors.WifiService
 import org.koin.core.KoinExperimentalAPI
 
diff --git a/app/src/main/java/com/rootstrap/android/di/DI.kt b/app/src/main/java/com/rootstrap/android/di/DI.kt
index f94d691..1a064a1 100644
--- a/app/src/main/java/com/rootstrap/android/di/DI.kt
+++ b/app/src/main/java/com/rootstrap/android/di/DI.kt
@@ -4,7 +4,12 @@ import android.app.Application
 import android.content.Context
 import android.content.SharedPreferences
 import com.rootstrap.android.BuildConfig
-import com.rootstrap.android.ui.activity.main.*
+import com.rootstrap.android.ui.login.SignInActivity
+import com.rootstrap.android.ui.login.SignInActivityViewModel
+import com.rootstrap.android.ui.login.SignUpActivity
+import com.rootstrap.android.ui.login.SignUpActivityViewModel
+import com.rootstrap.android.ui.profile.ProfileActivity
+import com.rootstrap.android.ui.profile.ProfileActivityViewModel
 import com.rootstrap.data.api.ApiProvider
 import com.rootstrap.data.api.ApiServiceFactory
 import com.rootstrap.data.api.interceptors.AuthenticationInterceptor
diff --git a/app/src/main/java/com/rootstrap/android/ui/adapter/Adapter.kt b/app/src/main/java/com/rootstrap/android/ui/adapter/Adapter.kt
deleted file mode 100644
index 5249c60..0000000
--- a/app/src/main/java/com/rootstrap/android/ui/adapter/Adapter.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.rootstrap.android.ui.adapter
-
-class Adapter
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivity.kt b/app/src/main/java/com/rootstrap/android/ui/login/SignInActivity.kt
similarity index 91%
rename from app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivity.kt
rename to app/src/main/java/com/rootstrap/android/ui/login/SignInActivity.kt
index 4c5052f..5fddcba 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/login/SignInActivity.kt
@@ -1,13 +1,14 @@
-package com.rootstrap.android.ui.activity.main
+package com.rootstrap.android.ui.login
 
 import android.Manifest
 import android.os.Bundle
 import androidx.lifecycle.Observer
 import com.rootstrap.android.R
 import com.rootstrap.android.databinding.ActivitySignInBinding
-import com.rootstrap.android.metrics.Analytics
-import com.rootstrap.android.metrics.PageEvents
-import com.rootstrap.android.metrics.VISIT_SIGN_IN
+import com.rootstrap.data.metrics.Analytics
+import com.rootstrap.data.metrics.PageEvents
+import com.rootstrap.data.metrics.VISIT_SIGN_IN
+import com.rootstrap.android.ui.profile.ProfileActivity
 import com.rootstrap.android.ui.view.AuthView
 import com.rootstrap.android.util.NetworkState
 import com.rootstrap.android.util.extensions.value
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivityViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/login/SignInActivityViewModel.kt
similarity index 97%
rename from app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivityViewModel.kt
rename to app/src/main/java/com/rootstrap/android/ui/login/SignInActivityViewModel.kt
index 2253815..018e53c 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignInActivityViewModel.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/login/SignInActivityViewModel.kt
@@ -1,4 +1,4 @@
-package com.rootstrap.android.ui.activity.main
+package com.rootstrap.android.ui.login
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivity.kt b/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivity.kt
similarity index 90%
rename from app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivity.kt
rename to app/src/main/java/com/rootstrap/android/ui/login/SignUpActivity.kt
index 2a30036..1fa2ea9 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivity.kt
@@ -1,14 +1,15 @@
-package com.rootstrap.android.ui.activity.main
+package com.rootstrap.android.ui.login
 
 import android.content.Intent
 import android.os.Bundle
 import androidx.lifecycle.Observer
 import com.rootstrap.android.R
 import com.rootstrap.android.databinding.ActivitySignUpBinding
-import com.rootstrap.android.metrics.Analytics
-import com.rootstrap.android.metrics.PageEvents
-import com.rootstrap.android.metrics.VISIT_SIGN_UP
+import com.rootstrap.data.metrics.Analytics
+import com.rootstrap.data.metrics.PageEvents
+import com.rootstrap.data.metrics.VISIT_SIGN_UP
 import com.rootstrap.android.ui.base.BaseActivity
+import com.rootstrap.android.ui.profile.ProfileActivity
 import com.rootstrap.android.ui.view.AuthView
 import com.rootstrap.android.util.NetworkState
 import com.rootstrap.android.util.extensions.value
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivityViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivityViewModel.kt
similarity index 97%
rename from app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivityViewModel.kt
rename to app/src/main/java/com/rootstrap/android/ui/login/SignUpActivityViewModel.kt
index bd09428..4398af2 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/SignUpActivityViewModel.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivityViewModel.kt
@@ -1,4 +1,4 @@
-package com.rootstrap.android.ui.activity.main
+package com.rootstrap.android.ui.login
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivity.kt b/app/src/main/java/com/rootstrap/android/ui/profile/ProfileActivity.kt
similarity index 89%
rename from app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivity.kt
rename to app/src/main/java/com/rootstrap/android/ui/profile/ProfileActivity.kt
index e584a5a..af35fdc 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/profile/ProfileActivity.kt
@@ -1,12 +1,13 @@
-package com.rootstrap.android.ui.activity.main
+package com.rootstrap.android.ui.profile
 
 import android.os.Bundle
 import androidx.lifecycle.Observer
 import com.rootstrap.android.R
 import com.rootstrap.android.databinding.ActivityProfileBinding
-import com.rootstrap.android.metrics.Analytics
-import com.rootstrap.android.metrics.PageEvents
-import com.rootstrap.android.metrics.VISIT_PROFILE
+import com.rootstrap.data.metrics.Analytics
+import com.rootstrap.data.metrics.PageEvents
+import com.rootstrap.data.metrics.VISIT_PROFILE
+import com.rootstrap.android.ui.login.SignUpActivity
 import com.rootstrap.android.ui.base.BaseActivity
 import com.rootstrap.android.ui.view.ProfileView
 import com.rootstrap.android.util.NetworkState
diff --git a/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivityViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/profile/ProfileActivityViewModel.kt
similarity index 97%
rename from app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivityViewModel.kt
rename to app/src/main/java/com/rootstrap/android/ui/profile/ProfileActivityViewModel.kt
index 1d1b669..649b79a 100644
--- a/app/src/main/java/com/rootstrap/android/ui/activity/main/ProfileActivityViewModel.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/profile/ProfileActivityViewModel.kt
@@ -1,4 +1,4 @@
-package com.rootstrap.android.ui.activity.main
+package com.rootstrap.android.ui.profile
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml
index 10863ce..6528681 100644
--- a/app/src/main/res/layout/activity_sign_up.xml
+++ b/app/src/main/res/layout/activity_sign_up.xml
@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/sign_up_margin_horizontal"
-        tools:context=".ui.activity.main.SignUpActivity">
+        tools:context=".ui.login.SignUpActivity">
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/first_name_text_input_layout"
diff --git a/data/build.gradle b/data/build.gradle
index adb3772..2ed4125 100644
--- a/data/build.gradle
+++ b/data/build.gradle
@@ -19,17 +19,20 @@ android {
         getByName("debug") {
             minifyEnabled false
             buildConfigField("String", "API_URL", "\"https://rails5-api-base.herokuapp.com/api/v1/\"")
+            buildConfigField("String", "MIX_PANEL_KEY", "\"mixpanel_api_key\"")
         }
 
         create("staging") {
             initWith(getByName("debug"))
             buildConfigField("String", "API_URL", "\"https://proj-staging.herokuapp.com/api/\"")
+            buildConfigField("String", "MIX_PANEL_KEY", "\"mixpanel_api_key\"")
         }
 
         getByName("release") {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             buildConfigField("String", "API_URL", "\"https://proj-production.herokuapp.com/api/\"")
+            buildConfigField("String", "MIX_PANEL_KEY", "\"mixpanel_api_key\"")
         }
     }
     compileOptions {
diff --git a/app/src/main/java/com/rootstrap/android/metrics/Analytics.kt b/data/src/main/java/com/rootstrap/data/metrics/Analytics.kt
similarity index 78%
rename from app/src/main/java/com/rootstrap/android/metrics/Analytics.kt
rename to data/src/main/java/com/rootstrap/data/metrics/Analytics.kt
index 0099f31..49239ca 100644
--- a/app/src/main/java/com/rootstrap/android/metrics/Analytics.kt
+++ b/data/src/main/java/com/rootstrap/data/metrics/Analytics.kt
@@ -1,9 +1,9 @@
-package com.rootstrap.android.metrics
+package com.rootstrap.data.metrics
 
-import com.rootstrap.android.metrics.base.BaseAnalytics
-import com.rootstrap.android.metrics.base.Provider
-import com.rootstrap.android.metrics.base.TrackEvent
-import com.rootstrap.android.metrics.base.UserProperty
+import com.rootstrap.data.metrics.base.BaseAnalytics
+import com.rootstrap.data.metrics.base.Provider
+import com.rootstrap.data.metrics.base.TrackEvent
+import com.rootstrap.data.metrics.base.UserProperty
 
 object Analytics : BaseAnalytics {
     var providers: ArrayList<Provider> = ArrayList()
diff --git a/app/src/main/java/com/rootstrap/android/metrics/Events.kt b/data/src/main/java/com/rootstrap/data/metrics/Events.kt
similarity index 92%
rename from app/src/main/java/com/rootstrap/android/metrics/Events.kt
rename to data/src/main/java/com/rootstrap/data/metrics/Events.kt
index c939024..5dc6504 100644
--- a/app/src/main/java/com/rootstrap/android/metrics/Events.kt
+++ b/data/src/main/java/com/rootstrap/data/metrics/Events.kt
@@ -1,6 +1,6 @@
-package com.rootstrap.android.metrics
+package com.rootstrap.data.metrics
 
-import com.rootstrap.android.metrics.base.TrackEvent
+import com.rootstrap.data.metrics.base.TrackEvent
 
 class UserEvents {
     companion object {
diff --git a/app/src/main/java/com/rootstrap/android/metrics/GoogleAnalytics.kt b/data/src/main/java/com/rootstrap/data/metrics/GoogleAnalytics.kt
similarity index 89%
rename from app/src/main/java/com/rootstrap/android/metrics/GoogleAnalytics.kt
rename to data/src/main/java/com/rootstrap/data/metrics/GoogleAnalytics.kt
index b76eeba..acdaf94 100644
--- a/app/src/main/java/com/rootstrap/android/metrics/GoogleAnalytics.kt
+++ b/data/src/main/java/com/rootstrap/data/metrics/GoogleAnalytics.kt
@@ -1,10 +1,10 @@
-package com.rootstrap.android.metrics
+package com.rootstrap.data.metrics
 
 import android.content.Context
 import com.google.firebase.analytics.FirebaseAnalytics
-import com.rootstrap.android.metrics.base.Provider
-import com.rootstrap.android.metrics.base.TrackEvent
-import com.rootstrap.android.metrics.base.UserProperty
+import com.rootstrap.data.metrics.base.Provider
+import com.rootstrap.data.metrics.base.TrackEvent
+import com.rootstrap.data.metrics.base.UserProperty
 import org.json.JSONException
 
 /**
diff --git a/app/src/main/java/com/rootstrap/android/metrics/MetricsEvents.kt b/data/src/main/java/com/rootstrap/data/metrics/MetricsEvents.kt
similarity index 85%
rename from app/src/main/java/com/rootstrap/android/metrics/MetricsEvents.kt
rename to data/src/main/java/com/rootstrap/data/metrics/MetricsEvents.kt
index c73c69e..5aad9c3 100644
--- a/app/src/main/java/com/rootstrap/android/metrics/MetricsEvents.kt
+++ b/data/src/main/java/com/rootstrap/data/metrics/MetricsEvents.kt
@@ -1,4 +1,4 @@
-package com.rootstrap.android.metrics
+package com.rootstrap.data.metrics
 
 // sample events
 const val LOGIN = "logIn"
diff --git a/app/src/main/java/com/rootstrap/android/metrics/MixPanelAnalytics.kt b/data/src/main/java/com/rootstrap/data/metrics/MixPanelAnalytics.kt
similarity index 85%
rename from app/src/main/java/com/rootstrap/android/metrics/MixPanelAnalytics.kt
rename to data/src/main/java/com/rootstrap/data/metrics/MixPanelAnalytics.kt
index 283f096..9177f24 100644
--- a/app/src/main/java/com/rootstrap/android/metrics/MixPanelAnalytics.kt
+++ b/data/src/main/java/com/rootstrap/data/metrics/MixPanelAnalytics.kt
@@ -1,11 +1,11 @@
-package com.rootstrap.android.metrics
+package com.rootstrap.data.metrics
 
 import android.content.Context
 import com.mixpanel.android.mpmetrics.MixpanelAPI
-import com.rootstrap.android.R
-import com.rootstrap.android.metrics.base.Provider
-import com.rootstrap.android.metrics.base.TrackEvent
-import com.rootstrap.android.metrics.base.UserProperty
+import com.rootstrap.data.BuildConfig
+import com.rootstrap.data.metrics.base.Provider
+import com.rootstrap.data.metrics.base.TrackEvent
+import com.rootstrap.data.metrics.base.UserProperty
 import org.json.JSONException
 
 /**
@@ -13,7 +13,7 @@ import org.json.JSONException
  * */
 class MixPanelAnalytics(context: Context) : Provider {
     var analytic: MixpanelAPI =
-        MixpanelAPI.getInstance(context, context.getString(R.string.mixpanel_api_key))
+        MixpanelAPI.getInstance(context, BuildConfig.MIX_PANEL_KEY)
 
     /**
      * Track any event in the app
diff --git a/app/src/main/java/com/rootstrap/android/metrics/base/BaseAnalytics.kt b/data/src/main/java/com/rootstrap/data/metrics/base/BaseAnalytics.kt
similarity index 88%
rename from app/src/main/java/com/rootstrap/android/metrics/base/BaseAnalytics.kt
rename to data/src/main/java/com/rootstrap/data/metrics/base/BaseAnalytics.kt
index 3f9e1e9..aabd112 100644
--- a/app/src/main/java/com/rootstrap/android/metrics/base/BaseAnalytics.kt
+++ b/data/src/main/java/com/rootstrap/data/metrics/base/BaseAnalytics.kt
@@ -1,4 +1,4 @@
-package com.rootstrap.android.metrics.base
+package com.rootstrap.data.metrics.base
 
 /**
  * Add custom metrics
diff --git a/app/src/main/java/com/rootstrap/android/metrics/base/Provider.kt b/data/src/main/java/com/rootstrap/data/metrics/base/Provider.kt
similarity index 95%
rename from app/src/main/java/com/rootstrap/android/metrics/base/Provider.kt
rename to data/src/main/java/com/rootstrap/data/metrics/base/Provider.kt
index ab5d9b7..6238824 100644
--- a/app/src/main/java/com/rootstrap/android/metrics/base/Provider.kt
+++ b/data/src/main/java/com/rootstrap/data/metrics/base/Provider.kt
@@ -1,4 +1,4 @@
-package com.rootstrap.android.metrics.base
+package com.rootstrap.data.metrics.base
 
 import android.os.Bundle
 import com.google.gson.Gson

From a60e5be76b569082ff8ba1c618adeca487497879 Mon Sep 17 00:00:00 2001
From: aguskoll <aguskoll@gmail.com>
Date: Tue, 11 Jan 2022 15:17:37 -0300
Subject: [PATCH 09/16] removed scope view model added test libraries renamed
 user dto

---
 .idea/vcs.xml                                 |   7 ++
 README.md                                     |   7 +-
 .../android/tests/ProfileActivityTest.kt      |   2 -
 .../com/rootstrap/android/utils/BaseTests.kt  |   4 +-
 .../main/java/com/rootstrap/android/di/DI.kt  |   4 +-
 .../android/ui/base/BaseViewModel.kt          |  16 +--
 .../com/rootstrap/android/ui/base/Scope.kt    |  28 -----
 .../android/ui/base/ScopedViewModel.kt        |  19 ----
 .../android/ui/login/SignInActivity.kt        |   2 -
 .../ui/login/SignInActivityViewModel.kt       |  19 ++--
 .../android/ui/login/SignUpActivity.kt        |   2 +-
 .../ui/login/SignUpActivityViewModel.kt       |  20 ++--
 .../android/ui/profile/ProfileActivity.kt     |   1 -
 .../ui/profile/ProfileActivityViewModel.kt    |  16 +--
 .../com/rootstrap/android/util/UtilModule.kt  |   1 +
 .../util/dispatcher/AppDispatcherProvider.kt  |  11 ++
 .../util/dispatcher/DispatcherProvider.kt     |  10 ++
 .../android/SignInActivityViewModelTest.kt    |  99 +++++++++++++++++
 .../android/SignUpActivityViewModelTest.kt    | 102 ++++++++++++++++++
 .../com/rootstrap/android/ValidationTests.kt  |   2 +-
 .../android/test/TestDispatcherProvider.kt    |  15 +++
 .../rootstrap/android/test/UnitTestBase.kt    |  19 ++++
 build.gradle                                  |   8 +-
 buildSrc/src/main/java/Dependencies.kt        |  20 ++--
 .../request/UserSignUpRequestSerializer.kt    |   2 +-
 .../dto/response/UserResponseSerializer.kt    |  16 ++-
 .../data/managers/session/SessionManager.kt   |   2 +-
 .../managers/session/SessionManagerImpl.kt    |   4 +-
 .../java/com/rootstrap/data/util/Prefs.kt     |   2 +-
 29 files changed, 346 insertions(+), 114 deletions(-)
 delete mode 100644 app/src/main/java/com/rootstrap/android/ui/base/Scope.kt
 delete mode 100644 app/src/main/java/com/rootstrap/android/ui/base/ScopedViewModel.kt
 create mode 100644 app/src/main/java/com/rootstrap/android/util/UtilModule.kt
 create mode 100644 app/src/main/java/com/rootstrap/android/util/dispatcher/AppDispatcherProvider.kt
 create mode 100644 app/src/main/java/com/rootstrap/android/util/dispatcher/DispatcherProvider.kt
 create mode 100644 app/src/test/java/com/rootstrap/android/SignInActivityViewModelTest.kt
 create mode 100644 app/src/test/java/com/rootstrap/android/SignUpActivityViewModelTest.kt
 create mode 100644 app/src/test/java/com/rootstrap/android/test/TestDispatcherProvider.kt
 create mode 100644 app/src/test/java/com/rootstrap/android/test/UnitTestBase.kt

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..38b67fd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GithubSharedProjectSettings">
+    <option name="branchProtectionPatterns">
+      <list>
+        <option value="develop" />
+      </list>
+    </option>
+  </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
diff --git a/README.md b/README.md
index ca66eb4..447838a 100644
--- a/README.md
+++ b/README.md
@@ -73,8 +73,13 @@ Lanes for each deployment target example are provided with some basic behavior:
 
 Check `fastlane/Appfile` and `fastlane/Fastfile` for more information.
 
+## CI/CD configuration with Bitrise (updated on Dec 12th 2021)
 
-## Continuous Integration with GitHub Actions
+We are going to start using a tool called Bitrise to configure de CI/CD pipelines for mobiles apps.
+
+--> For Android apps you can find how to do it in this link: https://www.notion.so/rootstrap/Android-CI-CD-26d4abd4f2454224be8f617110147366
+
+## Continuous Integration with GitHub Actions (DEPRECATED)
 
 We provide an example workflow [cicd.yml](.github/workflows/cicd.yml) including two jobs for running under [GitHub Actions](https://docs.github.com/en/actions), which can be modified according to the specifics of each project:
 
diff --git a/app/src/androidTest/java/com/rootstrap/android/tests/ProfileActivityTest.kt b/app/src/androidTest/java/com/rootstrap/android/tests/ProfileActivityTest.kt
index 8b94290..12d8e13 100644
--- a/app/src/androidTest/java/com/rootstrap/android/tests/ProfileActivityTest.kt
+++ b/app/src/androidTest/java/com/rootstrap/android/tests/ProfileActivityTest.kt
@@ -8,7 +8,6 @@ import com.rootstrap.android.R
 import com.rootstrap.android.ui.profile.ProfileActivity
 import com.rootstrap.android.ui.login.SignUpActivity
 import com.rootstrap.android.utils.BaseTests
-import dagger.hilt.android.testing.HiltAndroidTest
 import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.RecordedRequest
@@ -17,7 +16,6 @@ import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 
-@HiltAndroidTest
 class ProfileActivityTest : BaseTests() {
 
     private lateinit var activity: ProfileActivity
diff --git a/app/src/androidTest/java/com/rootstrap/android/utils/BaseTests.kt b/app/src/androidTest/java/com/rootstrap/android/utils/BaseTests.kt
index 96dd335..bf29e1b 100644
--- a/app/src/androidTest/java/com/rootstrap/android/utils/BaseTests.kt
+++ b/app/src/androidTest/java/com/rootstrap/android/utils/BaseTests.kt
@@ -14,7 +14,7 @@ import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry
 import androidx.test.runner.lifecycle.Stage
 import com.rootstrap.data.managers.session.SessionManager
-import com.rootstrap.data.dto.response.User
+import com.rootstrap.data.dto.response.UserDTO
 import com.rootstrap.data.api.ApiServiceFactory
 import dagger.hilt.android.testing.HiltAndroidRule
 import okhttp3.mockwebserver.Dispatcher
@@ -46,7 +46,7 @@ open class BaseTests {
         mockServer.stopServer()
     }
 
-    open fun testUser() = User(
+    open fun testUser() = UserDTO(
         "9032",
         "user123@mail.com",
         "Richard",
diff --git a/app/src/main/java/com/rootstrap/android/di/DI.kt b/app/src/main/java/com/rootstrap/android/di/DI.kt
index 1a064a1..c3115d8 100644
--- a/app/src/main/java/com/rootstrap/android/di/DI.kt
+++ b/app/src/main/java/com/rootstrap/android/di/DI.kt
@@ -10,6 +10,8 @@ import com.rootstrap.android.ui.login.SignUpActivity
 import com.rootstrap.android.ui.login.SignUpActivityViewModel
 import com.rootstrap.android.ui.profile.ProfileActivity
 import com.rootstrap.android.ui.profile.ProfileActivityViewModel
+import com.rootstrap.android.util.dispatcher.AppDispatcherProvider
+import com.rootstrap.android.util.dispatcher.DispatcherProvider
 import com.rootstrap.data.api.ApiProvider
 import com.rootstrap.data.api.ApiServiceFactory
 import com.rootstrap.data.api.interceptors.AuthenticationInterceptor
@@ -69,7 +71,7 @@ val dataModule = module {
             Context.MODE_PRIVATE
         )
     }
-
+    single<DispatcherProvider> { AppDispatcherProvider() }
     factory { Prefs(get()) }
     factory { UserRepository(get()) }
     single<SessionManager> { SessionManagerImpl(get()) }
diff --git a/app/src/main/java/com/rootstrap/android/ui/base/BaseViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/base/BaseViewModel.kt
index 24294c4..990fcaf 100644
--- a/app/src/main/java/com/rootstrap/android/ui/base/BaseViewModel.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/base/BaseViewModel.kt
@@ -1,30 +1,22 @@
 package com.rootstrap.android.ui.base
 
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleObserver
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.OnLifecycleEvent
-import androidx.lifecycle.ViewModel
+import androidx.lifecycle.*
 import com.rootstrap.android.util.NetworkState
-import com.squareup.otto.Bus
-import kotlinx.coroutines.CoroutineDispatcher
 
 /**
  * A [ViewModel] base class
  * implement app general LiveData as Session or User
  * **/
-open class BaseViewModel(uiDispatcher: CoroutineDispatcher) : ScopedViewModel(uiDispatcher),
-    LifecycleObserver {
+open class BaseViewModel : ViewModel() {
     var error: String? = null
 
     protected val _networkState = MutableLiveData<NetworkState>()
     val networkState: LiveData<NetworkState>
         get() = _networkState
 
-    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
+  /*  @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
     fun register() = Bus().register(this)
 
     @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
-    fun unregister() = Bus().unregister(this)
+    fun unregister() = Bus().unregister(this) */
 }
diff --git a/app/src/main/java/com/rootstrap/android/ui/base/Scope.kt b/app/src/main/java/com/rootstrap/android/ui/base/Scope.kt
deleted file mode 100644
index 1ea6fa8..0000000
--- a/app/src/main/java/com/rootstrap/android/ui/base/Scope.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.rootstrap.android.ui.base
-
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.SupervisorJob
-import kotlin.coroutines.CoroutineContext
-
-interface Scope : CoroutineScope {
-
-    class Impl(override val uiDispatcher: CoroutineDispatcher) : Scope {
-        override lateinit var job: Job
-    }
-
-    var job: Job
-    val uiDispatcher: CoroutineDispatcher
-
-    override val coroutineContext: CoroutineContext
-        get() = uiDispatcher + job
-
-    fun initScope() {
-        job = SupervisorJob()
-    }
-
-    fun destroyScope() {
-        job.cancel()
-    }
-}
diff --git a/app/src/main/java/com/rootstrap/android/ui/base/ScopedViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/base/ScopedViewModel.kt
deleted file mode 100644
index 7e47777..0000000
--- a/app/src/main/java/com/rootstrap/android/ui/base/ScopedViewModel.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.rootstrap.android.ui.base
-
-import androidx.annotation.CallSuper
-import androidx.lifecycle.ViewModel
-import kotlinx.coroutines.CoroutineDispatcher
-
-abstract class ScopedViewModel(uiDispatcher: CoroutineDispatcher) : ViewModel(),
-    Scope by Scope.Impl(uiDispatcher) {
-
-    init {
-        initScope()
-    }
-
-    @CallSuper
-    override fun onCleared() {
-        destroyScope()
-        super.onCleared()
-    }
-}
diff --git a/app/src/main/java/com/rootstrap/android/ui/login/SignInActivity.kt b/app/src/main/java/com/rootstrap/android/ui/login/SignInActivity.kt
index 5fddcba..9b2ecad 100644
--- a/app/src/main/java/com/rootstrap/android/ui/login/SignInActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/login/SignInActivity.kt
@@ -30,8 +30,6 @@ class SignInActivity : PermissionActivity(), AuthView {
 
         binding.signInButton.setOnClickListener { signIn() }
 
-        lifecycle.addObserver(viewModel)
-
         setObservers()
         sampleAskForPermission()
     }
diff --git a/app/src/main/java/com/rootstrap/android/ui/login/SignInActivityViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/login/SignInActivityViewModel.kt
index 018e53c..4174a0b 100644
--- a/app/src/main/java/com/rootstrap/android/ui/login/SignInActivityViewModel.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/login/SignInActivityViewModel.kt
@@ -5,20 +5,21 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import com.rootstrap.android.ui.base.BaseViewModel
 import com.rootstrap.android.util.NetworkState
+import com.rootstrap.android.util.dispatcher.DispatcherProvider
 import com.rootstrap.data.api.ApiException
 import com.rootstrap.data.dto.request.UserSignInRequest
 import com.rootstrap.data.dto.request.UserSignInRequestSerializer
 import com.rootstrap.data.dto.response.DataResult
+import com.rootstrap.data.dto.response.toDomainUser
 import com.rootstrap.data.managers.session.SessionManager
 import com.rootstrap.usecases.SignIn
-import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.launch
 
 open class SignInActivityViewModel(
     private val signIn: SignIn,
     private val sessionManager: SessionManager,
-    uiDispatcher: CoroutineDispatcher
-) : BaseViewModel(uiDispatcher) {
+    private val dispatcherProvider: DispatcherProvider
+) : BaseViewModel() {
 
     private val _state = MutableLiveData<SignInState>()
     val state: LiveData<SignInState>
@@ -26,15 +27,15 @@ open class SignInActivityViewModel(
 
     fun signIn(user: UserSignInRequest) {
         _networkState.value = NetworkState.LOADING
-        viewModelScope.launch {
+        viewModelScope.launch(dispatcherProvider.io) {
             when (val result = signIn.invoke(UserSignInRequestSerializer(user))) {
                 is DataResult.Success -> {
                     result.data?.user?.let { user ->
-                        sessionManager.signIn(user)
+                        sessionManager.signIn(user.toDomainUser())
                     }
 
                     restoreNetworkState()
-                    _state.value = SignInState.SIGN_IN_SUCCESS
+                    _state.postValue(SignInState.SIGN_IN_SUCCESS)
                 }
                 is DataResult.Error -> {
                     handleError(result.exception)
@@ -46,12 +47,12 @@ open class SignInActivityViewModel(
 
     private fun handleError(exception: ApiException?) {
         error = exception?.message
-        _networkState.value = NetworkState.ERROR
-        _state.value = SignInState.SIGN_IN_FAILURE
+        _networkState.postValue(NetworkState.ERROR)
+        _state.postValue(SignInState.SIGN_IN_FAILURE)
     }
 
     private fun restoreNetworkState() {
-        _networkState.value = NetworkState.IDLE
+        _networkState.postValue(NetworkState.IDLE)
     }
 }
 
diff --git a/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivity.kt b/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivity.kt
index 1fa2ea9..e4b6182 100644
--- a/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivity.kt
@@ -32,7 +32,7 @@ class SignUpActivity : BaseActivity(), AuthView {
             signUpButton.setOnClickListener { signUp() }
             signInTextView.setOnClickListener { signIn() }
         }
-        lifecycle.addObserver(viewModel)
+
         setObservers()
     }
 
diff --git a/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivityViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivityViewModel.kt
index 4398af2..e0742fd 100644
--- a/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivityViewModel.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivityViewModel.kt
@@ -5,21 +5,21 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import com.rootstrap.android.ui.base.BaseViewModel
 import com.rootstrap.android.util.NetworkState
+import com.rootstrap.android.util.dispatcher.DispatcherProvider
 import com.rootstrap.data.api.ApiException
 import com.rootstrap.data.dto.request.UserSignUpRequest
 import com.rootstrap.data.dto.request.UserSignUpRequestSerializer
 import com.rootstrap.data.dto.response.DataResult
+import com.rootstrap.data.dto.response.toDomainUser
 import com.rootstrap.data.managers.session.SessionManager
-
 import com.rootstrap.usecases.SignUp
-import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.launch
 
 open class SignUpActivityViewModel(
     private val signUp: SignUp,
     private val sessionManager: SessionManager,
-    uiDispatcher: CoroutineDispatcher
-) : BaseViewModel(uiDispatcher) {
+    private val dispatcherProvider: DispatcherProvider
+) : BaseViewModel() {
 
     private val _state = MutableLiveData<SignUpState>()
     val state: LiveData<SignUpState>
@@ -27,16 +27,16 @@ open class SignUpActivityViewModel(
 
     fun signUp(userSignUpRequest: UserSignUpRequest) {
         _networkState.value = NetworkState.LOADING
-        viewModelScope.launch {
+        viewModelScope.launch(dispatcherProvider.io) {
 
             when (val result = signUp.invoke(UserSignUpRequestSerializer(userSignUpRequest))) {
                 is DataResult.Success -> {
                     result.data?.user?.let { user ->
-                        sessionManager.signIn(user)
+                        sessionManager.signIn(user.toDomainUser())
                     } ?: handleError(ApiException(null))
 
                     restoreNetworkState()
-                    _state.value = SignUpState.SIGN_UP_SUCCESS
+                    _state.postValue(SignUpState.SIGN_UP_SUCCESS)
                 }
                 is DataResult.Error -> {
                     handleError(result.exception)
@@ -48,12 +48,12 @@ open class SignUpActivityViewModel(
 
     private fun handleError(exception: ApiException?) {
         error = exception?.message
-        _networkState.value = NetworkState.ERROR
-        _state.value = SignUpState.SIGN_UP_FAILURE
+        _networkState.postValue(NetworkState.ERROR)
+        _state.postValue(SignUpState.SIGN_UP_FAILURE)
     }
 
     private fun restoreNetworkState() {
-        _networkState.value = NetworkState.IDLE
+        _networkState.postValue(NetworkState.IDLE)
     }
 }
 
diff --git a/app/src/main/java/com/rootstrap/android/ui/profile/ProfileActivity.kt b/app/src/main/java/com/rootstrap/android/ui/profile/ProfileActivity.kt
index af35fdc..a3bec42 100644
--- a/app/src/main/java/com/rootstrap/android/ui/profile/ProfileActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/profile/ProfileActivity.kt
@@ -33,7 +33,6 @@ class ProfileActivity : BaseActivity(), ProfileView {
             signOutButton.setOnClickListener { viewModel.signOut() }
         }
 
-        lifecycle.addObserver(viewModel)
         setObservers()
     }
 
diff --git a/app/src/main/java/com/rootstrap/android/ui/profile/ProfileActivityViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/profile/ProfileActivityViewModel.kt
index 649b79a..e4e7f76 100644
--- a/app/src/main/java/com/rootstrap/android/ui/profile/ProfileActivityViewModel.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/profile/ProfileActivityViewModel.kt
@@ -5,18 +5,18 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import com.rootstrap.android.ui.base.BaseViewModel
 import com.rootstrap.android.util.NetworkState
+import com.rootstrap.android.util.dispatcher.DispatcherProvider
 import com.rootstrap.data.api.ApiException
 import com.rootstrap.data.dto.response.DataResult
 import com.rootstrap.data.managers.session.SessionManager
 import com.rootstrap.usecases.SignOut
-import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.launch
 
 open class ProfileActivityViewModel(
     private val signOut: SignOut,
     private val sessionManager: SessionManager,
-    uiDispatcher: CoroutineDispatcher
-) : BaseViewModel(uiDispatcher) {
+    private val dispatcherProvider: DispatcherProvider
+) : BaseViewModel() {
 
     private val _state = MutableLiveData<ProfileState>()
     val state: LiveData<ProfileState>
@@ -24,11 +24,11 @@ open class ProfileActivityViewModel(
 
     fun signOut() {
         _networkState.value = NetworkState.LOADING
-        viewModelScope.launch {
+        viewModelScope.launch(dispatcherProvider.io) {
             when (val result = signOut.invoke()) {
                 is DataResult.Success -> {
                     restoreNetworkState()
-                    _state.value = ProfileState.SIGN_OUT_SUCCESS
+                    _state.postValue(ProfileState.SIGN_OUT_SUCCESS)
                     sessionManager.signOut()
                 }
                 is DataResult.Error -> {
@@ -41,12 +41,12 @@ open class ProfileActivityViewModel(
 
     private fun handleError(exception: ApiException?) {
         error = exception?.message
-        _networkState.value = NetworkState.ERROR
-        _state.value = ProfileState.SIGN_OUT_FAILURE
+        _networkState.postValue(NetworkState.ERROR)
+        _state.postValue(ProfileState.SIGN_OUT_FAILURE)
     }
 
     private fun restoreNetworkState() {
-        _networkState.value = NetworkState.IDLE
+        _networkState.postValue(NetworkState.IDLE)
     }
 }
 
diff --git a/app/src/main/java/com/rootstrap/android/util/UtilModule.kt b/app/src/main/java/com/rootstrap/android/util/UtilModule.kt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/app/src/main/java/com/rootstrap/android/util/UtilModule.kt
@@ -0,0 +1 @@
+
diff --git a/app/src/main/java/com/rootstrap/android/util/dispatcher/AppDispatcherProvider.kt b/app/src/main/java/com/rootstrap/android/util/dispatcher/AppDispatcherProvider.kt
new file mode 100644
index 0000000..f53ba6c
--- /dev/null
+++ b/app/src/main/java/com/rootstrap/android/util/dispatcher/AppDispatcherProvider.kt
@@ -0,0 +1,11 @@
+package com.rootstrap.android.util.dispatcher
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+
+class AppDispatcherProvider : DispatcherProvider {
+    override val io: CoroutineDispatcher = Dispatchers.IO
+    override val default: CoroutineDispatcher = Dispatchers.Default
+    override val main: CoroutineDispatcher = Dispatchers.Main
+    override val unconfined: CoroutineDispatcher = Dispatchers.Unconfined
+}
diff --git a/app/src/main/java/com/rootstrap/android/util/dispatcher/DispatcherProvider.kt b/app/src/main/java/com/rootstrap/android/util/dispatcher/DispatcherProvider.kt
new file mode 100644
index 0000000..29c0213
--- /dev/null
+++ b/app/src/main/java/com/rootstrap/android/util/dispatcher/DispatcherProvider.kt
@@ -0,0 +1,10 @@
+package com.rootstrap.android.util.dispatcher
+
+import kotlinx.coroutines.CoroutineDispatcher
+
+interface DispatcherProvider {
+    val io: CoroutineDispatcher
+    val default: CoroutineDispatcher
+    val main: CoroutineDispatcher
+    val unconfined: CoroutineDispatcher
+}
diff --git a/app/src/test/java/com/rootstrap/android/SignInActivityViewModelTest.kt b/app/src/test/java/com/rootstrap/android/SignInActivityViewModelTest.kt
new file mode 100644
index 0000000..aaaadc7
--- /dev/null
+++ b/app/src/test/java/com/rootstrap/android/SignInActivityViewModelTest.kt
@@ -0,0 +1,99 @@
+package com.rootstrap.android
+
+import com.rootstrap.android.test.TestDispatcherProvider
+import com.rootstrap.android.test.UnitTestBase
+import com.rootstrap.android.ui.login.SignInActivityViewModel
+import com.rootstrap.android.ui.login.SignInState
+import com.rootstrap.android.util.NetworkState
+import com.rootstrap.data.api.ApiException
+import com.rootstrap.data.dto.request.UserSignInRequest
+import com.rootstrap.data.dto.request.UserSignInRequestSerializer
+import com.rootstrap.data.dto.response.DataResult
+import com.rootstrap.data.dto.response.UserResponseSerializer
+import com.rootstrap.data.managers.session.SessionManager
+import com.rootstrap.domain.User
+import com.rootstrap.usecases.SignIn
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import io.mockk.impl.annotations.RelaxedMockK
+import io.mockk.verify
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+
+@ExperimentalCoroutinesApi
+class SignInActivityViewModelTest : UnitTestBase() {
+
+    private lateinit var viewModel: SignInActivityViewModel
+
+    @RelaxedMockK
+    lateinit var sessionManager: SessionManager
+
+    @RelaxedMockK
+    lateinit var signIn: SignIn
+
+    @MockK
+    lateinit var user: User
+
+    @MockK
+    lateinit var userSignInRequestSerializer: UserSignInRequestSerializer
+
+    @MockK
+    lateinit var userSignInResponseSerializer: UserResponseSerializer
+
+    @MockK
+    lateinit var userSignInRequest: UserSignInRequest
+
+    companion object {
+        const val ERROR_EXAMPLE_TEXT = "Time out example"
+    }
+
+    @Before
+    override fun setup() {
+        super.setup()
+        every { userSignInRequestSerializer.user } returns userSignInRequest
+        viewModel = SignInActivityViewModel(signIn, sessionManager, TestDispatcherProvider()) // ver q hacer con los dispatchers
+    }
+
+    // reading: naming standards for unit testing https://osherove.com/blog/2005/4/3/naming-standards-for-unit-tests.html
+    @Test
+    fun `signIn success assert signInSuccess and network idle`() {
+        var state: SignInState? = null
+        coEvery { signIn.invoke(userSignInRequestSerializer) } returns DataResult.Success(
+            userSignInResponseSerializer
+        )
+
+        viewModel.signIn(userSignInRequest)
+        viewModel.state.observeForever {
+            state = it
+        }
+
+        assertEquals(state, SignInState.SIGN_IN_SUCCESS)
+        assertEquals(viewModel.networkState.value, NetworkState.IDLE)
+        verify { sessionManager.signIn(user) }
+        coVerify { signIn.invoke(userSignInRequestSerializer) }
+    }
+
+    @Test
+    fun `signIn fail assert signInFailure and network error`() {
+        var state: SignInState? = null
+        coEvery { signIn.invoke(userSignInRequestSerializer) } returns DataResult.Error(
+            ApiException(
+                ERROR_EXAMPLE_TEXT
+            )
+        )
+
+        viewModel.signIn(userSignInRequest)
+        viewModel.state.observeForever {
+            state = it
+        }
+
+        assertEquals(state, SignInState.SIGN_IN_FAILURE)
+        assertEquals(viewModel.networkState.value, NetworkState.ERROR)
+        assertEquals(viewModel.error, ERROR_EXAMPLE_TEXT)
+        coVerify { signIn.invoke(userSignInRequestSerializer) }
+    }
+}
diff --git a/app/src/test/java/com/rootstrap/android/SignUpActivityViewModelTest.kt b/app/src/test/java/com/rootstrap/android/SignUpActivityViewModelTest.kt
new file mode 100644
index 0000000..f559ef1
--- /dev/null
+++ b/app/src/test/java/com/rootstrap/android/SignUpActivityViewModelTest.kt
@@ -0,0 +1,102 @@
+package com.rootstrap.android
+
+import com.rootstrap.android.test.TestDispatcherProvider
+import com.rootstrap.android.test.UnitTestBase
+import com.rootstrap.android.ui.login.SignUpActivityViewModel
+import com.rootstrap.android.ui.login.SignUpState
+import com.rootstrap.android.util.NetworkState
+import com.rootstrap.data.api.ApiException
+import com.rootstrap.data.dto.request.UserSignUpRequest
+import com.rootstrap.data.dto.request.UserSignUpRequestSerializer
+import com.rootstrap.data.dto.response.DataResult
+import com.rootstrap.data.dto.response.UserDTO
+import com.rootstrap.data.dto.response.UserResponseSerializer
+import com.rootstrap.data.managers.session.SessionManager
+import com.rootstrap.domain.User
+import com.rootstrap.usecases.SignUp
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import io.mockk.impl.annotations.RelaxedMockK
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+
+@ExperimentalCoroutinesApi // This annotation is required to use TestDispatcherProvider is still an experiment
+class SignUpActivityViewModelTest : UnitTestBase() {
+
+    private lateinit var viewModel: SignUpActivityViewModel
+
+    @RelaxedMockK
+    lateinit var sessionManager: SessionManager
+
+    @RelaxedMockK
+    lateinit var signUp: SignUp
+
+    @MockK
+    lateinit var userDTO: UserDTO
+
+    @MockK
+    lateinit var user: User
+
+    @MockK
+    lateinit var userSignUpRequestSerializer: UserSignUpRequestSerializer
+
+    @MockK
+    lateinit var userResponseSerializer: UserResponseSerializer
+
+    @MockK
+    lateinit var userSignUpRequest: UserSignUpRequest
+
+    companion object {
+        const val ERROR_EXAMPLE_TEXT = "Time out example"
+    }
+
+    @Before
+    override fun setup() {
+        super.setup()
+        every { userResponseSerializer.user } returns userDTO
+        // every { userDTO.toDomainUser() } returns user
+        viewModel = SignUpActivityViewModel(signUp, sessionManager, TestDispatcherProvider())
+    }
+
+    @Test
+    fun `signUp success assert signUpSuccess and network idle`() {
+        var state: SignUpState? = null
+        coEvery { signUp.invoke(userSignUpRequestSerializer) } returns DataResult.Success(
+            userResponseSerializer
+        )
+
+        viewModel.signUp(userSignUpRequest)
+        viewModel.state.observeForever {
+            state = it
+        }
+
+       assertEquals(state, SignUpState.SIGN_UP_SUCCESS)
+//        assertEquals(viewModel.networkState.value, NetworkState.IDLE)
+        // verify { sessionManager.signIn(userDTO.toDomainUser()) }
+        coVerify { signUp.invoke(userSignUpRequestSerializer) }
+    }
+
+    @Test
+    fun `signUp fail assert signUpFailure and network error`() {
+        var state: SignUpState? = null
+        coEvery { signUp.invoke(userSignUpRequestSerializer) } returns DataResult.Error(
+            ApiException(
+                ERROR_EXAMPLE_TEXT
+            )
+        )
+
+        viewModel.signUp(userSignUpRequest)
+        viewModel.state.observeForever {
+            state = it
+        }
+
+//        assertEquals(state, SignUpState.SIGN_UP_FAILURE)
+        assertEquals(viewModel.networkState.value, NetworkState.ERROR)
+        assertEquals(viewModel.error, ERROR_EXAMPLE_TEXT)
+        coVerify { signUp.invoke(userSignUpRequestSerializer) }
+    }
+}
diff --git a/app/src/test/java/com/rootstrap/android/ValidationTests.kt b/app/src/test/java/com/rootstrap/android/ValidationTests.kt
index 4d0cebf..515e6ba 100644
--- a/app/src/test/java/com/rootstrap/android/ValidationTests.kt
+++ b/app/src/test/java/com/rootstrap/android/ValidationTests.kt
@@ -4,7 +4,7 @@ import com.rootstrap.android.util.extensions.isEmail
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
-public class ValidationTests {
+class ValidationTests {
     @Test
     fun checkEmailTest() {
         assertEquals(true, "email@mkdi.com".isEmail())
diff --git a/app/src/test/java/com/rootstrap/android/test/TestDispatcherProvider.kt b/app/src/test/java/com/rootstrap/android/test/TestDispatcherProvider.kt
new file mode 100644
index 0000000..1037e26
--- /dev/null
+++ b/app/src/test/java/com/rootstrap/android/test/TestDispatcherProvider.kt
@@ -0,0 +1,15 @@
+package com.rootstrap.android.test
+
+import com.rootstrap.android.util.dispatcher.DispatcherProvider
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestCoroutineDispatcher
+
+@ExperimentalCoroutinesApi
+class TestDispatcherProvider(testCoroutineDispatcher: TestCoroutineDispatcher = TestCoroutineDispatcher()) :
+    DispatcherProvider {
+    override val default: CoroutineDispatcher = testCoroutineDispatcher
+    override val main: CoroutineDispatcher = testCoroutineDispatcher
+    override val io: CoroutineDispatcher = testCoroutineDispatcher
+    override val unconfined: CoroutineDispatcher = testCoroutineDispatcher
+}
diff --git a/app/src/test/java/com/rootstrap/android/test/UnitTestBase.kt b/app/src/test/java/com/rootstrap/android/test/UnitTestBase.kt
new file mode 100644
index 0000000..f288824
--- /dev/null
+++ b/app/src/test/java/com/rootstrap/android/test/UnitTestBase.kt
@@ -0,0 +1,19 @@
+package com.rootstrap.android.test
+
+import androidx.annotation.CallSuper
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import io.mockk.MockKAnnotations
+import org.junit.Before
+import org.junit.Rule
+
+abstract class UnitTestBase {
+
+    @get:Rule
+    val instantExecutorRule = InstantTaskExecutorRule()
+
+    @CallSuper
+    @Before
+    open fun setup() {
+        MockKAnnotations.init(this)
+    }
+}
diff --git a/build.gradle b/build.gradle
index d479ccd..966e6ee 100644
--- a/build.gradle
+++ b/build.gradle
@@ -95,9 +95,11 @@ allprojects {
         ]
 
         testLibs = [
-                junit      : Libs.junit,
-                mockitoCore: Libs.mockitoCore,
-                mockk      : Libs.mockk
+                junit         : Libs.junit,
+                mockitoCore   : Libs.mockitoCore,
+                mockk         : Libs.mockk,
+                coroutinesTest: Libs.coroutinesTest,
+                coreTest      : Libs.coreTesting
         ]
 
         androidTestLibs = [
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 387ee47..9346502 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -2,7 +2,7 @@ object Versions {
     const val appCompat = "1.3.1"
     const val constraintLayout = "2.1.1"
     const val core = "1.6.0"
-    const val coroutines = "1.5.2-native-mt"
+    const val coroutines = "1.5.1"
     const val legacySupportV4 = "1.0.0"
     const val preference = "1.1.1"
     const val recyclerview = "1.1.0"
@@ -35,17 +35,20 @@ object Versions {
     const val mockwebserver = "4.9.0"
     const val testRunner = "1.4.0"
     const val mixPanel = "5.6.1"
+    const val coreTesting = "1.1.1"
 }
 
 object Libs {
     // Kotlin
     const val kotlinStdLib = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${Versions.kotlin}"
-    const val coroutinesAndroid = "org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.coroutines}"
+    const val coroutinesAndroid =
+        "org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.coroutines}"
     const val reflect = "org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlin}"
 
     const val appCompat = "androidx.appcompat:appcompat:${Versions.appCompat}"
     const val core = "androidx.core:core-ktx:${Versions.core}"
-    const val constraintlayout = "androidx.constraintlayout:constraintlayout:${Versions.constraintLayout}"
+    const val constraintlayout =
+        "androidx.constraintlayout:constraintlayout:${Versions.constraintLayout}"
     const val legacySupportV4 = "androidx.legacy:legacy-support-v4:${Versions.legacySupportV4}"
     const val preference = "androidx.preference:preference-ktx:${Versions.preference}"
     const val recyclerview = "androidx.recyclerview:recyclerview:${Versions.recyclerview}"
@@ -62,11 +65,14 @@ object Libs {
     const val lifecycleKapt = "android.arch.lifecycle:compiler:${Versions.lifecycleCommon}"
     const val lifecycleRuntime = "androidx.lifecycle:lifecycle-runtime-ktx:${Versions.lifecycle}"
     const val lifecycleLivedata = "androidx.lifecycle:lifecycle-livedata-ktx:${Versions.lifecycle}"
-    const val lifecycleExtensions = "androidx.lifecycle:lifecycle-extensions:${Versions.lifecycleExtension}"
-    const val lifecycleViewModel = "androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.lifecycle}"
+    const val lifecycleExtensions =
+        "androidx.lifecycle:lifecycle-extensions:${Versions.lifecycleExtension}"
+    const val lifecycleViewModel =
+        "androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.lifecycle}"
 
     // Navigation
-    const val navigationFragment = "androidx.navigation:navigation-fragment-ktx:${Versions.navigation}"
+    const val navigationFragment =
+        "androidx.navigation:navigation-fragment-ktx:${Versions.navigation}"
     const val navigationUi = "androidx.navigation:navigation-ui-ktx:${Versions.navigation}"
 
     // Google JSON serializer/deserializer
@@ -124,4 +130,6 @@ object Libs {
     const val uiautomator = "androidx.test.uiautomator:uiautomator:${Versions.uiautomator}"
     const val rules = "androidx.test:rules:${Versions.rules}"
     const val mockwebserver = "com.squareup.okhttp3:mockwebserver:${Versions.mockwebserver}"
+    const val coroutinesTest = "org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.coroutines}"
+    const val coreTesting = "android.arch.core:core-testing:${Versions.coreTesting}"
 }
diff --git a/data/src/main/java/com/rootstrap/data/dto/request/UserSignUpRequestSerializer.kt b/data/src/main/java/com/rootstrap/data/dto/request/UserSignUpRequestSerializer.kt
index 2ea06c0..550c0e2 100644
--- a/data/src/main/java/com/rootstrap/data/dto/request/UserSignUpRequestSerializer.kt
+++ b/data/src/main/java/com/rootstrap/data/dto/request/UserSignUpRequestSerializer.kt
@@ -10,4 +10,4 @@ data class UserSignUpRequest(
     val password: String = ""
 )
 
-data class UserSignUpRequestSerializer(val UserSignUpRequest: UserSignUpRequest)
+data class UserSignUpRequestSerializer(val user: UserSignUpRequest)
diff --git a/data/src/main/java/com/rootstrap/data/dto/response/UserResponseSerializer.kt b/data/src/main/java/com/rootstrap/data/dto/response/UserResponseSerializer.kt
index 05b780f..e941a5b 100644
--- a/data/src/main/java/com/rootstrap/data/dto/response/UserResponseSerializer.kt
+++ b/data/src/main/java/com/rootstrap/data/dto/response/UserResponseSerializer.kt
@@ -1,9 +1,9 @@
 package com.rootstrap.data.dto.response
 
 import com.google.gson.annotations.SerializedName
+import com.rootstrap.domain.User
 
-// TODO Discuss class name on Android Roundtable (UserDTO - DTO = Data Transfer Object as suffix)
-data class User(
+data class UserDTO(
     val id: String = "",
     var email: String = "",
     @SerializedName("first_name") var firstName: String = "",
@@ -14,4 +14,14 @@ data class User(
     val uid: String?
 )
 
-data class UserResponseSerializer(val user: User)
+fun UserDTO.toDomainUser() = User(
+    id = id,
+    email = email,
+    firstName = firstName,
+    lastName = lastName,
+    phoneNumber = phoneNumber,
+    password = password,
+    username = username
+)
+
+data class UserResponseSerializer(val user: UserDTO)
diff --git a/data/src/main/java/com/rootstrap/data/managers/session/SessionManager.kt b/data/src/main/java/com/rootstrap/data/managers/session/SessionManager.kt
index 7fbf84a..5e5f6ab 100644
--- a/data/src/main/java/com/rootstrap/data/managers/session/SessionManager.kt
+++ b/data/src/main/java/com/rootstrap/data/managers/session/SessionManager.kt
@@ -1,6 +1,6 @@
 package com.rootstrap.data.managers.session
 
-import com.rootstrap.data.dto.response.User
+import com.rootstrap.domain.User
 
 interface SessionManager {
     var user: User?
diff --git a/data/src/main/java/com/rootstrap/data/managers/session/SessionManagerImpl.kt b/data/src/main/java/com/rootstrap/data/managers/session/SessionManagerImpl.kt
index ae7f6a7..0efabcf 100644
--- a/data/src/main/java/com/rootstrap/data/managers/session/SessionManagerImpl.kt
+++ b/data/src/main/java/com/rootstrap/data/managers/session/SessionManagerImpl.kt
@@ -1,9 +1,9 @@
 package com.rootstrap.data.managers.session
 
-import com.rootstrap.data.dto.response.User
 import com.rootstrap.data.util.Prefs
+import com.rootstrap.domain.User
 
-class SessionManagerImpl (private val prefs: Prefs) : SessionManager {
+class SessionManagerImpl(private val prefs: Prefs) : SessionManager {
 
     override var user: User? = prefs.user
         set(value) {
diff --git a/data/src/main/java/com/rootstrap/data/util/Prefs.kt b/data/src/main/java/com/rootstrap/data/util/Prefs.kt
index 02ea6b4..3216a22 100644
--- a/data/src/main/java/com/rootstrap/data/util/Prefs.kt
+++ b/data/src/main/java/com/rootstrap/data/util/Prefs.kt
@@ -3,7 +3,7 @@ package com.rootstrap.data.util
 import android.content.SharedPreferences
 import com.google.gson.Gson
 import com.rootstrap.data.util.extensions.fromJson
-import com.rootstrap.data.dto.response.User
+import com.rootstrap.domain.User
 
 class Prefs(private val prefs: SharedPreferences) {
 

From d733a6fff78b615f3cf70fc7242335018601f7a3 Mon Sep 17 00:00:00 2001
From: aguskoll <aguskoll@gmail.com>
Date: Tue, 11 Jan 2022 16:20:54 -0300
Subject: [PATCH 10/16] unit test fixed

---
 .../android/ui/login/SignInActivity.kt        | 11 ++++---
 .../ui/login/SignInActivityViewModel.kt       |  1 -
 .../android/ui/login/SignUpActivity.kt        | 11 ++++---
 .../ui/login/SignUpActivityViewModel.kt       |  5 ++--
 .../android/SignInActivityViewModelTest.kt    | 11 +++----
 .../android/SignUpActivityViewModelTest.kt    | 30 ++++++-------------
 .../rootstrap/android/test/UnitTestBase.kt    | 12 ++++++++
 7 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/app/src/main/java/com/rootstrap/android/ui/login/SignInActivity.kt b/app/src/main/java/com/rootstrap/android/ui/login/SignInActivity.kt
index 9b2ecad..24aa832 100644
--- a/app/src/main/java/com/rootstrap/android/ui/login/SignInActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/login/SignInActivity.kt
@@ -5,9 +5,6 @@ import android.os.Bundle
 import androidx.lifecycle.Observer
 import com.rootstrap.android.R
 import com.rootstrap.android.databinding.ActivitySignInBinding
-import com.rootstrap.data.metrics.Analytics
-import com.rootstrap.data.metrics.PageEvents
-import com.rootstrap.data.metrics.VISIT_SIGN_IN
 import com.rootstrap.android.ui.profile.ProfileActivity
 import com.rootstrap.android.ui.view.AuthView
 import com.rootstrap.android.util.NetworkState
@@ -15,6 +12,9 @@ import com.rootstrap.android.util.extensions.value
 import com.rootstrap.android.util.permissions.PermissionActivity
 import com.rootstrap.android.util.permissions.PermissionResponse
 import com.rootstrap.data.dto.request.UserSignInRequest
+import com.rootstrap.data.metrics.Analytics
+import com.rootstrap.data.metrics.PageEvents
+import com.rootstrap.data.metrics.VISIT_SIGN_IN
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class SignInActivity : PermissionActivity(), AuthView {
@@ -60,7 +60,10 @@ class SignInActivity : PermissionActivity(), AuthView {
             when (it) {
                 NetworkState.LOADING -> showProgress()
                 NetworkState.IDLE -> hideProgress()
-                else -> showError(viewModel.error ?: getString(R.string.default_error))
+                else -> {
+                    hideProgress()
+                    showError(viewModel.error ?: getString(R.string.default_error))
+                }
             }
         })
     }
diff --git a/app/src/main/java/com/rootstrap/android/ui/login/SignInActivityViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/login/SignInActivityViewModel.kt
index 4174a0b..8a88a00 100644
--- a/app/src/main/java/com/rootstrap/android/ui/login/SignInActivityViewModel.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/login/SignInActivityViewModel.kt
@@ -39,7 +39,6 @@ open class SignInActivityViewModel(
                 }
                 is DataResult.Error -> {
                     handleError(result.exception)
-                    restoreNetworkState()
                 }
             }
         }
diff --git a/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivity.kt b/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivity.kt
index e4b6182..751f563 100644
--- a/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivity.kt
@@ -5,15 +5,15 @@ import android.os.Bundle
 import androidx.lifecycle.Observer
 import com.rootstrap.android.R
 import com.rootstrap.android.databinding.ActivitySignUpBinding
-import com.rootstrap.data.metrics.Analytics
-import com.rootstrap.data.metrics.PageEvents
-import com.rootstrap.data.metrics.VISIT_SIGN_UP
 import com.rootstrap.android.ui.base.BaseActivity
 import com.rootstrap.android.ui.profile.ProfileActivity
 import com.rootstrap.android.ui.view.AuthView
 import com.rootstrap.android.util.NetworkState
 import com.rootstrap.android.util.extensions.value
 import com.rootstrap.data.dto.request.UserSignUpRequest
+import com.rootstrap.data.metrics.Analytics
+import com.rootstrap.data.metrics.PageEvents
+import com.rootstrap.data.metrics.VISIT_SIGN_UP
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class SignUpActivity : BaseActivity(), AuthView {
@@ -68,7 +68,10 @@ class SignUpActivity : BaseActivity(), AuthView {
             when (it) {
                 NetworkState.LOADING -> showProgress()
                 NetworkState.IDLE -> hideProgress()
-                else -> showError(viewModel.error ?: getString(R.string.default_error))
+                else -> {
+                    hideProgress()
+                    showError(viewModel.error ?: getString(R.string.default_error))
+                }
             }
         })
     }
diff --git a/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivityViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivityViewModel.kt
index e0742fd..ae60d36 100644
--- a/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivityViewModel.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivityViewModel.kt
@@ -28,8 +28,8 @@ open class SignUpActivityViewModel(
     fun signUp(userSignUpRequest: UserSignUpRequest) {
         _networkState.value = NetworkState.LOADING
         viewModelScope.launch(dispatcherProvider.io) {
-
-            when (val result = signUp.invoke(UserSignUpRequestSerializer(userSignUpRequest))) {
+            val result = signUp.invoke(UserSignUpRequestSerializer(userSignUpRequest))
+            when (result) {
                 is DataResult.Success -> {
                     result.data?.user?.let { user ->
                         sessionManager.signIn(user.toDomainUser())
@@ -40,7 +40,6 @@ open class SignUpActivityViewModel(
                 }
                 is DataResult.Error -> {
                     handleError(result.exception)
-                    restoreNetworkState()
                 }
             }
         }
diff --git a/app/src/test/java/com/rootstrap/android/SignInActivityViewModelTest.kt b/app/src/test/java/com/rootstrap/android/SignInActivityViewModelTest.kt
index aaaadc7..ab0599c 100644
--- a/app/src/test/java/com/rootstrap/android/SignInActivityViewModelTest.kt
+++ b/app/src/test/java/com/rootstrap/android/SignInActivityViewModelTest.kt
@@ -55,6 +55,7 @@ class SignInActivityViewModelTest : UnitTestBase() {
     override fun setup() {
         super.setup()
         every { userSignInRequestSerializer.user } returns userSignInRequest
+        every { userSignInResponseSerializer.user } returns userDTO
         viewModel = SignInActivityViewModel(signIn, sessionManager, TestDispatcherProvider()) // ver q hacer con los dispatchers
     }
 
@@ -62,7 +63,7 @@ class SignInActivityViewModelTest : UnitTestBase() {
     @Test
     fun `signIn success assert signInSuccess and network idle`() {
         var state: SignInState? = null
-        coEvery { signIn.invoke(userSignInRequestSerializer) } returns DataResult.Success(
+        coEvery { signIn.invoke(any()) } returns DataResult.Success(
             userSignInResponseSerializer
         )
 
@@ -73,14 +74,14 @@ class SignInActivityViewModelTest : UnitTestBase() {
 
         assertEquals(state, SignInState.SIGN_IN_SUCCESS)
         assertEquals(viewModel.networkState.value, NetworkState.IDLE)
-        verify { sessionManager.signIn(user) }
-        coVerify { signIn.invoke(userSignInRequestSerializer) }
+        verify { sessionManager.signIn(any()) }
+        coVerify { signIn.invoke(any()) }
     }
 
     @Test
     fun `signIn fail assert signInFailure and network error`() {
         var state: SignInState? = null
-        coEvery { signIn.invoke(userSignInRequestSerializer) } returns DataResult.Error(
+        coEvery { signIn.invoke(any()) } returns DataResult.Error(
             ApiException(
                 ERROR_EXAMPLE_TEXT
             )
@@ -94,6 +95,6 @@ class SignInActivityViewModelTest : UnitTestBase() {
         assertEquals(state, SignInState.SIGN_IN_FAILURE)
         assertEquals(viewModel.networkState.value, NetworkState.ERROR)
         assertEquals(viewModel.error, ERROR_EXAMPLE_TEXT)
-        coVerify { signIn.invoke(userSignInRequestSerializer) }
+        coVerify { signIn.invoke(any()) }
     }
 }
diff --git a/app/src/test/java/com/rootstrap/android/SignUpActivityViewModelTest.kt b/app/src/test/java/com/rootstrap/android/SignUpActivityViewModelTest.kt
index f559ef1..d4ff921 100644
--- a/app/src/test/java/com/rootstrap/android/SignUpActivityViewModelTest.kt
+++ b/app/src/test/java/com/rootstrap/android/SignUpActivityViewModelTest.kt
@@ -7,18 +7,16 @@ import com.rootstrap.android.ui.login.SignUpState
 import com.rootstrap.android.util.NetworkState
 import com.rootstrap.data.api.ApiException
 import com.rootstrap.data.dto.request.UserSignUpRequest
-import com.rootstrap.data.dto.request.UserSignUpRequestSerializer
 import com.rootstrap.data.dto.response.DataResult
-import com.rootstrap.data.dto.response.UserDTO
 import com.rootstrap.data.dto.response.UserResponseSerializer
 import com.rootstrap.data.managers.session.SessionManager
-import com.rootstrap.domain.User
 import com.rootstrap.usecases.SignUp
 import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.impl.annotations.RelaxedMockK
+import io.mockk.verify
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import org.junit.Assert.assertEquals
 import org.junit.Before
@@ -35,15 +33,6 @@ class SignUpActivityViewModelTest : UnitTestBase() {
     @RelaxedMockK
     lateinit var signUp: SignUp
 
-    @MockK
-    lateinit var userDTO: UserDTO
-
-    @MockK
-    lateinit var user: User
-
-    @MockK
-    lateinit var userSignUpRequestSerializer: UserSignUpRequestSerializer
-
     @MockK
     lateinit var userResponseSerializer: UserResponseSerializer
 
@@ -58,14 +47,13 @@ class SignUpActivityViewModelTest : UnitTestBase() {
     override fun setup() {
         super.setup()
         every { userResponseSerializer.user } returns userDTO
-        // every { userDTO.toDomainUser() } returns user
         viewModel = SignUpActivityViewModel(signUp, sessionManager, TestDispatcherProvider())
     }
 
     @Test
     fun `signUp success assert signUpSuccess and network idle`() {
         var state: SignUpState? = null
-        coEvery { signUp.invoke(userSignUpRequestSerializer) } returns DataResult.Success(
+        coEvery { signUp.invoke(any()) } returns DataResult.Success(
             userResponseSerializer
         )
 
@@ -74,16 +62,16 @@ class SignUpActivityViewModelTest : UnitTestBase() {
             state = it
         }
 
-       assertEquals(state, SignUpState.SIGN_UP_SUCCESS)
-//        assertEquals(viewModel.networkState.value, NetworkState.IDLE)
-        // verify { sessionManager.signIn(userDTO.toDomainUser()) }
-        coVerify { signUp.invoke(userSignUpRequestSerializer) }
+        assertEquals(state, SignUpState.SIGN_UP_SUCCESS)
+        assertEquals(viewModel.networkState.value, NetworkState.IDLE)
+        verify { sessionManager.signIn(any()) }
+        coVerify { signUp.invoke(any()) }
     }
 
     @Test
     fun `signUp fail assert signUpFailure and network error`() {
         var state: SignUpState? = null
-        coEvery { signUp.invoke(userSignUpRequestSerializer) } returns DataResult.Error(
+        coEvery { signUp.invoke(any()) } returns DataResult.Error(
             ApiException(
                 ERROR_EXAMPLE_TEXT
             )
@@ -94,9 +82,9 @@ class SignUpActivityViewModelTest : UnitTestBase() {
             state = it
         }
 
-//        assertEquals(state, SignUpState.SIGN_UP_FAILURE)
+        assertEquals(state, SignUpState.SIGN_UP_FAILURE)
         assertEquals(viewModel.networkState.value, NetworkState.ERROR)
         assertEquals(viewModel.error, ERROR_EXAMPLE_TEXT)
-        coVerify { signUp.invoke(userSignUpRequestSerializer) }
+        coVerify { signUp.invoke(any()) }
     }
 }
diff --git a/app/src/test/java/com/rootstrap/android/test/UnitTestBase.kt b/app/src/test/java/com/rootstrap/android/test/UnitTestBase.kt
index f288824..c7ba50e 100644
--- a/app/src/test/java/com/rootstrap/android/test/UnitTestBase.kt
+++ b/app/src/test/java/com/rootstrap/android/test/UnitTestBase.kt
@@ -2,6 +2,7 @@ package com.rootstrap.android.test
 
 import androidx.annotation.CallSuper
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.rootstrap.data.dto.response.UserDTO
 import io.mockk.MockKAnnotations
 import org.junit.Before
 import org.junit.Rule
@@ -11,6 +12,17 @@ abstract class UnitTestBase {
     @get:Rule
     val instantExecutorRule = InstantTaskExecutorRule()
 
+    val userDTO: UserDTO = UserDTO(
+        "1",
+        "as@rs.com",
+        "joseph",
+        "GG",
+        "1234",
+        "12345",
+        "as",
+        ""
+    )
+
     @CallSuper
     @Before
     open fun setup() {

From 7030a850da514e608993ecb907ac6389fc01c989 Mon Sep 17 00:00:00 2001
From: aguskoll <aguskoll@gmail.com>
Date: Tue, 11 Jan 2022 16:23:06 -0300
Subject: [PATCH 11/16] removed unused var

---
 .../rootstrap/android/SignInActivityViewModelTest.kt   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/test/java/com/rootstrap/android/SignInActivityViewModelTest.kt b/app/src/test/java/com/rootstrap/android/SignInActivityViewModelTest.kt
index ab0599c..8089862 100644
--- a/app/src/test/java/com/rootstrap/android/SignInActivityViewModelTest.kt
+++ b/app/src/test/java/com/rootstrap/android/SignInActivityViewModelTest.kt
@@ -11,7 +11,6 @@ import com.rootstrap.data.dto.request.UserSignInRequestSerializer
 import com.rootstrap.data.dto.response.DataResult
 import com.rootstrap.data.dto.response.UserResponseSerializer
 import com.rootstrap.data.managers.session.SessionManager
-import com.rootstrap.domain.User
 import com.rootstrap.usecases.SignIn
 import io.mockk.coEvery
 import io.mockk.coVerify
@@ -35,9 +34,6 @@ class SignInActivityViewModelTest : UnitTestBase() {
     @RelaxedMockK
     lateinit var signIn: SignIn
 
-    @MockK
-    lateinit var user: User
-
     @MockK
     lateinit var userSignInRequestSerializer: UserSignInRequestSerializer
 
@@ -56,7 +52,11 @@ class SignInActivityViewModelTest : UnitTestBase() {
         super.setup()
         every { userSignInRequestSerializer.user } returns userSignInRequest
         every { userSignInResponseSerializer.user } returns userDTO
-        viewModel = SignInActivityViewModel(signIn, sessionManager, TestDispatcherProvider()) // ver q hacer con los dispatchers
+        viewModel = SignInActivityViewModel(
+            signIn,
+            sessionManager,
+            TestDispatcherProvider()
+        ) // ver q hacer con los dispatchers
     }
 
     // reading: naming standards for unit testing https://osherove.com/blog/2005/4/3/naming-standards-for-unit-tests.html

From 35d88d1d17c3cf427e8be09d1c41f7ee8dac3596 Mon Sep 17 00:00:00 2001
From: aguskoll <aguskoll@gmail.com>
Date: Wed, 12 Jan 2022 09:15:41 -0300
Subject: [PATCH 12/16] removed view package

---
 .../rootstrap/android/ui/login/SignInActivity.kt |  5 ++---
 .../rootstrap/android/ui/login/SignUpActivity.kt |  5 ++---
 .../android/ui/profile/ProfileActivity.kt        | 16 ++++++++--------
 .../com/rootstrap/android/ui/view/AuthView.kt    |  8 --------
 .../java/com/rootstrap/android/ui/view/IView.kt  |  3 ---
 .../com/rootstrap/android/ui/view/ProfileView.kt |  8 --------
 6 files changed, 12 insertions(+), 33 deletions(-)
 delete mode 100644 app/src/main/java/com/rootstrap/android/ui/view/AuthView.kt
 delete mode 100644 app/src/main/java/com/rootstrap/android/ui/view/IView.kt
 delete mode 100644 app/src/main/java/com/rootstrap/android/ui/view/ProfileView.kt

diff --git a/app/src/main/java/com/rootstrap/android/ui/login/SignInActivity.kt b/app/src/main/java/com/rootstrap/android/ui/login/SignInActivity.kt
index 24aa832..73ea7a7 100644
--- a/app/src/main/java/com/rootstrap/android/ui/login/SignInActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/login/SignInActivity.kt
@@ -6,7 +6,6 @@ import androidx.lifecycle.Observer
 import com.rootstrap.android.R
 import com.rootstrap.android.databinding.ActivitySignInBinding
 import com.rootstrap.android.ui.profile.ProfileActivity
-import com.rootstrap.android.ui.view.AuthView
 import com.rootstrap.android.util.NetworkState
 import com.rootstrap.android.util.extensions.value
 import com.rootstrap.android.util.permissions.PermissionActivity
@@ -17,7 +16,7 @@ import com.rootstrap.data.metrics.PageEvents
 import com.rootstrap.data.metrics.VISIT_SIGN_IN
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-class SignInActivity : PermissionActivity(), AuthView {
+class SignInActivity : PermissionActivity() {
 
     private val viewModel: SignInActivityViewModel by viewModel()
     private lateinit var binding: ActivitySignInBinding
@@ -34,7 +33,7 @@ class SignInActivity : PermissionActivity(), AuthView {
         sampleAskForPermission()
     }
 
-    override fun showProfile() {
+    private fun showProfile() {
         startActivityClearTask(ProfileActivity())
     }
 
diff --git a/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivity.kt b/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivity.kt
index 751f563..7a1be4b 100644
--- a/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/login/SignUpActivity.kt
@@ -7,7 +7,6 @@ import com.rootstrap.android.R
 import com.rootstrap.android.databinding.ActivitySignUpBinding
 import com.rootstrap.android.ui.base.BaseActivity
 import com.rootstrap.android.ui.profile.ProfileActivity
-import com.rootstrap.android.ui.view.AuthView
 import com.rootstrap.android.util.NetworkState
 import com.rootstrap.android.util.extensions.value
 import com.rootstrap.data.dto.request.UserSignUpRequest
@@ -16,7 +15,7 @@ import com.rootstrap.data.metrics.PageEvents
 import com.rootstrap.data.metrics.VISIT_SIGN_UP
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-class SignUpActivity : BaseActivity(), AuthView {
+class SignUpActivity : BaseActivity() {
 
     private val viewModel: SignUpActivityViewModel by viewModel()
     private val binding: ActivitySignUpBinding by lazy {
@@ -36,7 +35,7 @@ class SignUpActivity : BaseActivity(), AuthView {
         setObservers()
     }
 
-    override fun showProfile() {
+    private fun showProfile() {
         startActivityClearTask(ProfileActivity())
     }
 
diff --git a/app/src/main/java/com/rootstrap/android/ui/profile/ProfileActivity.kt b/app/src/main/java/com/rootstrap/android/ui/profile/ProfileActivity.kt
index a3bec42..b5c2d55 100644
--- a/app/src/main/java/com/rootstrap/android/ui/profile/ProfileActivity.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/profile/ProfileActivity.kt
@@ -4,18 +4,17 @@ import android.os.Bundle
 import androidx.lifecycle.Observer
 import com.rootstrap.android.R
 import com.rootstrap.android.databinding.ActivityProfileBinding
-import com.rootstrap.data.metrics.Analytics
-import com.rootstrap.data.metrics.PageEvents
-import com.rootstrap.data.metrics.VISIT_PROFILE
-import com.rootstrap.android.ui.login.SignUpActivity
 import com.rootstrap.android.ui.base.BaseActivity
-import com.rootstrap.android.ui.view.ProfileView
+import com.rootstrap.android.ui.login.SignUpActivity
 import com.rootstrap.android.util.NetworkState
 import com.rootstrap.data.managers.session.SessionManager
+import com.rootstrap.data.metrics.Analytics
+import com.rootstrap.data.metrics.PageEvents
+import com.rootstrap.data.metrics.VISIT_PROFILE
 import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-class ProfileActivity : BaseActivity(), ProfileView {
+class ProfileActivity : BaseActivity() {
 
     private val sessionManager: SessionManager by inject()
 
@@ -29,14 +28,15 @@ class ProfileActivity : BaseActivity(), ProfileView {
 
         with(binding) {
             setContentView(root)
-            welcomeTextView.text = getString(R.string.welcome_message, sessionManager.user?.firstName)
+            welcomeTextView.text =
+                getString(R.string.welcome_message, sessionManager.user?.firstName)
             signOutButton.setOnClickListener { viewModel.signOut() }
         }
 
         setObservers()
     }
 
-    override fun goToFirstScreen() {
+    private fun goToFirstScreen() {
         startActivityClearTask(SignUpActivity())
     }
 
diff --git a/app/src/main/java/com/rootstrap/android/ui/view/AuthView.kt b/app/src/main/java/com/rootstrap/android/ui/view/AuthView.kt
deleted file mode 100644
index 84e2276..0000000
--- a/app/src/main/java/com/rootstrap/android/ui/view/AuthView.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.rootstrap.android.ui.view
-
-import com.rootstrap.android.ui.base.BaseView
-
-interface AuthView : BaseView {
-
-    fun showProfile()
-}
diff --git a/app/src/main/java/com/rootstrap/android/ui/view/IView.kt b/app/src/main/java/com/rootstrap/android/ui/view/IView.kt
deleted file mode 100644
index 259b1a6..0000000
--- a/app/src/main/java/com/rootstrap/android/ui/view/IView.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.rootstrap.android.ui.view
-
-class IView
diff --git a/app/src/main/java/com/rootstrap/android/ui/view/ProfileView.kt b/app/src/main/java/com/rootstrap/android/ui/view/ProfileView.kt
deleted file mode 100644
index 7fa9062..0000000
--- a/app/src/main/java/com/rootstrap/android/ui/view/ProfileView.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.rootstrap.android.ui.view
-
-import com.rootstrap.android.ui.base.BaseView
-
-interface ProfileView : BaseView {
-
-    fun goToFirstScreen()
-}

From fdc2e4da05551ba80ae9a30d8434dcbc45040568 Mon Sep 17 00:00:00 2001
From: aguskoll <aguskoll@gmail.com>
Date: Wed, 2 Feb 2022 14:04:52 -0300
Subject: [PATCH 13/16] removed comment

---
 .../java/com/rootstrap/android/SignInActivityViewModelTest.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/test/java/com/rootstrap/android/SignInActivityViewModelTest.kt b/app/src/test/java/com/rootstrap/android/SignInActivityViewModelTest.kt
index 8089862..90755b7 100644
--- a/app/src/test/java/com/rootstrap/android/SignInActivityViewModelTest.kt
+++ b/app/src/test/java/com/rootstrap/android/SignInActivityViewModelTest.kt
@@ -56,7 +56,7 @@ class SignInActivityViewModelTest : UnitTestBase() {
             signIn,
             sessionManager,
             TestDispatcherProvider()
-        ) // ver q hacer con los dispatchers
+        )
     }
 
     // reading: naming standards for unit testing https://osherove.com/blog/2005/4/3/naming-standards-for-unit-tests.html

From 925539ed56c613fffd4e161ccf2c62d6a280f26d Mon Sep 17 00:00:00 2001
From: aguskoll <aguskoll@gmail.com>
Date: Wed, 2 Feb 2022 14:17:34 -0300
Subject: [PATCH 14/16] removed comment

---
 .../com/rootstrap/android/ui/base/BaseViewModel.kt     | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/rootstrap/android/ui/base/BaseViewModel.kt b/app/src/main/java/com/rootstrap/android/ui/base/BaseViewModel.kt
index 990fcaf..34d417b 100644
--- a/app/src/main/java/com/rootstrap/android/ui/base/BaseViewModel.kt
+++ b/app/src/main/java/com/rootstrap/android/ui/base/BaseViewModel.kt
@@ -1,6 +1,8 @@
 package com.rootstrap.android.ui.base
 
-import androidx.lifecycle.*
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
 import com.rootstrap.android.util.NetworkState
 
 /**
@@ -13,10 +15,4 @@ open class BaseViewModel : ViewModel() {
     protected val _networkState = MutableLiveData<NetworkState>()
     val networkState: LiveData<NetworkState>
         get() = _networkState
-
-  /*  @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
-    fun register() = Bus().register(this)
-
-    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
-    fun unregister() = Bus().unregister(this) */
 }

From b89a416a10ce48307ab531c25387fd566e3cad0f Mon Sep 17 00:00:00 2001
From: aguskoll <aguskoll@gmail.com>
Date: Wed, 2 Feb 2022 15:07:42 -0300
Subject: [PATCH 15/16] removed fastlane dev flavor

---
 .../rootstrap/android/database/AppDataBase.kt |  5 ----
 .../rootstrap/data/database/AppDataBase.kt    |  5 ++++
 fastlane/Appfile                              |  8 -------
 fastlane/Fastfile                             | 24 -------------------
 4 files changed, 5 insertions(+), 37 deletions(-)
 delete mode 100644 app/src/main/java/com/rootstrap/android/database/AppDataBase.kt
 create mode 100644 data/src/main/java/com/rootstrap/data/database/AppDataBase.kt

diff --git a/app/src/main/java/com/rootstrap/android/database/AppDataBase.kt b/app/src/main/java/com/rootstrap/android/database/AppDataBase.kt
deleted file mode 100644
index bcf5c65..0000000
--- a/app/src/main/java/com/rootstrap/android/database/AppDataBase.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.rootstrap.android.database
-
-class AppDataBase {
-    // TODO
-}
diff --git a/data/src/main/java/com/rootstrap/data/database/AppDataBase.kt b/data/src/main/java/com/rootstrap/data/database/AppDataBase.kt
new file mode 100644
index 0000000..edd7d66
--- /dev/null
+++ b/data/src/main/java/com/rootstrap/data/database/AppDataBase.kt
@@ -0,0 +1,5 @@
+package com.rootstrap.data.database
+
+class AppDataBase {
+    // TODO
+}
diff --git a/fastlane/Appfile b/fastlane/Appfile
index a6b0b8b..34b53b4 100644
--- a/fastlane/Appfile
+++ b/fastlane/Appfile
@@ -10,14 +10,6 @@ for_platform :android do
     package_name("com.rootstrap.android")
   end
 
-  for_lane :deploy_dev do
-   package_name("com.rootstrap.android.dev")
-  end
-
-  for_lane :debug_dev do
-    package_name("com.rootstrap.android.dev")
-  end
-
   for_lane :deploy_staging do
     package_name("com.rootstrap.android.staging")
   end
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index c4dd60a..2171b35 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -6,30 +6,6 @@ default_platform(:android)
 skip_docs
 
 platform :android do
-  lane :deploy_production do
-    release(flavor: 'Prod', track: 'internal')
-  end
-
-  lane :deploy_dev do
-    release(flavor: 'Dev', track: 'internal')
-  end
-
-  lane :deploy_staging do
-    release(flavor: 'Staging', track: 'internal')
-  end
-
-  lane :debug_production do
-      debug(flavor: 'Prod')
-  end
-
-  lane :debug_dev do
-    debug(flavor: 'Dev')
-  end
-
-  lane :debug_staging do
-    debug(flavor: 'Staging')
-  end
-
   lane :release do |options|
     increment_version_code(
       gradle_file_path: “app/build.gradle”

From 3bd8c71b9eae36d843c4b70ac507ebbcfd7626a9 Mon Sep 17 00:00:00 2001
From: aguskoll <aguskoll@gmail.com>
Date: Wed, 2 Feb 2022 15:11:38 -0300
Subject: [PATCH 16/16] removed fastlane dev flavor

---
 .github/workflows/cicd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 17eca57..87c89b5 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -24,7 +24,7 @@ jobs:
         bundle install --path vendor/bundle    
     # Runs build with Gradle
     - name: Build with Fastlane
-      run: bundle exec fastlane debug_dev
+      run: bundle exec fastlane debug
     - name: Send notification of build result
       uses: 8398a7/action-slack@v3
       with: