From 88560c184cbb64549c2cc1d5f9444b8a70a48304 Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <t.quathamer@mailbox.org>
Date: Fri, 8 Jan 2016 21:06:00 +0100
Subject: [PATCH 1/6] Update README.md with current build information

---
 README.md | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 2370286..12d4f8a 100644
--- a/README.md
+++ b/README.md
@@ -20,17 +20,13 @@ Download latest APK at https://github.com/rigid/Birthdroid/releases/latest
 
 2. Compile
 ==========
-Use the provided Makefile wrapper. Available targets are
+Use the provided gradle wrapper. To simply build the APK, use the command
 
-* make keygen        - generate own keystore
-* make update        - update project
-* make all           - build release
-* make debug         - build debug
-* make sign          - sign release
-* make install       - push .apk to device using adb
-* make install_debug - push debugging .apk to device using adb
+$ ./gradlew build
 
-e.g. make update && make keygen && make && make sign && make install
+For an overview of all available tasks, use
+
+$ ./gradlew tasks
 
 You need the appcompat library to compile Birthdroid. You might have to update that path for the update target in the Makefile.
 

From be6bcbed7dfc873dae2f4016bd95002b0dd9e7c1 Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <t.quathamer@mailbox.org>
Date: Fri, 8 Jan 2016 21:07:24 +0100
Subject: [PATCH 2/6] Remove untranslatable string from Spanish translation

---
 app/src/main/res/values-es/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index c8c2eb6..1d14c3b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -34,5 +34,4 @@
     <string name="prefs_title_widget_clickable">¿Widget clickable?</string>
     <string name="upcoming">Cumplira %1$d %2$s</string>
     <string name="upcoming_no_age">Cumplira %1$s</string>
-    <string name="widget_avatars" translatable="false"></string>
 </resources>
\ No newline at end of file

From a32aa187ca74429038e636339b5d0f3d8ccfd41e Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <t.quathamer@mailbox.org>
Date: Fri, 8 Jan 2016 21:12:33 +0100
Subject: [PATCH 3/6] Use proper characters (ndash and ellipsis) in texts

---
 app/src/main/res/values-de/strings.xml | 8 ++++----
 app/src/main/res/values-es/strings.xml | 8 ++++----
 app/src/main/res/values-fr/strings.xml | 2 +-
 app/src/main/res/values/strings.xml    | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 704bf46..0a4071b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -27,15 +27,15 @@
     <string name="born_today">wurde heute geboren</string>
     <string name="no_leap_year">(Heuer kein Schaltjahr, aber feiert gewiss trotzdem ;)</string>
     <string name="no_birthdays">Keine Geburtstage in Kontaktdatenbank</string>
-    <string name="no_upcoming_birthdays">Keine anstehenden Geburtstage ...</string>
+    <string name="no_upcoming_birthdays">Keine anstehenden Geburtstage …</string>
     <string name="menu_settings">Einstellungen</string>
-    <string name="menu_about">Über ...</string>
+    <string name="menu_about">Über …</string>
     <string name="prefs_title_general">Allgemein</string>
     <string name="prefs_title_app">Anwendung</string>
     <string name="prefs_title_widget">Widget</string>
     <string name="prefs_title_scan">Aktualisierungsintervall</string>
     <string name="prefs_title_avatar">Zeige Avatar</string>
-    <string name="prefs_title_sort_method">Sortierung ...</string>
+    <string name="prefs_title_sort_method">Sortierung …</string>
     <string name="prefs_title_days">Anzeigezeitraum</string>
     <string name="prefs_title_layout_settings">Layout-Einstellungen</string>
     <string name="prefs_title_flip_interval">Anzeigeintervall</string>
@@ -47,7 +47,7 @@
     <string name="prefs_summary_layout_settings">Anpassen der Anzeigeeinstellungen</string>
     <string name="prefs_summary_flip_interval">Zeige nächsten Eintrag nach n Sekunden</string>
     <string name="prefs_summary_widget_clickable">Öffne Birthdroid bei Klick auf Widget?</string>
-    <string name="about_copyright">2011-2015 © Daniel Hiepler</string>
+    <string name="about_copyright">2011–2015 © Daniel Hiepler</string>
     <string name="about_title">Birthdroid v0.6.4</string>
     <string name="about_name">Über Birthdroid</string>
     <string name="about_description">Einfache Anwendung um anstehende Geburtstage anzuzeigen.</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 1d14c3b..615dd08 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Cumpledroid</string>
-    <string name="menu_about">Acerca de ...</string>
+    <string name="menu_about">Acerca de …</string>
     <string name="menu_settings">Configuración</string>
     <string name="no_birthdays">Sin cumpleaños en los contactos</string>
     <string name="no_leap_year">(No es un año visiesto, pero seguro que lo celebra ;)</string>
-    <string name="no_upcoming_birthdays">Ningun cumpleaños cercano...</string>
+    <string name="no_upcoming_birthdays">Ningún cumpleaños cercano …</string>
     <string name="preferences_name">Preferencias de Birthdroid</string>
     <string name="prefs_summary_avatar">Cargar imagen desde contactos y mostrala</string>
     <string name="about_description">Simple aplicacion para indicar cumpleaños cercanos</string>
@@ -15,7 +15,7 @@
     <string name="days_more">en %1$d días</string>
     <string name="days_one">mañana</string>
     <string name="days_zero">hoy</string>
-    <string name="about_copyright">2011-2015 © Daniel Hiepler</string>
+    <string name="about_copyright">2011–2015 © Daniel Hiepler</string>
     <string name="prefs_summary_days">Mostrar los cumpleaños de los siguientes n días</string>
     <string name="prefs_summary_flip_interval">Cambiar a otro contacto cada n segundos</string>
     <string name="prefs_summary_layout_settings">Ajustar configuracion de layout</string>
