Skip to content

refactor NoteDatabase creation to AppModule and remove redundant companion object #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tiwiz merged 2 commits into from
Jan 20, 2026
Merged

refactor NoteDatabase creation to AppModule and remove redundant companion object #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1673a10
refactor NoteDatabase creation to AppModule and remove redundant comp…
cka-dev Jan 14, 2026
aee4caa
address Gemini Code Assist comment
cka-dev Jan 14, 2026
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
20 changes: 1 addition & 19 deletions app/src/main/java/com/example/cahier/data/NoteDatabase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@

package com.example.cahier.data

import android.content.Context
import androidx.room.Database
import androidx.room.Room
import androidx.room.RoomDatabase
import androidx.room.TypeConverters
import com.example.cahier.ui.Converters
Expand All @@ -35,22 +33,6 @@ abstract class NoteDatabase : RoomDatabase() {
abstract fun noteDao(): NoteDao

companion object {
@Volatile
private var Instance: NoteDatabase? = null

fun getDatabase(context: Context): NoteDatabase {
return Instance ?: synchronized(this) {
Instance ?: Room.databaseBuilder(
context,
NoteDatabase::class.java,
"note_database"
)
.addMigrations(MIGRATION_7_8)
.build()
.also {
Instance = it
}
}
}
const val DATABASE_NAME = "note_database"
}
}
10 changes: 9 additions & 1 deletion app/src/main/java/com/example/cahier/di/AppModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
package com.example.cahier.di

import android.content.Context
import androidx.room.Room
import coil3.ImageLoader
import com.example.cahier.data.MIGRATION_7_8
import com.example.cahier.data.NoteDatabase
import com.example.cahier.data.NotesRepository
import com.example.cahier.data.OfflineNotesRepository
Expand All @@ -38,7 +40,13 @@ object AppModule {
@Provides
@Singleton
fun provideNoteDatabase(@ApplicationContext context: Context): NoteDatabase {
return NoteDatabase.getDatabase(context)
return Room.databaseBuilder(
context,
NoteDatabase::class.java,
NoteDatabase.DATABASE_NAME
)
.addMigrations(MIGRATION_7_8)
.build()
}

@Provides
Expand Down
Loading