Release 1.1.4 - Bugfixes

fei0316 · Apr 7, 2019 · 2524e74 · 2524e74
1 parent 38fb1ab
commit 2524e74
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 21 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.iatfei.streakalarm"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 16
-        versionName "1.1.3"
+        versionCode 17
+        versionName "1.1.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 

diff --git a/app/src/main/java/com/iatfei/streakalarm/NewAboutActivity.java b/app/src/main/java/com/iatfei/streakalarm/NewAboutActivity.java
@@ -24,6 +24,7 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
@@ -70,8 +71,9 @@ public static class AboutFragment extends PreferenceFragmentCompat {
         @Override
         public void onCreatePreferences(Bundle bundle, String s) {
             addPreferencesFromResource(R.xml.about);
+            String version = BuildConfig.VERSION_NAME + "-" + BuildConfig.FLAVOR + " v" + BuildConfig.VERSION_CODE;
             Preference ver = findPreference("edit_text_preference_2");
-            Objects.requireNonNull(ver).setSummary(BuildConfig.VERSION_NAME);
+            Objects.requireNonNull(ver).setSummary(version);
             Preference license = findPreference("edit_text_preference_6");
             Objects.requireNonNull(license).setIntent(new Intent(getActivity(),OpenSourceActivity.class));
 

diff --git a/app/src/main/java/com/iatfei/streakalarm/OpenSourceActivity.java b/app/src/main/java/com/iatfei/streakalarm/OpenSourceActivity.java
@@ -21,6 +21,8 @@
 package com.iatfei.streakalarm;
 
 import android.os.Bundle;
+import android.view.MenuItem;
+
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
@@ -57,4 +59,15 @@ public void onCreate(Bundle savedInstanceState) {
                 .replace(R.id.container, fragment)
                 .commit();
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                finish();
+                return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -8,7 +8,7 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <com.google.android.material.appbar.AppBarLayout
+        <com.google.android.material.appbar.AppBarLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/app_bar"

diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml
@@ -4,25 +4,18 @@
 
     <item
         android:id="@+id/menu_stopalarm"
-        android:checkable="false"
-        android:title="@string/menu_cancel" />
+        android:title="@string/menu_cancel"
+        android:textSize="18sp"/>
     <item
         android:id="@+id/menu_setinterval"
-        android:title="@string/menu_remindinterval" />
+        android:title="@string/menu_remindinterval"
+        android:textSize="18sp" />
     <item
         android:id="@+id/menu_snooze"
-        android:title="@string/menu_snooze" />
+        android:title="@string/menu_snooze"
+        android:textSize="18sp" />
     <item
         android:id="@+id/about"
-        android:title="@string/title_activity_about" />
-    <!--<item android:title="Ðébúg">
-        <menu>
-            <item
-                android:id="@+id/debug_1"
-                android:title="§þá®þ §é®ví©é" />
-            <item
-                android:id="@+id/debug_2"
-                android:title="§þóö §é®ví©é" />
-        </menu>
-    </item>-->
+        android:title="@string/title_activity_about"
+        android:textSize="18sp" />
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -15,7 +15,7 @@
     <string name="restart" translatable="false">The past is in the past.</string>
     <string name="menu_justnow">Sent streak just now</string>
     <string name="menu_customtime">Sent streak some time earlier</string>
-    <string name="menu_remindinterval">Set reminder interval</string>
+    <string name="menu_remindinterval">Set Reminder Interval</string>
     <string name="menu_opensnapchat">Open Snapchat</string>
     <string name="nosnapapp">Snapchat not installed!</string>
     <string name="snapbefore_title">How long ago? (as shown on Snapchat)</string>
@@ -96,7 +96,7 @@
     <string name="main_long_ago">Long ago…</string>
     <string name="main_new">Unknown</string>
     <string name="notif_snooze">Snooze</string>
-    <string name="menu_snooze">Set snooze duration</string>
+    <string name="menu_snooze">Set Snooze Duration</string>
     <string name="snooze_length_title">How long should snooze last (in minutes)?</string>
     <string name="snooze_set">Your reminder will be deferred for %1$d minutes when you press the Snooze button.</string>
 </resources>