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=f16de22d84b3cce63e07118f063fea6afe5d5c39;hp=a22d9891824a70e9b59bda2cc8b0f4bf81d0d979;hb=2e6d7c5f759986f89a867ee5b9162496019d5130;hpb=c61d93caae92d1ef74d47842dc3f9d312ac5ec90 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 a22d9891..f16de22d 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 @@ -95,8 +95,8 @@ public class MainActivity extends AppCompatActivity { Data.profile.addObserver((o, arg) -> { MobileLedgerProfile profile = Data.profile.get(); runOnUiThread(() -> { - if (profile == null) toolbar.setSubtitle(""); - else toolbar.setSubtitle(profile.getName()); + if (profile == null) setTitle(R.string.app_name); + else setTitle(profile.getName()); }); }); @@ -240,8 +240,6 @@ 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); @@ -252,16 +250,6 @@ public class MainActivity extends AppCompatActivity { } } } - public void onViewClicked(View view) { - switch (view.getId()) { - case R.id.clearAccountNameFilter: - if (transactionListFragment != null) - transactionListFragment.onClearAccountNameClick(view); - break; - default: - Log.e("click", String.format("View %d click not handled", view.getId())); - } - } public void onAccountSummaryClicked(View view) { drawer.closeDrawers(); @@ -284,6 +272,7 @@ public class MainActivity extends AppCompatActivity { // fragmentManager.popBackStack(0, FragmentManager.POP_BACK_STACK_INCLUSIVE); } private void showTransactionsFragment(LedgerAccount account) { + TransactionListFragment.accountFilter.set(account.getName()); mViewPager.setCurrentItem(1, true); // FragmentTransaction ft = fragmentManager.beginTransaction(); // if (transactionListFragment == null) {