From f29585aaf800e26cb1d642b62d70124b0e98e50d Mon Sep 17 00:00:00 2001
From: Alaa Smadi <alaasmadi1010@gmail.com>
Date: Mon, 22 Jun 2026 00:01:47 +0300
Subject: [PATCH 1/2] refactor safe to support android edge2edge

---
 widget/assets/css/style.css | 43 +++++++++++++++++++++----------------
 widget/templates/Item.html  |  6 +++---
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/widget/assets/css/style.css b/widget/assets/css/style.css
index fcf538e..b3b8174 100755
--- a/widget/assets/css/style.css
+++ b/widget/assets/css/style.css
@@ -65,8 +65,12 @@ h5{
 			opacity: 1;
 	}
 }
-.bottom.fixed-bottom.primaryBackgroundTheme{
-	padding-bottom: var(--bf-safe-area-inset-bottom);
+.bottom.fixed-bottom{
+	padding-bottom: calc(var(--bf-safe-area-inset-bottom) + 15px) !important;
+}
+.bottom.fixed-bottom .btn-primary{
+	width: calc(100vw - 32px);
+	margin: 0 16px;
 }
 .plugin-slider .plugin-slide,
 .plugin-slider.owl-carousel .owl-stage-outer,
@@ -493,18 +497,18 @@ html[browser="Firefox"] .layout3 .list-layout .list-item-media .list-media-holde
 }
 
 /* Fixed Bottom */
-.holder.has-bottom{
-	padding-bottom: 7vh !important;
+.holder.has-bottom .scrollable{
+	padding-bottom: calc(45px + var(--bf-safe-area-inset-bottom)) !important;
 }
-.holder.has-bottom.has-filter{
-	padding-bottom: calc(7vh + 23px) !important;
+.holder.has-bottom.has-filter .scrollable{
+	padding-bottom: calc(68px + var(--bf-safe-area-inset-bottom)) !important;
 }
-.holder.has-bottom.has-extra-links,
-.holder.has-bottom.has-extra-links.has-filter{
-	padding-bottom: 5.5rem !important;
+.holder.has-bottom.has-extra-links .scrollable,
+.holder.has-bottom.has-extra-links.has-filter .scrollable{
+	padding-bottom: calc(5.5rem + var(--bf-safe-area-inset-bottom)) !important;
 }
-.holder.has-bottom.has-extra-links.has-filter.map-layout{
-	padding-bottom: 0rem !important;
+.holder.has-bottom.has-extra-links.has-filter.map-layout .scrollable{
+	padding-bottom: calc(0rem + var(--bf-safe-area-inset-bottom)) !important;
 }
 
 .holder.has-bottom.has-filter .bottom .filterBar{
@@ -520,11 +524,13 @@ html[browser="Firefox"] .layout3 .list-layout .list-item-media .list-media-holde
 	left: 0;
 	z-index: 11;
 	width: 100%;
-	min-height: 7vh;
-	height: fit-content;
+	height: calc(var(--bf-safe-area-inset-bottom) + 45px);
 	background: var(--bf-theme-primary);
 	overflow: hidden;
 }
+.holder .bottom.fixed-bottom.item-buttons-container {
+	background: unset !important;
+}
 
 .holder .bottom.fixed-bottom .primaryBackgroundTheme{
 	background:#09a3ee;
@@ -911,11 +917,12 @@ html[buildfire='widget'] .modal {
 	background-position: center;
 	height: 80vh;
 }
-#googleMap {
-	height: calc(100vh - 32px);
-	background:#eef0f0;
-}
 
 body #googleMap{
-	height: calc(100vh - 32px - var(--bf-safe-area-inset-bottom)) !important;
+	height: calc(100vh - 45px - var(--bf-safe-area-inset-bottom)) !important;
+	background:#eef0f0;
 }
+
+body #googleMap .gm-fullscreen-control {
+	top: calc(var(--bf-safe-area-inset-top) + 32px) !important;
+}
\ No newline at end of file
diff --git a/widget/templates/Item.html b/widget/templates/Item.html
index eb7a577..b3f3d79 100755
--- a/widget/templates/Item.html
+++ b/widget/templates/Item.html
@@ -60,12 +60,12 @@ <h5>{{WidgetItem.item.data.title}}</h5>
     </div>
   </div>
 
-  <div class="bottom fixed-bottom transition-third primaryBackgroundTheme">
-    <div class=" text-center"  ng-show="showItemRedeemed">
+  <div class="bottom fixed-bottom transition-third item-buttons-container">
+    <div class="btn btn-primary text-center"  ng-show="showItemRedeemed">
       <p class="whiteTheme stretch margin-top-ten">{{getString('itemDetails.itemRedeemedTimeago')}}
         {{WidgetItem.item.redeemedOn |timeago}}</p>
     </div>
-    <div class=" text-center primaryBackgroundTheme"
+    <div class="btn btn-primary text-center"
          ng-click="WidgetItem.redeemCoupon(WidgetItem.item)" ng-show="showRedeemButton">
       <p class="whiteTheme stretch margin-top-ten">{{getString('itemDetails.redeemThisItem')}}</p>
     </div>

From cf79b4a566f905b2ff3d0d06c92e690aa8155f81 Mon Sep 17 00:00:00 2001
From: Alaa Smadi <alaasmadi1010@gmail.com>
Date: Mon, 22 Jun 2026 15:50:18 +0300
Subject: [PATCH 2/2] handle button background

---
 widget/assets/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/widget/assets/css/style.css b/widget/assets/css/style.css
index b3b8174..c0027f3 100755
--- a/widget/assets/css/style.css
+++ b/widget/assets/css/style.css
@@ -529,7 +529,7 @@ html[browser="Firefox"] .layout3 .list-layout .list-item-media .list-media-holde
 	overflow: hidden;
 }
 .holder .bottom.fixed-bottom.item-buttons-container {
-	background: unset !important;
+	background: var(--bf-theme-background) !important;
 }
 
 .holder .bottom.fixed-bottom .primaryBackgroundTheme{