fix: Removed unused room packages and classes. This addresses #52

droidconKE · Jan 16, 2020 · 57813ac · 57813ac
1 parent b61148c
commit 57813ac
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 226 deletions.
diff --git a/app/src/main/java/com/android254/droidconke19/database/AppDatabase.kt b/app/src/main/java/com/android254/droidconke19/database/AppDatabase.kt
diff --git a/app/src/main/java/com/android254/droidconke19/database/converters/Converter.kt b/app/src/main/java/com/android254/droidconke19/database/converters/Converter.kt
diff --git a/app/src/main/java/com/android254/droidconke19/database/dao/SessionsDao.kt b/app/src/main/java/com/android254/droidconke19/database/dao/SessionsDao.kt
diff --git a/app/src/main/java/com/android254/droidconke19/database/dao/StarredSessionDao.kt b/app/src/main/java/com/android254/droidconke19/database/dao/StarredSessionDao.kt
diff --git a/app/src/main/java/com/android254/droidconke19/database/entities/StarredSessionEntity.kt b/app/src/main/java/com/android254/droidconke19/database/entities/StarredSessionEntity.kt
diff --git a/app/src/main/java/com/android254/droidconke19/di/modules.kt b/app/src/main/java/com/android254/droidconke19/di/modules.kt
@@ -1,8 +1,6 @@
 package com.android254.droidconke19.di
 
 import android.content.Context
-import androidx.room.Room
-import com.android254.droidconke19.database.AppDatabase
 import com.android254.droidconke19.firebase.FirebaseRemoteConfigFactory
 import com.android254.droidconke19.repository.*
 import com.android254.droidconke19.utils.SharedPref
@@ -12,7 +10,6 @@ import com.google.firebase.database.FirebaseDatabase
 import com.google.firebase.firestore.ktx.firestore
 import com.google.firebase.ktx.Firebase
 import com.google.firebase.messaging.FirebaseMessaging
-import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
 
@@ -44,8 +41,8 @@ val appModule = module {
 val dataModule = module {
     // Repos
     single<AboutDetailsRepo> { AboutDetailsRepoImpl(get()) }
-    single<SessionsRepo> { SessionsRepoImpl(get(), get()) }
-    single<SessionDataRepo> { SessionDataRepoImpl(get(), get()) }
+    single<SessionsRepo> { SessionsRepoImpl(get()) }
+    single<SessionDataRepo> { SessionDataRepoImpl(get()) }
     single<SpeakersRepo> { SpeakersRepoImpl(get()) }
     single<RoomRepo> { RoomRepoImpl(get()) }
     single<SessionFeedbackRepo> { SessionFeedbackRepoImpl(get()) }
@@ -57,6 +54,4 @@ val dataModule = module {
     single<ReserveSeatRepo> { ReserveSeatRepoImpl(get()) }
     single<WifiDetailsRepo> { WifiDetailsRepoImpl(get()) }
 
-    // Database
-    single { Room.databaseBuilder(get(), AppDatabase::class.java, "droidconKE_db").fallbackToDestructiveMigration().build() }
 }
diff --git a/app/src/main/java/com/android254/droidconke19/repository/ReserveSeatRepo.kt b/app/src/main/java/com/android254/droidconke19/repository/ReserveSeatRepo.kt
@@ -1,11 +1,11 @@
 package com.android254.droidconke19.repository
 
+import com.android254.droidconke19.datastates.FirebaseResult
+import com.android254.droidconke19.datastates.runCatching
 import com.android254.droidconke19.models.ReserveSeatModel
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.FirebaseFirestoreException
 import kotlinx.coroutines.tasks.await
-import com.android254.droidconke19.datastates.FirebaseResult
-import com.android254.droidconke19.datastates.runCatching
 
 interface ReserveSeatRepo {
     suspend fun reserveSeat(reserveSeatModel: ReserveSeatModel): FirebaseResult<String>

diff --git a/app/src/main/java/com/android254/droidconke19/repository/SessionDataRepo.kt b/app/src/main/java/com/android254/droidconke19/repository/SessionDataRepo.kt
@@ -1,7 +1,5 @@
 package com.android254.droidconke19.repository
 
-import com.android254.droidconke19.database.AppDatabase
-import com.android254.droidconke19.database.dao.SessionsDao
 import com.android254.droidconke19.datastates.FirebaseResult
 import com.android254.droidconke19.datastates.runCatching
 import com.android254.droidconke19.models.SessionsModel
@@ -21,9 +19,7 @@ interface SessionDataRepo {
     suspend fun clearStarredSessions(userId: String)
 }
 
-class SessionDataRepoImpl(db: AppDatabase, private val firestore: FirebaseFirestore) : SessionDataRepo {
-    private val sessionsDao: SessionsDao = db.sessionsDao()
-
+class SessionDataRepoImpl(private val firestore: FirebaseFirestore) : SessionDataRepo {
     private val starredSessionCollection = "starred_sessions"
 
     override suspend fun getSessionData(dayNumber: String, sessionId: Int): FirebaseResult<SessionsModel> =

diff --git a/app/src/main/java/com/android254/droidconke19/repository/SessionsRepo.kt b/app/src/main/java/com/android254/droidconke19/repository/SessionsRepo.kt
@@ -1,6 +1,5 @@
 package com.android254.droidconke19.repository
 
-import com.android254.droidconke19.database.AppDatabase
 import com.android254.droidconke19.datastates.FirebaseResult
 import com.android254.droidconke19.datastates.runCatching
 import com.android254.droidconke19.models.SessionsModel
@@ -14,7 +13,7 @@ interface SessionsRepo {
     suspend fun getSessions(sessionDay: String): FirebaseResult<List<SessionsModel>>
 }
 
-class SessionsRepoImpl(db: AppDatabase, private val firestore: FirebaseFirestore) : SessionsRepo {
+class SessionsRepoImpl(private val firestore: FirebaseFirestore) : SessionsRepo {
 
     override suspend fun getSessions(sessionDay: String): FirebaseResult<List<SessionsModel>> =
             runCatching {

diff --git a/app/src/main/java/com/android254/droidconke19/repository/WifiDetailsRepo.kt b/app/src/main/java/com/android254/droidconke19/repository/WifiDetailsRepo.kt
@@ -1,10 +1,10 @@
 package com.android254.droidconke19.repository
 
 import com.android254.droidconke19.datastates.FirebaseResult
-import com.android254.droidconke19.models.WifiDetailsModel
-import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import com.android254.droidconke19.datastates.runCatching
+import com.android254.droidconke19.models.WifiDetailsModel
 import com.android254.droidconke19.models.utils.WifiDetailsModelFactory
+import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import kotlinx.coroutines.tasks.await
 
 interface WifiDetailsRepo {