2.0.10

handydevcom · Jun 22, 2020 · 4eaa23d · 4eaa23d
1 parent a5d8071
commit 4eaa23d
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 20 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -173,6 +173,9 @@
         <activity
             android:name="com.handydev.financier.activity.BlotterActivity"
             android:label="@string/blotter" />
+        <activity
+            android:name="com.handydev.financier.activity.BlotterActivity2"
+            android:label="@string/blotter" />
 
         <activity
             android:name="com.handydev.financier.activity.PlannerActivity"

diff --git a/app/src/main/assets/whatsnew.htm b/app/src/main/assets/whatsnew.htm
@@ -17,6 +17,14 @@
 </head>
 <body>
 
+<p><b>2.0.10</b></p>
+<p>
+    [*] Fixed parent category selection.<br/>
+    [*] Fixed missing checkbox in all selection dialogs.<br/>
+    [*] Optimized accounts list UI.<br/>
+    [*] Account Blotter code unified with main Blotter..<br/>
+</p>
+
 <p><b>2.0.9</b></p>
 <p>
     [*] Fixed back button issues.<br/>

diff --git a/app/src/main/java/com/handydev/financier/activity/BlotterActivity.java b/app/src/main/java/com/handydev/financier/activity/BlotterActivity.java
@@ -15,7 +15,6 @@
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
-import android.widget.LinearLayout;
 import android.widget.ListAdapter;
 import android.widget.PopupMenu;
 import android.widget.TextView;
@@ -545,7 +544,7 @@ protected void applyFilter() {
     }
 
     private void setScreenTitle(String title) {
-        ((LinearLayout)findViewById(R.id.title_view)).setVisibility(View.VISIBLE);
+        findViewById(R.id.title_view).setVisibility(View.VISIBLE);
         ((TextView)findViewById(R.id.title_view_text)).setText(title);
     }
 

