From 517ae884b451078fc6332305dc4559ba896db8c7 Mon Sep 17 00:00:00 2001
From: tim <tim@treehouse.org.za>
Date: Tue, 19 Aug 2014 09:34:39 +0200
Subject: [PATCH] - New package name, because of a certificate error with the
 first uploaded version.

---
 HypoAlarm/build.gradle                        |  1 +
 HypoAlarm/src/main/AndroidManifest.xml        | 26 +++++++++----------
 .../AlarmAlertActivity.java                   |  2 +-
 .../AlarmChangeReceiver.java                  |  2 +-
 .../{hypoalarm => HypoAlarm}/AlarmKlaxon.java |  2 +-
 .../{hypoalarm => HypoAlarm}/AlarmNotify.java |  2 +-
 .../AlarmReceiver.java                        |  2 +-
 .../AlarmService.java                         |  2 +-
 .../CancelAlarmReceiver.java                  |  2 +-
 .../CancelGraceReceiver.java                  |  2 +-
 .../GraceReceiver.java                        |  2 +-
 .../MainActivity.java                         |  2 +-
 .../PreAlarmNotify.java                       |  2 +-
 .../PreAlarmReceiver.java                     |  2 +-
 HypoAlarm/src/main/res/layout/alarm_alert.xml |  4 +--
 15 files changed, 28 insertions(+), 27 deletions(-)
 rename HypoAlarm/src/main/java/za/org/treehouse/{hypoalarm => HypoAlarm}/AlarmAlertActivity.java (98%)
 rename HypoAlarm/src/main/java/za/org/treehouse/{hypoalarm => HypoAlarm}/AlarmChangeReceiver.java (97%)
 rename HypoAlarm/src/main/java/za/org/treehouse/{hypoalarm => HypoAlarm}/AlarmKlaxon.java (99%)
 rename HypoAlarm/src/main/java/za/org/treehouse/{hypoalarm => HypoAlarm}/AlarmNotify.java (99%)
 rename HypoAlarm/src/main/java/za/org/treehouse/{hypoalarm => HypoAlarm}/AlarmReceiver.java (91%)
 rename HypoAlarm/src/main/java/za/org/treehouse/{hypoalarm => HypoAlarm}/AlarmService.java (99%)
 rename HypoAlarm/src/main/java/za/org/treehouse/{hypoalarm => HypoAlarm}/CancelAlarmReceiver.java (97%)
 rename HypoAlarm/src/main/java/za/org/treehouse/{hypoalarm => HypoAlarm}/CancelGraceReceiver.java (94%)
 rename HypoAlarm/src/main/java/za/org/treehouse/{hypoalarm => HypoAlarm}/GraceReceiver.java (99%)
 rename HypoAlarm/src/main/java/za/org/treehouse/{hypoalarm => HypoAlarm}/MainActivity.java (99%)
 rename HypoAlarm/src/main/java/za/org/treehouse/{hypoalarm => HypoAlarm}/PreAlarmNotify.java (98%)
 rename HypoAlarm/src/main/java/za/org/treehouse/{hypoalarm => HypoAlarm}/PreAlarmReceiver.java (96%)

