From e496c69e1572902c901a1b8bb38107ffc0edeea8 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Wed, 14 Jul 2021 19:39:19 +0200
Subject: [PATCH] Fix FAB being below other elements in Android 4

---
 CHANGELOG.md                                          |  1 +
 .../protect/card_locker/LoyaltyCardEditActivity.java  |  1 +
 .../protect/card_locker/LoyaltyCardViewActivity.java  |  1 +
 .../main/java/protect/card_locker/MainActivity.java   | 11 ++++-------
 .../protect/card_locker/ManageGroupsActivity.java     |  8 ++------
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5cae9d9b4..e71e39736 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ Changes:
 - Support importing from Stocard (Beta)
 - Fix useless whitespace in notes from Fidme import
 - Support new Voucher Vault export format
+- Fix Floating Action Buttons being behind other UI elements on Android 4
 
 ## v1.14.1 (2021-06-14)
 
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
index bbf6b0fd2..a391cd9df 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -732,6 +732,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
         FloatingActionButton saveButton = findViewById(R.id.fabSave);
         saveButton.setOnClickListener(v -> doSave());
+        saveButton.bringToFront();
 
         generateIcon(storeFieldEdit.getText().toString());
     }
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
index 6e9438e76..08032b1b5 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -222,6 +222,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             startActivity(intent);
             finish();
         });
+        editButton.bringToFront();
 
         behavior = BottomSheetBehavior.from(bottomSheet);
         behavior.addBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
diff --git a/app/src/main/java/protect/card_locker/MainActivity.java b/app/src/main/java/protect/card_locker/MainActivity.java
index 98e4e6937..3d6a252ed 100644
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -275,14 +275,11 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
         // End of active tab logic
 
         FloatingActionButton addButton = findViewById(R.id.fabAdd);
-        addButton.setOnClickListener(new View.OnClickListener()
-        {
-            @Override
-            public void onClick(View v) {
-                Intent i = new Intent(getApplicationContext(), ScanActivity.class);
-                startActivityForResult(i, Utils.BARCODE_SCAN);
-            }
+        addButton.setOnClickListener(v -> {
+            Intent i = new Intent(getApplicationContext(), ScanActivity.class);
+            startActivityForResult(i, Utils.BARCODE_SCAN);
         });
+        addButton.bringToFront();
     }
 
     @Override
diff --git a/app/src/main/java/protect/card_locker/ManageGroupsActivity.java b/app/src/main/java/protect/card_locker/ManageGroupsActivity.java
index 3d253e8c0..16b697d89 100644
--- a/app/src/main/java/protect/card_locker/ManageGroupsActivity.java
+++ b/app/src/main/java/protect/card_locker/ManageGroupsActivity.java
@@ -52,12 +52,8 @@ public class ManageGroupsActivity extends AppCompatActivity
         updateGroupList();
 
         FloatingActionButton addButton = findViewById(R.id.fabAdd);
-        addButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                createGroup();
-            }
-        });
+        addButton.setOnClickListener(v -> createGroup());
+        addButton.bringToFront();
     }
 
     @Override