Myzel394/NumberHub
1
0
Fork 0
mirror of https://github.com/Myzel394/NumberHub.git synced 2025-06-19 08:45:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Do not use Enum

Browse Source 
- Fixed moshi and R8 bug
This commit is contained in:
Sad Ellie 2023-12-02 23:07:53 +03:00
parent 5b1552f328
commit c1e52557a3
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/backup/src/main/java/com/sadellie/unitto/data/backup/BackupManager.kt
View File

@ -135,10 +135,10 @@ class BackupManager @Inject constructor(
clearInputAfterEquals = data.getClearInputAfterEquals(), clearInputAfterEquals = data.getClearInputAfterEquals(),
latestLeftSide = data.getLatestLeftSide(), latestLeftSide = data.getLatestLeftSide(),
latestRightSide = data.getLatestRightSide(), latestRightSide = data.getLatestRightSide(),
shownUnitGroups = data.getShownUnitGroups(), shownUnitGroups = data.getShownUnitGroups().joinToString(","),
unitConverterFavoritesOnly = data.getUnitConverterFavoritesOnly(), unitConverterFavoritesOnly = data.getUnitConverterFavoritesOnly(),
unitConverterFormatTime = data.getUnitConverterFormatTime(), unitConverterFormatTime = data.getUnitConverterFormatTime(),
unitConverterSorting = data.getUnitConverterSorting(), unitConverterSorting = data.getUnitConverterSorting().name,
unitsTable = unitsTableData, unitsTable = unitsTableData,
timeZoneTable = timeZoneTableData, timeZoneTable = timeZoneTableData,
) )
@ -172,10 +172,10 @@ class BackupManager @Inject constructor(
// UNIT CONVERTER // UNIT CONVERTER
it[PrefsKeys.LATEST_LEFT_SIDE] = userData.latestLeftSide it[PrefsKeys.LATEST_LEFT_SIDE] = userData.latestLeftSide
it[PrefsKeys.LATEST_RIGHT_SIDE] = userData.latestRightSide 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_FAVORITES_ONLY] = userData.unitConverterFavoritesOnly
it[PrefsKeys.UNIT_CONVERTER_FORMAT_TIME] = userData.unitConverterFormatTime it[PrefsKeys.UNIT_CONVERTER_FORMAT_TIME] = userData.unitConverterFormatTime
it[PrefsKeys.UNIT_CONVERTER_SORTING] = userData.unitConverterSorting.name it[PrefsKeys.UNIT_CONVERTER_SORTING] = userData.unitConverterSorting
} }
} }

6
data/backup/src/main/java/com/sadellie/unitto/data/backup/UserData.kt
View File

@ -20,8 +20,6 @@ package com.sadellie.unitto.data.backup
import com.sadellie.unitto.data.database.TimeZoneEntity import com.sadellie.unitto.data.database.TimeZoneEntity
import com.sadellie.unitto.data.database.UnitsEntity 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 // Don't move to model module. This uses entity classes from database module
data class UserData( data class UserData(
@ -47,10 +45,10 @@ data class UserData(
val latestLeftSide: String, val latestLeftSide: String,
val latestRightSide: String, val latestRightSide: String,
val shownUnitGroups: List<UnitGroup>, val shownUnitGroups: String,
val unitConverterFavoritesOnly: Boolean, val unitConverterFavoritesOnly: Boolean,
val unitConverterFormatTime: Boolean, val unitConverterFormatTime: Boolean,
val unitConverterSorting: UnitsListSorting, val unitConverterSorting: String,
val unitsTable: List<UnitsEntity>, val unitsTable: List<UnitsEntity>,
val timeZoneTable: List<TimeZoneEntity>, val timeZoneTable: List<TimeZoneEntity>,