Update version to 2.6.2

Signed-off-by: Abhijit Kiran Valluri <[email protected]>
abhijitvalluri · Jan 26, 2017 · d6783a6 · d6783a6
1 parent 6e8adf0
commit d6783a6
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/app/app-release.apk b/app/app-release.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.abhijitvalluri.android.fitnotifications"
         minSdkVersion 19
         targetSdkVersion 24
-        versionCode 16
-        versionName "2.6.1"
+        versionCode 17
+        versionName "2.6.2"
     }
     buildTypes {
         debug {

diff --git a/app/src/main/java/com/abhijitvalluri/android/fitnotifications/HomeActivity.java b/app/src/main/java/com/abhijitvalluri/android/fitnotifications/HomeActivity.java
@@ -84,15 +84,21 @@ protected void onCreate(Bundle savedInstanceState) {
         PreferenceManager.setDefaultValues(this, R.xml.main_settings, false);
         mPreferences = PreferenceManager.getDefaultSharedPreferences(this);
 
+        Fragment frag = new HomeFragment();
+
+        // Add a new fragment to the appropriate view element
+        FragmentManager fragmentManager = getSupportFragmentManager();
+        if (fragmentManager.findFragmentById(R.id.flContent) == null) {
+            fragmentManager.beginTransaction().add(R.id.flContent, frag).commit();
+        }
+
         if (mPreferences.getInt(getString(R.string.version_key), 0) < Constants.VERSION_CODE
-            && mPreferences.getInt(getString(R.string.version_key), 0) > 0) {
-            // Updated from old version
-            new AlertDialog.Builder(HomeActivity.this)
-                    .setTitle(R.string.whats_new)
-                    .setMessage(Html.fromHtml(getString(R.string.whats_new_text)))
-                    .setPositiveButton(android.R.string.ok, null)
-                    .create()
-                    .show();
+                && mPreferences.getInt(getString(R.string.version_key), 0) > 0) {
+
+            mNavDrawer.setCheckedItem(R.id.nav_whats_new);
+            setTitle(R.string.whats_new);
+            frag = InfoFragment.newInstance(getString(R.string.whats_new_text));
+            fragmentManager.beginTransaction().replace(R.id.flContent, frag).commit();
 
             mPreferences.edit().putInt(getString(R.string.version_key), Constants.VERSION_CODE).apply();
         }
@@ -103,14 +109,6 @@ protected void onCreate(Bundle savedInstanceState) {
                     LAUNCH_ACTIVITY_ANIM_BUNDLE);
         }
 
-        Fragment frag = new HomeFragment();
-
-        // Add a new fragment to the appropriate view element
-        FragmentManager fragmentManager = getSupportFragmentManager();
-        if (fragmentManager.findFragmentById(R.id.flContent) == null) {
-            fragmentManager.beginTransaction().add(R.id.flContent, frag).commit();
-        }
-
     }
 
     private void setupDrawerContent(NavigationView navigationView) {

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -288,8 +288,8 @@
        We will attempt to resolve this issue in an update.</p>
     ]]></string>
     <string name="whats_new_text"><![CDATA[
-    <p><b>Version 2.6.1</b> fixes a bug in ver. 2.6 that caused users to not receive some notifications.</p>
-    <p>New in Fit Notifications <b>version 2.6</b>:</p>
+    <p><b>Version 2.6.2</b>: bug fixes and improvements to setup process for Android 7.0 (Nougat)</p>
+    <p>Changes in <b>version 2.6</b>:</p>
     <ul>
         <li><b>Updated UI!</b> Drag the new navigation drawer from the left to access useful information.<br /><br /></li>
         <li><b>New Setting!</b> (Experimental) Transliterate non-Latin characters in notification text to Latin characters. Not all characters are properly displayed.<br /><br /></li>