sadorowo/szkolnyplus
1
0
Fork 0
forked from github/szkolny
Code Pull Requests Activity

[Home/TimetableCard] Add counting in seconds.

Browse Source
This commit is contained in:
Kacper Ziubryniewicz 2019-12-22 21:31:12 +01:00
parent d67c2a90b1
commit 5991ef820f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt
View File

@ -77,6 +77,9 @@ class HomeTimetableCard(
private val ignoreCancelled = true private val ignoreCancelled = true
private val countInSeconds: Boolean
get() = app.config.timetable.countInSeconds
override fun bind(position: Int, holder: HomeCardAdapter.ViewHolder) { override fun bind(position: Int, holder: HomeCardAdapter.ViewHolder) {
holder.root.removeAllViews() holder.root.removeAllViews()
b = CardHomeTimetableBinding.inflate(LayoutInflater.from(holder.root.context)) b = CardHomeTimetableBinding.inflate(LayoutInflater.from(holder.root.context))
@ -341,7 +344,7 @@ class HomeTimetableCard(
b.progress.visibility = View.GONE b.progress.visibility = View.GONE
b.counter.visibility = View.VISIBLE b.counter.visibility = View.VISIBLE
val diff = counterStart - now val diff = counterStart - now
b.counter.text = activity.timeTill(diff.toInt(), "\n") b.counter.text = activity.timeTill(diff.toInt(), "\n", countInSeconds)
} }
else { else {
// the lesson is right now // the lesson is right now
@ -350,7 +353,7 @@ class HomeTimetableCard(
val lessonLength = counterEnd - counterStart val lessonLength = counterEnd - counterStart
val timePassed = now - counterStart val timePassed = now - counterStart
val timeLeft = counterEnd - now val timeLeft = counterEnd - now
b.counter.text = activity.timeLeft(timeLeft.toInt(), "\n") b.counter.text = activity.timeLeft(timeLeft.toInt(), "\n", countInSeconds)
b.progress.max = lessonLength.toInt() b.progress.max = lessonLength.toInt()
b.progress.progress = timePassed.toInt() b.progress.progress = timePassed.toInt()
} }