From 9854125af9925b610bb2fac888a3462e6fdf70a2 Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Mon, 26 Jul 2021 23:32:08 +0200 Subject: [PATCH] Make lint happy --- .../card_locker/ImportExportActivity.java | 17 +++++++---------- app/src/main/res/layout/loyalty_card_layout.xml | 2 +- .../res/layout/loyalty_card_view_layout.xml | 6 +++--- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/protect/card_locker/ImportExportActivity.java b/app/src/main/java/protect/card_locker/ImportExportActivity.java index ad4d38c44..144454e44 100644 --- a/app/src/main/java/protect/card_locker/ImportExportActivity.java +++ b/app/src/main/java/protect/card_locker/ImportExportActivity.java @@ -220,23 +220,20 @@ public class ImportExportActivity extends AppCompatActivity } @Override - public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) - { - if(requestCode == PERMISSIONS_EXTERNAL_STORAGE) - { + public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); + + if (requestCode == PERMISSIONS_EXTERNAL_STORAGE) { // If request is cancelled, the result arrays are empty. boolean success = grantResults.length > 0; - for(int grant : grantResults) - { - if(grant != PackageManager.PERMISSION_GRANTED) - { + for (int grant : grantResults) { + if (grant != PackageManager.PERMISSION_GRANTED) { success = false; } } - if(!success) - { + if (!success) { // External storage permission rejected, inform user that // import/export is prevented Toast.makeText(getApplicationContext(), R.string.noExternalStoragePermissionError, diff --git a/app/src/main/res/layout/loyalty_card_layout.xml b/app/src/main/res/layout/loyalty_card_layout.xml index aad759f5c..80175c980 100644 --- a/app/src/main/res/layout/loyalty_card_layout.xml +++ b/app/src/main/res/layout/loyalty_card_layout.xml @@ -113,6 +113,6 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" - app:tint="@android:color/black" /> + app:tint="#000000" /> \ No newline at end of file diff --git a/app/src/main/res/layout/loyalty_card_view_layout.xml b/app/src/main/res/layout/loyalty_card_view_layout.xml index f0e6d5aa7..2430513ff 100644 --- a/app/src/main/res/layout/loyalty_card_view_layout.xml +++ b/app/src/main/res/layout/loyalty_card_view_layout.xml @@ -53,7 +53,7 @@ android:padding="0dp" app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24" android:contentDescription="@string/moveBarcodeToTopOfScreen" - android:tint="@android:color/white" + app:tint="#ffffff" android:background="@color/colorPrimary" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toTopOf="@+id/barcode" @@ -84,7 +84,7 @@ android:padding="0dp" app:srcCompat="@drawable/ic_baseline_arrow_drop_down_24" android:contentDescription="@string/moveBarcodeToCenterOfScreen" - android:tint="@android:color/white" + app:tint="#ffffff" android:background="@color/colorPrimary" app:layout_constraintTop_toBottomOf="@+id/barcode" app:layout_constraintEnd_toEndOf="parent" @@ -150,7 +150,7 @@ android:layout_gravity="top|start" android:background="@color/colorPrimary" android:scaleType="fitCenter" - android:tint="@android:color/white" + app:tint="#ffffff" app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24" />