X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=b98ccbe06678921a4cbdf04752842123cd3db89a;hp=52436c4d85b55bac04bb7afb296f9b2e539999b7;hb=05efd84b433be55e8992fe87e31912d9d57c2362;hpb=d14edf52b78a295408db62145dd321414fea8513 diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java index 52436c4d..b98ccbe0 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java @@ -1,5 +1,5 @@ /* - * Copyright © 2018 Damyan Ivanov. + * Copyright © 2019 Damyan Ivanov. * This file is part of Mobile-Ledger. * Mobile-Ledger is free software: you can distribute it and/or modify it * under the term of the GNU General Public License as published by @@ -21,6 +21,7 @@ import android.content.Intent; import android.content.pm.PackageInfo; import android.os.Build; import android.os.Bundle; +import android.support.annotation.ColorInt; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; @@ -34,16 +35,25 @@ import android.view.ContextMenu; import android.view.MenuItem; import android.view.View; import android.widget.LinearLayout; +import android.widget.TextView; -import net.ktnx.mobileledger.ui.account_summary.AccountSummaryFragment; import net.ktnx.mobileledger.R; +import net.ktnx.mobileledger.model.LedgerAccount; +import net.ktnx.mobileledger.ui.account_summary.AccountSummaryFragment; import net.ktnx.mobileledger.ui.transaction_list.TransactionListFragment; +import net.ktnx.mobileledger.utils.MLDB; + +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.util.Date; public class MainActivity extends AppCompatActivity { DrawerLayout drawer; private AccountSummaryFragment accountSummaryFragment; private TransactionListFragment transactionListFragment; private Fragment currentFragment = null; + private FragmentManager fragmentManager; + private TextView tvLastUpdate; @Override protected void onCreate(Bundle savedInstanceState) { @@ -70,33 +80,16 @@ public class MainActivity extends AppCompatActivity { e.printStackTrace(); } - onAccountSummaryClicked(null); - } + tvLastUpdate = findViewById(R.id.transactions_last_update); + updateLastUpdateText(); + long last_update = MLDB.get_option_value(MLDB.OPT_TRANSACTION_LIST_STAMP, 0L); + Log.d("transactions", String.format("Last update = %d", last_update)); - @Override - protected void onStart() { - super.onStart(); - LinearLayout grp = drawer.findViewById(R.id.nav_actions); - for (int i = 0; i < grp.getChildCount(); i++) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - grp.getChildAt(i).setBackgroundColor( - getResources().getColor(R.color.drawer_background, getTheme())); - } - else { - grp.getChildAt(i) - .setBackgroundColor(getResources().getColor(R.color.drawer_background)); - } - } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - drawer.findViewById(R.id.nav_account_summary).setBackgroundColor( - getResources().getColor(R.color.table_row_even_bg, getTheme())); - } - else { - drawer.findViewById(R.id.nav_account_summary) - .setBackgroundColor(getResources().getColor(R.color.table_row_even_bg)); - } - } + fragmentManager = getSupportFragmentManager(); + + onAccountSummaryClicked(null); + } public void fab_new_transaction_clicked(View view) { Intent intent = new Intent(this, NewTransactionActivity.class); startActivity(intent); @@ -112,8 +105,8 @@ public class MainActivity extends AppCompatActivity { Intent intent = new Intent(this, SettingsActivity.class); startActivity(intent); } - private void markDrawerItemCurrent(int id) { - View item = drawer.findViewById(id); + public void markDrawerItemCurrent(int id) { + TextView item = drawer.findViewById(id); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { item.setBackgroundColor(getResources().getColor(R.color.table_row_even_bg, getTheme())); } @@ -121,11 +114,15 @@ public class MainActivity extends AppCompatActivity { item.setBackgroundColor(getResources().getColor(R.color.table_row_even_bg)); } + setTitle(item.getText()); + + @ColorInt int transparent = getResources().getColor(android.R.color.transparent); + LinearLayout actions = drawer.findViewById(R.id.nav_actions); for (int i = 0; i < actions.getChildCount(); i++) { View view = actions.getChildAt(i); if (view.getId() != id) { - view.setBackgroundColor(getResources().getColor(android.R.color.transparent)); + view.setBackgroundColor(transparent); } } } @@ -163,24 +160,50 @@ public class MainActivity extends AppCompatActivity { } } public void onAccountSummaryClicked(View view) { - markDrawerItemCurrent(R.id.nav_account_summary); drawer.closeDrawers(); - FragmentManager fm = getSupportFragmentManager(); - FragmentTransaction ft = fm.beginTransaction(); - currentFragment = accountSummaryFragment = new AccountSummaryFragment(); + resetFragmentBackStack(); + + showAccountSummaryFragment(); + } + private void showAccountSummaryFragment() { + FragmentTransaction ft = fragmentManager.beginTransaction(); + accountSummaryFragment = new AccountSummaryFragment(); ft.replace(R.id.root_frame, accountSummaryFragment); ft.commit(); + currentFragment = accountSummaryFragment; } public void onLatestTransactionsClicked(View view) { - markDrawerItemCurrent(R.id.nav_latest_transactions); drawer.closeDrawers(); - FragmentManager fm = getSupportFragmentManager(); - FragmentTransaction ft = fm.beginTransaction(); - currentFragment = transactionListFragment = new TransactionListFragment(); + resetFragmentBackStack(); + + showTransactionsFragment(null); + } + private void resetFragmentBackStack() { +// fragmentManager.popBackStack(0, FragmentManager.POP_BACK_STACK_INCLUSIVE); + } + private void showTransactionsFragment(LedgerAccount account) { + FragmentTransaction ft = fragmentManager.beginTransaction(); + if (transactionListFragment == null) { + Log.d("flow", "MainActivity creating TransactionListFragment"); + transactionListFragment = new TransactionListFragment(); + } + Bundle bundle = new Bundle(); + if (account != null) { + bundle.putString(TransactionListFragment.BUNDLE_KEY_FILTER_ACCOUNT_NAME, + account.getName()); + } + transactionListFragment.setArguments(bundle); ft.replace(R.id.root_frame, transactionListFragment); + if (account != null) + ft.addToBackStack(getResources().getString(R.string.title_activity_transaction_list)); ft.commit(); + + currentFragment = transactionListFragment; + } + public void showAccountTransactions(LedgerAccount account) { + showTransactionsFragment(account); } @Override public void onBackPressed() { @@ -189,8 +212,30 @@ public class MainActivity extends AppCompatActivity { drawer.closeDrawer(GravityCompat.START); } else { + Log.d("fragments", + String.format("manager stack: %d", fragmentManager.getBackStackEntryCount())); + super.onBackPressed(); } } + public void updateLastUpdateText() { + { + long last_update = MLDB.get_option_value(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)); + } + else { + Date date = new Date(last_update); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + tvLastUpdate.setText(date.toInstant().atZone(ZoneId.systemDefault()) + .format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)); + } + else { + tvLastUpdate.setText(date.toLocaleString()); + } + } + } + } }