From 014fb0b99d5954c4335c1d50f6147e0db6dfa216 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 15 May 2019 11:58:36 +0200 Subject: [PATCH] move WifiQrView and SendFDroidView to pure XML views This puts the logic in the "Presenter": SwapWorkflowActivity --- .../fdroid/views/swap/SendFDroidView.java | 45 ------------------- .../views/swap/SwapWorkflowActivity.java | 30 +++++++++++++ .../fdroid/fdroid/views/swap/WifiQrView.java | 44 ------------------ app/src/full/res/layout/swap_send_fdroid.xml | 4 +- app/src/full/res/layout/swap_wifi_qr.xml | 4 +- 5 files changed, 34 insertions(+), 93 deletions(-) delete mode 100644 app/src/full/java/org/fdroid/fdroid/views/swap/SendFDroidView.java delete mode 100644 app/src/full/java/org/fdroid/fdroid/views/swap/WifiQrView.java diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SendFDroidView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SendFDroidView.java deleted file mode 100644 index 307533028..000000000 --- a/app/src/full/java/org/fdroid/fdroid/views/swap/SendFDroidView.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.fdroid.fdroid.views.swap; - -import android.annotation.TargetApi; -import android.content.Context; -import android.util.AttributeSet; -import android.view.View; -import android.widget.Button; -import org.fdroid.fdroid.R; -import org.fdroid.fdroid.localrepo.SwapView; - -public class SendFDroidView extends SwapView { - - private static final String TAG = "SendFDroidView"; - - public SendFDroidView(Context context) { - super(context); - } - - public SendFDroidView(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public SendFDroidView(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - @TargetApi(21) - public SendFDroidView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - } - - @Override - protected void onFinishInflate() { - super.onFinishInflate(); - - Button useBluetooth = (Button) findViewById(R.id.btn_use_bluetooth); - useBluetooth.setOnClickListener(new Button.OnClickListener() { - @Override - public void onClick(View v) { - getActivity().showIntro(); - getActivity().sendFDroidBluetooth(); - } - }); - } -} diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java index 7e278fb00..b1db868dc 100644 --- a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java +++ b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java @@ -36,6 +36,7 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; @@ -506,8 +507,12 @@ public class SwapWorkflowActivity extends AppCompatActivity { switch (currentView.getLayoutResId()) { case R.layout.swap_send_fdroid: + setUpFromWifi(); + setUpUseBluetoothButton(); + break; case R.layout.swap_wifi_qr: setUpFromWifi(); + setUpQrScannerButton(); break; } @@ -969,4 +974,29 @@ public class SwapWorkflowActivity extends AppCompatActivity { } } } + + private void setUpUseBluetoothButton() { + Button useBluetooth = findViewById(R.id.btn_use_bluetooth); + if (useBluetooth != null) { + useBluetooth.setOnClickListener(new Button.OnClickListener() { + @Override + public void onClick(View v) { + showIntro(); + sendFDroidBluetooth(); + } + }); + } + } + + private void setUpQrScannerButton() { + Button openQr = findViewById(R.id.btn_qr_scanner); + if (openQr != null) { + openQr.setOnClickListener(new Button.OnClickListener() { + @Override + public void onClick(View v) { + initiateQrScan(); + } + }); + } + } } diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/WifiQrView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/WifiQrView.java deleted file mode 100644 index cb3b741c3..000000000 --- a/app/src/full/java/org/fdroid/fdroid/views/swap/WifiQrView.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.fdroid.fdroid.views.swap; - -import android.annotation.TargetApi; -import android.content.Context; -import android.util.AttributeSet; -import android.view.View; -import android.widget.Button; -import org.fdroid.fdroid.R; -import org.fdroid.fdroid.localrepo.SwapView; - -public class WifiQrView extends SwapView { - - private static final String TAG = "WifiQrView"; - - public WifiQrView(Context context) { - super(context); - } - - public WifiQrView(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public WifiQrView(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - @TargetApi(21) - public WifiQrView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - } - - @Override - protected void onFinishInflate() { - super.onFinishInflate(); - - Button openQr = (Button) findViewById(R.id.btn_qr_scanner); - openQr.setOnClickListener(new Button.OnClickListener() { - @Override - public void onClick(View v) { - getActivity().initiateQrScan(); - } - }); - } -} diff --git a/app/src/full/res/layout/swap_send_fdroid.xml b/app/src/full/res/layout/swap_send_fdroid.xml index c86099843..d0a8fa371 100644 --- a/app/src/full/res/layout/swap_send_fdroid.xml +++ b/app/src/full/res/layout/swap_send_fdroid.xml @@ -1,6 +1,6 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/full/res/layout/swap_wifi_qr.xml b/app/src/full/res/layout/swap_wifi_qr.xml index 6678e3b84..7e46c10d1 100644 --- a/app/src/full/res/layout/swap_wifi_qr.xml +++ b/app/src/full/res/layout/swap_wifi_qr.xml @@ -1,6 +1,6 @@ - - \ No newline at end of file + \ No newline at end of file