Fixed #41

UriahShaulMandel · Aug 13, 2019 · dfd6e3e · dfd6e3e
1 parent 9b41b2c
commit dfd6e3e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/app/src/main/java/com/bald/uriah/baldphone/activities/alarms/AddTimerActivity.java b/app/src/main/java/com/bald/uriah/baldphone/activities/alarms/AddTimerActivity.java
@@ -64,7 +64,7 @@ private void attachXml() {
     }
 
     private void submit() {
-        final String name = getString(R.string.quick_alarm);
+        final String name = getString(R.string.timer);
         final DateTime now = DateTime.now();
 
         final Alarm alarm = new Alarm();

diff --git a/app/src/main/java/com/bald/uriah/baldphone/activities/alarms/AlarmScreenActivity.java b/app/src/main/java/com/bald/uriah/baldphone/activities/alarms/AlarmScreenActivity.java
@@ -108,14 +108,14 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         cancel.setOnClickListener(v -> {
             if (vibrator != null)
                 vibrator.vibrate(D.vibetime);
-            if (alarm.getDays() == -1)//TODO change the CountDownAlarm way of working
+            if (alarm.getName().equals(getString(R.string.timer)))
                 AlarmsDatabase.getInstance(this).alarmsDatabaseDao().delete(alarm);
             finish();
         });
         cancel.setOnLongClickListener(v -> {
             if (vibrator != null)
                 vibrator.vibrate(D.vibetime);
-            if (alarm.getDays() == -1)//TODO change the CountDownAlarm way of working
+            if (alarm.getName().equals(getString(R.string.timer)))
                 AlarmsDatabase.getInstance(this).alarmsDatabaseDao().delete(alarm);
             finish();
             return true;

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -198,7 +198,7 @@
     <string name="pill_name">Name des Medikaments</string>
     <string name="pills">Medikamente</string>
     <string name="press_longer">Länger drücken!</string>
-    <string name="quick_alarm">Eieruhr</string>
+    <string name="timer">Eieruhr</string>
     <string name="read_call_log">Anrufliste einlesen</string>
     <string name="read_call_log_subtext">Diese Erlaubnis wird benötigt, um die bisherigen Telefonate lesen zu können.</string>
     <string name="read_contacts">Kontakte einlesen</string>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -199,7 +199,7 @@
     <string name="pill_name">Nom du médicament</string>
     <string name="pills">Médicaments</string>
     <string name="press_longer">Appuyez plus longtemps !</string>
-    <string name="quick_alarm">Minuteur</string>
+    <string name="timer">Minuteur</string>
     <string name="read_call_log">Lire l\'historique des appels</string>
     <string name="read_call_log_subtext">Cette permission est nécessaire pour voir le journal d\'appels.</string>
     <string name="read_contacts">Lire les contacts</string>

diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
@@ -198,7 +198,7 @@
     <string name="pill_name">שם תרופה</string>
     <string name="pills">תרופות</string>
     <string name="press_longer">לחיצה ארוכה</string>
-    <string name="quick_alarm">טיימר</string>
+    <string name="timer">טיימר</string>
     <string name="read_call_log">גישה לשיחות האחרונות</string>
     <string name="read_call_log_subtext">אנא אפשר לBaldPhone לגשת לשיחות האחרונות, אשר יוצגו במסך השיחות האחרונות.
     </string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -205,7 +205,7 @@
     <string name="pill_name">Pill Name</string>
     <string name="pills">Pills</string>
     <string name="press_longer">Press Longer!</string>
-    <string name="quick_alarm">Timer</string>
+    <string name="timer">Timer</string>
     <string name="read_call_log">Read Call History</string>
     <string name="read_call_log_subtext">This permission is required in order to view the call history.</string>
     <string name="read_contacts">Read contacts</string>