Mirrors
/
xmrwallet
mirror of https://github.com/m2049r/xmrwallet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32 from m2049r/bugfix_scanbutton 

fix scan button enable/disable
This commit is contained in:
m2049r 2017-08-31 18:48:27 +02:00 committed by GitHub
parent 49e338e80d 93ec3865da
commit e0439a1359
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -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 {

8
app/src/main/java/com/m2049r/xmrwallet/SendFragment.java
View File

@ -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 class SendFragment extends Fragment {
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 class SendFragment extends Fragment {
}
});
bAddress.setOnClickListener(new View.OnClickListener() {
bScan.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
activityCallback.onScanAddress();
@ -321,6 +321,7 @@ public class SendFragment extends Fragment {
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 @@ public class SendFragment extends Fragment {
etAddress.setEnabled(true);
etPaymentId.setEnabled(true);
etAmount.setEnabled(true);
bScan.setEnabled(true);
bPaymentId.setEnabled(true);
bSweep.setEnabled(true);
bPrepareSend.setEnabled(true);

2
app/src/main/res/layout/send_fragment.xml
View File

@ -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"