From bfee9581f2921f16be3dd15bfbdc66795bb877ef Mon Sep 17 00:00:00 2001
From: Navratan Soni <navratans@adobe.com>
Date: Fri, 21 Jun 2024 22:46:52 +0530
Subject: [PATCH 1/3] Fixed UI issue when less then 5 images are present

---
 .../src/main/res/layout/push_template_multi_icon.xml             | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/notificationbuilder/src/main/res/layout/push_template_multi_icon.xml b/code/notificationbuilder/src/main/res/layout/push_template_multi_icon.xml
index 2c8bd71a..4477bc37 100644
--- a/code/notificationbuilder/src/main/res/layout/push_template_multi_icon.xml
+++ b/code/notificationbuilder/src/main/res/layout/push_template_multi_icon.xml
@@ -23,7 +23,6 @@
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:weightSum="5"
         android:layout_centerVertical="true"
         android:gravity="center_vertical"
         android:layout_toStartOf="@+id/five_icon_close_button"/>

From 938fecdc9cd8b9942fcd5ea91e04222b971154f9 Mon Sep 17 00:00:00 2001
From: Navratan Soni <navratans@adobe.com>
Date: Sat, 22 Jun 2024 00:30:48 +0530
Subject: [PATCH 2/3] Made space between title and body, added zero bazel notif
 fix

---
 .../src/main/res/layout/push_template_zero_bezel_expanded.xml    | 1 +
 code/notificationbuilder/src/main/res/values/dimens.xml          | 1 +
 code/notificationbuilder/src/main/res/values/styles.xml          | 1 +
 3 files changed, 3 insertions(+)

diff --git a/code/notificationbuilder/src/main/res/layout/push_template_zero_bezel_expanded.xml b/code/notificationbuilder/src/main/res/layout/push_template_zero_bezel_expanded.xml
index f0f02ab4..451abc7b 100644
--- a/code/notificationbuilder/src/main/res/layout/push_template_zero_bezel_expanded.xml
+++ b/code/notificationbuilder/src/main/res/layout/push_template_zero_bezel_expanded.xml
@@ -40,6 +40,7 @@
         <TextView
             android:id="@+id/notification_body_expanded"
             style="@style/Body"
+            android:layout_marginBottom="@dimen/zero_bezel_padding_horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="start"
diff --git a/code/notificationbuilder/src/main/res/values/dimens.xml b/code/notificationbuilder/src/main/res/values/dimens.xml
index 52a27179..a7abbe9c 100644
--- a/code/notificationbuilder/src/main/res/values/dimens.xml
+++ b/code/notificationbuilder/src/main/res/values/dimens.xml
@@ -60,4 +60,5 @@
     <dimen name="multi_icon_single_icon_height">48dp</dimen>
     <dimen name="multi_icon_layout_height">56dp</dimen>
     <dimen name="multi_icon_item_padding">4dp</dimen>
+    <dimen name="standard_title_bottom_margin">4dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/code/notificationbuilder/src/main/res/values/styles.xml b/code/notificationbuilder/src/main/res/values/styles.xml
index aec29723..2626dcbe 100644
--- a/code/notificationbuilder/src/main/res/values/styles.xml
+++ b/code/notificationbuilder/src/main/res/values/styles.xml
@@ -18,6 +18,7 @@
         <item name="android:textStyle">bold</item>
         <item name="android:textSize">12sp</item>
         <item name="android:maxLines">1</item>
+        <item name="android:layout_marginBottom">@dimen/standard_title_bottom_margin</item>
         <item name="android:ellipsize">end</item>
     </style>
     <style name="Body" parent="android:TextAppearance.Material.Body1">

From 53aeae77353df75cfd48bb57f326867b885e91b9 Mon Sep 17 00:00:00 2001
From: Navratan Soni <navratans@adobe.com>
Date: Sat, 22 Jun 2024 00:44:30 +0530
Subject: [PATCH 3/3] Fixed some styling in horizontal catalog

---
 .../main/res/layout/push_template_horizontal_catalog.xml | 9 +++++----
 code/notificationbuilder/src/main/res/values/dimens.xml  | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/code/notificationbuilder/src/main/res/layout/push_template_horizontal_catalog.xml b/code/notificationbuilder/src/main/res/layout/push_template_horizontal_catalog.xml
index c5fdd1d5..4cbb49e0 100644
--- a/code/notificationbuilder/src/main/res/layout/push_template_horizontal_catalog.xml
+++ b/code/notificationbuilder/src/main/res/layout/push_template_horizontal_catalog.xml
@@ -22,6 +22,7 @@
         android:id="@+id/horizontal_catalog_mid_row_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:gravity="center_vertical"
         android:layout_marginTop="@dimen/product_catalog_horizontal_mid_row_margin_top"
         android:layout_below="@id/product_image">
 
@@ -29,10 +30,9 @@
             android:id="@+id/product_title"
             style="@style/Title"
             android:layout_weight="1"
-            android:layout_gravity="start"
             android:layout_width="@dimen/product_catalog_horizontal_mid_row_width"
-            android:layout_height="@dimen/product_catalog_horizontal_mid_row_height"
-            android:paddingTop="@dimen/product_catalog_horizontal_mid_row_text_padding"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="0dp"
             android:textAlignment="center"
             android:textSize="14sp" />
 
@@ -41,7 +41,8 @@
             android:layout_weight="1"
             android:layout_gravity="end"
             android:layout_width="@dimen/product_catalog_horizontal_mid_row_width"
-            android:layout_height="@dimen/product_catalog_horizontal_mid_row_height"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/standard_title_bottom_margin"
             android:text="@string/buy_now"
             android:textAlignment="center"
             android:textSize="12sp" />
diff --git a/code/notificationbuilder/src/main/res/values/dimens.xml b/code/notificationbuilder/src/main/res/values/dimens.xml
index a7abbe9c..4d2c85cf 100644
--- a/code/notificationbuilder/src/main/res/values/dimens.xml
+++ b/code/notificationbuilder/src/main/res/values/dimens.xml
@@ -33,7 +33,7 @@
     <dimen name="zero_bezel_title_margin_horizontal">3dp</dimen>
     <dimen name="product_catalog_cta_button_height">48dp</dimen>
     <dimen name="product_catalog_cta_button_width">80dp</dimen>
-    <dimen name="product_catalog_horizontal_mid_row_margin_top">5dp</dimen>
+    <dimen name="product_catalog_horizontal_mid_row_margin_top">16dp</dimen>
     <dimen name="product_catalog_horizontal_mid_row_height">32dp</dimen>
     <dimen name="product_catalog_horizontal_mid_row_width">0dp</dimen>
     <dimen name="product_catalog_horizontal_mid_row_text_padding">7dp</dimen>