Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,15 @@ package com.example.money2.data.local
import androidx.room.Database
import androidx.room.RoomDatabase
import com.example.money2.data.local.dao.HoldingDao
import com.example.money2.data.local.dao.TransactionDao
import com.example.money2.data.local.entity.HoldingEntity
import com.example.money2.data.local.entity.HoldingTransactionEntity
import com.example.money2.data.local.entity.TransactionEntity

@Database(
entities = [TransactionEntity::class, HoldingEntity::class, HoldingTransactionEntity::class],
entities = [HoldingEntity::class, HoldingTransactionEntity::class],

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

Since TransactionEntity has been removed from the database entities, the database schema has changed. If the database version is kept at 2, Room will throw an IllegalStateException on startup for existing users because the schema on disk won't match the compiled schema. To prevent this crash and allow fallbackToDestructiveMigration() to recreate the database, please increment the database version to 3 (on line 11).

version = 2,
exportSchema = false
)
abstract class AppDatabase : RoomDatabase() {
abstract fun transactionDao(): TransactionDao
abstract fun holdingDao(): HoldingDao

companion object {
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

11 changes: 0 additions & 11 deletions app/src/main/java/com/example/money2/di/AppModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ import com.example.money2.data.local.prefs.EncryptedPrefs
import com.example.money2.data.remote.api.MarketApi
import com.example.money2.data.repository.HoldingRepositoryImpl
import com.example.money2.data.repository.MarketRepositoryImpl
import com.example.money2.data.repository.TransactionRepositoryImpl
import com.example.money2.domain.repository.HoldingRepository
import com.example.money2.domain.repository.MarketRepository
import com.example.money2.domain.repository.TransactionRepository
import okhttp3.OkHttpClient
import okhttp3.logging.HttpLoggingInterceptor
import org.koin.android.ext.koin.androidContext
Expand All @@ -19,11 +17,8 @@ import org.koin.dsl.module
import retrofit2.Retrofit
import retrofit2.converter.gson.GsonConverterFactory
import com.example.money2.domain.usecase.AddHoldingUseCase
import com.example.money2.domain.usecase.AddTransactionUseCase
import com.example.money2.domain.usecase.DeleteTransactionUseCase
import com.example.money2.domain.usecase.GetDashboardStatsUseCase
import com.example.money2.domain.usecase.GetHoldingsUseCase
import com.example.money2.domain.usecase.GetTransactionsUseCase
import com.example.money2.presentation.dashboard.DashboardViewModel

val databaseModule = module {
Expand All @@ -35,12 +30,10 @@ val databaseModule = module {
).fallbackToDestructiveMigration()
.build()
}
single { get<AppDatabase>().transactionDao() }
single { get<AppDatabase>().holdingDao() }
}

val repositoryModule = module {
single<TransactionRepository> { TransactionRepositoryImpl(get()) }
single<HoldingRepository> { HoldingRepositoryImpl(get()) }
}

Expand Down Expand Up @@ -73,9 +66,6 @@ val networkModule = module {
}

val useCaseModule = module {
single { GetTransactionsUseCase(get()) }
single { AddTransactionUseCase(get()) }
single { DeleteTransactionUseCase(get()) }
single { GetDashboardStatsUseCase(get(), get<EncryptedPrefs>().selectedCurrencyFlow, get<EncryptedPrefs>().exchangeRateFlow) }

single { GetHoldingsUseCase(get()) }
Expand All @@ -84,7 +74,6 @@ val useCaseModule = module {

val viewModelModule = module {
viewModel { DashboardViewModel(get(), get(), get(), get(), get()) }
viewModel { com.example.money2.presentation.transactions.TransactionsViewModel(get(), get(), get()) }
viewModel { com.example.money2.presentation.holdings.HoldingsViewModel(get(), get(), get(), get()) }
viewModel { com.example.money2.presentation.holdings.detail.HoldingDetailViewModel(get(), get()) }
viewModel { com.example.money2.presentation.settings.SettingsViewModel(get(), get()) }
Expand Down
13 changes: 0 additions & 13 deletions app/src/main/java/com/example/money2/domain/model/Transaction.kt

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ package com.example.money2.presentation.navigation

sealed class NavRoutes(val route: String) {
data object Dashboard : NavRoutes("dashboard")
data object Transactions : NavRoutes("transactions")
data object Holdings : NavRoutes("holdings")
data object Settings : NavRoutes("settings")
data object AddTransaction : NavRoutes("add_transaction")
data object AddHolding : NavRoutes("add_holding")

data object HoldingDetail : NavRoutes("holding_detail/{symbol}") {
Expand Down

This file was deleted.

Loading