yetangitu/opentimelimit-android
1
0
Fork 0
mirror of https://codeberg.org/timelimit/opentimelimit-android.git synced 2025-10-05 10:49:29 +02:00
Code Issues Projects Releases Wiki Activity

Show if category is for unassigned apps in category list

Browse source
This commit is contained in:
Jonas L 2019-01-24 20:29:53 +01:00
parent 45706a509c
commit 0c60d0be42
6 changed files with 53 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/io/timelimit/android/ui/manage/child/category/Adapter.kt
View file

@ -124,6 +124,7 @@ class Adapter: RecyclerView.Adapter<ViewHolder>() {
} else {
null
}
binding.usedForAppsWithoutCategory = item.usedForNotAssignedApps
binding.card.setOnClickListener { handlers?.onCategoryClicked(item.category) }

3
app/src/main/java/io/timelimit/android/ui/manage/child/category/Items.kt
View file

@ -25,5 +25,6 @@ data class CategoryItem(
val category: Category,
val isBlockedTimeNow: Boolean,
val remainingTimeToday: Long?,
val usedTimeToday: Long
val usedTimeToday: Long,
val usedForNotAssignedApps: Boolean
): ManageChildCategoriesListItem()

65
app/src/main/java/io/timelimit/android/ui/manage/child/category/ManageChildCategoriesModel.kt
View file

@ -46,6 +46,8 @@ class ManageChildCategoriesModel(application: Application): AndroidViewModel(app
private val childEntry = childId.switchMap { logic.database.user().getChildUserByIdLive(it) }
private val categoryForUnassignedAppsLive = childEntry.map { it?.categoryForNotAssignedApps }.ignoreUnchanged()
private val childTimezone = childEntry.mapToTimezone()
private val childMinuteOfWeek = childTimezone.switchMap { timeZone ->
@ -74,40 +76,43 @@ class ManageChildCategoriesModel(application: Application): AndroidViewModel(app
)
}
private val categoryItems = categories.switchMap { categories ->
timeLimitRules.switchMap { timeLimitRules ->
childDate.switchMap { childDate ->
usedTimeItemsForWeek.switchMap { usedTimeItemsForWeek ->
childMinuteOfWeek.map { childMinuteOfWeek ->
val rulesByCategoryId = timeLimitRules.groupBy { rule -> rule.categoryId }
val usedTimesByCategory = usedTimeItemsForWeek.groupBy { item -> item.categoryId }
val firstDayOfWeek = childDate.dayOfEpoch - childDate.dayOfWeek
private val categoryItems = categoryForUnassignedAppsLive.switchMap { categoryForUnassignedApps ->
categories.switchMap { categories ->
timeLimitRules.switchMap { timeLimitRules ->
childDate.switchMap { childDate ->
usedTimeItemsForWeek.switchMap { usedTimeItemsForWeek ->
childMinuteOfWeek.map { childMinuteOfWeek ->
val rulesByCategoryId = timeLimitRules.groupBy { rule -> rule.categoryId }
val usedTimesByCategory = usedTimeItemsForWeek.groupBy { item -> item.categoryId }
val firstDayOfWeek = childDate.dayOfEpoch - childDate.dayOfWeek
categories.map {
category ->
categories.map { category ->
val rules = rulesByCategoryId[category.id] ?: emptyList()
val usedTimeItemsForCategory = usedTimesByCategory[category.id] ?: emptyList()
val rules = rulesByCategoryId[category.id] ?: emptyList()
val usedTimeItemsForCategory = usedTimesByCategory[category.id]
?: emptyList()
CategoryItem(
category = category,
isBlockedTimeNow = category.blockedMinutesInWeek.read(childMinuteOfWeek),
remainingTimeToday = RemainingTime.getRemainingTime(
dayOfWeek = childDate.dayOfWeek,
usedTimes = SparseLongArray().apply {
usedTimeItemsForCategory.forEach {
usedTimeItem ->
CategoryItem(
category = category,
isBlockedTimeNow = category.blockedMinutesInWeek.read(childMinuteOfWeek),
remainingTimeToday = RemainingTime.getRemainingTime(
dayOfWeek = childDate.dayOfWeek,
usedTimes = SparseLongArray().apply {
usedTimeItemsForCategory.forEach { usedTimeItem ->
val dayOfWeek = usedTimeItem.dayOfEpoch - firstDayOfWeek
val dayOfWeek = usedTimeItem.dayOfEpoch - firstDayOfWeek
put(dayOfWeek, usedTimeItem.usedMillis)
}
},
rules = rules,
extraTime = category.extraTimeInMillis
)?.includingExtraTime,
usedTimeToday = usedTimeItemsForCategory.find { item -> item.dayOfEpoch == childDate.dayOfEpoch }?.usedMillis ?: 0
)
put(dayOfWeek, usedTimeItem.usedMillis)
}
},
rules = rules,
extraTime = category.extraTimeInMillis
)?.includingExtraTime,
usedTimeToday = usedTimeItemsForCategory.find { item -> item.dayOfEpoch == childDate.dayOfEpoch }?.usedMillis
?: 0,
usedForNotAssignedApps = categoryForUnassignedApps == category.id
)
}
}
}
}
@ -136,4 +141,4 @@ class ManageChildCategoriesModel(application: Application): AndroidViewModel(app
}
}
}
}
}