From feabe353b0212eac4e5674281ae8fa4e781e2fb7 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Wed, 14 Jul 2021 20:08:28 +0200
Subject: [PATCH] Fix loyalty card viewer appbar top margin

---
 CHANGELOG.md                                                  | 1 +
 .../java/protect/card_locker/LoyaltyCardViewActivity.java     | 2 --
 app/src/main/res/layout/loyalty_card_view_layout.xml          | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e71e39736..7b1acfd81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ Changes:
 - 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
+- Fix loyalty card viewer appbar top margin
 
 ## v1.14.1 (2021-06-14)
 
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
index 08032b1b5..cc02b4706 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -719,7 +719,6 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             // Or the barcode will be centered instead of on top of the screen
             // Don't ask me why...
             appBarLayout.setVisibility(View.INVISIBLE);
-            appBarLayout.setPadding(0, 0, 0, 0);
             collapsingToolbarLayout.setVisibility(View.GONE);
             findViewById(R.id.toolbar_landscape).setVisibility(View.GONE);
 
@@ -768,7 +767,6 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             appBarLayout.setVisibility(View.VISIBLE);
             DisplayMetrics metrics = new DisplayMetrics();
             getWindowManager().getDefaultDisplay().getMetrics(metrics);
-            appBarLayout.setPadding(0, (int) Math.ceil(metrics.density * 24), 0, 0);
             setupOrientation();
 
             // Show other UI elements
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 e7defa167..f0e6d5aa7 100644
--- a/app/src/main/res/layout/loyalty_card_view_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_view_layout.xml
@@ -259,7 +259,6 @@
         android:clipToPadding="false"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="24dp"
         android:weightSum="1.0"
         android:fitsSystemWindows="true">
         <com.google.android.material.appbar.CollapsingToolbarLayout
@@ -305,6 +304,7 @@
             android:layout_width="fill_parent"
             android:layout_height="?actionBarSize"
             app:contentInsetStart="72.0dip"
-            app:layout_collapseMode="pin" />
+            app:layout_collapseMode="pin"
+            android:paddingTop="6dp" />
     </com.google.android.material.appbar.AppBarLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>