Skip to content

Commit a7b9a08

Browse files
committed
Dark background when no camera permission is given
1 parent 35da21c commit a7b9a08

File tree

4 files changed

+29
-14
lines changed

4 files changed

+29
-14
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ allprojects {
2424
}
2525

2626
project.ext {
27-
sdkVersion='0.7.10'
27+
sdkVersion='0.7.11'
2828
versionCode=1
2929

3030
compileSdkVersion=27

ui/src/main/java/io/snabble/sdk/ui/scanner/SelfScanningView.java

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class SelfScanningView extends CoordinatorLayout implements Checkout.OnCh
5454
private DialogInterface.OnCancelListener progressDialogCancelListener = new DialogInterface.OnCancelListener() {
5555
@Override
5656
public void onCancel(DialogInterface dialog) {
57-
barcodeScanner.resume();
57+
resumeBarcodeScanner();
5858
checkout.cancel();
5959
}
6060
};
@@ -131,7 +131,7 @@ public void onBarcodeDetected(final Barcode barcode) {
131131
productDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
132132
@Override
133133
public void onDismiss(DialogInterface dialog) {
134-
barcodeScanner.resume();
134+
resumeBarcodeScanner();
135135
allowScan = true;
136136
}
137137
});
@@ -140,7 +140,7 @@ public void onDismiss(DialogInterface dialog) {
140140
@Override
141141
public void onShow(DialogInterface dialog) {
142142
allowScan = false;
143-
barcodeScanner.pause();
143+
pauseBarcodeScanner();
144144
}
145145
});
146146

@@ -166,7 +166,7 @@ public void lookupAndShowProduct(final ScannableCode scannedCode) {
166166

167167
progressDialog.setOnCancelListener(progressDialogCancelListener);
168168
progressDialog.showAfterDelay(300);
169-
barcodeScanner.pause();
169+
pauseBarcodeScanner();
170170

171171
if(scannedCode.hasEmbeddedData()){
172172
productDatabase.findByWeighItemIdOnline(scannedCode.getLookupCode(), new OnProductAvailableListener() {
@@ -235,7 +235,7 @@ private void handleProductAvailable(Product product, boolean wasOnlineProduct, S
235235

236236
private void handleProductNotFound(ScannableCode scannedCode) {
237237
progressDialog.dismiss();
238-
barcodeScanner.resume();
238+
resumeBarcodeScanner();
239239
delayNextScan();
240240

241241
Telemetry.event(Telemetry.Event.ScannedUnknownCode, scannedCode.getCode());
@@ -247,7 +247,7 @@ private void handleProductNotFound(ScannableCode scannedCode) {
247247

248248
private void handleProductError() {
249249
progressDialog.dismiss();
250-
barcodeScanner.resume();
250+
resumeBarcodeScanner();
251251
delayNextScan();
252252

253253
UIUtils.snackbar(SelfScanningView.this,
@@ -287,15 +287,29 @@ public void onClick(DialogInterface dialog, int which) {
287287
}
288288

289289
public void resume() {
290-
barcodeScanner.resume();
290+
resumeBarcodeScanner();
291291
}
292292

293293
public void pause() {
294-
barcodeScanner.pause();
294+
pauseBarcodeScanner();
295+
}
296+
297+
private void pauseBarcodeScanner() {
298+
if (ActivityCompat.checkSelfPermission(getContext(), Manifest.permission.CAMERA)
299+
== PackageManager.PERMISSION_GRANTED) {
300+
barcodeScanner.pause();
301+
}
302+
}
303+
304+
private void resumeBarcodeScanner() {
305+
if (ActivityCompat.checkSelfPermission(getContext(), Manifest.permission.CAMERA)
306+
== PackageManager.PERMISSION_GRANTED) {
307+
barcodeScanner.resume();
308+
}
295309
}
296310

297311
private void showProduct(Product product, ScannableCode scannedCode) {
298-
barcodeScanner.pause();
312+
pauseBarcodeScanner();
299313
allowScan = false;
300314
showProductDialog(product, scannedCode);
301315
}

ui/src/main/res/layout/view_self_scanning.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
android:visibility="gone" />
1414

1515
<TextView
16-
android:layout_width="304dp"
17-
android:layout_height="wrap_content"
16+
android:layout_width="match_parent"
17+
android:layout_height="match_parent"
1818
android:layout_gravity="center"
19-
android:layout_marginTop="16dp"
2019
android:text="@string/Snabble.Scanner.Camera.accessDenied"
21-
android:textColor="@color/snabble_textColorDark"
20+
android:textColor="@color/snabble_textColorLight"
2221
android:id="@+id/no_permission"
2322
android:gravity="center"
2423
android:textStyle="bold"
24+
android:background="@color/snabble_backgroundColorDark"
2525
android:visibility="gone" />
2626

2727
<TextView

ui/src/main/res/values/colors.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@
99
<color name="snabble_textColorDark">#1D1F24</color>
1010
<color name="snabble_textColorAction">@color/snabble_primaryColor</color>
1111
<color name="snabble_dividerColor">#D8D8D8</color>
12+
<color name="snabble_backgroundColorDark">#212121</color>
1213
</resources>

0 commit comments

Comments
 (0)