fixed alarm set time ...still looping though

Author: haayhappen

app/build.gradle

@@ -15,6 +15,9 @@ apply plugin: 'com.neenbedankt.android-apt'
 
 
 android {
+    defaultConfig{
+        multiDexEnabled true
+    }
     /*
     signingConfigs {
         config {
@@ -39,11 +42,12 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         debug {
             applicationIdSuffix ".debug"
+
         }
     }
 }
@@ -72,4 +76,5 @@ dependencies {
     compile 'com.google.android.gms:play-services:10.0.1'
     compile 'agency.tango.android:material-intro-screen:0.0.5'
     testCompile 'junit:junit:4.12'
+
 }

app/src/main/java/com/haayhappen/clockplus/MainActivity.java

@@ -74,7 +74,7 @@ public void onClick(View view) {
         getSupportActionBar().setTitle(getString(R.string.app_name));
 
         //TODO delete when published
-        startActivity(new Intent(this, IntroActivity.class));
+        //startActivity(new Intent(this, IntroActivity.class));
         //Intro
         prefs = getSharedPreferences("com.haayhappen.clockplus", MODE_PRIVATE);
     }

app/src/main/java/com/haayhappen/clockplus/alarms/ui/ExpandedAlarmViewHolder.java

@@ -24,7 +24,10 @@
 import android.net.Uri;
 import android.os.Vibrator;
 import android.support.annotation.IdRes;
+import android.support.annotation.Nullable;
 import android.support.v4.graphics.drawable.DrawableCompat;
+import android.text.format.DateUtils;
+import android.text.format.Time;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -50,6 +53,10 @@
 import com.haayhappen.clockplus.timepickers.Utils;
 import com.haayhappen.clockplus.util.FragmentTagUtils;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.concurrent.TimeUnit;
 
 import butterknife.Bind;
@@ -286,7 +293,7 @@ void onClearTo() {
         duration.setText("");
         final Alarm oldAlarm = getAlarm();
         Alarm newAlarm = oldAlarm.toBuilder()
-                .destination(new Location("",0,0))
+                .destination(new Location("", 0, 0))
                 .build();
         oldAlarm.copyMutableFieldsTo(newAlarm);
         persistUpdatedAlarm(newAlarm, false);
@@ -299,21 +306,50 @@ void onDurationClicked() {
 
     private void setDuration() {
         Log.d(TAG, "set duration");
-        DistanceHandler asyncTask = new DistanceHandler(getAlarm(),new DistanceHandler.AsyncResponse() {
+        DistanceHandler asyncTask = new DistanceHandler(getAlarm(), new DistanceHandler.AsyncResponse() {
             @Override
             public void processFinish(long delaySecs) {
-                //#################new############
-                int min = (int)TimeUnit.SECONDS.toMinutes(delaySecs);
+                int testseconds = 4000;
                 final Alarm oldAlarm = getAlarm();
-                int oldmin = oldAlarm.minutes();
-                int newmin = oldmin - min;
+                int delayMinutes = (int) TimeUnit.SECONDS.toMinutes(testseconds);
+                int delayHours = delayMinutes / 60;
+                delayMinutes = delayMinutes % 60;
+
+
+                Date d = new Date();
+                SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
+                try {
+                    d = sdf.parse(oldAlarm.hour() + ":" + oldAlarm.minutes());
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+
+                //TODO remove all debug logs for production
+                Calendar cal = Calendar.getInstance();
+                cal.setTime(d);
+                Log.d("ExpandedAlarmViewHolder","calendar time before new set: "+cal.getTime().toString());
+                Log.d("ExpandedAlarmViewHolder","hours to be subtracted: "+delayHours);
+                Log.d("ExpandedAlarmViewHolder","minutes to be subtracted: "+delayMinutes);
+
+                if (delayHours == 0){
+                    cal.add(Calendar.MINUTE, -Math.abs(delayMinutes));
+                }else{
+                    cal.add(Calendar.HOUR_OF_DAY,-Math.abs(delayHours));
+                    cal.add(Calendar.MINUTE,-Math.abs(delayMinutes));
+                }
+
+                Log.d("ExpandedAlarmViewHolder","calendar time after set: "+cal.getTime().toString());
+                Log.d("ExpandedAlarmViewHolder","setting new hours to: "+cal.get(Calendar.HOUR_OF_DAY));
+                Log.d("ExpandedAlarmViewHolder","setting new minutes to: "+cal.get(Calendar.MINUTE));
+
                 Alarm newAlarm = oldAlarm.toBuilder()
-                        .minutes(newmin)
+                        .minutes(cal.get(Calendar.MINUTE))
+                        .hour(cal.get(Calendar.HOUR_OF_DAY))
                         .build();
                 oldAlarm.copyMutableFieldsTo(newAlarm);
                 persistUpdatedAlarm(newAlarm, false);
                 //#############################
-                duration.setText(String.valueOf(min)+"delay");
+                duration.setText(String.valueOf(delayMinutes) + "delay");
             }
         });
 

app/src/main/java/com/haayhappen/clockplus/util/TimeFormatUtils.java

@@ -30,10 +30,23 @@ public final class TimeFormatUtils {
 
     private TimeFormatUtils() {}
 
+    /**
+     *
+     * @param context
+     * @param millis
+     * @return String time
+     */
     public static String formatTime(Context context, long millis) {
         return getTimeFormat(context).format(new Date(millis));
     }
 
+    /**
+     *
+     * @param context
+     * @param hourOfDay
+     * @param minute
+     * @return String time
+     */
     public static String formatTime(Context context, int hourOfDay, int minute) {
         Calendar cal = Calendar.getInstance();
         cal.set(Calendar.HOUR_OF_DAY, hourOfDay);

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files