package net.ktnx.mobileledger.ui.transaction_list;
-import android.arch.lifecycle.ViewModelProviders;
import android.content.Context;
import android.database.MatrixCursor;
import android.os.Bundle;
import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.InputMethodManager;
-import android.widget.AdapterView;
import android.widget.AutoCompleteTextView;
+import android.widget.Toast;
import net.ktnx.mobileledger.R;
import net.ktnx.mobileledger.model.Data;
import net.ktnx.mobileledger.ui.activity.MainActivity;
import net.ktnx.mobileledger.utils.Globals;
import net.ktnx.mobileledger.utils.MLDB;
+import net.ktnx.mobileledger.utils.ObservableValue;
import java.util.Observable;
import java.util.Observer;
public class TransactionListFragment extends MobileLedgerListFragment {
public static final String BUNDLE_KEY_FILTER_ACCOUNT_NAME = "filter_account_name";
+ public static ObservableValue<String> accountFilter = new ObservableValue<>();
private String mShowOnlyAccountName;
private MenuItem menuTransactionListFilter;
private View vAccountFilter;
private AutoCompleteTextView accNameFilter;
+ private Observer backgroundTaskCountObserver;
private static void update(Observable o, Object arg) {
}
+ @Override
+ public void onDestroy() {
+ if (backgroundTaskCountObserver != null) {
+ Log.d("rtl", "destroying background task count observer");
+ Data.backgroundTaskCount.deleteObserver(backgroundTaskCountObserver);
+ }
+ super.onDestroy();
+ }
public void setShowOnlyAccountName(String mShowOnlyAccountName) {
this.mShowOnlyAccountName = mShowOnlyAccountName;
if (modelAdapter != null) {
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setHasOptionsMenu(true);
+ if (backgroundTaskCountObserver == null) {
+ Log.d("rtl", "creating background task count observer");
+ Data.backgroundTaskCount.addObserver(backgroundTaskCountObserver = new Observer() {
+ @Override
+ public void update(Observable o, Object arg) {
+ mActivity.runOnUiThread(() -> {
+ int cnt = Data.backgroundTaskCount.get();
+ Log.d("trl", String.format("background task count changed to %d", cnt));
+ swiper.setRefreshing(cnt > 0);
+ });
+ }
+ });
+ }
}
@Override
public void onAttach(Context context) {
@Nullable Bundle savedInstanceState) {
return inflater.inflate(R.layout.transaction_list_fragment, container, false);
}
-
+ @Override
+ public void onResume() {
+ super.onResume();
+ Log.d("flow", "TransactionListFragment.onResume()");
+ }
+ @Override
+ public void onStop() {
+ super.onStop();
+ Log.d("flow", "TransactionListFragment.onStop()");
+ }
+ @Override
+ public void onPause() {
+ super.onPause();
+ Log.d("flow", "TransactionListFragment.onPause()");
+ }
@Override
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
Log.d("flow", "TransactionListFragment.onActivityCreated called");
super.onActivityCreated(savedInstanceState);
- mActivity.markDrawerItemCurrent(R.id.nav_latest_transactions);
-
swiper = mActivity.findViewById(R.id.transaction_swipe);
if (swiper == null) throw new RuntimeException("Can't get hold on the swipe layout");
root = mActivity.findViewById(R.id.transaction_root);
if (root == null)
throw new RuntimeException("Can't get hold on the transaction value view");
- model = ViewModelProviders.of(this).get(TransactionListViewModel.class);
modelAdapter = new TransactionListAdapter();
modelAdapter.setBoldAccountName(mShowOnlyAccountName);
+ root.setAdapter(modelAdapter);
FloatingActionButton fab = mActivity.findViewById(R.id.btn_add_transaction);
- RecyclerView root = mActivity.findViewById(R.id.transaction_root);
- root.setAdapter(modelAdapter);
-
- fab.show();
+ mActivity.fabShouldShow();
root.addOnScrollListener(new RecyclerView.OnScrollListener() {
@Override
public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
- if (fab != null) {
- if (dy < 0) fab.show();
- if (dy > 0) fab.hide();
- }
+ if (dy < 0) mActivity.fabShouldShow();
+ if (dy > 0) fab.hide();
}
});
swiper.setOnRefreshListener(() -> {
Log.d("ui", "refreshing transactions via swipe");
- mActivity.update_transactions();
+ mActivity.scheduleTransactionListRetrieval();
});
swiper.setColorSchemeResources(R.color.colorPrimary, R.color.colorAccent);
accNameFilter = mActivity.findViewById(R.id.transaction_filter_account_name);
TransactionListFragment me = this;
- MLDB.hook_autocompletion_adapter(mActivity, accNameFilter, "accounts", "name");
- accNameFilter.setOnItemClickListener(new AdapterView.OnItemClickListener() {
- @Override
- public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
- Log.d("tmp", "direct onItemClick");
- ((TransactionListViewModel) model).scheduleTransactionListReload(mActivity);
- MatrixCursor mc = (MatrixCursor) parent.getItemAtPosition(position);
- modelAdapter.setBoldAccountName(mc.getString(1));
- modelAdapter.notifyDataSetChanged();
- Globals.hideSoftKeyboard(mActivity);
- }
+ MLDB.hookAutocompletionAdapter(mActivity, accNameFilter, "accounts", "name", true);
+ accNameFilter.setOnItemClickListener((parent, view, position, id) -> {
+// Log.d("tmp", "direct onItemClick");
+ TransactionListViewModel.scheduleTransactionListReload();
+ MatrixCursor mc = (MatrixCursor) parent.getItemAtPosition(position);
+ accountFilter.set(mc.getString(1));
+ Globals.hideSoftKeyboard(mActivity);
});
- if (mShowOnlyAccountName != null) {
- accNameFilter.setText(mShowOnlyAccountName, false);
- onShowFilterClick(null);
- Log.d("flow", String.format("Account filter set to '%s'", mShowOnlyAccountName));
- }
-
- TransactionListViewModel.scheduleTransactionListReload(mActivity);
- TransactionListViewModel.updating.addObserver(new Observer() {
- @Override
- public void update(Observable o, Object arg) {
- swiper.setRefreshing(TransactionListViewModel.updating.get());
- }
+ accountFilter.addObserver((o, arg) -> {
+ String accountName = accountFilter.get();
+ modelAdapter.setBoldAccountName(accountName);
+ setShowOnlyAccountName(accountName);
+ TransactionListViewModel.scheduleTransactionListReload();
+ if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(false);
});
- Data.transactions.addObserver(new Observer() {
+ Data.profile.addObserver((o, arg) -> mActivity.runOnUiThread(() -> {
+ Log.d("transactions", "requesting list reload");
+ TransactionListViewModel.scheduleTransactionListReload();
+ }));
+
+ TransactionListViewModel.scheduleTransactionListReload();
+ TransactionListViewModel.updating.addObserver(
+ (o, arg) -> swiper.setRefreshing(TransactionListViewModel.updating.get()));
+ TransactionListViewModel.updateError.addObserver(new Observer() {
@Override
public void update(Observable o, Object arg) {
- mActivity.runOnUiThread(new Runnable() {
- @Override
- public void run() {
- modelAdapter.notifyDataSetChanged();
- }
- });
+ String err = TransactionListViewModel.updateError.get();
+ if (err == null) return;
+
+ Toast.makeText(mActivity, err, Toast.LENGTH_SHORT).show();
+ TransactionListViewModel.updateError.set(null);
}
});
+ Data.transactions.addObserver(
+ (o, arg) -> mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged()));
+
+ mActivity.findViewById(R.id.clearAccountNameFilter).setOnClickListener(v -> {
+ vAccountFilter.setVisibility(View.GONE);
+ if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(true);
+ accountFilter.set(null);
+ accNameFilter.setText(null);
+ TransactionListViewModel.scheduleTransactionListReload();
+ Globals.hideSoftKeyboard(mActivity);
+ });
}
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
}
super.onCreateOptionsMenu(menu, inflater);
- }
- public void onClearAccountNameClick(View view) {
- vAccountFilter.setVisibility(View.GONE);
- if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(true);
- accNameFilter.setText(null);
- mShowOnlyAccountName = null;
- modelAdapter.resetBoldAccountName();
- TransactionListViewModel.scheduleTransactionListReload(mActivity);
- Globals.hideSoftKeyboard(mActivity);
- }
- public void onShowFilterClick(MenuItem menuItem) {
- vAccountFilter.setVisibility(View.VISIBLE);
- if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(false);
- if (menuItem != null) {
+ menuTransactionListFilter.setOnMenuItemClickListener(item -> {
+ vAccountFilter.setVisibility(View.VISIBLE);
+ if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(false);
accNameFilter.requestFocus();
InputMethodManager imm =
(InputMethodManager) mActivity.getSystemService(INPUT_METHOD_SERVICE);
imm.showSoftInput(accNameFilter, 0);
- }
+
+ return true;
+ });
}
}
\ No newline at end of file
projects / mobile-ledger.git / blobdiff