Merge branch 'develop'

handydevcom · Sep 10, 2021 · 2065c1e · 2065c1e
2 parents 1b9a484 + 09b16d0
commit 2065c1e
Show file tree

Hide file tree

Showing 17 changed files with 483 additions and 486 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -48,8 +48,8 @@ android {
         applicationId "com.handydev.financier"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 220
-        versionName "2.0.20"
+        versionCode 221
+        versionName "2.0.21"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         javaCompileOptions {
@@ -139,14 +139,14 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'androidx.multidex:multidex:2.0.1'
-    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.0"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
     implementation "androidx.viewpager2:viewpager2:1.0.0"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
 
     //googledrive
-    googleplayImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1'
+    googleplayImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
     googleplayImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1'
     googleplayImplementation 'com.google.android.gms:play-services-auth:19.2.0'
     googleplayImplementation 'com.google.http-client:google-http-client-gson:1.26.0'
@@ -155,14 +155,14 @@ dependencies {
         //googledrive misc
     googleplayImplementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
     googleplayImplementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    googleplayImplementation ('androidx.work:work-runtime-ktx:2.5.0'){
+    googleplayImplementation ('androidx.work:work-runtime-ktx:2.6.0'){
         //Needed due to a transitive dependency clash with the google api client dep
         exclude group: 'com.google.guava', module:'listenablefuture'
     }
     //googledrive
 
     //untied - SAME AS ABOVE
-    untiedImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1'
+    untiedImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
     untiedImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1'
     untiedImplementation 'com.google.android.gms:play-services-auth:19.2.0'
     untiedImplementation 'com.google.http-client:google-http-client-gson:1.26.0'
@@ -171,7 +171,7 @@ dependencies {
     //googledrive misc
     untiedImplementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
     untiedImplementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    untiedImplementation ('androidx.work:work-runtime-ktx:2.5.0'){
+    untiedImplementation ('androidx.work:work-runtime-ktx:2.6.0'){
         //Needed due to a transitive dependency clash with the google api client dep
         exclude group: 'com.google.guava', module:'listenablefuture'
     }
@@ -203,7 +203,7 @@ dependencies {
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'androidx.test:core:1.4.0'
-    testImplementation 'org.robolectric:robolectric:4.5.1'
+    testImplementation 'org.robolectric:robolectric:4.6.1'
     implementation "androidx.core:core-ktx:1.6.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

diff --git a/app/src/googleplay/java/com/handydev/financier/MainActivity.kt b/app/src/googleplay/java/com/handydev/financier/MainActivity.kt
@@ -66,6 +66,7 @@ class MainActivity : FragmentActivity() {
         eventBus = EventBus.getDefault()
         initialLoad()
         val tabPager = findViewById<ViewPager2>(R.id.mainViewPager)
+        tabPager.offscreenPageLimit = 4
         tabPager.isUserInputEnabled = false
     }
 

diff --git a/app/src/googleplay/java/com/handydev/financier/fragments/MenuListFragment.kt b/app/src/googleplay/java/com/handydev/financier/fragments/MenuListFragment.kt
@@ -40,7 +40,7 @@ class MenuListFragment: ListFragment() {
 
     var bus: EventBus? = null
 
-    protected fun init() {
+    private fun init() {
         if(activity == null) {
             return
         }

diff --git a/app/src/main/assets/whatsnew.htm b/app/src/main/assets/whatsnew.htm
@@ -17,6 +17,25 @@
 </head>
 <body>
 
+<p><b>2.0.21</b></p>
+<p>
+    [*]Fix unresponsive Menu tab.
+    [*]Remove white/gray color mess in Transaction lists.
+    [*]Category and payee selectors in Transaction entry don't erase the current selection anymore.
+    [*]Remove monospace fonts from Totals.
+</p>
+
+<p><b>2.0.20</b></p>
+<p>
+    [*]Fix Category selection issues.
+    [*]Improve hierarchy view of Categories.
+    [*]Fixed subcategory issues in reports.
+    [*]Fix Budget filter not being saved.
+    [*]Fix Recur dialog in Budget.
+    [*]Category selection: Select/Back buttons now are in same order as Ok/Cancel elsewhere.
+    [*]Improved Ukrainian translation.
+</p>
+
 <p><b>2.0.19</b></p>
 <p>
     [*]Reduce application size by removing unused resources.

diff --git a/app/src/main/java/com/handydev/financier/activity/ActivityLayout.kt b/app/src/main/java/com/handydev/financier/activity/ActivityLayout.kt
@@ -98,10 +98,12 @@ class ActivityLayout(private val inflater: NodeInflater, private val listener: A
     }
 
     class FilterNode(val nodeLayout: View, val listLayout: View, val filterLayout: View, val textView: TextView, val autoCompleteTextView: AutoCompleteTextView) {
-        fun showFilter() {
+        fun showFilter(initializeWithSelectedItem: Boolean = false) {
             listLayout.visibility = View.GONE
             filterLayout.visibility = View.VISIBLE
-            autoCompleteTextView.setText("")
+            if(initializeWithSelectedItem) {
+                autoCompleteTextView.setText(textView.text)
+            }
             Utils.openSoftKeyboard(autoCompleteTextView, autoCompleteTextView.context)
         }
 

diff --git a/app/src/main/java/com/handydev/financier/activity/CategorySelector.kt b/app/src/main/java/com/handydev/financier/activity/CategorySelector.kt
@@ -178,7 +178,7 @@ class CategorySelector<A : AbstractActivity?> @JvmOverloads constructor(private
 
     private fun showFilter() {
         initAutoCompleteFilter()
-        filterNode!!.showFilter()
+        filterNode!!.showFilter(selectedCategoryId != 0L)
     }
 
     private val isListPick: Boolean

diff --git a/app/src/main/java/com/handydev/financier/activity/MyEntitySelector.kt b/app/src/main/java/com/handydev/financier/activity/MyEntitySelector.kt
@@ -122,7 +122,7 @@ abstract class MyEntitySelector<T : MyEntity, A : AbstractActivity?> internal co
 
     private fun showFilter() {
         initAutoCompleteFilter()
-        filterNode!!.showFilter()
+        filterNode!!.showFilter(selectedEntityId != 0L)
     }
 
     private val isListPick: Boolean