From 6d1fc68ff12b5cb39ad0c6e3356fd028cdb463f8 Mon Sep 17 00:00:00 2001 From: jif Date: Thu, 1 Mar 2018 18:40:30 +0100 Subject: [PATCH] Call to the camera autofocus checker in the view --- .../java/org/fdroid/fdroid/views/swap/WifiQrView.java | 10 ++++++++++ app/src/main/res/layout/swap_wifi_qr.xml | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/WifiQrView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/WifiQrView.java index 9212addde..dd73267c6 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/swap/WifiQrView.java +++ b/app/src/main/java/org/fdroid/fdroid/views/swap/WifiQrView.java @@ -29,6 +29,7 @@ import org.fdroid.fdroid.R; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.localrepo.SwapService; import org.fdroid.fdroid.net.WifiStateChangeService; +import org.fdroid.fdroid.views.swap.device.camera.CameraCharacteristicsChecker; import java.net.URI; import java.util.List; @@ -63,6 +64,7 @@ public class WifiQrView extends ScrollView implements SwapWorkflowActivity.Inner protected void onFinishInflate() { super.onFinishInflate(); setUIFromWifi(); + setUpWarningMessageQrScan(); ImageView qrImage = (ImageView) findViewById(R.id.wifi_qr_code); @@ -81,6 +83,14 @@ public class WifiQrView extends ScrollView implements SwapWorkflowActivity.Inner onWifiStateChanged, new IntentFilter(WifiStateChangeService.BROADCAST)); } + private void setUpWarningMessageQrScan() { + final View qrWarnningMessage = findViewById(R.id.warning_qr_scanner); + final boolean hasAutofocus = CameraCharacteristicsChecker.getInstance(getContext()).hasAutofocus(); + final int visiblity = hasAutofocus ? GONE : VISIBLE; + qrWarnningMessage.setVisibility(visiblity); + } + + /** * Remove relevant listeners/receivers/etc so that they do not receive and process events * when this view is not in use. diff --git a/app/src/main/res/layout/swap_wifi_qr.xml b/app/src/main/res/layout/swap_wifi_qr.xml index 32ca0df63..44d64a6dc 100644 --- a/app/src/main/res/layout/swap_wifi_qr.xml +++ b/app/src/main/res/layout/swap_wifi_qr.xml @@ -44,6 +44,14 @@ android:layout_gravity="center" android:id="@+id/btn_qr_scanner"/> + + \ No newline at end of file