From f846ba7da71cd3170e9797d7ad720a572408b981 Mon Sep 17 00:00:00 2001
From: Kevin Puertas <kevin01010@gmail.com>
Date: Thu, 7 Dec 2017 21:38:11 +0100
Subject: [PATCH] Fixes to notification and other

---
 app/build.gradle                                     |  3 ++-
 .../kotlin/com/jkanetwork/st/frasesdeanime/App.kt    |  3 ++-
 .../com/jkanetwork/st/frasesdeanime/MainActivity.kt  | 11 +++++++++++
 .../kotlin/com/jkanetwork/st/frasesdeanime/Prefs.kt  | 12 +++++++++++-
 app/versioncode.count                                |  4 ++--
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f092b74..cc4f642 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,12 +19,13 @@ android {
         versionProps.store(versionPropsFile.newWriter(), null)
         // Fin de subir automáticamente la build en cada compilación
         versionCode code
-        versionName "1.0"
+        versionName "1.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
             minifyEnabled false
+            shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
diff --git a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/App.kt b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/App.kt
index cd40a92..6b57957 100644
--- a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/App.kt
+++ b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/App.kt
@@ -48,7 +48,7 @@ fun putAlarm(context: Context) {
     if (P.getNotifOn()) {
         if (P.getPersNotifOn()) { /* Persistent */
             var intent = Intent()
-            intent.setAction("com.jkanetwork.st.com.jkanetwork.st.frasesdeanime.notif")
+            intent.setAction("com.jkanetwork.st.frasesdeanime.notif")
             context.sendBroadcast(intent)
 
         }else{ /* At x hour every day */
@@ -59,6 +59,7 @@ fun putAlarm(context: Context) {
                 /* Add a day */
                 time.add(Calendar.DATE, 1)
             }
+
             time.set(Calendar.HOUR_OF_DAY, P.getHour())
             time.set(Calendar.MINUTE, P.getMinute())
             time.set(Calendar.SECOND, 0)
diff --git a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/MainActivity.kt b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/MainActivity.kt
index c9ccf44..5ae1586 100644
--- a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/MainActivity.kt
+++ b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/MainActivity.kt
@@ -84,6 +84,17 @@ class MainActivity : AppCompatActivity(), RewardedVideoAdListener  {
             }
         }
 
+        //For "Vote us in Play Store"
+        if (P.getRateCountdown() == 0){
+            alert("¿Te gusta la apliación? ¿Crees que la falta algo?"){
+                positiveButton("Danos tu opinión") {browse("https://play.google.com/store/apps/details?id=com.jkanetwork.st.frasesdeanime")}
+                negativeButton("Más tarde") { }
+            }.show()
+        }else{
+            P.setRateCountdown(); //Countdown one
+        }
+
+
 
         txt_sentence.setMovementMethod(ScrollingMovementMethod()) //Make sentence text scrollable
 
diff --git a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/Prefs.kt b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/Prefs.kt
index 4660bf2..130b943 100644
--- a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/Prefs.kt
+++ b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/Prefs.kt
@@ -8,7 +8,7 @@ import android.content.SharedPreferences
  * Help of: http://blog.teamtreehouse.com/making-sharedpreferences-easy-with-kotlin
  */
 class Prefs (context: Context){
-    var prefs: SharedPreferences = context.getSharedPreferences("com.jkanetwork.st.com.jkanetwork.st.frasesdeanime.PREFS", 0);
+    var prefs: SharedPreferences = context.getSharedPreferences("com.jkanetwork.st.frasesdeanime.PREFS", 0);
 
     fun getHour(): Int {
         return prefs.getInt("HOUR", 8)
@@ -51,4 +51,14 @@ class Prefs (context: Context){
             return false;
         }
     }
+
+    //For countdown to rate us dialog
+    fun getRateCountdown(): Int {
+        return prefs.getInt("RATECOUNTDOWN", 6)
+    }
+
+    fun setRateCountdown() {
+        prefs.edit().putInt("RATECOUNTDOWN", (getRateCountdown()-1)).commit()
+    }
+
 }
\ No newline at end of file
diff --git a/app/versioncode.count b/app/versioncode.count
index 6dc4b7b..dce0b52 100644
--- a/app/versioncode.count
+++ b/app/versioncode.count
@@ -1,2 +1,2 @@
-#Sun Dec 03 14:16:06 CET 2017
-VERSION_CODE=847
+#Thu Dec 07 21:34:37 CET 2017
+VERSION_CODE=873