From 615b81e2959af16f7d99d4c67700a390b9ab565b Mon Sep 17 00:00:00 2001
From: tim <tim@treehouse.org.za>
Date: Thu, 17 Apr 2014 16:24:52 +0200
Subject: [PATCH] Minor tweaks to MainActivity

---
 .idea/libraries/library_1_5_2.xml                 | 10 ++++++++++
 HypoAlarm/HypoAlarm-HypoAlarm.iml                 |  1 +
 HypoAlarm/build.gradle                            |  3 +++
 .../za/org/treehouse/hypoalarm/MainActivity.java  | 15 ++++++---------
 4 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 .idea/libraries/library_1_5_2.xml

diff --git a/.idea/libraries/library_1_5_2.xml b/.idea/libraries/library_1_5_2.xml
new file mode 100644
index 0000000..d72fdf4
--- /dev/null
+++ b/.idea/libraries/library_1_5_2.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="library-1.5.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/HypoAlarm/build/exploded-aar/com.doomonafireball.betterpickers/library/1.5.2/classes.jar!/" />
+      <root url="file://$PROJECT_DIR$/HypoAlarm/build/exploded-aar/com.doomonafireball.betterpickers/library/1.5.2/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/HypoAlarm/HypoAlarm-HypoAlarm.iml b/HypoAlarm/HypoAlarm-HypoAlarm.iml
index 978d53d..fa07357 100644
--- a/HypoAlarm/HypoAlarm-HypoAlarm.iml
+++ b/HypoAlarm/HypoAlarm-HypoAlarm.iml
@@ -75,6 +75,7 @@
     <orderEntry type="library" exported="" name="play-services-4.3.23" level="project" />
     <orderEntry type="library" exported="" name="glowpadbackport-2.1.0" level="project" />
     <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
+    <orderEntry type="library" exported="" name="library-1.5.2" level="project" />
   </component>
 </module>
 
diff --git a/HypoAlarm/build.gradle b/HypoAlarm/build.gradle
index 79e84e8..9d758da 100644
--- a/HypoAlarm/build.gradle
+++ b/HypoAlarm/build.gradle
@@ -32,6 +32,9 @@ dependencies {
     compile 'net.frakbot.glowpadbackport:glowpadbackport:+'
     //compile 'net.frakbot.glowpadbackport:glowpadbackport:2.1.0'
 
+    compile 'com.doomonafireball.betterpickers:library:+'
+    //compile 'com.doomonafireball.betterpickers:library:1.5.2'
+
     //compile project(':GlowPadBackport')
     //compile project(':SeekArc')
 
diff --git a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/MainActivity.java b/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/MainActivity.java
index c7d96d6..25599ff 100644
--- a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/MainActivity.java
+++ b/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/MainActivity.java
@@ -1,6 +1,5 @@
 package za.org.treehouse.hypoalarm;
 
-import android.app.ActivityManager;
 import android.app.AlarmManager;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -377,7 +376,7 @@ public class MainActivity extends ActionBarActivity {
             } else {
                 alarmManager.set(AlarmManager.RTC_WAKEUP, cal.getTimeInMillis(), alarmPendingIntent);
             }
-            Log.d("MainActivity", "Setting alarm for " + MainActivity.debugDate(cal));
+            Log.d("MainActivity", "Setting alarm for " + debugDate(cal));
 
             // Set an alarm for the pre-alarm notification, an hour before the alarm
             Calendar preNotifyCal = (Calendar) cal.clone();
@@ -390,7 +389,7 @@ public class MainActivity extends ActionBarActivity {
             } else {
                 alarmManager.set(AlarmManager.RTC_WAKEUP, preNotifyCal.getTimeInMillis(), preNotifyPendingIntent);
             }
-            Log.d("MainActivity", "Setting pre-alarm for " + MainActivity.debugDate(preNotifyCal));
+            Log.d("MainActivity", "Setting pre-alarm for " + debugDate(preNotifyCal));
 
         }
     }
@@ -404,7 +403,7 @@ public class MainActivity extends ActionBarActivity {
         AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
         SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(context);
         Boolean alarmActive = sharedPref.getBoolean(context.getString(R.string.AlarmActivePref), defaultActive);
-        int gracePeriod = sharedPref.getInt(context.getString(R.string.GracePeriodPref), MainActivity.defaultGracePeriod);
+        int gracePeriod = sharedPref.getInt(context.getString(R.string.GracePeriodPref), defaultGracePeriod);
 
         cancelGraceAlarm(context);
 
@@ -414,17 +413,16 @@ public class MainActivity extends ActionBarActivity {
             graceCal.set(Calendar.SECOND, 0);
             graceCal.add(Calendar.MINUTE, gracePeriod);
             Intent graceIntent = new Intent(context, GraceReceiver.class);
-            PendingIntent gracePendingIntent = PendingIntent.getBroadcast(context, MainActivity.GRACE_REQUEST, graceIntent, 0);
+            PendingIntent gracePendingIntent = PendingIntent.getBroadcast(context, GRACE_REQUEST, graceIntent, 0);
             if (Build.VERSION.SDK_INT >= 19) {
                 alarmManager.setExact(AlarmManager.RTC_WAKEUP, graceCal.getTimeInMillis(), gracePendingIntent);
             } else {
                 alarmManager.set(AlarmManager.RTC_WAKEUP, graceCal.getTimeInMillis(), gracePendingIntent);
             }
-            Log.d("MainActivity", "Setting grace alarm for " + MainActivity.debugDate(graceCal));
+            Log.d("MainActivity", "Setting grace alarm for " + debugDate(graceCal));
         }
     }
 
-    // Alarm time picker
     public static class TimePickerFragment extends DialogFragment implements TimePickerDialog.OnTimeSetListener {
         SharedPreferences sharedPref;
 
@@ -440,8 +438,7 @@ public class MainActivity extends ActionBarActivity {
             int minute = cal.get(Calendar.MINUTE);
 
             // Create a new instance of TimePickerDialog and return it
-            return new TimePickerDialog(getActivity(), this, hour, minute,
-                    DateFormat.is24HourFormat(getActivity()));
+            return new TimePickerDialog(getActivity(), this, hour, minute, DateFormat.is24HourFormat(getActivity()));
         }
 
         public void onTimeSet(TimePicker view, int hourOfDay, int minute) {