X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2FTransactionListActivity.java;h=2ccb286c1e78a50285c87fc139f16f027292e4fe;hb=2f91ed329f624355043f7c3b6c75a24bb1af07a6;hp=5577d501f05b3d9da7de76ba6d40b0cc3715a16d;hpb=83ab10f246f2475f03dd1240f681ba5aaa84bb46;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/TransactionListActivity.java b/app/src/main/java/net/ktnx/mobileledger/TransactionListActivity.java index 5577d501..2ccb286c 100644 --- a/app/src/main/java/net/ktnx/mobileledger/TransactionListActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/TransactionListActivity.java @@ -44,10 +44,10 @@ import java.util.Date; import java.util.List; public class TransactionListActivity extends AppCompatActivity { + public TransactionListViewModel model; private SwipeRefreshLayout swiper; private RecyclerView root; private ProgressBar progressBar; - public TransactionListViewModel model; private TextView tvLastUpdate; private TransactionListAdapter modelAdapter; @Override @@ -70,7 +70,7 @@ public class TransactionListActivity extends AppCompatActivity { tvLastUpdate = findViewById(R.id.transactions_last_update); updateLastUpdateText(); model = ViewModelProviders.of(this).get(TransactionListViewModel.class); - List transactions = model.getTransactions(getApplicationContext()); + List transactions = model.getTransactions(this); modelAdapter = new TransactionListAdapter(transactions); RecyclerView root = findViewById(R.id.transaction_root); @@ -138,7 +138,7 @@ public class TransactionListActivity extends AppCompatActivity { } public void onRetrieveDone(boolean success) { - progressBar.setVisibility(View.GONE); + progressBar.setVisibility(View.INVISIBLE); swiper.setRefreshing(false); updateLastUpdateText(); if (success) { @@ -149,7 +149,7 @@ 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("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) {