hide receive button before wallet is loaded (#115)

m2049r · Nov 4, 2017 · cfb3c23 · cfb3c23
1 parent 2cb87ba
commit cfb3c23
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 38
-        versionName "1.1.7"
+        versionCode 39
+        versionName "1.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {

diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
@@ -447,6 +447,16 @@ public void run() {
         } else {
             haveWallet = true;
             invalidateOptionsMenu();
+
+            final WalletFragment walletFragment = (WalletFragment)
+                    getSupportFragmentManager().findFragmentById(R.id.fragment_container);
+            runOnUiThread(new Runnable() {
+                public void run() {
+                    if (walletFragment != null) {
+                        walletFragment.onLoaded();
+                    }
+                }
+            });
         }
     }
 

diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java b/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java
@@ -244,6 +244,20 @@ public void onSynced() {
         }
     }
 
+    boolean walletLoaded = false;
+
+    public void onLoaded() {
+        walletLoaded = true;
+        showReceive();
+    }
+
+    private void showReceive() {
+        if (walletLoaded) {
+            bReceive.setVisibility(View.VISIBLE);
+            bReceive.setEnabled(true);
+        }
+    }
+
     public void setProgressText(final String text) {
         tvProgress.setText(text);
     }
@@ -373,5 +387,6 @@ public void onResume() {
         Log.d(TAG, "onResume()");
         activityCallback.setTitle(walletTitle, walletSubtitle);
         activityCallback.setToolbarButton(Toolbar.BUTTON_CLOSE);
+        showReceive();
     }
 }
diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml
@@ -137,11 +137,11 @@
                 android:layout_margin="8dp"
                 android:layout_weight="1"
                 android:drawableStart="@drawable/ic_hand"
-                android:enabled="true"
+                android:enabled="false"
                 android:paddingEnd="16dp"
                 android:paddingStart="16dp"
                 android:text="@string/label_wallet_receive"
-                android:visibility="visible" />
+                android:visibility="invisible" />
 
             <Button
                 android:id="@+id/bSend"
@@ -151,7 +151,7 @@
                 android:layout_margin="8dp"
                 android:layout_weight="1"
                 android:drawableStart="@drawable/ic_send"
-                android:enabled="true"
+                android:enabled="false"
                 android:paddingEnd="16dp"
                 android:paddingStart="16dp"
                 android:text="@string/label_wallet_send"