Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move NfcView to pure XML view

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2019-05-15 14:18:21 +02:00
parent a9aafa080d
commit 5ddc287ab3
3 changed files with 16 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/src/full/java/org/fdroid/fdroid/views/swap/NfcView.java
View File

@ -1,42 +0,0 @@
package org.fdroid.fdroid.views.swap;
import android.annotation.TargetApi;
import android.content.Context;
import android.util.AttributeSet;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import org.fdroid.fdroid.Preferences;
import org.fdroid.fdroid.R;
import org.fdroid.fdroid.localrepo.SwapView;
public class NfcView extends SwapView {
public NfcView(Context context) {
super(context);
}
public NfcView(Context context, AttributeSet attrs) {
super(context, attrs);
}
public NfcView(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
@TargetApi(21)
public NfcView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
}
@Override
protected void onFinishInflate() {
super.onFinishInflate();
CheckBox dontShowAgain = (CheckBox) findViewById(R.id.checkbox_dont_show);
dontShowAgain.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
Preferences.get().setShowNfcDuringSwap(!isChecked);
}
});
}
}

14
app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
View File

@ -506,6 +506,9 @@ public class SwapWorkflowActivity extends AppCompatActivity {
setUpFromWifi(); setUpFromWifi();
setUpQrScannerButton(); setUpQrScannerButton();
break; break;
case R.layout.swap_nfc:
setUpNfcView();
break;
} }
return currentView; return currentView;
@ -1051,4 +1054,15 @@ public class SwapWorkflowActivity extends AppCompatActivity {
}); });
} }
} }
private void setUpNfcView() {
CheckBox dontShowAgain = container.findViewById(R.id.checkbox_dont_show);
dontShowAgain.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
Preferences.get().setShowNfcDuringSwap(!isChecked);
}
});
}
} }

4
app/src/full/res/layout/swap_nfc.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<org.fdroid.fdroid.views.swap.NfcView <org.fdroid.fdroid.localrepo.SwapView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:swap="http://schemas.android.com/apk/res-auto" xmlns:swap="http://schemas.android.com/apk/res-auto"
swap:toolbarTitle="@string/swap_nfc_title" swap:toolbarTitle="@string/swap_nfc_title"
@ -35,4 +35,4 @@
android:layout_below="@+id/text_description" android:layout_below="@+id/text_description"
android:layout_centerHorizontal="true"/> android:layout_centerHorizontal="true"/>
</org.fdroid.fdroid.views.swap.NfcView> </org.fdroid.fdroid.localrepo.SwapView>