]> git.ktnx.net Git - mobile-ledger.git/blobdiff - app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
remove unused members
[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / activity / MainActivity.java
index 7e9469a296524d706f8fa7adb3cc6e147458a269..1ccdf3cae03ec113ab375a9cd23d0206dfa4960a 100644 (file)
@@ -37,6 +37,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import net.ktnx.mobileledger.R;
 import net.ktnx.mobileledger.async.RefreshDescriptionsTask;
@@ -44,24 +45,16 @@ import net.ktnx.mobileledger.async.RetrieveTransactionsTask;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.LedgerAccount;
 import net.ktnx.mobileledger.model.MobileLedgerProfile;
-import net.ktnx.mobileledger.ui.MobileLedgerListFragment;
 import net.ktnx.mobileledger.ui.account_summary.AccountSummaryFragment;
 import net.ktnx.mobileledger.ui.transaction_list.TransactionListFragment;
 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;
     DrawerLayout drawer;
-    private AccountSummaryFragment accountSummaryFragment;
-    private TransactionListFragment transactionListFragment;
     private FragmentManager fragmentManager;
     private TextView tvLastUpdate;
     private RetrieveTransactionsTask retrieveTransactionsTask;
@@ -96,15 +89,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();
@@ -116,7 +106,7 @@ public class MainActivity extends AppCompatActivity {
         drawer.addDrawerListener(toggle);
         toggle.syncState();
 
-        android.widget.TextView ver = drawer.findViewById(R.id.drawer_version_text);
+        TextView ver = drawer.findViewById(R.id.drawer_version_text);
 
         try {
             PackageInfo pi =
@@ -168,22 +158,17 @@ 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));
                 }
             });
         });
     }
     private void setupProfile() {
-        Data.profiles.setList(MobileLedgerProfile.loadAllFromDB());
-        MobileLedgerProfile profile = null;
+        String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null);
+        MobileLedgerProfile profile;
 
-        String profileUUID = MLDB.get_option_value(MLDB.OPT_PROFILE_UUID, null);
         if (profileUUID == null) {
             if (Data.profiles.isEmpty()) {
                 Data.profiles.setList(MobileLedgerProfile.createInitialProfileList());
@@ -206,17 +191,17 @@ public class MainActivity extends AppCompatActivity {
                 editor.clear();
                 editor.apply();
             }
+            else profile = Data.profiles.get(0);
         }
         else {
-            profile = MobileLedgerProfile.loadUUIDFromDB(profileUUID);
+            profile = MobileLedgerProfile.loadAllFromDB(profileUUID);
         }
 
         if (profile == null) profile = Data.profiles.get(0);
 
         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);
@@ -227,18 +212,12 @@ public class MainActivity extends AppCompatActivity {
             startActivity(intent, args);
         }
     }
-    public void fab_new_transaction_clicked(View view) {
+    public void fabNewTransactionClicked(View view) {
         Intent intent = new Intent(this, NewTransactionActivity.class);
         startActivity(intent);
         overridePendingTransition(R.anim.slide_in_right, R.anim.dummy);
     }
-
-    public void nav_exit_clicked(View view) {
-        Log.w("app", "exiting");
-        finish();
-    }
-
-    public void nav_settings_clicked(View view) {
+    public void navSettingsClicked(View view) {
         Intent intent = new Intent(this, SettingsActivity.class);
         startActivity(intent);
         drawer.closeDrawers();
@@ -246,14 +225,12 @@ public class MainActivity extends AppCompatActivity {
     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()));
+            item.setBackgroundColor(getResources().getColor(R.color.table_row_dark_bg, getTheme()));
         }
         else {
-            item.setBackgroundColor(getResources().getColor(R.color.table_row_even_bg));
+            item.setBackgroundColor(getResources().getColor(R.color.table_row_dark_bg));
         }
 
-        setTitle(item.getText());
-
         @ColorInt int transparent = getResources().getColor(android.R.color.transparent);
 
         LinearLayout actions = drawer.findViewById(R.id.nav_actions);
@@ -264,16 +241,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();
 
@@ -281,6 +248,7 @@ public class MainActivity extends AppCompatActivity {
     }
     private void showAccountSummaryFragment() {
         mViewPager.setCurrentItem(0, true);
+        TransactionListFragment.accountFilter.set(null);
 //        FragmentTransaction ft = fragmentManager.beginTransaction();
 //        accountSummaryFragment = new AccountSummaryFragment();
 //        ft.replace(R.id.root_frame, accountSummaryFragment);
@@ -296,6 +264,7 @@ public class MainActivity extends AppCompatActivity {
 //        fragmentManager.popBackStack(0, FragmentManager.POP_BACK_STACK_INCLUSIVE);
     }
     private void showTransactionsFragment(LedgerAccount account) {
+        if (account != null) TransactionListFragment.accountFilter.set(account.getName());
         mViewPager.setCurrentItem(1, true);
 //        FragmentTransaction ft = fragmentManager.beginTransaction();
 //        if (transactionListFragment == null) {
@@ -333,7 +302,7 @@ public class MainActivity extends AppCompatActivity {
     }
     public void updateLastUpdateTextFromDB() {
         {
-            long last_update = Data.profile.get().get_option_value(MLDB.OPT_LAST_SCRAPE, 0L);
+            long last_update = Data.profile.get().getLongOption(MLDB.OPT_LAST_SCRAPE, 0L);
 
             Log.d("transactions", String.format("Last update = %d", last_update));
             if (last_update == 0) {
@@ -355,11 +324,15 @@ public class MainActivity extends AppCompatActivity {
         if (retrieveTransactionsTask != null) retrieveTransactionsTask.cancel(false);
         bTransactionListCancelDownload.setEnabled(false);
     }
-    public void onRetrieveDone(boolean success) {
+    public void onRetrieveDone(String error) {
         progressLayout.setVisibility(View.GONE);
-        updateLastUpdateTextFromDB();
 
-        new RefreshDescriptionsTask().execute();
+        if (error == null) {
+            updateLastUpdateTextFromDB();
+
+            new RefreshDescriptionsTask().execute();
+        }
+        else Toast.makeText(this, error, Toast.LENGTH_LONG).show();
     }
     public void onRetrieveStart() {
         progressBar.setIndeterminate(true);
@@ -385,7 +358,7 @@ public class MainActivity extends AppCompatActivity {
             progressBar.setIndeterminate(false);
         }
     }
-    public void nav_profiles_clicked(View view) {
+    public void navProfilesClicked(View view) {
         drawer.closeDrawers();
         Intent intent = new Intent(this, ProfileListActivity.class);
         startActivity(intent);