diff --git a/app/src/main/java/com/handydev/financier/activity/BlotterActivity2.kt b/app/src/main/java/com/handydev/financier/activity/BlotterActivity2.kt
@@ -0,0 +1,23 @@
+package com.handydev.financier.activity
+
+import android.os.Bundle
+import androidx.fragment.app.FragmentActivity
+import com.handydev.financier.R
+import com.handydev.financier.fragments.BlotterFragment
+
+class BlotterActivity2 : FragmentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.blotter2)
+        if (savedInstanceState == null) {
+            val blotter = BlotterFragment()
+            if(intent?.extras != null) {
+                blotter.arguments = intent.extras
+            }
+            supportFragmentManager
+                    .beginTransaction()
+                    .add(R.id.blotter_root_layout, BlotterFragment(), "blotter")
+                    .commit()
+        }
+    }
+}
diff --git a/app/src/main/java/com/handydev/financier/fragments/AccountsFragment.kt b/app/src/main/java/com/handydev/financier/fragments/AccountsFragment.kt
@@ -286,7 +286,7 @@ open class AccountsFragment: AbstractListFragment(R.layout.account_list) {
     private fun showAccountTransactions(id: Long) {
         val account = db?.getAccount(id)
         if (account != null && activity != null) {
-            val intent = Intent(activity!!, BlotterActivity::class.java)
+            val intent = Intent(activity!!, BlotterActivity2::class.java)
             Criteria.eq(BlotterFilter.FROM_ACCOUNT_ID, id.toString())
                     .toIntent(account.title, intent)
             intent.putExtra(BlotterFilterActivity.IS_ACCOUNT_FILTER, true)
@@ -302,13 +302,6 @@ open class AccountsFragment: AbstractListFragment(R.layout.account_list) {
         }
     }
 
-   /* protected override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        if (requestCode == AccountListActivity.VIEW_ACCOUNT_REQUEST || requestCode == AccountListActivity.PURGE_ACCOUNT_REQUEST) {
-            recreateCursor()
-        }
-    }*/
-
     private fun purgeAccount() {
         if(activity == null) {
             return

diff --git a/app/src/main/java/com/handydev/financier/fragments/BlotterFragment.kt b/app/src/main/java/com/handydev/financier/fragments/BlotterFragment.kt
@@ -1,7 +1,6 @@
 package com.handydev.financier.fragments
 
 import android.app.Activity
-import androidx.appcompat.app.AlertDialog
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
@@ -15,26 +14,27 @@ import android.view.View
 import android.view.View.OnFocusChangeListener
 import android.view.inputmethod.InputMethodManager
 import android.widget.*
-import greendroid.widget.QuickActionGrid
-import greendroid.widget.QuickActionWidget
-import greendroid.widget.QuickActionWidget.OnQuickActionClickListener
+import androidx.appcompat.app.AlertDialog
 import com.handydev.financier.R
 import com.handydev.financier.activity.*
 import com.handydev.financier.adapter.BlotterListAdapter
 import com.handydev.financier.adapter.TransactionsListAdapter
+import com.handydev.financier.base.AbstractListFragment
 import com.handydev.financier.blotter.AccountTotalCalculationTask
 import com.handydev.financier.blotter.BlotterFilter
 import com.handydev.financier.blotter.BlotterTotalCalculationTask
 import com.handydev.financier.blotter.TotalCalculationTask
 import com.handydev.financier.dialog.TransactionInfoDialog
 import com.handydev.financier.filter.WhereFilter
 import com.handydev.financier.model.AccountType
+import com.handydev.financier.protocol.IOTransactionDeleteListener
 import com.handydev.financier.utils.IntegrityCheckRunningBalance
 import com.handydev.financier.utils.MenuItemInfo
 import com.handydev.financier.utils.MyPreferences
 import com.handydev.financier.view.NodeInflater
-import com.handydev.financier.base.AbstractListFragment
-import com.handydev.financier.protocol.IOTransactionDeleteListener
+import greendroid.widget.QuickActionGrid
+import greendroid.widget.QuickActionWidget
+import greendroid.widget.QuickActionWidget.OnQuickActionClickListener
 
 open class BlotterFragment: AbstractListFragment(R.layout.blotter), IOTransactionDeleteListener {
     companion object {
@@ -104,7 +104,7 @@ open class BlotterFragment: AbstractListFragment(R.layout.blotter), IOTransactio
             intent.putExtra(BlotterFilterActivity.IS_ACCOUNT_FILTER, isAccountBlotter && blotterFilter.accountId > 0)
             startActivityForResult(intent, FILTER_REQUEST)
         }
-        totalText = view?.findViewById<TextView>(R.id.total)
+        totalText = view?.findViewById(R.id.total)
         totalText!!.setOnClickListener { showTotals() }
         val intent: Intent = activity!!.intent
         blotterFilter = WhereFilter.fromIntent(intent)
@@ -125,7 +125,7 @@ open class BlotterFragment: AbstractListFragment(R.layout.blotter), IOTransactio
             bTemplate!!.visibility = View.VISIBLE
             bTemplate!!.setOnClickListener { createFromTemplate() }
         }
-        bSearch = view?.findViewById<ImageButton>(R.id.bSearch)
+        bSearch = view?.findViewById(R.id.bSearch)
         bSearch!!.setOnClickListener {
             val searchText = view?.findViewById<EditText>(R.id.search_text)
             val searchLayout = view?.findViewById<FrameLayout>(R.id.search_text_frame)
@@ -209,6 +209,11 @@ open class BlotterFragment: AbstractListFragment(R.layout.blotter), IOTransactio
         }
     }
 
+    private fun setScreenTitle(title: String) {
+        view?.findViewById<LinearLayout>(R.id.title_view)?.visibility = View.VISIBLE
+        view?.findViewById<TextView>(R.id.title_view_text)?.text = title
+    }
+
     private fun onPopupMenuSelected(id: Int) {
         if(activity == null) {
             return
@@ -506,13 +511,13 @@ open class BlotterFragment: AbstractListFragment(R.layout.blotter), IOTransactio
         }
         val title = blotterFilter.title
         if (title != null) {
-            //setScreenTitle(getString(R.string.blotter) + " : " + title)
+            setScreenTitle(getString(R.string.blotter) + " : " + title)
         }
         updateFilterImage()
     }
 
     /*private fun setScreenTitle(title: String) {
-        val container = view?.findViewById<LinearLayout>(R.id.title_view)
+        val lcontainer = view?.findViewById<LinearLayout>(R.id.title_view)
         container?.visibility = if(title.isEmpty()) View.GONE else View.VISIBLE
         view?.findViewById<TextView>(R.id.title_view_text)?.text = title
     }*/

diff --git a/app/src/main/res/layout/blotter2.xml b/app/src/main/res/layout/blotter2.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/blotter_root_layout"
+    >
+</FrameLayout>