Form layout fixes

4 years ago · e7906da438
8 changed files with 140 additions and 153 deletions
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java
@ -73,9 +73,6 @@ public class RegisterV2Activity extends BaseActivity implements RegisterV2Presen
    Button btn_submit;


-    @BindView(R.id.tv_login)
-    TextView tv_login;
-

    @BindView(R.id.scrollView)
    ScrollView scrollView;
@ -219,6 +216,7 @@ public class RegisterV2Activity extends BaseActivity implements RegisterV2Presen
        presenter.registerUser();
    }

+    @OnClick(R.id.tv_login)
    @Override
    public void redirectToLogin() {
        Intent redirectIntent = new Intent(this, LoginV2Activity.class);
--- a/app/src/main/res/drawable/mform_with_corner_radius_bg.xml
+++ b/app/src/main/res/drawable/mform_with_corner_radius_bg.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/mform_bg_color"/>
+    <corners android:radius="@dimen/form_corner_radius"/>
+
+</shape>
--- a/app/src/main/res/layout/activity_change_password_v2.xml
+++ b/app/src/main/res/layout/activity_change_password_v2.xml
@ -15,9 +15,7 @@
        android:layout_height="wrap_content"
        android:scrollbars="none">
        <LinearLayout
-            android:layout_margin="@dimen/_2sdp"
-            style="@style/MFormBound"
-            android:background="@drawable/ic_rounded_white"
+            style="@style/MFormBoundWithCornerRadius"
            android:orientation="vertical">


--- a/app/src/main/res/layout/fragment_amount_detail_send_money_v2.xml
+++ b/app/src/main/res/layout/fragment_amount_detail_send_money_v2.xml
@ -11,25 +11,14 @@

    <LinearLayout
        android:id="@+id/rootView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
-        android:background="@drawable/ic_rounded_white"
+        style="@style/MFormBoundWithCornerRadius"
        android:orientation="vertical"
-        android:paddingStart="10dp"
-        android:paddingLeft="10dp"
-        android:paddingTop="20dp"
-        android:paddingEnd="10dp"
-        android:paddingRight="10dp">
+       >

        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_margin="@dimen/_8sdp"
            android:background="@drawable/curve_rectangle_grey_bg"
            android:orientation="horizontal">

@ -161,10 +150,7 @@
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_margin="@dimen/_8sdp"
            android:background="@drawable/curve_rectangle_grey_bg"
            android:orientation="horizontal"
            android:padding="1.5dp">
@ -421,11 +407,7 @@
            android:layout_gravity="center"
            android:layout_marginTop="20dp"
            android:layout_marginBottom="20dp"
-            android:background="@drawable/ic_rounded_background_red_coloured"
            android:text="@string/calculate_text"
-            android:textAllCaps="false"
-            android:textColor="@color/white"
-            android:textSize="@dimen/_14ssp"
            />

    </LinearLayout>
--- a/app/src/main/res/layout/fragment_verification_send_money_v2.xml
+++ b/app/src/main/res/layout/fragment_verification_send_money_v2.xml
@ -1,25 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
    android:background="@color/background_gray"
    android:clickable="true"
-    android:scrollbars="none"
-    android:focusable="true">
+    android:focusable="true"
+    android:scrollbars="none">

    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:background="@drawable/ic_rounded_white"
-        android:layout_marginTop="3dp"
-        android:paddingEnd="20dp"
-        android:paddingTop="20dp"
-        android:paddingLeft="20dp"
-        android:paddingRight="20dp"
-        android:paddingStart="20dp">
+        style="@style/MFormBoundWithCornerRadius"
+        android:orientation="vertical">


        <LinearLayout
@ -27,6 +19,7 @@
            android:layout_height="wrap_content"
            android:orientation="vertical"
            android:padding="@dimen/_8sdp">
+
            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
@ -34,12 +27,13 @@
                android:text="@string/reciever_details_text"
                android:textColor="@color/colorPrimary"
                android:textSize="@dimen/_14ssp" />
-            <LinearLayout
-                android:paddingTop="@dimen/_8sdp"

+            <LinearLayout
                android:layout_width="match_parent"
+
                android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:paddingTop="@dimen/_8sdp">

                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                    android:layout_width="wrap_content"
@ -127,8 +121,8 @@
                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                    android:id="@+id/txt_mobile"
                    android:layout_width="0dp"
-                android:layout_weight="1"
                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
                    android:gravity="end"
                    android:textColor="@color/black"
                    android:textSize="@dimen/_11ssp"
@ -139,13 +133,13 @@
        </LinearLayout>


-
        <LinearLayout
-            android:layout_marginTop="@dimen/_8sdp"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/_8sdp"
            android:orientation="vertical"
            android:padding="@dimen/_8sdp">
+
            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
@ -153,6 +147,7 @@
                android:text="@string/transaction_detail_text"
                android:textColor="@color/colorPrimary"
                android:textSize="@dimen/_14ssp" />
+
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
@ -286,9 +281,9 @@
                android:id="@+id/pAgentContainerView"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:paddingTop="@dimen/_8sdp"
+                android:orientation="horizontal"

-                android:orientation="horizontal">
+                android:paddingTop="@dimen/_8sdp">

                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                    android:layout_width="wrap_content"
@ -313,11 +308,11 @@
            </LinearLayout>

            <LinearLayout
-                android:visibility="gone"
                android:id="@+id/bankAcNoContainer"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:visibility="gone">

                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                    android:layout_width="wrap_content"
@ -331,8 +326,8 @@
                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                    android:id="@+id/txt_bankAcNo"
                    android:layout_width="0dp"
-                    android:layout_weight="1"
                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
                    android:gravity="end"

                    android:textColor="@color/black"
@ -346,51 +341,49 @@


        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-            android:layout_marginTop="@dimen/_8sdp"
            android:layout_width="match_parent"
-            android:singleLine="false"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/_8sdp"
            android:gravity="center"
            android:maxLines="2"
-            android:layout_height="wrap_content"
+            android:singleLine="false"
            android:text="@string/i_have_read_to_text"
            android:textColor="@color/dark_gray"
            android:textSize="@dimen/_11ssp" />
+
        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-           android:layout_marginTop="@dimen/_5sdp"
            android:id="@+id/txt_user_aggreement"
-            android:paddingTop="@dimen/_4sdp"
-            android:paddingBottom="@dimen/_4sdp"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/_5sdp"
            android:gravity="center"
+            android:paddingTop="@dimen/_4sdp"
+            android:paddingBottom="@dimen/_4sdp"
            android:text="@string/gme_user_aggreement_text"
            android:textColor="@color/colorPrimary"
            android:textSize="@dimen/_11ssp" />

        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-            android:layout_marginBottom="@dimen/_16sdp"
            android:id="@+id/txt_fraud_warning"
-            android:paddingTop="@dimen/_4sdp"
-            android:paddingBottom="@dimen/_4sdp"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/_16sdp"
            android:gravity="center"
+            android:paddingTop="@dimen/_4sdp"
+            android:paddingBottom="@dimen/_4sdp"
            android:text="@string/gme_fraud_warning_text"
            android:textColor="@color/colorPrimary"
            android:textSize="@dimen/_11ssp" />


-
        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
            android:id="@+id/exRateCalculateButton"
            style="@style/MButton"
            android:layout_gravity="center"
-            android:layout_marginBottom="20dp"
            android:layout_marginTop="20dp"
+            android:layout_marginBottom="20dp"
+            android:enabled="true"
            android:background="@drawable/ic_rounded_background_red_coloured"
-            android:text="@string/agree_and_send_text"
-            android:textAllCaps="false"
-            android:textColor="@color/white"
-            android:textSize="@dimen/_14ssp" />
+            android:text="@string/agree_and_send_text" />
    </LinearLayout>
 </androidx.core.widget.NestedScrollView>
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@ -44,4 +44,7 @@
    <color name="hint_color_inactive">@color/darkgray2</color>


+    <color name="mform_bg_color">@color/white</color>
+
+
 </resources>
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@ -30,6 +30,8 @@
    <dimen name="button_max_width">@dimen/_200sdp</dimen>
    <dimen name="button_padding">@dimen/_6sdp</dimen>

+    <dimen name="form_corner_radius">@dimen/_8sdp</dimen>
+    <dimen name="form_rounded_corner_default_margin">@dimen/_3sdp</dimen>


    <dimen name="form_input_padding_top">@dimen/_8sdp</dimen>
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@ -209,6 +209,10 @@
        <item name="android:layout_height">wrap_content</item>
        <item name="android:layout_width">match_parent</item>
    </style>
+    <style name="MFormBoundWithCornerRadius" parent="MFormBound">
+        <item name="android:background">@drawable/mform_with_corner_radius_bg</item>
+        <item name="android:layout_margin">@dimen/form_rounded_corner_default_margin</item>
+    </style>

    <style name="MFormTitle">
        <item name="android:textColor">@color/colorPrimary</item>