From 162b6bf68d782b0ab9631286c2aec9daebf6843b Mon Sep 17 00:00:00 2001
From: Mukesh Dhungana <dhunganamukesh0702@gmail.com>
Date: Thu, 28 Jul 2022 10:59:14 +0545
Subject: [PATCH] fix few design issues on my notice page and remove old
 deposit menu from side bar

---
 .../gateway/MyNotificationGateway.java        |  2 +-
 .../res/layout/my_notice_list_viewholder.xml  | 22 +++++--------
 .../main/res/layout/nav_drawer_fragment.xml   | 31 +------------------
 3 files changed, 10 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/com/remit/jmecustomer/features/mynotifications/gateway/MyNotificationGateway.java b/app/src/main/java/com/remit/jmecustomer/features/mynotifications/gateway/MyNotificationGateway.java
index 3d2645c5..7ce9dbf2 100644
--- a/app/src/main/java/com/remit/jmecustomer/features/mynotifications/gateway/MyNotificationGateway.java
+++ b/app/src/main/java/com/remit/jmecustomer/features/mynotifications/gateway/MyNotificationGateway.java
@@ -71,7 +71,7 @@ public class MyNotificationGateway extends PrivilegedGateway implements MyNotifi
         MyNotificationDTO myNotificationDTO2 = new MyNotificationDTO();
         myNotificationDTO2.setRowId("2");
         myNotificationDTO2.setTitle("Title 3");
-        myNotificationDTO2.setBody("Deposit Slip of amount 10 JPY has been uploaded.");
+        myNotificationDTO2.setBody("Deposit Slip of amount 10 JPY has been uploaded. Deposit Slip of amount 10 JPY has been uploaded. Deposit Slip of amount 10 JPY has been uploaded. Deposit Slip of amount 10 JPY has been uploaded.");
         myNotificationDTO2.setCreateDate("2077/01/02");
         myNotificationDTO2.setIsRead("0");
         myNotificationDTO2.setType("1");
diff --git a/app/src/main/res/layout/my_notice_list_viewholder.xml b/app/src/main/res/layout/my_notice_list_viewholder.xml
index b9d9c277..d3f4a4cb 100644
--- a/app/src/main/res/layout/my_notice_list_viewholder.xml
+++ b/app/src/main/res/layout/my_notice_list_viewholder.xml
@@ -15,14 +15,14 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/_5sdp"
-        android:paddingLeft="@dimen/_8sdp"
-        android:paddingRight="@dimen/_8sdp">
+        android:padding="@dimen/_10sdp">
 
         <LinearLayout
             android:id="@+id/jmeDepositLayout"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/_30sdp"
+            android:layout_weight="1"
             android:orientation="vertical"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/imgNotificationStat"
@@ -32,7 +32,6 @@
                 android:id="@+id/tv_notification_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/_5sdp"
                 android:ellipsize="end"
                 android:gravity="start"
                 android:maxLines="10"
@@ -61,7 +60,7 @@
 
             <com.remit.jmecustomer.common.customwidgets.JmeTextView
                 android:id="@+id/tv_notification_date"
-                android:layout_width="385dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/_4sdp"
                 android:layout_marginBottom="@dimen/_5sdp"
@@ -77,20 +76,15 @@
         </LinearLayout>
 
 
-
-
         <ImageView
             android:id="@+id/imgNotificationStat"
             android:layout_width="@dimen/_18sdp"
             android:layout_height="@dimen/_18sdp"
-            android:layout_marginLeft="@dimen/_50sdp"
             android:layout_marginRight="@dimen/commonMargin"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/jmeDepositLayout"
+            android:layout_weight="1"
+            android:contentDescription="TODO"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.1"
-            android:contentDescription="TODO" />
+            app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/nav_drawer_fragment.xml b/app/src/main/res/layout/nav_drawer_fragment.xml
index e4bfe2e3..5eb3bd86 100644
--- a/app/src/main/res/layout/nav_drawer_fragment.xml
+++ b/app/src/main/res/layout/nav_drawer_fragment.xml
@@ -243,36 +243,6 @@
                         android:textSize="@dimen/text_small" />
 
                 </LinearLayout>
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:visibility="gone"
-                    android:background="@color/divider" />
-
-                <LinearLayout
-                    android:id="@+id/view_atm_cash_deposit"
-                    android:layout_width="match_parent"
-                    android:layout_height="48dp"
-                    android:gravity="center"
-                    android:orientation="horizontal">
-
-                    <ImageView
-                        android:layout_width="@dimen/_15sdp"
-                        android:layout_height="@dimen/_15sdp"
-                        android:contentDescription="@string/app_name"
-                        app:srcCompat="@drawable/icv_menu_wallet_statement" />
-
-                    <com.remit.jmecustomer.common.customwidgets.JmeTextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="14dp"
-                        android:layout_marginStart="14dp"
-                        android:text="ATM Bank Deposit"
-                        android:textColor="@color/darkgray2"
-                        android:textSize="@dimen/text_small" />
-
-                </LinearLayout>
-
 
                 <View
                     android:layout_width="match_parent"
@@ -360,6 +330,7 @@
                             android:textSize="@dimen/text_small" />
 
                     </LinearLayout>
+
                     <LinearLayout
                         android:id="@+id/view_furikomi_details"
                         android:layout_width="match_parent"