X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2FTransactionListActivity.java;h=ac992cdf8df0d7bfed137aa06c046ccbd45e5fc2;hp=2ccb286c1e78a50285c87fc139f16f027292e4fe;hb=14873dbc3aa249dc5af735c8906be1a19b5f7dda;hpb=2f91ed329f624355043f7c3b6c75a24bb1af07a6 diff --git a/app/src/main/java/net/ktnx/mobileledger/TransactionListActivity.java b/app/src/main/java/net/ktnx/mobileledger/TransactionListActivity.java index 2ccb286c..ac992cdf 100644 --- a/app/src/main/java/net/ktnx/mobileledger/TransactionListActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/TransactionListActivity.java @@ -18,6 +18,7 @@ package net.ktnx.mobileledger; import android.arch.lifecycle.ViewModelProviders; +import android.database.MatrixCursor; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; @@ -28,12 +29,17 @@ import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.Toolbar; import android.util.Log; +import android.view.Menu; +import android.view.MenuItem; import android.view.View; +import android.view.inputmethod.InputMethodManager; +import android.widget.AdapterView; +import android.widget.AutoCompleteTextView; +import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; import net.ktnx.mobileledger.async.RetrieveTransactionsTask; -import net.ktnx.mobileledger.model.LedgerTransaction; import net.ktnx.mobileledger.ui.transaction_list.TransactionListViewModel; import net.ktnx.mobileledger.utils.MLDB; @@ -41,15 +47,20 @@ import java.lang.ref.WeakReference; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.Date; -import java.util.List; public class TransactionListActivity extends AppCompatActivity { public TransactionListViewModel model; + private View bTransactionListCancelDownload; + private MenuItem menuTransactionListFilter; + private View vAccountFilter; private SwipeRefreshLayout swiper; private RecyclerView root; private ProgressBar progressBar; + private LinearLayout progressLayout; private TextView tvLastUpdate; private TransactionListAdapter modelAdapter; + private RetrieveTransactionsTask retrieveTransactionsTask; + private AutoCompleteTextView accNameFilter; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -64,14 +75,16 @@ public class TransactionListActivity extends AppCompatActivity { if (swiper == null) throw new RuntimeException("Can't get hold on the swipe layout"); root = findViewById(R.id.transaction_root); if (root == null) throw new RuntimeException("Can't get hold on the transaction list view"); - progressBar = findViewById(R.id.transaction_progress_bar); + progressBar = findViewById(R.id.transaction_list_progress_bar); if (progressBar == null) throw new RuntimeException("Can't get hold on the transaction list progress bar"); + progressLayout = findViewById(R.id.transaction_progress_layout); + if (progressLayout == null) throw new RuntimeException( + "Can't get hold on the transaction list progress bar layout"); tvLastUpdate = findViewById(R.id.transactions_last_update); updateLastUpdateText(); model = ViewModelProviders.of(this).get(TransactionListViewModel.class); - List transactions = model.getTransactions(this); - modelAdapter = new TransactionListAdapter(transactions); + modelAdapter = new TransactionListAdapter(model); RecyclerView root = findViewById(R.id.transaction_root); root.setAdapter(modelAdapter); @@ -88,7 +101,33 @@ public class TransactionListActivity extends AppCompatActivity { swiper.setColorSchemeResources(R.color.colorPrimary, R.color.colorAccent); -// update_transactions(); + vAccountFilter = findViewById(R.id.transaction_list_account_name_filter); + accNameFilter = findViewById(R.id.transaction_filter_account_name); + bTransactionListCancelDownload = findViewById(R.id.transaction_list_cancel_download); + + MLDB.hook_autocompletion_adapter(this, accNameFilter, "accounts", "name"); + TransactionListActivity me = this; + accNameFilter.setOnItemClickListener(new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + Log.d("tmp", "direct onItemClick"); + model.reloadTransactions(me); + MatrixCursor mc = (MatrixCursor) parent.getItemAtPosition(position); + modelAdapter.setBoldAccountName(mc.getString(1)); + modelAdapter.notifyDataSetChanged(); + me.hideSoftKeyboard(); + } + }); + + updateLastUpdateText(); + long last_update = MLDB.get_option_value(this, MLDB.OPT_TRANSACTION_LIST_STAMP, 0L); + Log.d("transactions", String.format("Last update = %d", last_update)); + if (last_update == 0) { + update_transactions(); + } + else { + model.reloadTransactions(this); + } } private void setupActionBar() { ActionBar actionBar = getSupportActionBar(); @@ -104,19 +143,28 @@ public class TransactionListActivity extends AppCompatActivity { overridePendingTransition(R.anim.dummy, R.anim.slide_out_right); } private void update_transactions() { - RetrieveTransactionsTask task = new RetrieveTransactionsTask(new WeakReference<>(this)); + retrieveTransactionsTask = new RetrieveTransactionsTask(new WeakReference<>(this)); RetrieveTransactionsTask.Params params = new RetrieveTransactionsTask.Params( PreferenceManager.getDefaultSharedPreferences(this)); - task.execute(params); + retrieveTransactionsTask.execute(params); + bTransactionListCancelDownload.setEnabled(true); } public void onRetrieveStart() { progressBar.setIndeterminate(true); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) progressBar.setProgress(0, false); else progressBar.setProgress(0); - progressBar.setVisibility(View.VISIBLE); + progressLayout.setVisibility(View.VISIBLE); + } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.transaction_list, menu); + menuTransactionListFilter = menu.findItem(R.id.menu_transaction_list_filter); + if ((menuTransactionListFilter == null)) throw new AssertionError(); + + return true; } public void onRetrieveProgress(RetrieveTransactionsTask.Progress progress) { if ((progress.getTotal() == RetrieveTransactionsTask.Progress.INDETERMINATE) || @@ -138,10 +186,11 @@ public class TransactionListActivity extends AppCompatActivity { } public void onRetrieveDone(boolean success) { - progressBar.setVisibility(View.INVISIBLE); + progressLayout.setVisibility(View.GONE); swiper.setRefreshing(false); updateLastUpdateText(); if (success) { + Log.d("transactions", "calling notifyDataSetChanged()"); modelAdapter.notifyDataSetChanged(); } } @@ -149,7 +198,9 @@ public class TransactionListActivity extends AppCompatActivity { { long last_update = MLDB.get_option_value(this, MLDB.OPT_TRANSACTION_LIST_STAMP, 0L); Log.d("transactions", String.format("Last update = %d", last_update)); - if (last_update == 0) tvLastUpdate.setText(getString(R.string.transaction_last_update_never)); + if (last_update == 0) { + tvLastUpdate.setText(getString(R.string.transaction_last_update_never)); + } else { Date date = new Date(last_update); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { @@ -162,4 +213,33 @@ public class TransactionListActivity extends AppCompatActivity { } } } + public void onClearAccountNameClick(View view) { + vAccountFilter.setVisibility(View.GONE); + menuTransactionListFilter.setVisible(true); + accNameFilter.setText(null); + model.reloadTransactions(this); + modelAdapter.resetBoldAccountName(); + modelAdapter.notifyDataSetChanged(); + hideSoftKeyboard(); + } + private void hideSoftKeyboard() { + // hide the keyboard + View v = getCurrentFocus(); + if (v != null) { + InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE); + imm.hideSoftInputFromWindow(v.getWindowToken(), 0); + } + } + public void onShowFilterClick(MenuItem menuItem) { + vAccountFilter.setVisibility(View.VISIBLE); + menuTransactionListFilter.setVisible(false); + accNameFilter.requestFocus(); + InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE); + imm.showSoftInput(accNameFilter, 0); + } + public void onStopTransactionRefreshClick(View view) { + Log.d("interactive", "Cancelling transactions refresh"); + if (retrieveTransactionsTask != null) retrieveTransactionsTask.cancel(false); + bTransactionListCancelDownload.setEnabled(false); + } }