Fix Back button issues

handydevcom · Jun 5, 2020 · 38d9d4a · 38d9d4a
1 parent 3f4b6d0
commit 38d9d4a
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 18 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -33,8 +33,8 @@ android {
         applicationId "com.handydev.financier"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 208
-        versionName "2.0.8"
+        versionCode 209
+        versionName "2.0.9"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         javaCompileOptions {

diff --git a/app/src/fdroid/java/com/handydev/financier/MainActivity.kt b/app/src/fdroid/java/com/handydev/financier/MainActivity.kt
@@ -63,7 +63,11 @@ class MainActivity : FragmentActivity() {
         val tabPager = findViewById<ViewPager2>(R.id.mainViewPager)
         if(tabPager != null) {
             val fragment = supportFragmentManager.findFragmentByTag("f" + tabPager.currentItem)
-            (fragment as? IOnBackPressed)?.onBackPressed()?.not()?.let {
+            var handled = false
+            if(fragment is IOnBackPressed) {
+                handled = fragment.onBackPressed()
+            }
+            if(!handled) {
                 super.onBackPressed()
             }
         } else {
@@ -128,12 +132,12 @@ class MainActivity : FragmentActivity() {
     }
 
     fun refreshCurrentTab() {
-        /*val currentActivity: Activity = getLocalActivityManager().getCurrentActivity()
-        if (currentActivity is RefreshSupportedActivity) {
-            val activity = currentActivity as RefreshSupportedActivity
-            activity.recreateCursor()
-            activity.integrityCheck()
-        }*/
+        for(fragment in supportFragmentManager.fragments) {
+            if(fragment.isVisible && fragment is RefreshSupportedActivity) {
+                fragment.recreateCursor()
+                fragment.integrityCheck()
+            }
+        }
     }
 
     private fun initialLoad() {

diff --git a/app/src/googleplay/java/com/handydev/financier/MainActivity.kt b/app/src/googleplay/java/com/handydev/financier/MainActivity.kt
@@ -29,6 +29,7 @@ import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import com.google.android.gms.common.api.Scope
 import com.google.api.services.drive.DriveScopes
 import com.handydev.financier.activity.PreferencesActivity.CHOOSE_ACCOUNT
+import com.handydev.financier.activity.RefreshSupportedActivity
 import com.handydev.financier.app.FinancierApp
 import com.handydev.financier.base.AbstractListFragment
 import com.handydev.financier.bus.RefreshData
@@ -72,7 +73,11 @@ class MainActivity : FragmentActivity() {
         val tabPager = findViewById<ViewPager2>(R.id.mainViewPager)
         if(tabPager != null) {
             val fragment = supportFragmentManager.findFragmentByTag("f" + tabPager.currentItem)
-            (fragment as? IOnBackPressed)?.onBackPressed()?.not()?.let {
+            var handled = false
+            if(fragment is IOnBackPressed) {
+                handled = fragment.onBackPressed()
+            }
+            if(!handled) {
                 super.onBackPressed()
             }
         } else {
@@ -131,12 +136,12 @@ class MainActivity : FragmentActivity() {
     }
 
     fun refreshCurrentTab() {
-        /*val currentActivity: Activity = getLocalActivityManager().getCurrentActivity()
-        if (currentActivity is RefreshSupportedActivity) {
-            val activity = currentActivity as RefreshSupportedActivity
-            activity.recreateCursor()
-            activity.integrityCheck()
-        }*/
+        for(fragment in supportFragmentManager.fragments) {
+            if(fragment.isVisible && fragment is RefreshSupportedActivity) {
+                fragment.recreateCursor()
+                fragment.integrityCheck()
+            }
+        }
     }
 
     private fun initialLoad() {

diff --git a/app/src/main/assets/whatsnew.htm b/app/src/main/assets/whatsnew.htm
@@ -17,6 +17,12 @@
 </head>
 <body>
 
+<p><b>2.0.9</b></p>
+<p>
+    [*] Fixed back button issues.<br/>
+    [*] Fixed accounts list info refresh.<br/>
+</p>
+
 <p><b>2.0.8</b></p>
 <p>
     [*] Fixed refresh of main menu blotter list.<br/>

diff --git a/app/src/main/java/com/handydev/financier/fragments/AccountsFragment.kt b/app/src/main/java/com/handydev/financier/fragments/AccountsFragment.kt
@@ -51,6 +51,11 @@ open class AccountsFragment: AbstractListFragment(R.layout.account_list) {
         integrityCheck()
     }
 
+    override fun onResume() {
+        super.onResume()
+        recreateCursor()
+    }
+
     private fun setupUi() {
         view?.findViewById<View>(R.id.integrity_error)?.setOnClickListener { v: View -> v.visibility = View.GONE }
         listView.onItemLongClickListener = AdapterView.OnItemLongClickListener { _, view, _, id ->

diff --git a/app/src/main/java/com/handydev/financier/fragments/BlotterFragment.kt b/app/src/main/java/com/handydev/financier/fragments/BlotterFragment.kt
@@ -564,9 +564,9 @@ open class BlotterFragment: AbstractListFragment(R.layout.blotter), IOTransactio
         val searchLayout = view?.findViewById<FrameLayout>(R.id.search_text_frame)
         return if (searchLayout != null && searchLayout.visibility == View.VISIBLE) {
             searchLayout.visibility = View.GONE
-            false
-        } else {
             true
+        } else {
+            false
         }
     }
 }
diff --git a/app/src/main/java/com/handydev/financier/widget/CalculatorInput.java b/app/src/main/java/com/handydev/financier/widget/CalculatorInput.java
@@ -5,6 +5,7 @@
 import android.os.Bundle;
 import android.os.Vibrator;
 import androidx.core.content.ContextCompat;
+
 import android.view.View;
 import android.view.Window;
 import android.widget.Button;