Merge pull request #32 from m2049r/bugfix_scanbutton

fix scan button enable/disable
m2049r · Aug 31, 2017 · e0439a1 · e0439a1
2 parents 49e338e + 93ec386
commit e0439a1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 9
-        versionName "0.5.2"
+        versionCode 10
+        versionName "0.5.3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {

diff --git a/app/src/main/java/com/m2049r/xmrwallet/SendFragment.java b/app/src/main/java/com/m2049r/xmrwallet/SendFragment.java
@@ -51,7 +51,7 @@ public class SendFragment extends Fragment {
     EditText etAddress;
     EditText etPaymentId;
     EditText etAmount;
-    Button bAddress;
+    Button bScan;
     Button bSweep;
     Spinner sMixin;
     Spinner sPriority;
@@ -84,7 +84,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         etAddress = (EditText) view.findViewById(R.id.etAddress);
         etPaymentId = (EditText) view.findViewById(R.id.etPaymentId);
         etAmount = (EditText) view.findViewById(R.id.etAmount);
-        bAddress = (Button) view.findViewById(R.id.bAddress);
+        bScan = (Button) view.findViewById(R.id.bScan);
         bSweep = (Button) view.findViewById(R.id.bSweep);
         bPrepareSend = (Button) view.findViewById(R.id.bPrepareSend);
         bPaymentId = (Button) view.findViewById(R.id.bPaymentId);
@@ -199,7 +199,7 @@ public void onClick(View v) {
             }
         });
 
-        bAddress.setOnClickListener(new View.OnClickListener() {
+        bScan.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 activityCallback.onScanAddress();
@@ -321,6 +321,7 @@ private void disableEdit() {
         etAddress.setEnabled(false);
         etPaymentId.setEnabled(false);
         etAmount.setEnabled(false);
+        bScan.setEnabled(false);
         bPaymentId.setEnabled(false);
         bSweep.setEnabled(false);
         bPrepareSend.setEnabled(false);
@@ -332,6 +333,7 @@ private void enableEdit() {
         etAddress.setEnabled(true);
         etPaymentId.setEnabled(true);
         etAmount.setEnabled(true);
+        bScan.setEnabled(true);
         bPaymentId.setEnabled(true);
         bSweep.setEnabled(true);
         bPrepareSend.setEnabled(true);

diff --git a/app/src/main/res/layout/send_fragment.xml b/app/src/main/res/layout/send_fragment.xml
@@ -52,7 +52,7 @@
                 android:textSize="16sp" />
 
             <Button
-                android:id="@+id/bAddress"
+                android:id="@+id/bScan"
                 android:layout_width="0sp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"