remove 'Loading' layout from the main activity

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / activity / MainActivity.java

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 b44c30f270ef6c2b3c77943c6172d48d67388863..091a58fe097cd2f44d6e2ee14ddd70a2af2eb990 100644 (file)
--- 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 © 2019 Damyan Ivanov.
+ * Copyright © 2020 Damyan Ivanov.
  * This file is part of MoLe.
  * MoLe is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
@@ -69,6 +69,7 @@ import net.ktnx.mobileledger.ui.transaction_list.TransactionListViewModel;
 import net.ktnx.mobileledger.utils.Colors;
 import net.ktnx.mobileledger.utils.GetOptCallback;
 import net.ktnx.mobileledger.utils.LockHolder;
+import net.ktnx.mobileledger.utils.Logger;
 import net.ktnx.mobileledger.utils.MLDB;
 
 import org.jetbrains.annotations.NotNull;
@@ -109,6 +110,8 @@ public class MainActivity extends ProfileThemedActivity {
     protected void onStart() {
         super.onStart();
 
+        Logger.debug("MainActivity", "onStart()");
+
         mViewPager.setCurrentItem(mCurrentPage, false);
     }
     @Override
@@ -152,8 +155,9 @@ public class MainActivity extends ProfileThemedActivity {
     }
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        debug("MainActivity", "onCreate()/entry");
         super.onCreate(savedInstanceState);
-        debug("flow", "MainActivity.onCreate()");
+        debug("MainActivity", "onCreate()/after super");
         setContentView(R.layout.activity_main);
 
         fab = findViewById(R.id.btn_add_transaction);
@@ -317,6 +321,13 @@ public class MainActivity extends ProfileThemedActivity {
             };
             drawer.addDrawerListener(drawerListener);
         }
+
+        Data.drawerOpen.observe(this, open -> {
+            if (open)
+                drawer.open();
+            else
+                drawer.close();
+        });
     }
     private void scheduleDataRetrievalIfStale(Date lastUpdate) {
         long now = new Date().getTime();
@@ -345,47 +356,30 @@ public class MainActivity extends ProfileThemedActivity {
             if (!p.isPostingPermitted())
                 continue;
 
-            ShortcutInfo si =
-                    new ShortcutInfo.Builder(this, "new_transaction_" + p.getUuid()).setShortLabel(
-                            p.getName())
-                                                                                    .setIcon(
-                                                                                            Icon.createWithResource(
-                                                                                                    this,
-                                                                                                    R.drawable.svg_thick_plus_white))
-                                                                                    .setIntent(
-                                                                                            new Intent(
-                                                                                                    Intent.ACTION_VIEW,
-                                                                                                    null,
-                                                                                                    this,
-                                                                                                    NewTransactionActivity.class).putExtra(
-                                                                                                    "profile_uuid",
-                                                                                                    p.getUuid()))
-                                                                                    .setRank(i)
-                                                                                    .build();
+            final ShortcutInfo.Builder builder =
+                    new ShortcutInfo.Builder(this, "new_transaction_" + p.getUuid());
+            ShortcutInfo si = builder.setShortLabel(p.getName())
+                                     .setIcon(Icon.createWithResource(this,
+                                             R.drawable.thick_plus_icon))
+                                     .setIntent(new Intent(Intent.ACTION_VIEW, null, this,
+                                             NewTransactionActivity.class).putExtra("profile_uuid",
+                                             p.getUuid()))
+                                     .setRank(i)
+                                     .build();
             shortcuts.add(si);
             i++;
         }
         sm.setDynamicShortcuts(shortcuts);
     }
     private void onProfileListChanged(List<MobileLedgerProfile> newList) {
-        if (newList == null) {
-            // profiles not yet loaded from DB
-            findViewById(R.id.loading_layout).setVisibility(View.VISIBLE);
-            findViewById(R.id.no_profiles_layout).setVisibility(View.GONE);
-            findViewById(R.id.main_app_layout).setVisibility(View.GONE);
-            return;
-        }
-
-        if (newList.isEmpty()) {
+        if ((newList == null) || newList.isEmpty()) {
             findViewById(R.id.no_profiles_layout).setVisibility(View.VISIBLE);
             findViewById(R.id.main_app_layout).setVisibility(View.GONE);
-            findViewById(R.id.loading_layout).setVisibility(View.GONE);
             return;
         }
 
         findViewById(R.id.main_app_layout).setVisibility(View.VISIBLE);
         findViewById(R.id.no_profiles_layout).setVisibility(View.GONE);
-        findViewById(R.id.loading_layout).setVisibility(View.GONE);
 
         findViewById(R.id.nav_profile_list).setMinimumHeight(
                 (int) (getResources().getDimension(R.dimen.thumb_row_height) * newList.size()));
@@ -425,8 +419,6 @@ public class MainActivity extends ProfileThemedActivity {
 
         mProfileListAdapter.notifyDataSetChanged();
 
-        drawer.closeDrawers();
-
         Data.transactions.clear();
         debug("transactions", "requesting list reload");
         TransactionListViewModel.scheduleTransactionListReload();