diff --git a/HypoAlarm/build.gradle b/HypoAlarm/build.gradle
index 2ce4fbc..62f925a 100644
--- a/HypoAlarm/build.gradle
+++ b/HypoAlarm/build.gradle
@@ -15,6 +15,7 @@ android {
         targetSdkVersion 20
         versionCode 2
         versionName '1.0'
+        signingConfig signingConfigs.config
     }
     buildTypes {
         release {
diff --git a/HypoAlarm/src/main/AndroidManifest.xml b/HypoAlarm/src/main/AndroidManifest.xml
index 3e303b7..6603eae 100644
--- a/HypoAlarm/src/main/AndroidManifest.xml
+++ b/HypoAlarm/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="za.org.treehouse.hypoalarm" >
+    package="za.org.treehouse.HypoAlarm" >
 
     <!-- permission required to read contacts -->
     <uses-permission android:name="android.permission.READ_CONTACTS" />
@@ -8,7 +8,7 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <!-- permission required to set an alarm -->
     <uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
-    <!-- permission required to Send SMS -->
+    <!-- permission required to send an SMS -->
     <uses-permission android:name="android.permission.SEND_SMS" />
     <!-- permission required to message the user's location -->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -25,7 +25,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name="za.org.treehouse.hypoalarm.MainActivity"
+            android:name="za.org.treehouse.HypoAlarm.MainActivity"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -34,19 +34,19 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="za.org.treehouse.hypoalarm.AlarmAlertActivity"
+            android:name="za.org.treehouse.HypoAlarm.AlarmAlertActivity"
             android:label="@string/alarm_alert"
             android:launchMode="singleInstance"
             android:noHistory="true" >
         </activity>
 
-        <receiver android:name="za.org.treehouse.hypoalarm.PreAlarmReceiver" />
-        <receiver android:name="za.org.treehouse.hypoalarm.CancelAlarmReceiver" />
-        <receiver android:name="za.org.treehouse.hypoalarm.AlarmReceiver" />
-        <receiver android:name="za.org.treehouse.hypoalarm.GraceReceiver" />
-        <receiver android:name="za.org.treehouse.hypoalarm.CancelGraceReceiver" />
+        <receiver android:name="za.org.treehouse.HypoAlarm.PreAlarmReceiver" />
+        <receiver android:name="za.org.treehouse.HypoAlarm.CancelAlarmReceiver" />
+        <receiver android:name="za.org.treehouse.HypoAlarm.AlarmReceiver" />
+        <receiver android:name="za.org.treehouse.HypoAlarm.GraceReceiver" />
+        <receiver android:name="za.org.treehouse.HypoAlarm.CancelGraceReceiver" />
         <receiver
-            android:name="za.org.treehouse.hypoalarm.AlarmChangeReceiver"
+            android:name="za.org.treehouse.HypoAlarm.AlarmChangeReceiver"
             android:enabled="false" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -56,12 +56,12 @@
         </receiver>
 
         <service
-            android:name="za.org.treehouse.hypoalarm.AlarmService" />
+            android:name="za.org.treehouse.HypoAlarm.AlarmService" />
         <service
-            android:name="za.org.treehouse.hypoalarm.AlarmNotify"
+            android:name="za.org.treehouse.HypoAlarm.AlarmNotify"
             android:label="@string/alarm_notification" />
         <service
-            android:name="za.org.treehouse.hypoalarm.PreAlarmNotify"
+            android:name="za.org.treehouse.HypoAlarm.PreAlarmNotify"
             android:label="@string/pre_alarm_notification" />
 
         <meta-data
diff --git a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmAlertActivity.java b/HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/AlarmAlertActivity.java
similarity index 98%
rename from HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmAlertActivity.java
rename to HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/AlarmAlertActivity.java
index 39b439e..637bc65 100644
--- a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmAlertActivity.java
+++ b/HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/AlarmAlertActivity.java
@@ -1,4 +1,4 @@
-package za.org.treehouse.hypoalarm;
+package za.org.treehouse.HypoAlarm;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmChangeReceiver.java b/HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/AlarmChangeReceiver.java
similarity index 97%
rename from HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmChangeReceiver.java
rename to HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/AlarmChangeReceiver.java
index 7f37f67..4290eb8 100644
--- a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmChangeReceiver.java
+++ b/HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/AlarmChangeReceiver.java
@@ -1,4 +1,4 @@
-package za.org.treehouse.hypoalarm;
+package za.org.treehouse.HypoAlarm;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmKlaxon.java b/HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/AlarmKlaxon.java
similarity index 99%
rename from HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmKlaxon.java
rename to HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/AlarmKlaxon.java
index be72e25..e3aaff5 100644
--- a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmKlaxon.java
+++ b/HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/AlarmKlaxon.java
@@ -1,4 +1,4 @@
-package za.org.treehouse.hypoalarm;
+package za.org.treehouse.HypoAlarm;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmNotify.java b/HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/AlarmNotify.java
similarity index 99%
rename from HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmNotify.java
rename to HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/AlarmNotify.java
index 7ae11c0..068b968 100644
--- a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmNotify.java
+++ b/HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/AlarmNotify.java
@@ -1,4 +1,4 @@
-package za.org.treehouse.hypoalarm;
+package za.org.treehouse.HypoAlarm;
 
 import android.app.Notification;
 import android.app.NotificationManager;
diff --git a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmReceiver.java b/HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/AlarmReceiver.java
similarity index 91%
rename from HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmReceiver.java
rename to HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/AlarmReceiver.java
index b4186e4..df77039 100644
--- a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmReceiver.java
+++ b/HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/AlarmReceiver.java
@@ -1,4 +1,4 @@
-package za.org.treehouse.hypoalarm;
+package za.org.treehouse.HypoAlarm;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmService.java b/HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/AlarmService.java
similarity index 99%
rename from HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmService.java
rename to HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/AlarmService.java
index 00378d9..6e3d532 100644
--- a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmService.java
+++ b/HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/AlarmService.java
@@ -1,4 +1,4 @@
-package za.org.treehouse.hypoalarm;
+package za.org.treehouse.HypoAlarm;
 
 import android.app.Service;
 import android.content.Context;
diff --git a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/CancelAlarmReceiver.java b/HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/CancelAlarmReceiver.java
similarity index 97%
rename from HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/CancelAlarmReceiver.java
rename to HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/CancelAlarmReceiver.java
index a9a6d93..fe1a5e0 100644
--- a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/CancelAlarmReceiver.java
+++ b/HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/CancelAlarmReceiver.java
@@ -1,4 +1,4 @@
-package za.org.treehouse.hypoalarm;
+package za.org.treehouse.HypoAlarm;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/CancelGraceReceiver.java b/HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/CancelGraceReceiver.java
similarity index 94%
rename from HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/CancelGraceReceiver.java
rename to HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/CancelGraceReceiver.java
index a0a8c8a..87eeecc 100644
--- a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/CancelGraceReceiver.java
+++ b/HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/CancelGraceReceiver.java
@@ -1,4 +1,4 @@
-package za.org.treehouse.hypoalarm;
+package za.org.treehouse.HypoAlarm;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/GraceReceiver.java b/HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/GraceReceiver.java
similarity index 99%
rename from HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/GraceReceiver.java
rename to HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/GraceReceiver.java
index 151ffab..533fe0c 100644
--- a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/GraceReceiver.java
+++ b/HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/GraceReceiver.java
@@ -1,4 +1,4 @@
-package za.org.treehouse.hypoalarm;
+package za.org.treehouse.HypoAlarm;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/MainActivity.java b/HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/MainActivity.java
similarity index 99%
rename from HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/MainActivity.java
rename to HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/MainActivity.java
index c1485c5..82df669 100644
--- a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/MainActivity.java
+++ b/HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/MainActivity.java
@@ -1,4 +1,4 @@
-package za.org.treehouse.hypoalarm;
+package za.org.treehouse.HypoAlarm;
 
 import android.app.AlarmManager;
 import android.app.AlertDialog;
diff --git a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/PreAlarmNotify.java b/HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/PreAlarmNotify.java
similarity index 98%
rename from HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/PreAlarmNotify.java
rename to HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/PreAlarmNotify.java
index 267c683..9f316c4 100644
--- a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/PreAlarmNotify.java
+++ b/HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/PreAlarmNotify.java
@@ -1,4 +1,4 @@
-package za.org.treehouse.hypoalarm;
+package za.org.treehouse.HypoAlarm;
 
 import android.app.Notification;
 import android.app.NotificationManager;
diff --git a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/PreAlarmReceiver.java b/HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/PreAlarmReceiver.java
similarity index 96%
rename from HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/PreAlarmReceiver.java
rename to HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/PreAlarmReceiver.java
index 50fee9f..3125ac6 100644
--- a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/PreAlarmReceiver.java
+++ b/HypoAlarm/src/main/java/za/org/treehouse/HypoAlarm/PreAlarmReceiver.java
@@ -1,4 +1,4 @@
-package za.org.treehouse.hypoalarm;
+package za.org.treehouse.HypoAlarm;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/HypoAlarm/src/main/res/layout/alarm_alert.xml b/HypoAlarm/src/main/res/layout/alarm_alert.xml
index b5d4f42..7960a28 100644
--- a/HypoAlarm/src/main/res/layout/alarm_alert.xml
+++ b/HypoAlarm/src/main/res/layout/alarm_alert.xml
@@ -3,9 +3,10 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".AlarmNotificationActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".AlarmNotificationActivity">
+    android:background="@android:color/black">
 
     <TextView
         android:layout_width="wrap_content"
@@ -13,7 +14,6 @@
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:text="@string/app_name"
         android:id="@+id/cancel_dialog_title"
-        android:background="@android:color/black"
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="@dimen/alarm_widget_vertical_margin" />