refactored data layer

trying new approach

Author: muramrr

app/build.gradle

@@ -28,6 +28,7 @@ android {
 
 	def globalConfiguration = rootProject.extensions.getByName("ext")
 	compileSdkVersion globalConfiguration["androidCompileSdkVersion"]
+	buildToolsVersion globalConfiguration["androidBuildToolsVersion"]
 
 
 	defaultConfig {
@@ -74,23 +75,20 @@ android {
 		}
 	}
 
-	sourceSets {
-		main.java.srcDirs += 'src/main/kotlin'
-	}
-
 }
 
 dependencies {
 
 	implementation fileTree(dir: 'libs', include: ['*.jar'])
-	implementation project(':business')
+	implementation project(':domain')
 	implementation project(':data')
 
 	//core
 	implementation 'androidx.core:core-ktx:1.5.0-alpha05'
 	implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 	implementation 'androidx.constraintlayout:constraintlayout:2.1.0-alpha2'
 	implementation 'com.google.android.material:material:1.3.0-beta01'
+	implementation 'androidx.lifecycle:lifecycle-process:2.3.0-rc01'
 
 	// dagger hilt
 	implementation "com.google.dagger:hilt-android:2.30.1-alpha"
@@ -113,7 +111,7 @@ dependencies {
 
 
 	//facebook auth
-	implementation libs.facebookLogin
+	implementation 'com.facebook.android:facebook-login:7.1.0'
 
 	//glide
 	implementation 'com.github.bumptech.glide:glide:4.11.0'
@@ -123,23 +121,15 @@ dependencies {
 	}
 
 
-
 	// Navigation component
 	implementation "androidx.navigation:navigation-ui-ktx:2.3.2"
 	implementation "androidx.navigation:navigation-fragment-ktx:2.3.2"
 
 	// RxJava
-	implementation libs.rxJava
+	implementation "io.reactivex.rxjava3:rxjava:3.0.8"
 
 	// RxAndroid
-	implementation libs.rxAndroid
-
-
-	// ViewModel and LiveData
-	implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
-
-	//binary prefs
-	implementation "com.github.yandextaxitech:binaryprefs:1.0.1"
+	implementation "io.reactivex.rxjava3:rxandroid:3.0.0"
 
 
 }

app/src/main/java/com/mmdev/roove/core/di/AppComponent.kt

@@ -1,6 +1,6 @@
 /*
  * Created by Andrii Kovalchuk
- * Copyright (C) 2020. roove
+ * Copyright (C) 2021. roove
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,18 +20,18 @@ package com.mmdev.roove.core.di
 
 import android.app.Application
 import com.mmdev.roove.core.di.modules.AuthModule
+import com.mmdev.roove.core.di.modules.DataSourceModule
 import com.mmdev.roove.core.di.modules.FirebaseModule
 import com.mmdev.roove.core.di.modules.RepositoryModule
-import com.mmdev.roove.core.di.modules.UserModule
 import dagger.BindsInstance
 import dagger.Component
 import javax.inject.Singleton
 
 @Component(modules = [
 	AuthModule::class,
+	DataSourceModule::class,
 	FirebaseModule::class,
-	RepositoryModule::class,
-	UserModule::class
+	RepositoryModule::class
 ])
 @Singleton
 interface AppComponent {

app/src/main/java/com/mmdev/roove/core/di/modules/AuthModule.kt

@@ -1,6 +1,6 @@
 /*
  * Created by Andrii Kovalchuk
- * Copyright (C) 2020. roove
+ * Copyright (C) 2021. roove
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,18 +19,24 @@
 package com.mmdev.roove.core.di.modules
 
 import com.facebook.login.LoginManager
+import com.google.firebase.auth.FirebaseAuth
+import com.mmdev.data.datasource.AuthCollector
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ApplicationComponent
+import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
 
 @Module
-@InstallIn(ApplicationComponent::class)
+@InstallIn(SingletonComponent::class)
 class AuthModule{
 
 	@Provides
 	@Singleton
 	fun facebookAuth(): LoginManager = LoginManager.getInstance()
 
+	@Provides
+	@Singleton
+	fun authCollector(auth: FirebaseAuth): AuthCollector = AuthCollector(auth)
+	
 }

app/src/main/java/com/mmdev/roove/core/log/DebugConfig.kt renamed to app/src/main/java/com/mmdev/roove/core/di/modules/DataSourceModule.kt

@@ -1,6 +1,6 @@
 /*
  * Created by Andrii Kovalchuk
- * Copyright (C) 2020. roove
+ * Copyright (C) 2021. roove
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,29 +16,32 @@
  * along with this program.  If not, see https://www.gnu.org/licenses
  */
 
-package com.mmdev.roove.core.log
+package com.mmdev.roove.core.di.modules
 
-import com.mmdev.data.core.log.DebugConfig
-import com.mmdev.data.core.log.MyLogger
-import com.mmdev.roove.BuildConfig
+import android.content.Context
+import com.google.firebase.firestore.FirebaseFirestore
+import com.mmdev.data.datasource.UserDataSource
+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
 
 /**
- * Own solution for logging operations
- * Good enough to not use Timber or any other third-party loggers
+ *
  */
 
-interface DebugConfig {
+@Module
+@InstallIn(SingletonComponent::class)
+class DataSourceModule {
 
-	val isEnabled: Boolean
-	val logger: MyLogger
+	@Provides
+	@Singleton
+	fun userDataSource(fs: FirebaseFirestore) = UserDataSource(fs)
 
-	object Default : DebugConfig {
-		override val isEnabled: Boolean = BuildConfig.DEBUG
-		override val logger: MyLogger = if (isEnabled) MyLogger.Debug else MyLogger.Default
-	}
+	@Provides
+	@Singleton
+	fun appContext(@ApplicationContext appContext: Context): Context = appContext
 
-	object Enabled : DebugConfig {
-		override val isEnabled: Boolean = true
-		override val logger: MyLogger = MyLogger.Debug
-	}
 }

app/src/main/java/com/mmdev/roove/core/di/modules/FirebaseModule.kt

@@ -1,6 +1,6 @@
 /*
  * Created by Andrii Kovalchuk
- * Copyright (C) 2020. roove
+ * Copyright (C) 2021. roove
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@ import com.mmdev.data.BuildConfig
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ApplicationComponent
+import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
 
 /**
@@ -36,7 +36,7 @@ import javax.inject.Singleton
  */
 
 @Module
-@InstallIn(ApplicationComponent::class)
+@InstallIn(SingletonComponent::class)
 class FirebaseModule {
 
 	@Provides

app/src/main/java/com/mmdev/roove/core/di/modules/RepositoryModule.kt

@@ -1,6 +1,6 @@
 /*
  * Created by Andrii Kovalchuk
- * Copyright (C) 2020. roove
+ * Copyright (C) 2021. roove
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,56 +18,50 @@
 
 package com.mmdev.roove.core.di.modules
 
+import com.google.firebase.auth.FirebaseAuth
 import com.mmdev.business.auth.AuthRepository
 import com.mmdev.business.cards.CardsRepository
 import com.mmdev.business.chat.ChatRepository
 import com.mmdev.business.conversations.ConversationsRepository
-import com.mmdev.business.local.LocalUserRepository
 import com.mmdev.business.pairs.PairsRepository
-import com.mmdev.business.remote.RemoteUserRepository
+import com.mmdev.business.user.IUserRepository
+import com.mmdev.data.datasource.AuthCollector
 import com.mmdev.data.repository.auth.AuthRepositoryImpl
 import com.mmdev.data.repository.cards.CardsRepositoryImpl
 import com.mmdev.data.repository.chat.ChatRepositoryImpl
 import com.mmdev.data.repository.conversations.ConversationsRepositoryImpl
 import com.mmdev.data.repository.pairs.PairsRepositoryImpl
-import com.mmdev.data.repository.user.UserRepositoryLocal
-import com.mmdev.data.repository.user.UserRepositoryRemoteImpl
+import com.mmdev.data.repository.user.UserRepositoryImpl
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ApplicationComponent
+import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
 
 @Module
-@InstallIn(ApplicationComponent::class)
+@InstallIn(SingletonComponent::class)
 class RepositoryModule {
-
+	
 	@Provides
 	@Singleton
+	fun authCollector(auth: FirebaseAuth): AuthCollector = AuthCollector(auth)
+	
+	@Provides
 	fun authRepository(repository: AuthRepositoryImpl): AuthRepository = repository
 
 	@Provides
-	@Singleton
 	fun cardsRepository(repository: CardsRepositoryImpl): CardsRepository = repository
 
 	@Provides
-	@Singleton
 	fun chatRepository(repository: ChatRepositoryImpl): ChatRepository = repository
 
 	@Provides
-	@Singleton
 	fun conversationsRepository(repository: ConversationsRepositoryImpl): ConversationsRepository = repository
 
 	@Provides
-	@Singleton
 	fun pairsRepository(repository: PairsRepositoryImpl): PairsRepository = repository
 
 	@Provides
-	@Singleton
-	fun localUserRepository(repository: UserRepositoryLocal): LocalUserRepository = repository
-
-	@Provides
-	@Singleton
-	fun remoteUserRepository(repository: UserRepositoryRemoteImpl): RemoteUserRepository = repository
+	fun remoteUserRepository(repository: UserRepositoryImpl): IUserRepository = repository
 
 }