Don't show "Duplicate" button for bedtime alarm

- Remove unnecessary event
qw123wh · Apr 6, 2024 · 0e62b25 · 0e62b25
1 parent 163cc24
commit 0e62b25
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 35 deletions.
diff --git a/app/src/main/java/com/best/deskclock/alarms/AlarmTimeClickHandler.java b/app/src/main/java/com/best/deskclock/alarms/AlarmTimeClickHandler.java
@@ -124,7 +124,6 @@ public void onDeleteClicked(AlarmItemHolder itemHolder) {
 
  public void onDuplicateClicked(AlarmItemHolder itemHolder) {
  final Alarm alarm = itemHolder.item;
- Events.sendAlarmEvent(R.string.action_create, R.string.label_deskclock);
  mAlarmUpdateHandler.asyncAddAlarm(alarm);
  LOGGER.d("Adding alarm.");
  }

diff --git a/app/src/main/java/com/best/deskclock/alarms/dataadapter/ExpandedAlarmViewHolder.java b/app/src/main/java/com/best/deskclock/alarms/dataadapter/ExpandedAlarmViewHolder.java
@@ -40,6 +40,7 @@
 import com.best.deskclock.R;
 import com.best.deskclock.Utils;
 import com.best.deskclock.alarms.AlarmTimeClickHandler;
+import com.best.deskclock.bedtime.BedtimeFragment;
 import com.best.deskclock.data.DataModel;
 import com.best.deskclock.events.Events;
 import com.best.deskclock.provider.Alarm;
@@ -144,6 +145,7 @@ protected void onBindItemView(final AlarmItemHolder itemHolder) {
  bindDaysOfWeekButtons(alarm, context);
  bindVibrator(alarm);
  bindRingtone(context, alarm);
+ bindDuplicateButton();
  }
 
  private void bindRingtone(Context context, Alarm alarm) {
@@ -183,6 +185,13 @@ private void bindVibrator(Alarm alarm) {
  }
  }
 
+ private void bindDuplicateButton() {
+ if (!getItemHolder().item.equals(
+ Alarm.getAlarmByLabel(itemView.getContext().getContentResolver(), BedtimeFragment.BEDLABEL))) {
+ duplicate.setVisibility(View.VISIBLE);
+ }
+ }
+
  private AlarmTimeClickHandler getAlarmTimeClickHandler() {
  return getItemHolder().getAlarmTimeClickHandler();
  }

diff --git a/app/src/main/res/layout/alarm_time_expanded.xml b/app/src/main/res/layout/alarm_time_expanded.xml
@@ -119,39 +119,39 @@
  android:orientation="horizontal"
  app:layout_constraintTop_toBottomOf="@id/onoff" />
 
-  <com.google.android.material.textview.MaterialTextView
-  android:id="@+id/choose_ringtone"
-  android:layout_width="match_parent"
-  android:layout_height="48dp"
-  android:background="?attr/selectableItemBackground"
-  android:clickable="true"
-  android:drawableStart="@drawable/ic_ringtone"
-  android:drawableTint="@color/md_theme_onSurfaceVariant"
-  android:drawablePadding="10dp"
-  android:ellipsize="marquee"
-  android:focusable="true"
-  android:gravity="center_vertical"
-  android:marqueeRepeatLimit="marquee_forever"
-  android:scrollHorizontally="true"
-  android:singleLine="true"
-  android:textColor="?android:attr/textColorPrimary"
-  app:layout_constraintTop_toBottomOf="@id/repeat_days_alarm"
-  tools:text="Standard (Hassium)" />
-
-  <com.google.android.material.checkbox.MaterialCheckBox
-  android:id="@+id/vibrate_onoff"
-  android:layout_width="match_parent"
-  android:layout_height="48dp"
-  android:background="?selectableItemBackground"
-  android:button="@null"
-  android:drawableStart="@drawable/ic_vibrate"
-  android:drawableEnd="@drawable/ic_selector_checkbox"
-  android:drawablePadding="10dp"
-  android:text="@string/alarm_vibrate"
-  android:textColor="?android:attr/textColorPrimary"
-  app:layout_constraintTop_toBottomOf="@id/choose_ringtone"
-  tools:ignore="RtlSymmetry"
-  tools:checked="true" />
+ <com.google.android.material.textview.MaterialTextView
+ android:id="@+id/choose_ringtone"
+ android:layout_width="match_parent"
+ android:layout_height="48dp"
+ android:background="?attr/selectableItemBackground"
+ android:clickable="true"
+ android:drawableStart="@drawable/ic_ringtone"
+ android:drawableTint="@color/md_theme_onSurfaceVariant"
+ android:drawablePadding="10dp"
+ android:ellipsize="marquee"
+ android:focusable="true"
+ android:gravity="center_vertical"
+ android:marqueeRepeatLimit="marquee_forever"
+ android:scrollHorizontally="true"
+ android:singleLine="true"
+ android:textColor="?android:attr/textColorPrimary"
+ app:layout_constraintTop_toBottomOf="@id/repeat_days_alarm"
+ tools:text="Standard (Hassium)" />
+
+ <com.google.android.material.checkbox.MaterialCheckBox
+ android:id="@+id/vibrate_onoff"
+ android:layout_width="match_parent"
+ android:layout_height="48dp"
+ android:background="?selectableItemBackground"
+ android:button="@null"
+ android:drawableStart="@drawable/ic_vibrate"
+ android:drawableEnd="@drawable/ic_selector_checkbox"
+ android:drawablePadding="10dp"
+ android:text="@string/alarm_vibrate"
+ android:textColor="?android:attr/textColorPrimary"
+ app:layout_constraintTop_toBottomOf="@id/choose_ringtone"
+ tools:ignore="RtlSymmetry"
+ tools:checked="true" />
 
  <com.google.android.material.chip.Chip
  android:id="@+id/delete"
@@ -174,12 +174,14 @@
  android:text="@string/duplicate"
  android:textColor="?android:attr/textColorPrimaryInverse"
  android:textAllCaps="false"
+ android:visibility="invisible"
  app:chipIcon="@drawable/ic_duplicate"
  app:chipIconTint="?android:attr/textColorPrimaryInverse"
  app:chipBackgroundColor="@color/md_theme_primary"
  app:chipStrokeWidth="0dp"
  app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toBottomOf="@id/vibrate_onoff" />
+ app:layout_constraintTop_toBottomOf="@id/vibrate_onoff"
+ tools:visibility="visible" />
 
  </androidx.constraintlayout.widget.ConstraintLayout>