mirror of
https://github.com/Myzel394/NumberHub.git
synced 2025-06-18 16:25:27 +02:00
Do not use Enum
- Fixed moshi and R8 bug
This commit is contained in:
parent
5b1552f328
commit
c1e52557a3
@ -135,10 +135,10 @@ class BackupManager @Inject constructor(
|
||||
clearInputAfterEquals = data.getClearInputAfterEquals(),
|
||||
latestLeftSide = data.getLatestLeftSide(),
|
||||
latestRightSide = data.getLatestRightSide(),
|
||||
shownUnitGroups = data.getShownUnitGroups(),
|
||||
shownUnitGroups = data.getShownUnitGroups().joinToString(","),
|
||||
unitConverterFavoritesOnly = data.getUnitConverterFavoritesOnly(),
|
||||
unitConverterFormatTime = data.getUnitConverterFormatTime(),
|
||||
unitConverterSorting = data.getUnitConverterSorting(),
|
||||
unitConverterSorting = data.getUnitConverterSorting().name,
|
||||
unitsTable = unitsTableData,
|
||||
timeZoneTable = timeZoneTableData,
|
||||
)
|
||||
@ -172,10 +172,10 @@ class BackupManager @Inject constructor(
|
||||
// UNIT CONVERTER
|
||||
it[PrefsKeys.LATEST_LEFT_SIDE] = userData.latestLeftSide
|
||||
it[PrefsKeys.LATEST_RIGHT_SIDE] = userData.latestRightSide
|
||||
it[PrefsKeys.SHOWN_UNIT_GROUPS] = userData.shownUnitGroups.joinToString(",")
|
||||
it[PrefsKeys.SHOWN_UNIT_GROUPS] = userData.shownUnitGroups
|
||||
it[PrefsKeys.UNIT_CONVERTER_FAVORITES_ONLY] = userData.unitConverterFavoritesOnly
|
||||
it[PrefsKeys.UNIT_CONVERTER_FORMAT_TIME] = userData.unitConverterFormatTime
|
||||
it[PrefsKeys.UNIT_CONVERTER_SORTING] = userData.unitConverterSorting.name
|
||||
it[PrefsKeys.UNIT_CONVERTER_SORTING] = userData.unitConverterSorting
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -20,8 +20,6 @@ package com.sadellie.unitto.data.backup
|
||||
|
||||
import com.sadellie.unitto.data.database.TimeZoneEntity
|
||||
import com.sadellie.unitto.data.database.UnitsEntity
|
||||
import com.sadellie.unitto.data.model.UnitGroup
|
||||
import com.sadellie.unitto.data.model.UnitsListSorting
|
||||
|
||||
// Don't move to model module. This uses entity classes from database module
|
||||
data class UserData(
|
||||
@ -47,10 +45,10 @@ data class UserData(
|
||||
|
||||
val latestLeftSide: String,
|
||||
val latestRightSide: String,
|
||||
val shownUnitGroups: List<UnitGroup>,
|
||||
val shownUnitGroups: String,
|
||||
val unitConverterFavoritesOnly: Boolean,
|
||||
val unitConverterFormatTime: Boolean,
|
||||
val unitConverterSorting: UnitsListSorting,
|
||||
val unitConverterSorting: String,
|
||||
|
||||
val unitsTable: List<UnitsEntity>,
|
||||
val timeZoneTable: List<TimeZoneEntity>,
|
||||
|
Loading…
x
Reference in New Issue
Block a user