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=7e9469a296524d706f8fa7adb3cc6e147458a269;hb=2e6d7c5f759986f89a867ee5b9162496019d5130;hpb=32147725c77f956d37c62a7e50709ec3839586c6

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 7e9469a2..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
@@ -51,11 +51,7 @@ import net.ktnx.mobileledger.utils.MLDB;
 
 import java.lang.ref.WeakReference;
 import java.text.DateFormat;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
 import java.util.Date;
-import java.util.Observable;
-import java.util.Observer;
 
 public class MainActivity extends AppCompatActivity {
     public MobileLedgerListFragment currentFragment = null;
@@ -96,15 +92,12 @@ public class MainActivity extends AppCompatActivity {
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        Data.profile.addObserver(new Observer() {
-            @Override
-            public void update(Observable o, Object arg) {
-                MobileLedgerProfile profile = Data.profile.get();
-                runOnUiThread(() -> {
-                    if (profile == null) toolbar.setSubtitle("");
-                    else toolbar.setSubtitle(profile.getName());
-                });
-            }
+        Data.profile.addObserver((o, arg) -> {
+            MobileLedgerProfile profile = Data.profile.get();
+            runOnUiThread(() -> {
+                if (profile == null) setTitle(R.string.app_name);
+                else setTitle(profile.getName());
+            });
         });
 
         setupProfile();
@@ -168,13 +161,9 @@ public class MainActivity extends AppCompatActivity {
                     tvLastUpdate.setText(R.string.transaction_last_update_never);
                 }
                 else {
-                    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(DateFormat.getDateTimeInstance().format(date));
-                    }
+                    final String text = DateFormat.getDateTimeInstance().format(date);
+                    tvLastUpdate.setText(text);
+                    Log.d("despair", String.format("Date formatted: %s", text));
                 }
             });
         });
@@ -215,8 +204,7 @@ public class MainActivity extends AppCompatActivity {
 
         if (profile == null) throw new AssertionError("profile must have a value");
 
-        Data.profile.set(profile);
-        MLDB.set_option_value(MLDB.OPT_PROFILE_UUID, profile.getUuid());
+        Data.setCurrentProfile(profile);
 
         if (profile.getUrl().isEmpty()) {
             Intent intent = new Intent(this, ProfileListActivity.class);
@@ -252,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);
@@ -264,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();
 
@@ -296,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) {