@@ -29,7 +29,7 @@
     <string name="prefs_title_general">General</string>
     <string name="prefs_title_layout_settings">Configuracion de layout</string>
     <string name="prefs_title_scan">Intervalo de escaneo de contactos</string>
-    <string name="prefs_title_sort_method">Ordenar por...</string>
+    <string name="prefs_title_sort_method">Ordenar por …</string>
     <string name="prefs_title_widget">Widget</string>
     <string name="prefs_title_widget_clickable">¿Widget clickable?</string>
     <string name="upcoming">Cumplira %1$d %2$s</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 84faf2d..2dd561e 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -50,5 +50,5 @@
     <string name="prefs_summary_widget_clickable">Ouvrir Annidroid lors du clic sur le widget ?</string>
     <string name="about_title">Annidroid v0.6.4</string>
     <string name="about_description">Application simple pour afficher les anniversaires à venir.</string>
-    <string name="about_copyright">2011-2015 © Daniel Hiepler</string>
+    <string name="about_copyright">2011–2015 © Daniel Hiepler</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 53014d9..dfadce0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,7 +28,7 @@
     <string name="born_today">was born today</string>
     <string name="no_leap_year">(This is no leap year, but surely celebrates anyway ;)</string>
     <string name="no_birthdays">No birthdays in contacts</string>
-    <string name="no_upcoming_birthdays">No upcoming birthdays...</string>
+    <string name="no_upcoming_birthdays">No upcoming birthdays …</string>
     <string name="menu_settings">Settings</string>
     <string name="menu_about">About</string>
     <string name="prefs_title_general">General</string>
@@ -36,7 +36,7 @@
     <string name="prefs_title_widget">Widget</string>
     <string name="prefs_title_scan">Contact scan interval</string>
     <string name="prefs_title_avatar">Show avatar</string>
-    <string name="prefs_title_sort_method">Sort by...</string>
+    <string name="prefs_title_sort_method">Sort by …</string>
     <string name="prefs_title_days">Foresight period</string>
     <string name="prefs_title_layout_settings">Layout settings</string>
     <string name="prefs_title_flip_interval">Flip cycle interval</string>
@@ -49,7 +49,7 @@
     <string name="prefs_summary_flip_interval">Flip to next contact every n seconds</string>
     <string name="prefs_summary_widget_clickable">Open Birthdroid upon click on widget?</string>
     <string name="about_title">Birthdroid v0.6.4</string>
-    <string name="about_copyright">2011-2015 © Daniel Hiepler</string>
+    <string name="about_copyright">2011–2015 © Daniel Hiepler</string>
     <string name="about_url" translatable="false">http://github.com/rigid/Birthdroid</string>
     <string name="about_description">Simple application to show upcoming birthdays.</string>
     <string name="about_changes" translatable="false">

From 59009dd506dbafbe1252d20a2f07303a7578b7fe Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <t.quathamer@mailbox.org>
Date: Fri, 8 Jan 2016 21:14:46 +0100
Subject: [PATCH 4/6] Add copyright and license header to translation

---
 app/src/main/res/values-es/strings.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 615dd08..7352ee3 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+ Birthdroid - Android upcoming birthday App/Widget
+ Copyright (C) 2011-2015 Daniel Hiepler <daniel@niftylight.de>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <resources>
     <string name="app_name">Cumpledroid</string>
     <string name="menu_about">Acerca de …</string>

From 67f4ff302682419f70c1e2a068f187fcd2ab76c2 Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <t.quathamer@mailbox.org>
Date: Fri, 8 Jan 2016 22:06:49 +0100
Subject: [PATCH 5/6] Use API version 19 as target

---
 .idea/misc.xml   |  2 +-
 Birthdroid.iml   |  2 +-
 app/app.iml      | 24 +++++++-----------------
 app/build.gradle |  8 ++++----
 4 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1a3eaff..45bb483 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/Birthdroid.iml b/Birthdroid.iml
index 182d52e..e2941d4 100644
--- a/Birthdroid.iml
+++ b/Birthdroid.iml
@@ -8,7 +8,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
diff --git a/app/app.iml b/app/app.iml
index 0dc3c02..37ce0bd 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -26,7 +26,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
     <exclude-output />
@@ -67,32 +67,22 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes-proguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/19.1.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-23.jar" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/release" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
-      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-19.1.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 82f0d9a..7ede728 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 19
+    buildToolsVersion "19.1.0"
 
     defaultConfig {
         applicationId "com.rigid.birthdroid"
         minSdkVersion 8
-        targetSdkVersion 23
+        targetSdkVersion 19
     }
 
     buildTypes {
@@ -19,5 +19,5 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:appcompat-v7:19.1.0'
 }

From 59f014491c3ae49e7680eba173c690048f310904 Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <t.quathamer@mailbox.org>
Date: Fri, 8 Jan 2016 22:23:14 +0100
Subject: [PATCH 6/6] Move version information from Manifest to build.gradle

---
 app/build.gradle                 | 2 ++
 app/src/main/AndroidManifest.xml | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7ede728..3dbfb7c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,6 +8,8 @@ android {
         applicationId "com.rigid.birthdroid"
         minSdkVersion 8
         targetSdkVersion 19
+        versionCode 64
+        versionName "0.6.4"
     }
 
     buildTypes {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 61c4259..5cfb396 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,9 +18,7 @@
 -->
 <manifest 
       xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.rigid.birthdroid"
-      android:versionCode="64"
-      android:versionName="0.6.4">
+      package="com.rigid.birthdroid">
         
     <uses-permission android:name="android.permission.READ_CONTACTS" />