Merge pull request #13 from morris-james/development

Development
jamesmorrisstudios · Oct 14, 2015 · 7da9bdf · 7da9bdf
2 parents 94176ff + 1b17f29
commit 7da9bdf
Show file tree

Hide file tree

Showing 97 changed files with 31,324 additions and 13,158 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -20,6 +20,8 @@ repositories {
     mavenLocal()
     maven { url "https://jitpack.io" }
     mavenCentral()
+    jcenter()
+    maven { url 'http://guardian.github.com/maven/repo-releases' }
 }
 
 android {
@@ -31,6 +33,10 @@ android {
             applicationId "jamesmorrisstudios.com.randremind"
         }
 
+        googlePlayDonation {
+            applicationId "jamesmorrisstudios.com.randremind.donate"
+        }
+
         amazon {
             applicationId "jamesmorrisstudios.com.randremind.amazon"
         }
@@ -44,8 +50,8 @@ android {
         applicationId "jamesmorrisstudios.com.randremind"
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 38
-        versionName "1.2.0"
+        versionCode 50
+        versionName "1.3.0"
     }
 
     signingConfigs {
@@ -63,7 +69,7 @@ android {
             zipAlignEnabled false
         }
         release {
-            minifyEnabled false
+            minifyEnabled true
             jniDebuggable false
             debuggable false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -76,9 +82,6 @@ android {
 apply from: file("../../../keystore/signing-rand-remind.gradle")
 
 dependencies {
-    //compile 'com.jamesmorrisstudios:utilitieslibrary:1.1' //local gradle
     //compile 'com.jamesmorrisstudios:appbaselibrary:1.1' //local gradle
-
-    compile 'com.github.morris-james:UtilitiesLibrary:v1.1.2' //Jitpack
-    compile 'com.github.morris-james:appbaselibrary:v1.1.3' //Jitpack
+    compile 'com.github.morris-james:appbaselibrary:v1.1.5' //Jitpack
 }
diff --git a/app/mapping.txt b/app/mapping.txt
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -16,6 +16,51 @@
 #   public *;
 #}
 
+
+# Explicitly preserve all serialization members. The Serializable interface
+# is only a marker interface, so it wouldn't save them.
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+    java.lang.Object writeReplace();
+    java.lang.Object readResolve();
+}
+
+# Preserve all native method names and the names of their classes.
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+-keepclasseswithmembernames class * {
+    public <init>(android.content.Context, android.util.AttributeSet);
+}
+
+-keepclasseswithmembernames class * {
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+
+# Preserve static fields of inner classes of R classes that might be accessed
+# through introspection.
+-keepclassmembers class **.R$* {
+  public static <fields>;
+}
+
+# Preserve the special static methods that are required in all enumeration classes.
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+-keep public class * {
+    public protected *;
+}
+
+-keep class * implements android.os.Parcelable {
+  public static final android.os.Parcelable$Creator *;
+}
+
 -keep public class * extends android.app.Activity
 -keep public class * extends android.app.Application
 -keep public class * extends android.app.Service
@@ -60,4 +105,26 @@
 -keepclassmembers enum * {
     public static **[] values();
     public static ** valueOf(java.lang.String);
-}
+}
+
+# Gson uses generic type information stored in a class file when working with fields. Proguard
+# removes such information by default, so configure it to keep all of it.
+-keepattributes Signature
+
+# Gson specific classes
+-keep class sun.misc.Unsafe { *; }
+-keep class com.google.gson.stream.** { *; }
+
+# Gson uses generic type information stored in a class file when working with fields. Proguard
+# removes such information by default, so configure it to keep all of it.
+-keepattributes Signature
+
+# For using GSON @Expose annotation
+-keepattributes *Annotation*
+
+# Application classes that will be serialized/deserialized over Gson
+-keep class jamesmorrisstudios.com.randremind.reminder.ReminderListData.** { *; }
+-keep class jamesmorrisstudios.com.randremind.reminder.ReminderItemData.** { *; }
+-keep class com.jamesmorrisstudios.appbaselibrary.time.DateTimeItem.** { *; }
+-keep class com.jamesmorrisstudios.appbaselibrary.time.DateItem.** { *; }
+-keep class com.jamesmorrisstudios.appbaselibrary.time.TimeItem.** { *; }
diff --git a/app/src/googlePlayDonation/res/values/strings_store_specific.xml b/app/src/googlePlayDonation/res/values/strings_store_specific.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="store_link" translatable="false">http://play.google.com/store/apps/details?id=jamesmorrisstudios.com.randremind.donate</string>
+    <string name="store_link_all" translatable="false">http://play.google.com/store/apps/dev?id=4941635797772545432</string>
+
+</resources>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
   ~ Copyright (c) 2015.  James Morris Studios
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +17,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="jamesmorrisstudios.com.randremind">
+    package="jamesmorrisstudios.com.randremind" >
 
     <!-- For notifications -->
     <uses-permission android:name="android.permission.VIBRATE" />
@@ -25,28 +26,55 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <!-- Needed to pick custom ringtones on some devices (mainly Sony) -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <!-- Used for data backup/export -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
-        android:name=".app.App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
-        tools:replace="android:name">
+        tools:replace="android:theme" >
 
         <activity
             android:name=".activities.MainActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:launchMode="singleTask" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="application/json" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="text/json" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="application/json" />
+            </intent-filter>
         </activity>
 
         <receiver
             android:name=".receiver.AlarmReceiver"
             android:enabled="true"
-            android:exported="false">
+            android:exported="false" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="jamesmorrisstudios.com.randremind.WAKEREMINDER" />
@@ -57,7 +85,7 @@
         <receiver
             android:name=".receiver.NotificationReceiver"
             android:enabled="true"
-            android:exported="false">
+            android:exported="false" >
             <intent-filter>
                 <action android:name="jamesmorrisstudios.com.randremind.NOTIFICATION_CLICKED" />
                 <action android:name="jamesmorrisstudios.com.randremind.NOTIFICATION_CLICKED_SILENT" />
@@ -68,6 +96,12 @@
             </intent-filter>
         </receiver>
 
+        <activity
+            android:name=".activities.PopupSnoozeActivity"
+            android:launchMode="singleInstance" android:excludeFromRecents="true"
+            android:taskAffinity="" android:theme="@android:style/Theme.Dialog" >
+        </activity>
+
     </application>
 
 </manifest>