diff --git a/.idea/libraries/library_2_4_0.xml b/.idea/libraries/library_2_4_0.xml
new file mode 100644
index 0000000..eedfc0d
--- /dev/null
+++ b/.idea/libraries/library_2_4_0.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GlowPadBackport/GlowPadBackport.iml b/GlowPadBackport/GlowPadBackport.iml
new file mode 100644
index 0000000..7ec238f
--- /dev/null
+++ b/GlowPadBackport/GlowPadBackport.iml
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/GlowPadBackport/build.gradle b/GlowPadBackport/build.gradle
new file mode 100644
index 0000000..28927b0
--- /dev/null
+++ b/GlowPadBackport/build.gradle
@@ -0,0 +1,19 @@
+apply plugin: 'android-library'
+
+android {
+ compileSdkVersion 19
+ buildToolsVersion "19.0.1"
+
+ defaultConfig {
+ minSdkVersion 10
+ targetSdkVersion 19
+ versionCode 1
+ versionName "1.0"
+ }
+ buildTypes {
+ release {
+ runProguard false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+ }
+ }
+}
diff --git a/GlowPadBackport/proguard-rules.txt b/GlowPadBackport/proguard-rules.txt
new file mode 100644
index 0000000..60fff78
--- /dev/null
+++ b/GlowPadBackport/proguard-rules.txt
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /home/tim/sources/android-studio/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
\ No newline at end of file
diff --git a/GlowPadBackport/src/main/AndroidManifest.xml b/GlowPadBackport/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..05d1d2d
--- /dev/null
+++ b/GlowPadBackport/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+
+
+
diff --git a/GlowPadBackport/src/main/res/values/strings.xml b/GlowPadBackport/src/main/res/values/strings.xml
new file mode 100644
index 0000000..47a7dd3
--- /dev/null
+++ b/GlowPadBackport/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+
+ GlowPadBackport
+
diff --git a/HypoAlarm/HypoAlarm-HypoAlarm.iml b/HypoAlarm/HypoAlarm-HypoAlarm.iml
index 2d8cdeb..893cde5 100644
--- a/HypoAlarm/HypoAlarm-HypoAlarm.iml
+++ b/HypoAlarm/HypoAlarm-HypoAlarm.iml
@@ -72,6 +72,7 @@
+
diff --git a/HypoAlarm/build.gradle b/HypoAlarm/build.gradle
index da51134..58bf143 100644
--- a/HypoAlarm/build.gradle
+++ b/HypoAlarm/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android'
android {
compileSdkVersion 19
- buildToolsVersion "19.0.1"
+ buildToolsVersion '19.0.1'
defaultConfig {
minSdkVersion 10
@@ -21,5 +21,7 @@ android {
dependencies {
compile 'com.android.support:support-v4:19.0.1'
compile 'com.android.support:appcompat-v7:19.0.1'
+ compile 'com.nineoldandroids:library:2.4.0'
+ compile fileTree(dir: 'libs', include: ['*.aar'])
compile fileTree(dir: 'libs', include: ['*.jar'])
}
diff --git a/HypoAlarm/src/main/ic_launcher-web.png b/HypoAlarm/src/main/ic_launcher-web.png
index 0023ef9..aa45afc 100644
Binary files a/HypoAlarm/src/main/ic_launcher-web.png and b/HypoAlarm/src/main/ic_launcher-web.png differ
diff --git a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmAlertActivity.java b/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmAlertActivity.java
index ffcf5dd..bcf9d67 100644
--- a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmAlertActivity.java
+++ b/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmAlertActivity.java
@@ -50,10 +50,10 @@ public class AlarmAlertActivity extends Activity {
public void run() {
// Close the dialogue
finish();
- Log.d("AlarmAlertActivity", "Started notification");
// Switch to notification if the Activity has not been closed by the user
if (!userCancelled) {
startService(new Intent(getApplicationContext(), AlarmNotify.class));
+ Log.d("AlarmAlertActivity", "Started notification");
}
}
}, ALERT_LIFE);
@@ -83,6 +83,7 @@ public class AlarmAlertActivity extends Activity {
// Close the dialogue (stop vibration &c)
finish();
}
+
});
}
diff --git a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/CancelGraceReceiver.java b/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/CancelGraceReceiver.java
index 22828ce..23d1019 100644
--- a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/CancelGraceReceiver.java
+++ b/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/CancelGraceReceiver.java
@@ -15,7 +15,7 @@ public class CancelGraceReceiver extends BroadcastReceiver {
Intent graceIntent = new Intent(context, GraceReceiver.class);
PendingIntent gracePendingIntent = PendingIntent.getBroadcast(context, MainActivity.GRACE_REQUEST, graceIntent, 0);
graceManager.cancel(gracePendingIntent);
- Log.d("CancelGraceReceiver", "Cancelled grace alarm.");
+ Log.d("CancelGraceReceiver", "Cancelled grace alarm");
// Display toast
Toast.makeText(context, context.getString(R.string.alarmCancelToast), Toast.LENGTH_LONG).show();
diff --git a/HypoAlarm/src/main/res/drawable-hdpi/ic_launcher.png b/HypoAlarm/src/main/res/drawable-hdpi/ic_launcher.png
index 32b703a..8c8ffbe 100644
Binary files a/HypoAlarm/src/main/res/drawable-hdpi/ic_launcher.png and b/HypoAlarm/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/HypoAlarm/src/main/res/drawable-mdpi/ic_launcher.png b/HypoAlarm/src/main/res/drawable-mdpi/ic_launcher.png
index 23abd3e..b9402ae 100644
Binary files a/HypoAlarm/src/main/res/drawable-mdpi/ic_launcher.png and b/HypoAlarm/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/HypoAlarm/src/main/res/drawable-xhdpi/ic_launcher.png b/HypoAlarm/src/main/res/drawable-xhdpi/ic_launcher.png
index ba40326..c0dcf15 100644
Binary files a/HypoAlarm/src/main/res/drawable-xhdpi/ic_launcher.png and b/HypoAlarm/src/main/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/HypoAlarm/src/main/res/drawable-xxhdpi/ic_launcher.png b/HypoAlarm/src/main/res/drawable-xxhdpi/ic_launcher.png
index 402ca09..87b7fde 100644
Binary files a/HypoAlarm/src/main/res/drawable-xxhdpi/ic_launcher.png and b/HypoAlarm/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/HypoAlarm/src/main/res/drawable/hypoalarm.png b/HypoAlarm/src/main/res/drawable/hypoalarm.png
index 70440ec..8e4015a 100644
Binary files a/HypoAlarm/src/main/res/drawable/hypoalarm.png and b/HypoAlarm/src/main/res/drawable/hypoalarm.png differ
diff --git a/HypoAlarm/src/main/res/layout/alarm_alert.xml b/HypoAlarm/src/main/res/layout/alarm_alert.xml
index ae7be7d..e0ff827 100644
--- a/HypoAlarm/src/main/res/layout/alarm_alert.xml
+++ b/HypoAlarm/src/main/res/layout/alarm_alert.xml
@@ -1,9 +1,9 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/HypoAlarm/src/main/res/values/dimens.xml b/HypoAlarm/src/main/res/values/dimens.xml
index c0af484..48963b2 100644
--- a/HypoAlarm/src/main/res/values/dimens.xml
+++ b/HypoAlarm/src/main/res/values/dimens.xml
@@ -3,28 +3,4 @@
16dp
16dp
-
-
- 135dip
-
-
- 75dip
-
-
- 40dip
-
-
- 15dip
-
-
- 270dp
-
-
- 94dp
-
-
- 28dp
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index ef12cb7..cef31ed 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':HypoAlarm'
+include ':HypoAlarm', ':GlowPadBackport'