aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2025-12-19 07:24:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renamed

Browse Source
This commit is contained in:
hiar
2025-09-09 11:46:19 +02:00
committed by Himali Aryal
parent c14935add9
commit dd795b58bf
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/Configuration.kt
View File

@@ -5,7 +5,7 @@ import androidx.room.Entity
import androidx.room.PrimaryKey import androidx.room.PrimaryKey
@Entity(tableName = "configurations") @Entity(tableName = "configurations")
data class ConfigurationEntity( data class Configuration(
@PrimaryKey(autoGenerate = true) @PrimaryKey(autoGenerate = true)
@ColumnInfo(name = "_id") val _id: Int?, @ColumnInfo(name = "_id") val _id: Int?,
@ColumnInfo(name = "name") val name: String, @ColumnInfo(name = "name") val name: String,

4
lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/ConfigurationDao.kt
View File

@@ -9,10 +9,10 @@ import kotlinx.coroutines.flow.Flow
@Dao @Dao
interface ConfigurationsDao { interface ConfigurationsDao {
@Query("SELECT * FROM configurations") @Query("SELECT * FROM configurations")
fun getAllConfigurations(): Flow<List<ConfigurationEntity>> fun getAllConfigurations(): Flow<List<Configuration>>
@Insert(onConflict = OnConflictStrategy.REPLACE) @Insert(onConflict = OnConflictStrategy.REPLACE)
suspend fun insertConfiguration(configuration: ConfigurationEntity): Long suspend fun insertConfiguration(configuration: Configuration): Long
@Query("DELETE FROM configurations WHERE name = :configurationName") @Query("DELETE FROM configurations WHERE name = :configurationName")
suspend fun deleteConfiguration(configurationName: String) suspend fun deleteConfiguration(configurationName: String)

4
lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/ConfigurationDatabase.kt → lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/ConfigurationsDatabase.kt
View File

@@ -4,9 +4,9 @@ import androidx.room.Database
import androidx.room.RoomDatabase import androidx.room.RoomDatabase
@Database( @Database(
entities = [ConfigurationEntity::class], entities = [Configuration::class],
version = 3 version = 3
) )
internal abstract class ConfigurationDatabase : RoomDatabase() { abstract class ConfigurationsDatabase : RoomDatabase() {
abstract fun configurationDao(): ConfigurationsDao abstract fun configurationDao(): ConfigurationsDao
} }

4
lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/di/DaoHiltModule.kt
View File

@@ -4,7 +4,7 @@ import dagger.Module
import dagger.Provides import dagger.Provides
import dagger.hilt.InstallIn import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent import dagger.hilt.components.SingletonComponent
import no.nordicsemi.android.toolbox.lib.storage.ConfigurationDatabase import no.nordicsemi.android.toolbox.lib.storage.ConfigurationsDatabase
import no.nordicsemi.android.toolbox.lib.storage.ConfigurationsDao import no.nordicsemi.android.toolbox.lib.storage.ConfigurationsDao
import javax.inject.Singleton import javax.inject.Singleton
@@ -14,7 +14,7 @@ class DaoHiltModule {
@Provides @Provides
@Singleton @Singleton
internal fun provideDeviceDao(db: ConfigurationDatabase): ConfigurationsDao { internal fun provideDeviceDao(db: ConfigurationsDatabase): ConfigurationsDao {
return db.configurationDao() return db.configurationDao()
} }
} }

6
lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/di/DbHiltModule.kt
View File

@@ -7,7 +7,7 @@ import dagger.Provides
import dagger.hilt.InstallIn import dagger.hilt.InstallIn
import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.android.qualifiers.ApplicationContext
import dagger.hilt.components.SingletonComponent import dagger.hilt.components.SingletonComponent
import no.nordicsemi.android.toolbox.lib.storage.ConfigurationDatabase import no.nordicsemi.android.toolbox.lib.storage.ConfigurationsDatabase
import no.nordicsemi.android.toolbox.lib.storage.MIGRATION_1_2 import no.nordicsemi.android.toolbox.lib.storage.MIGRATION_1_2
import javax.inject.Singleton import javax.inject.Singleton
@@ -17,10 +17,10 @@ class DbHiltModule {
@Provides @Provides
@Singleton @Singleton
internal fun provideDeviceDB(@ApplicationContext context: Context): ConfigurationDatabase { internal fun provideDeviceDB(@ApplicationContext context: Context): ConfigurationsDatabase {
return Room.databaseBuilder( return Room.databaseBuilder(
context, context,
ConfigurationDatabase::class.java, ConfigurationsDatabase::class.java,
"toolbox_uart.db" "toolbox_uart.db"
) )
.addMigrations(MIGRATION_1_2) .addMigrations(MIGRATION_1_2)

8
profile/src/main/java/no/nordicsemi/android/toolbox/profile/repository/uartXml/UartConfigurationRepository.kt
View File

@@ -2,7 +2,7 @@ package no.nordicsemi.android.toolbox.profile.repository.uartXml
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
import no.nordicsemi.android.toolbox.lib.storage.ConfigurationEntity import no.nordicsemi.android.toolbox.lib.storage.Configuration
import no.nordicsemi.android.toolbox.lib.storage.ConfigurationsDao import no.nordicsemi.android.toolbox.lib.storage.ConfigurationsDao
import no.nordicsemi.android.toolbox.profile.data.uart.MacroIcon import no.nordicsemi.android.toolbox.profile.data.uart.MacroIcon
import no.nordicsemi.android.toolbox.profile.data.uart.UARTConfiguration import no.nordicsemi.android.toolbox.profile.data.uart.UARTConfiguration
@@ -29,7 +29,7 @@ internal class UartConfigurationRepository @Inject constructor(
configurations.mapNotNull { it.toDomain() } configurations.mapNotNull { it.toDomain() }
} }
private fun ConfigurationEntity.toDomain(): UARTConfiguration? { private fun Configuration.toDomain(): UARTConfiguration? {
return try { return try {
val xml: String = xml val xml: String = xml
val format = Format(HyphenStyle()) val format = Format(HyphenStyle())
@@ -67,7 +67,7 @@ internal class UartConfigurationRepository @Inject constructor(
configurationDao.deleteConfiguration(configuration.name) configurationDao.deleteConfiguration(configuration.name)
} }
private fun UARTConfiguration.toConfigurationEntity(): ConfigurationEntity? { private fun UARTConfiguration.toConfigurationEntity(): Configuration? {
return try { return try {
val format = Format(HyphenStyle()) val format = Format(HyphenStyle())
val strategy: Strategy = VisitorStrategy(CommentVisitor()) val strategy: Strategy = VisitorStrategy(CommentVisitor())
@@ -75,7 +75,7 @@ internal class UartConfigurationRepository @Inject constructor(
val writer = StringWriter() val writer = StringWriter()
serializer.write(this.toXmlConfiguration(), writer) serializer.write(this.toXmlConfiguration(), writer)
return ConfigurationEntity( return Configuration(
_id = id, _id = id,
name = name, name = name,
xml = writer.toString(), xml = writer.toString(),