Final fix on notification and introducing new version

z3r0c00l-2k · Jun 7, 2019 · d2a7038 · d2a7038
1 parent dd44cfc
commit d2a7038
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 3 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "io.github.z3r0c00l_2k.aquadroid"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 3
-        versionName "1.1.1"
+        versionCode 4
+        versionName "1.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/src/main/java/io/github/z3r0c00l_2k/aquadroid/MainActivity.kt b/app/src/main/java/io/github/z3r0c00l_2k/aquadroid/MainActivity.kt
@@ -59,6 +59,16 @@ class MainActivity : AppCompatActivity() {
 
         notificStatus = sharedPref.getBoolean(AppUtils.NOTIFICATION_STATUS_KEY, true)
         val alarm = AlarmHelper()
+        if (!alarm.checkAlarm(this) && notificStatus) {
+            btnNotific.setImageDrawable(getDrawable(R.drawable.ic_bell))
+            alarm.setAlarm(this, sharedPref.getInt(AppUtils.NOTIFICATION_FREQUENCY_KEY, 30).toLong())
+        }
+
+        if (notificStatus) {
+            btnNotific.setImageDrawable(getDrawable(R.drawable.ic_bell))
+        } else {
+            btnNotific.setImageDrawable(getDrawable(R.drawable.ic_bell_disabled))
+        }
 
         sqliteHelper.addAll(dateNow, 0, totalIntake)
 

diff --git a/app/src/main/java/io/github/z3r0c00l_2k/aquadroid/helpers/AlarmHelper.kt b/app/src/main/java/io/github/z3r0c00l_2k/aquadroid/helpers/AlarmHelper.kt
@@ -73,4 +73,16 @@ class AlarmHelper {
         )
         Log.i("AlarmHelper", "Cancelling alarms")
     }
+
+    fun checkAlarm(context: Context): Boolean {
+
+        val alarmIntent = Intent(context, NotifierReceiver::class.java)
+        alarmIntent.action = ACTION_BD_NOTIFICATION
+
+        return PendingIntent.getBroadcast(
+            context, 0,
+            alarmIntent,
+            PendingIntent.FLAG_NO_CREATE
+        ) != null
+    }
 }
diff --git a/fastlane/metadata/android/en-US/changelogs/4.txt b/fastlane/metadata/android/en-US/changelogs/4.txt
@@ -0,0 +1,4 @@
+* Improved UI/UX
+* Fixed Summary chart X values
+* Fixed Notification Bug on Android O and Later
+* Added double back press to exit