From 9067240c4fabed09eaebdfad35f0cfb5066c8d6d Mon Sep 17 00:00:00 2001 From: "smileomi18@gmail.com" Date: Tue, 25 Jul 2023 11:40:10 +0530 Subject: [PATCH] HemoCube new Changes --- .../com/example/hpostesting/HPOSTestingApplication.kt | 7 +++++++ .../java/com/example/hpostesting/data/dao/MyDataBase.kt | 8 ++++++-- .../hpostesting/data/repository/DatabaseRepository.kt | 6 +++++- .../java/com/example/hpostesting/domain/di/AppModule.kt | 4 +++- .../hpostesting/presentation/hemocube/HemoCubeFragment.kt | 1 - 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/example/hpostesting/HPOSTestingApplication.kt b/app/src/main/java/com/example/hpostesting/HPOSTestingApplication.kt index 1cee7e6..7dd5c98 100644 --- a/app/src/main/java/com/example/hpostesting/HPOSTestingApplication.kt +++ b/app/src/main/java/com/example/hpostesting/HPOSTestingApplication.kt @@ -1,12 +1,19 @@ package com.example.hpostesting import android.app.Application +import android.content.Context +import androidx.room.Room +import com.example.hpostesting.data.dao.MyDatabase +import com.google.android.datatransport.runtime.dagger.Provides import dagger.hilt.android.HiltAndroidApp import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob +import javax.inject.Singleton @HiltAndroidApp class HPOSTestingApplication: Application() { val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.IO) + + } \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt b/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt index 41a7e36..4a2778d 100644 --- a/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt +++ b/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt @@ -1,14 +1,18 @@ package com.example.hpostesting.data.dao +import android.content.Context import androidx.room.Database +import androidx.room.Room import androidx.room.RoomDatabase import androidx.room.TypeConverters import com.example.hpostesting.data.model.patient.UserData import com.example.hpostesting.data.model.patient.HemoCubeTestData +import com.google.android.datatransport.runtime.dagger.Provides +import javax.inject.Singleton -@Database(entities = [UserData::class, HemoCubeTestData::class], version = 1, exportSchema = false) +@Database(entities = [UserData::class, HemoCubeTestData::class], version = 2, exportSchema = false) @TypeConverters(Converters::class) abstract class MyDatabase : RoomDatabase() { abstract fun userDao(): UserDao abstract fun hemoCubeDao(): HemoCubeDao -} +} \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt b/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt index 4a855f3..b6a4fb8 100644 --- a/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt +++ b/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt @@ -1,16 +1,21 @@ package com.example.hpostesting.data.repository +import android.content.Context import android.net.Uri +import androidx.room.Room +import com.example.hpostesting.data.dao.MyDatabase import com.example.hpostesting.data.model.PendingUploads import com.example.hpostesting.data.model.Response import com.example.hpostesting.data.model.patient.HemoCubeTestData import com.example.hpostesting.data.model.patient.UserData +import com.google.android.datatransport.runtime.dagger.Provides import com.google.firebase.firestore.FirebaseFirestore import com.google.firebase.firestore.ktx.firestore import com.google.firebase.ktx.Firebase import com.google.firebase.storage.ktx.storage import kotlinx.coroutines.tasks.await import java.io.File +import javax.inject.Singleton class DatabaseRepository : Repository { @@ -107,5 +112,4 @@ class DatabaseRepository : Repository { Response.Error(e) } } - } \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/domain/di/AppModule.kt b/app/src/main/java/com/example/hpostesting/domain/di/AppModule.kt index 3cc5b1a..e0252b6 100644 --- a/app/src/main/java/com/example/hpostesting/domain/di/AppModule.kt +++ b/app/src/main/java/com/example/hpostesting/domain/di/AppModule.kt @@ -27,7 +27,9 @@ object AppModule { fun provideMyDatabase(@ApplicationContext context: Context): MyDatabase { return Room.databaseBuilder( context, MyDatabase::class.java, "my_database" - ).build() + ) + .fallbackToDestructiveMigration() + .build() } @Provides diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt index c5615b1..c54967a 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt @@ -1,5 +1,4 @@ package com.example.hpostesting.presentation.hemocube - import android.content.Context import android.content.SharedPreferences import android.os.Bundle