From 6ece6ca52a877b4ac15d0b66ccae4a701e8f1c97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= Date: Tue, 7 Jan 2020 09:48:24 +0100 Subject: [PATCH] [UI/Counter] Add Bell Sync option in counter activity. --- .../ui/modules/home/CounterActivity.kt | 18 +++++++++++--- app/src/main/res/layout/activity_counter.xml | 24 +++++++++++++++++++ app/src/main/res/values/strings.xml | 1 + 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CounterActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CounterActivity.kt index 0a94f001..d7428a50 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CounterActivity.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CounterActivity.kt @@ -6,11 +6,16 @@ package pl.szczodrzynski.edziennik.ui.modules.home import android.os.Bundle import androidx.appcompat.app.AppCompatActivity +import com.mikepenz.iconics.IconicsDrawable +import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont +import com.mikepenz.iconics.utils.colorInt +import com.mikepenz.iconics.utils.sizeDp import kotlinx.coroutines.* import pl.szczodrzynski.edziennik.* import pl.szczodrzynski.edziennik.data.db.entity.Lesson import pl.szczodrzynski.edziennik.data.db.full.LessonFull import pl.szczodrzynski.edziennik.databinding.ActivityCounterBinding +import pl.szczodrzynski.edziennik.ui.dialogs.bell.BellSyncTimeChooseDialog import pl.szczodrzynski.edziennik.utils.models.Date import pl.szczodrzynski.edziennik.utils.models.Time import kotlin.coroutines.CoroutineContext @@ -32,7 +37,7 @@ class CounterActivity : AppCompatActivity(), CoroutineScope { private val syncedNow: Time get() = Time.fromMillis(Time.getNow().inMillis - bellSyncDiffMillis) - private val countInSeconts: Boolean + private val countInSeconds: Boolean get() = app.config.timetable.countInSeconds override fun onCreate(savedInstanceState: Bundle?) { @@ -54,6 +59,13 @@ class CounterActivity : AppCompatActivity(), CoroutineScope { } } + b.bellSync.setImageDrawable(IconicsDrawable(this@CounterActivity, SzkolnyFont.Icon.szf_alarm_bell_outline) + .colorInt(0xff404040.toInt()) + .sizeDp(36)) + b.bellSync.onClick { + BellSyncTimeChooseDialog(activity = this@CounterActivity) + } + app.config.timetable.bellSyncDiff?.let { bellSyncDiffMillis = (it.hour * 60 * 60 * 1000 + it.minute * 60 * 1000 + it.second * 1000).toLong() bellSyncDiffMillis *= app.config.timetable.bellSyncMultiplier.toLong() @@ -85,13 +97,13 @@ class CounterActivity : AppCompatActivity(), CoroutineScope { b.lessonName.text = actual.displaySubjectName val left = actual.displayEndTime!! - now - b.timeLeft.text = timeLeft(left.toInt(), "\n", countInSeconts) + b.timeLeft.text = timeLeft(left.toInt(), "\n", countInSeconds) } next != null -> { b.lessonName.text = next.displaySubjectName val till = next.displayStartTime!! - now - b.timeLeft.text = timeTill(till.toInt(), "\n", countInSeconts) + b.timeLeft.text = timeTill(till.toInt(), "\n", countInSeconds) } else -> { b.lessonName.text = app.getString(R.string.lessons_finished) diff --git a/app/src/main/res/layout/activity_counter.xml b/app/src/main/res/layout/activity_counter.xml index 7a633481..f96d0ce2 100644 --- a/app/src/main/res/layout/activity_counter.xml +++ b/app/src/main/res/layout/activity_counter.xml @@ -8,6 +8,30 @@ android:gravity="center" android:orientation="vertical"> + + + + + Udostępniam wydarzenie... Usuwam udostępnione wydarzenie... Usuwam wydarzenie... + Synchronizuj