text issue fixes

app/src/main/java/com/remit/jmecustomer/features/mynotifications/view/MyNotificationActivity.java

@@ -66,7 +66,7 @@ public class MyNotificationActivity extends BaseActivity implements MyNotificati
         fragments.add(noticeListingFragment);
         fragments.add(noticeDetailFragment);
 
-        noticeViewPagerAdapter = new GenericViewPagerAdapter(getSupportFragmentManager(),fragments);
+        noticeViewPagerAdapter = new GenericViewPagerAdapter(getSupportFragmentManager(), fragments);
 
 
         myNoticeViewPager.setOffscreenPageLimit(2);
@@ -80,6 +80,10 @@ public class MyNotificationActivity extends BaseActivity implements MyNotificati
 
     @OnClick(R.id.iv_back)
     public void backButtonPressed() {
+        if (myNoticeViewPager.getCurrentItem() == 1) {
+            myNoticeViewPager.setCurrentItem(0);
+            return;
+        }
         this.onBackPressed();
     }
 
@@ -115,6 +119,10 @@ public class MyNotificationActivity extends BaseActivity implements MyNotificati
 
     @Override
     public void onBackPressed() {
+        if (myNoticeViewPager.getCurrentItem() == 1) {
+            myNoticeViewPager.setCurrentItem(0);
+            return;
+        }
         super.onBackPressed();
 //        if (myNoticeViewPager.getCurrentItem() == 0) {
 //            Intent redirectIntent = new Intent(this, HomeActivityV2.class);

app/src/main/res/layout/activity_beneficiary_detail.xml

@@ -55,7 +55,7 @@
                 android:gravity="center"
                 android:paddingHorizontal="@dimen/_25sdp"
                 android:paddingVertical="@dimen/_9sdp"
-                android:text="Update"
+                android:text="@string/update_text"
                 android:textAlignment="center"
                 android:textColor="@color/light_blue"
                 app:layout_constraintHorizontal_bias="0.5"
@@ -119,7 +119,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/_8sdp"
             android:layout_marginTop="@dimen/_10sdp"
-            android:text="Mobile Number"
+            android:text="@string/mobileNumber_text"
             android:textColor="@color/black_opacity_38"
             app:layout_constraintStart_toEndOf="@id/iv_mobile"
             app:layout_constraintTop_toBottomOf="@id/tv_name" />
@@ -188,7 +188,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/_8sdp"
             android:layout_marginTop="@dimen/_10sdp"
-            android:text="Location"
+            android:text="@string/country_text"
             android:textColor="@color/black_opacity_38"
             app:layout_constraintStart_toEndOf="@id/iv_mobile"
             app:layout_constraintTop_toBottomOf="@id/tv_relation" />
@@ -231,7 +231,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:drawableTint="@color/white"
-                android:text="Continue"
+                android:text="@string/continue_text"
                 android:textColor="@color/white" />
 
             <ImageView

app/src/main/res/layout/fragment_profile.xml

@@ -683,7 +683,7 @@
                         android:layout_toLeftOf="@+id/enableFingerPrint"
                         android:layout_toEndOf="@+id/ic_fingerPrint"
                         android:layout_toRightOf="@+id/ic_fingerPrint"
-                        android:text="Use fingerprint for payment"
+                        android:text="Use fingerprint for login"
                         android:textColor="@color/black_opacity_60"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toStartOf="@+id/enableFingerPrint"

app/src/main/res/layout/row_send_method.xml

@@ -39,7 +39,7 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_marginRight="@dimen/_4sdp"
+            android:layout_marginRight="@dimen/_12sdp"
             android:layout_weight="1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content">