From 1f1387239297076ed158aa702a73273f7adeecbc Mon Sep 17 00:00:00 2001 From: Agnieszka C <85929121+Aga-C@users.noreply.github.com> Date: Sun, 30 Mar 2025 19:04:02 +0200 Subject: [PATCH] Added placeholders for alarms and timers (#124) --- .../fossify/clock/adapters/AlarmsAdapter.kt | 3 ++ .../fossify/clock/fragments/AlarmFragment.kt | 2 + .../fossify/clock/fragments/TimerFragment.kt | 2 + app/src/main/res/layout/fragment_alarm.xml | 16 +++++++ app/src/main/res/layout/fragment_timer.xml | 47 ++++++++++++++----- 5 files changed, 58 insertions(+), 12 deletions(-) diff --git a/app/src/main/kotlin/org/fossify/clock/adapters/AlarmsAdapter.kt b/app/src/main/kotlin/org/fossify/clock/adapters/AlarmsAdapter.kt index bccbe0c9..6f6e34d8 100644 --- a/app/src/main/kotlin/org/fossify/clock/adapters/AlarmsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/clock/adapters/AlarmsAdapter.kt @@ -19,6 +19,7 @@ import org.fossify.clock.helpers.TOMORROW_BIT import org.fossify.clock.helpers.getCurrentDayMinutes import org.fossify.clock.interfaces.ToggleAlarmInterface import org.fossify.clock.models.Alarm +import org.fossify.clock.models.AlarmEvent import org.fossify.commons.adapters.MyRecyclerViewAdapter import org.fossify.commons.dialogs.ConfirmationDialog import org.fossify.commons.extensions.applyColorFilter @@ -29,6 +30,7 @@ import org.fossify.commons.interfaces.ItemMoveCallback import org.fossify.commons.interfaces.ItemTouchHelperContract import org.fossify.commons.interfaces.StartReorderDragListener import org.fossify.commons.views.MyRecyclerView +import org.greenrobot.eventbus.EventBus class AlarmsAdapter( activity: SimpleActivity, @@ -123,6 +125,7 @@ class AlarmsAdapter( alarms.removeAll(alarmsToRemove) removeSelectedItems(positions) activity.dbHelper.deleteAlarms(alarmsToRemove) + EventBus.getDefault().post(AlarmEvent.Refresh) } private fun getSelectedItems(): ArrayList { diff --git a/app/src/main/kotlin/org/fossify/clock/fragments/AlarmFragment.kt b/app/src/main/kotlin/org/fossify/clock/fragments/AlarmFragment.kt index 4838deaa..f8d1e763 100644 --- a/app/src/main/kotlin/org/fossify/clock/fragments/AlarmFragment.kt +++ b/app/src/main/kotlin/org/fossify/clock/fragments/AlarmFragment.kt @@ -26,6 +26,7 @@ import org.fossify.clock.helpers.getTomorrowBit import org.fossify.clock.interfaces.ToggleAlarmInterface import org.fossify.clock.models.Alarm import org.fossify.clock.models.AlarmEvent +import org.fossify.commons.extensions.beVisibleIf import org.fossify.commons.extensions.getProperBackgroundColor import org.fossify.commons.extensions.getProperTextColor import org.fossify.commons.extensions.toast @@ -159,6 +160,7 @@ class AlarmFragment : Fragment(), ToggleAlarmInterface { updateItems(alarms) } } + binding.alarmsPlaceholder.beVisibleIf(alarms.isEmpty()) } } diff --git a/app/src/main/kotlin/org/fossify/clock/fragments/TimerFragment.kt b/app/src/main/kotlin/org/fossify/clock/fragments/TimerFragment.kt index d7a2365b..3caaec61 100644 --- a/app/src/main/kotlin/org/fossify/clock/fragments/TimerFragment.kt +++ b/app/src/main/kotlin/org/fossify/clock/fragments/TimerFragment.kt @@ -19,6 +19,7 @@ import org.fossify.clock.helpers.DisabledItemChangeAnimator import org.fossify.clock.helpers.SORT_BY_TIMER_DURATION import org.fossify.clock.models.Timer import org.fossify.clock.models.TimerEvent +import org.fossify.commons.extensions.beVisibleIf import org.fossify.commons.extensions.getProperBackgroundColor import org.fossify.commons.extensions.getProperTextColor import org.fossify.commons.extensions.hideKeyboard @@ -161,6 +162,7 @@ class TimerFragment : Fragment() { } } } + binding.timersPlaceholder.beVisibleIf(timers.isEmpty()) } } } diff --git a/app/src/main/res/layout/fragment_alarm.xml b/app/src/main/res/layout/fragment_alarm.xml index 2a5e0e97..dce8207e 100644 --- a/app/src/main/res/layout/fragment_alarm.xml +++ b/app/src/main/res/layout/fragment_alarm.xml @@ -22,6 +22,22 @@ app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" tools:listitem="@layout/item_alarm" /> + + - + android:layout_height="match_parent"> + + + + + +