V 0.1.2 Beta

Author: ktprograms

README.md

@@ -36,7 +36,7 @@ A 'Drink water!' notification like shown above will be displayed if you have not
 When all 5 glasses are empty, the notifications will no longer come (until you restart them), and a 'Congratulations' message will appear!
 
 ## Download
-[Download the APK](https://github.com/ktprograms/WaterTracker/blob/master/app/release/WaterTracker0.1.0beta.apk)
+[Download the APK](https://github.com/ktprograms/WaterTracker/blob/master/app/release/WaterTracker0.1.2beta.apk)
 
 ## Checksums (All versions)
 **V 0.1.0 Beta:**
@@ -51,6 +51,12 @@ When all 5 glasses are empty, the notifications will no longer come (until you r
 >
 >SHA1: 88fe561d635a015d816af3593e86df009e11285a
 
+**V 0.1.2 Beta:**
+
+>MD5: 3c9a796a192bf109beda90c28f1a1da1
+>
+>SHA1: 857f9f8babcacde37f9d7ccc118d9fd993c2f1c2
+
 # Changelogs
 **V 0.1.0 Beta:**
 
@@ -59,3 +65,7 @@ When all 5 glasses are empty, the notifications will no longer come (until you r
 **V 0.1.1 Beta:**
 
 >Fixed bug where 'running' text would change to 'not running' when screen is locked then unlocked
+
+**V 0.1.2 Beta:**
+
+>Converted images to SVG

app/build.gradle

@@ -33,8 +33,8 @@ android {
         applicationId "com.ktprograms.watertracker"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 2
-        versionName "0.1.1-beta"
+        versionCode 3
+        versionName "0.1.2-beta"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/release/WaterTracker0.1.2beta.apk

@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 2,
-      "versionName": "0.1.1-beta",
+      "versionCode": 3,
+      "versionName": "0.1.2-beta",
       "outputFile": "app-release.apk"
     }
   ]

app/release/output-metadata.json

@@ -26,9 +26,9 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/water_drop"
+        android:icon="@drawable/app_icon"
         android:label="@string/app_name"
-        android:roundIcon="@drawable/water_drop"
+        android:roundIcon="@drawable/app_icon"
         android:supportsRtl="true"
         android:theme="@style/Theme.WaterTracker"
         >

app/src/main/AndroidManifest.xml

@@ -37,7 +37,7 @@ class AlarmReceiver : BroadcastReceiver() {
         val pendingIntent =
             PendingIntent.getActivity(context, 0, i, PendingIntent.FLAG_UPDATE_CURRENT)
         val builder = NotificationCompat.Builder(context, "WATER_TRACKER")
-            .setSmallIcon(R.drawable.water_drop)
+            .setSmallIcon(R.drawable.app_icon)
             .setContentTitle("Drink water!!!")
             .setContentIntent(pendingIntent)
             .setAutoCancel(true)

app/src/main/java/com/ktprograms/watertracker/AlarmReceiver.kt

@@ -53,11 +53,11 @@ class MainActivity : AppCompatActivity() {
     // Initialize arrays
     private val glassAmounts = mutableListOf(0, 0, 0, 0, 0) // 0 -> full, 4 -> empty
     private val glassLevels = listOf(
-        R.drawable.glass100,
-        R.drawable.glass75,
-        R.drawable.glass50,
-        R.drawable.glass25,
-        R.drawable.glass0
+        R.drawable.glass_100,
+        R.drawable.glass_75,
+        R.drawable.glass_50,
+        R.drawable.glass_25,
+        R.drawable.glass_0
     )
 
     // Declare other object instances
@@ -73,6 +73,9 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+        supportActionBar?.setIcon(R.drawable.app_icon)
+        supportActionBar?.setDisplayUseLogoEnabled(true)
 
         // Initialize views
         initViews()

app/src/main/java/com/ktprograms/watertracker/MainActivity.kt

@@ -0,0 +1,38 @@
+<!--
+  ~ GNU General Public License v3.0
+  ~
+  ~ Copyright (c) 2020 Toh Jeen Gie Keith
+  ~
+  ~
+  ~ This file is part of WaterTracker.
+  ~
+  ~ WaterTracker 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.
+  ~
+  ~ WaterTracker 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 WaterTracker.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="80dp"
+    android:height="80dp"
+    android:viewportWidth="80.0"
+    android:viewportHeight="80.0">
+
+    <path android:fillColor="#FF00BFFF"
+        android:strokeWidth="0"
+        android:strokeColor="#00000000"
+        android:pathData="M0,0 L80,0 L80,80 L0,80 Z" />
+
+    <path android:fillColor="#FF0000FF"
+        android:strokeWidth="5"
+        android:strokeColor="#FF000000"
+        android:pathData="M45,7 L25,42 C00,87 80,77 55,47 Q39,32 45,7 Z" />
+</vector>