yetangitu/timelimit-android
1
0
Fork 0
mirror of https://codeberg.org/timelimit/timelimit-android.git synced 2025-10-06 11:59:57 +02:00
Code Issues Projects Releases Wiki Activity

Make the categories sortable

Browse source
This commit is contained in:
Jonas Lochmann 2020-02-10 01:00:00 +01:00
parent 412966df26
commit 0d2dd7bed1
No known key found for this signature in database
GPG key ID: 8B8C9AEE10FA5B36
16 changed files with 1020 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/io/timelimit/android/sync/ApplyServerDataStatus.kt
View file

@ -312,7 +312,8 @@ object ApplyServerDataStatus {
parentCategoryId = newCategory.parentCategoryId,
timeWarnings = newCategory.timeWarnings,
minBatteryLevelMobile = newCategory.minBatteryLevelMobile,
minBatteryLevelWhileCharging = newCategory.minBatteryLevelCharging
minBatteryLevelWhileCharging = newCategory.minBatteryLevelCharging,
sort = newCategory.sort
))
} else {
val updatedCategory = oldCategory.copy(
@ -327,7 +328,8 @@ object ApplyServerDataStatus {
parentCategoryId = newCategory.parentCategoryId,
timeWarnings = newCategory.timeWarnings,
minBatteryLevelMobile = newCategory.minBatteryLevelMobile,
minBatteryLevelWhileCharging = newCategory.minBatteryLevelCharging
minBatteryLevelWhileCharging = newCategory.minBatteryLevelCharging,
sort = newCategory.sort
)
if (updatedCategory != oldCategory) {