Style updated

4 years ago · bf1b5d9b78
48 changed files with 131 additions and 160 deletions
--- a/.idea/caches/build_file_checksums.ser
+++ b/.idea/caches/build_file_checksums.ser
--- a/app/src/main/res/layout/activity_app_update.xml
+++ b/app/src/main/res/layout/activity_app_update.xml
@ -74,7 +74,7 @@
        app:layout_constraintTop_toBottomOf="@+id/gmeTextViewDetail">

        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
-            style="@style/gme_button"
+            style="@style/MButton"
            android:id="@+id/btn_update"
            android:layout_gravity="center_horizontal"
            android:layout_marginTop="25dp"
--- a/app/src/main/res/layout/activity_bank_account_validation_v2.xml
+++ b/app/src/main/res/layout/activity_bank_account_validation_v2.xml
@ -144,7 +144,7 @@

            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
                android:id="@+id/verifyButton"
-                style="@style/gme_button"
+                style="@style/MButton"
                android:layout_gravity="center"
                android:layout_marginStart="8dp"
                android:layout_marginTop="40dp"
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@ -100,7 +100,7 @@
                   android:hint="Confirm your password"/>
           </LinearLayout>
           <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
-               style="@style/gme_button"
+               style="@style/MButton"
               android:id="@+id/btn_submit"
               android:text="Save"

--- a/app/src/main/res/layout/activity_change_password_v2.xml
+++ b/app/src/main/res/layout/activity_change_password_v2.xml
@ -15,13 +15,9 @@
        android:layout_height="wrap_content"
        android:scrollbars="none">
        <LinearLayout
-            android:layout_marginStart="@dimen/_4sdp"
-            android:layout_marginEnd="@dimen/_4sdp"
-            android:layout_marginTop="@dimen/_2sdp"
-            android:padding="@dimen/_11sdp"
+            android:layout_margin="@dimen/_2sdp"
+            style="@style/MFormBound"
            android:background="@drawable/ic_rounded_white"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
            android:orientation="vertical">


@ -75,10 +71,9 @@
            </com.gmeremit.online.gmeremittance_native.common.view.MTextInputLayout>

            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
-                style="@style/gme_button"
+                style="@style/MButton"
                android:id="@+id/btn_submit"
                android:text="@string/save_password_text"
-                android:enabled="false"
                android:layout_gravity="center"
                android:layout_marginTop="20dp"/>

--- a/app/src/main/res/layout/activity_domestic_remit.xml
+++ b/app/src/main/res/layout/activity_domestic_remit.xml
@ -278,7 +278,7 @@

        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
            android:id="@+id/btn_ok"
-            style="@style/gme_button"
+            style="@style/MButton"

            android:layout_width="@dimen/_200sdp"
            android:layout_gravity="center"
@ -292,7 +292,7 @@
            android:textSize="16sp" />

        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
-            style="@style/gme_button"
+            style="@style/MButton"

            android:visibility="gone"
            android:id="@+id/btn_submit"
--- a/app/src/main/res/layout/activity_domestic_remit_receipt.xml
+++ b/app/src/main/res/layout/activity_domestic_remit_receipt.xml
@ -600,7 +600,7 @@
            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
                android:visibility="visible"
                android:id="@+id/btn_submit"
-                style="@style/gme_button"
+                style="@style/MButton"
                android:layout_centerInParent="true"
                android:layout_gravity="center"
                android:layout_marginBottom="30dp"
--- a/app/src/main/res/layout/activity_exchange_method_v2.xml
+++ b/app/src/main/res/layout/activity_exchange_method_v2.xml
@ -275,7 +275,7 @@
        android:id="@+id/exRateCalculateButton"
        android:layout_marginTop="@dimen/_14sdp"
        android:layout_marginBottom="@dimen/_14sdp"
-        style="@style/gme_button"
+        style="@style/MButton"
        android:layout_gravity="center"
        android:background="@drawable/ic_rounded_background_red_coloured"
        android:text="@string/calculate_text"
--- a/app/src/main/res/layout/activity_fingerprint_enable_prompt.xml
+++ b/app/src/main/res/layout/activity_fingerprint_enable_prompt.xml
@ -83,7 +83,7 @@

    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
        android:id="@+id/btn_use_fingerprint"
-        style="@style/gme_button"
+        style="@style/MButton"
        android:layout_gravity="center"
        android:layout_marginStart="8dp"
        android:layout_marginTop="60dp"
--- a/app/src/main/res/layout/activity_general_enquiry.xml
+++ b/app/src/main/res/layout/activity_general_enquiry.xml
@ -79,7 +79,7 @@

            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
                android:id="@+id/btn_submit"
-                style="@style/gme_button"
+                style="@style/MButton"
                android:layout_gravity="center"
                android:layout_marginTop="34dp"
                android:background="@drawable/ic_rounded_background_red_coloured"
--- a/app/src/main/res/layout/activity_inbound_remit_receipt.xml
+++ b/app/src/main/res/layout/activity_inbound_remit_receipt.xml
@ -613,7 +613,7 @@
                android:orientation="horizontal">

                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
-                    style="@style/gme_button"
+                    style="@style/MButton"
                    android:layout_marginStart="@dimen/_5sdp"
                    android:layout_marginEnd="@dimen/_5sdp"
                    android:visibility="visible"
@ -630,7 +630,7 @@
                    android:textSize="16sp" />

                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
-                    style="@style/gme_button"
+                    style="@style/MButton"
                    android:layout_marginStart="@dimen/_5sdp"
                    android:layout_marginEnd="@dimen/_5sdp"
                    android:visibility="visible"
@ -648,7 +648,7 @@
            </LinearLayout>

            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
-                style="@style/gme_button"
+                style="@style/MButton"
                android:visibility="gone"
                android:id="@+id/btn_submit"
                android:layout_gravity="center"
--- a/app/src/main/res/layout/activity_invite.xml
+++ b/app/src/main/res/layout/activity_invite.xml
@ -41,7 +41,7 @@
            </LinearLayout>

            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
-                style="@style/gme_button"
+                style="@style/MButton"
                android:id="@+id/btn_invite"
                android:layout_gravity="center"
                android:layout_marginBottom="4dp"
--- a/app/src/main/res/layout/activity_invite_form.xml
+++ b/app/src/main/res/layout/activity_invite_form.xml
@ -128,7 +128,7 @@

            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
                android:id="@+id/btn_invite"
-                style="@style/gme_button"
+                style="@style/MButton"
                android:layout_gravity="center"
                android:layout_marginBottom="4dp"
                android:layout_marginTop="22dp"
--- a/app/src/main/res/layout/activity_login_v2.xml
+++ b/app/src/main/res/layout/activity_login_v2.xml
@ -8,7 +8,6 @@
    android:layout_height="match_parent"
    android:orientation="vertical"
    android:focusableInTouchMode="true"
-
    android:background="#fff">
    <include layout="@layout/layout_kyc_toolbar"/>

@ -20,24 +19,14 @@
            android:scrollbars="none">

            <LinearLayout
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
-                android:background="@android:color/transparent"
+               style="@style/MFormBound"
                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+               >

                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:paddingTop="6dp"
+                    style="@style/MFormTitle"
                    android:text="@string/login_title_text"
-                    android:textColor="@color/colorAccent"
-                    android:textSize="@dimen/h5"
-                    app:txtfontName="@string/bold"/>
-
-
+                   />


                <com.gmeremit.online.gmeremittance_native.common.view.MTextInputLayout
@ -98,26 +87,24 @@

                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
                    android:layout_marginTop="@dimen/_15sdp"
-                    style="@style/gme_button"
+                    style="@style/MButton"
                    android:id="@+id/btn_submit"
                    android:layout_gravity="center"
                    android:text="@string/login_text"
-                    android:enabled="false"
                    />



                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                        style="@style/MFormLink"
                        android:id="@+id/tv_forgotpass"
                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
                        android:layout_gravity="center"
-                        android:layout_marginTop="8dp"
-                        android:layout_marginBottom="8dp"
-                        android:padding="5dp"
+                        android:layout_marginTop="@dimen/_8sdp"
+                        android:layout_marginBottom="@dimen/_8sdp"
                        android:text="@string/forgot_password_text"
-                        android:textColor="@color/colorAccent"
-                        android:textSize="@dimen/text_small"/>
+
+                       />

                    <LinearLayout
                        android:layout_gravity="center_horizontal"
@ -128,26 +115,19 @@
                        >

                        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                            android:paddingBottom="5dp"
-                            android:paddingTop="5dp"
+                           style="@style/MFormLink"
                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
                            android:text="@string/new_to_gme_text"
                            android:textColor="@color/darkgray"
-                            android:textSize="@dimen/text_small"/>
-                        <View
-                            android:layout_width="3dp"
-                            android:layout_height="match_parent"/>
+                            />
+
                        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                            android:paddingBottom="5dp"
-                            android:paddingTop="5dp"
+                            style="@style/MFormLink"
                            android:id="@+id/register"
                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
                            android:text="@string/login_register_here_text"
-                            android:textColor="#2e3192"
-                            android:textSize="@dimen/text_small"/>
+                            android:textColor="@color/bluebg"
+                           />
                    </LinearLayout>


--- a/app/src/main/res/layout/activity_penny_test.xml
+++ b/app/src/main/res/layout/activity_penny_test.xml
@ -44,7 +44,7 @@

        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
            android:id="@+id/btn_submit"
-            style="@style/gme_button"
+            style="@style/MButton"
            android:layout_gravity="center"
            android:layout_marginTop="4dp"
            android:layout_marginBottom="4dp"
--- a/app/src/main/res/layout/activity_recipient_add_edit_v3.xml
+++ b/app/src/main/res/layout/activity_recipient_add_edit_v3.xml
@ -517,11 +517,10 @@

            <Button
                android:id="@+id/btn_submit"
-                style="@style/gme_button"
+                style="@style/MButton"
                android:layout_gravity="center"
-                android:layout_marginTop="20dp"
-                android:layout_marginBottom="30dp"
-                android:enabled="false"
+                android:layout_marginTop="@dimen/_15sdp"
+                android:layout_marginBottom="@dimen/_15sdp"
                android:text="@string/submit_text"
            />

--- a/app/src/main/res/layout/activity_register_v2.xml
+++ b/app/src/main/res/layout/activity_register_v2.xml
@ -18,23 +18,14 @@
            android:scrollbars="none">

            <LinearLayout
-                android:background="@android:color/transparent"
-                android:paddingStart="10dp"
-                android:paddingEnd="10dp"
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                style="@style/MFormBound"
+                android:orientation="vertical">


                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="10dp"
-                    android:paddingBottom="5dp"
+                    style="@style/MFormTitle"
                    android:text="@string/register_title_text"
-                    android:textColor="@color/colorAccent"
-                    android:textSize="@dimen/h5"
-                    app:txtfontName="@string/bold"/>
+                    />



@ -111,37 +102,27 @@
                    >

                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                        android:paddingBottom="4dp"
-                        android:paddingTop="4dp"
+                        style="@style/MFormLink"
                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
                        android:text="@string/already_have_account_text"
-                        android:textColor="@color/darkgray"
-                        android:textSize="@dimen/text_small"                        />
-                    <View
-                        android:layout_width="@dimen/_5sdp"
-                        android:layout_height="match_parent"/>
+                        android:textColor="@color/darkgray"/>

                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                        android:paddingBottom="5dp"
-                        android:paddingTop="5dp"
+                        style="@style/MFormLink"
                        android:id="@+id/tv_login"
                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
                        android:text="@string/login_text"
-                        android:textColor="#2e3192"
+                        android:textColor="@color/bluebg"
                        android:textSize="@dimen/text_small"                        />
                </LinearLayout>


                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
-                    style="@style/gme_button"
+                    style="@style/MButton"
                    android:id="@+id/btn_submit"
                    android:layout_gravity="center"
-                    android:layout_marginBottom="4dp"
-                    android:layout_marginTop="4dp"
-                    android:enabled="false"
+                    android:layout_marginBottom="@dimen/_4sdp"
+                    android:layout_marginTop="@dimen/_4sdp"
                    android:text="@string/register_text"
                  />
            </LinearLayout>
--- a/app/src/main/res/layout/activity_reset_pass_v2.xml
+++ b/app/src/main/res/layout/activity_reset_pass_v2.xml
@ -17,31 +17,20 @@
            android:scrollbars="none">

            <LinearLayout
-                android:paddingLeft="20dp"
-                android:paddingRight="20dp"
+                style="@style/MFormBound"
                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+               >

                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="10dp"
-                    android:paddingBottom="5dp"
+                    style="@style/MFormTitle"
                    android:text="@string/forgot_password_title_text"
-                    android:textColor="@color/colorAccent"
-                    android:textSize="@dimen/h5"
-                    app:txtfontName="@string/bold"/>
+                   />

                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/_5sdp"
+                    android:layout_marginBottom="@dimen/_10sdp"
+                    style="@style/MRegularFormTextView"
                     android:text="@string/forgot_password_subtitle_text"
-                    android:textSize="14sp"
-                    android:paddingTop="8dp"
-                    android:paddingBottom="8dp"
-
-                    app:txtfontName="@string/regular"
                    />

                <com.gmeremit.online.gmeremittance_native.common.view.MTextInputLayout
@ -64,11 +53,10 @@

                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
                    android:id="@+id/btn_submit"
-                    style="@style/gme_button"
+                    style="@style/MButton"
                    android:layout_gravity="center"
                    android:layout_marginBottom="4dp"
                    android:layout_marginTop="30dp"
-                    android:enabled="false"
                    android:text="@string/reset_text"
                   />
            </LinearLayout>
--- a/app/src/main/res/layout/activity_reward_order_detail.xml
+++ b/app/src/main/res/layout/activity_reward_order_detail.xml
@ -371,7 +371,7 @@
            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
                android:visibility="invisible"
                android:id="@+id/btn_submit"
-                style="@style/gme_button"
+                style="@style/MButton"
                android:layout_centerInParent="true"
                android:layout_gravity="center"
                android:layout_marginBottom="30dp"
--- a/app/src/main/res/layout/activity_reward_redeem_v2.xml
+++ b/app/src/main/res/layout/activity_reward_redeem_v2.xml
@ -196,7 +196,7 @@

        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
            android:id="@+id/btn_submit"
-            style="@style/gme_button"
+            style="@style/MButton"
            android:layout_gravity="center"
            android:layout_marginStart="8dp"
            android:layout_marginTop="25dp"
--- a/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml
+++ b/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml
@ -576,7 +576,7 @@

            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
                android:id="@+id/btn_submit"
-                style="@style/gme_button"
+                style="@style/MButton"
                android:layout_gravity="center"
                android:layout_marginTop="20dp"
                android:layout_marginBottom="30dp"
@ -598,7 +598,7 @@

                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
                    android:id="@+id/btn_cancel"
-                    style="@style/gme_button"
+                    style="@style/MButton"
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
                    android:layout_marginStart="@dimen/_5sdp"
@ -616,7 +616,7 @@

                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
                    android:id="@+id/btn_change"
-                    style="@style/gme_button"
+                    style="@style/MButton"
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
                    android:layout_gravity="center"
--- a/app/src/main/res/layout/activity_splash_screen_key_0.xml
+++ b/app/src/main/res/layout/activity_splash_screen_key_0.xml
@ -394,7 +394,7 @@


        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
-            style="@style/gme_button"
+            style="@style/MButton"
            android:id="@+id/btn_rgstr"
            android:layout_width="0dp"
            android:layout_height="wrap_content"
@ -414,7 +414,7 @@
            />

        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
-            style="@style/gme_button"
+            style="@style/MButton"
            android:id="@+id/btn_lgn"
            android:text="@string/login_text"
            android:background="@drawable/ic_blue_button_with_white_border"
--- a/app/src/main/res/layout/activity_splash_screen_key_2.xml
+++ b/app/src/main/res/layout/activity_splash_screen_key_2.xml
@ -110,7 +110,7 @@


    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
-        style="@style/gme_button"
+        style="@style/MButton"
        android:id="@+id/btn_rgstr"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
@ -129,7 +129,7 @@
        app:layout_constraintTop_toBottomOf="@+id/gmeExratePC" />

    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
-        style="@style/gme_button"
+        style="@style/MButton"
        android:id="@+id/btn_lgn"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
--- a/app/src/main/res/layout/activity_suggestion_feedback.xml
+++ b/app/src/main/res/layout/activity_suggestion_feedback.xml
@ -79,7 +79,7 @@

            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
                android:id="@+id/btn_submit"
-                style="@style/gme_button"
+                style="@style/MButton"

                android:layout_gravity="center"
                android:layout_marginTop="34dp"
--- a/app/src/main/res/layout/activity_support_v2.xml
+++ b/app/src/main/res/layout/activity_support_v2.xml
@ -83,7 +83,7 @@

            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
                android:id="@+id/btn_submit"
-                style="@style/gme_button"
+                style="@style/MButton"
                android:layout_gravity="center"
                android:layout_marginTop="47dp"
                android:background="@drawable/ic_rounded_background_red_coloured"
--- a/app/src/main/res/layout/activity_user_bank_detail.xml
+++ b/app/src/main/res/layout/activity_user_bank_detail.xml
@ -182,7 +182,7 @@

    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
        android:id="@+id/btn_submit"
-        style="@style/gme_button"
+        style="@style/MButton"
        android:text="Done"
        android:layout_centerInParent="true"
        android:background="@drawable/ic_rounded_background_red_coloured"
--- a/app/src/main/res/layout/activity_user_documents.xml
+++ b/app/src/main/res/layout/activity_user_documents.xml
@ -259,7 +259,7 @@

          <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
              android:id="@+id/btn_submit"
-              style="@style/gme_button"
+              style="@style/MButton"
              android:text="Done"
              android:visibility="gone"
              android:layout_centerInParent="true"
--- a/app/src/main/res/layout/activity_user_email_change.xml
+++ b/app/src/main/res/layout/activity_user_email_change.xml
@ -46,7 +46,7 @@
            android:enabled="false"
            android:layout_marginTop="@dimen/_30sdp"
            android:layout_marginBottom="@dimen/_15sdp"
-            style="@style/gme_button"
+            style="@style/MButton"
            android:background="@drawable/ic_rounded_background_red_coloured"
            android:layout_gravity="center_horizontal"
            android:text="@string/save_text"
--- a/app/src/main/res/layout/activity_user_general_detail.xml
+++ b/app/src/main/res/layout/activity_user_general_detail.xml
@ -404,7 +404,7 @@

            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
                android:id="@+id/btn_submit"
-                style="@style/gme_button"
+                style="@style/MButton"
                android:layout_centerInParent="true"
                android:layout_gravity="center"
                android:layout_marginBottom="30dp"
--- a/app/src/main/res/layout/activity_user_mobile_change.xml
+++ b/app/src/main/res/layout/activity_user_mobile_change.xml
@ -46,7 +46,7 @@
            android:enabled="false"
            android:layout_marginTop="@dimen/_30sdp"
            android:layout_marginBottom="@dimen/_15sdp"
-            style="@style/gme_button"
+            style="@style/MButton"
            android:background="@drawable/ic_rounded_background_red_coloured"
            android:layout_gravity="center_horizontal"
            android:text="@string/save_text"
--- a/app/src/main/res/layout/activity_withdraw_v2.xml
+++ b/app/src/main/res/layout/activity_withdraw_v2.xml
@ -171,7 +171,7 @@

        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
            android:id="@+id/refundButton"
-            style="@style/gme_button"
+            style="@style/MButton"
            android:layout_gravity="center"
            android:layout_marginStart="8dp"
            android:layout_marginTop="50dp"
--- a/app/src/main/res/layout/confirm_recharge_payment_bottom_sheet.xml
+++ b/app/src/main/res/layout/confirm_recharge_payment_bottom_sheet.xml
@ -122,7 +122,7 @@

    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
        android:id="@+id/continueBtn"
-        style="@style/gme_button"
+        style="@style/MButton"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
--- a/app/src/main/res/layout/fragment_amount_detail_resend_money_v2.xml
+++ b/app/src/main/res/layout/fragment_amount_detail_resend_money_v2.xml
@ -419,7 +419,7 @@

        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
            android:id="@+id/agreeButton"
-           style="@style/gme_button"
+           style="@style/MButton"
            android:layout_gravity="center"
            android:layout_marginTop="20dp"
            android:layout_marginBottom="20dp"
--- 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
@ -417,7 +417,7 @@

        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
            android:id="@+id/agreeButton"
-            style="@style/gme_button"
+            style="@style/MButton"
            android:layout_gravity="center"
            android:layout_marginTop="20dp"
            android:layout_marginBottom="20dp"
--- a/app/src/main/res/layout/fragment_auto_debit_bank_confirmation.xml
+++ b/app/src/main/res/layout/fragment_auto_debit_bank_confirmation.xml
@ -134,7 +134,7 @@

            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
                android:id="@+id/verifyButton"
-                style="@style/gme_button"
+                style="@style/MButton"
                android:layout_gravity="center"
                android:layout_marginStart="8dp"
                android:layout_marginTop="40dp"
--- a/app/src/main/res/layout/fragment_fixed_local_topup.xml
+++ b/app/src/main/res/layout/fragment_fixed_local_topup.xml
@ -150,7 +150,7 @@
            android:layout_marginStart="@dimen/_8sdp"
            android:layout_marginEnd="@dimen/_8sdp"
            android:id="@+id/continueBtn"
-            style="@style/gme_button"
+            style="@style/MButton"
            android:enabled="false"
            android:layout_gravity="center"
            android:layout_marginTop="@dimen/_15sdp"
--- a/app/src/main/res/layout/fragment_inbound_account_add.xml
+++ b/app/src/main/res/layout/fragment_inbound_account_add.xml
@ -149,7 +149,7 @@

    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
        android:id="@+id/startPennyTestButton"
-        style="@style/gme_button"
+        style="@style/MButton"
        android:layout_gravity="center"
        android:layout_marginTop="16dp"
        android:layout_marginBottom="32dp"
--- a/app/src/main/res/layout/fragment_inbound_account_penny_test.xml
+++ b/app/src/main/res/layout/fragment_inbound_account_penny_test.xml
@ -125,7 +125,7 @@

    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
        android:id="@+id/agreeButton"
-        style="@style/gme_button"
+        style="@style/MButton"
        android:layout_gravity="center"
        android:layout_marginTop="16dp"
        android:layout_marginBottom="8dp"
--- a/app/src/main/res/layout/fragment_kyc_auto_debit_prompt.xml
+++ b/app/src/main/res/layout/fragment_kyc_auto_debit_prompt.xml
@ -53,7 +53,7 @@
        app:layout_constraintEnd_toEndOf="parent"
        android:id="@+id/btn_submit"
        android:minWidth="200dp"
-        style="@style/gme_button"
+        style="@style/MButton"
        android:layout_marginTop="@dimen/_25sdp"
        android:layout_gravity="center"
        android:background="@drawable/ic_rounded_background_red_coloured"
--- a/app/src/main/res/layout/fragment_kyc_customer_detail.xml
+++ b/app/src/main/res/layout/fragment_kyc_customer_detail.xml
@ -171,12 +171,10 @@

            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
                android:id="@+id/btn_submit1"
-                style="@style/gme_button"
+                style="@style/MButton"
                android:layout_gravity="center"
                android:layout_marginTop="@dimen/_15sdp"
                android:layout_marginBottom="@dimen/_15sdp"
-
-                android:enabled="false"
                android:text="@string/save_and_next_text"
              />

@ -447,12 +445,10 @@

            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
                android:id="@+id/btn_submit2"
-                style="@style/gme_button"
+                style="@style/MButton"
                android:layout_gravity="center"
                android:layout_marginTop="@dimen/_15sdp"
                android:layout_marginBottom="@dimen/_15sdp"
-
-                android:enabled="false"
                android:text="@string/save_and_next_text"
                 />
        </LinearLayout>
--- a/app/src/main/res/layout/fragment_kyc_document.xml
+++ b/app/src/main/res/layout/fragment_kyc_document.xml
@ -218,7 +218,7 @@

            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
                android:id="@+id/btn_submit3"
-                style="@style/gme_button"
+                style="@style/MButton"
                android:layout_gravity="center"
                android:layout_marginTop="@dimen/_15sdp"
                android:background="@drawable/ic_rounded_background_red_coloured"
--- a/app/src/main/res/layout/fragment_kyc_perform_penny_test.xml
+++ b/app/src/main/res/layout/fragment_kyc_perform_penny_test.xml
@ -130,7 +130,7 @@
        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
            android:id="@+id/agreeButton"
            android:minWidth="200dp"
-            style="@style/gme_button"
+            style="@style/MButton"
            android:layout_gravity="center"
            android:layout_marginTop="16dp"
            android:layout_marginBottom="8dp"
--- a/app/src/main/res/layout/fragment_payout_mode_send_money_v2.xml
+++ b/app/src/main/res/layout/fragment_payout_mode_send_money_v2.xml
@ -160,7 +160,7 @@
    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
        android:id="@+id/payoutModeContinueButton"
        android:layout_marginTop="@dimen/_14sdp"
-        style="@style/gme_button"
+        style="@style/MButton"
        android:layout_marginBottom="@dimen/_10sdp"
        android:layout_gravity="center"
        android:background="@drawable/ic_rounded_background_red_coloured"
--- a/app/src/main/res/layout/fragment_regular_local_topup.xml
+++ b/app/src/main/res/layout/fragment_regular_local_topup.xml
@ -106,7 +106,7 @@
            android:layout_marginStart="@dimen/_8sdp"
            android:layout_marginEnd="@dimen/_8sdp"
            android:id="@+id/continueBtn"
-            style="@style/gme_button"
+            style="@style/MButton"
            android:enabled="false"

            android:layout_gravity="center"
--- a/app/src/main/res/layout/fragment_terms_and_condition.xml
+++ b/app/src/main/res/layout/fragment_terms_and_condition.xml
@ -237,7 +237,7 @@
    </ScrollView>
    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
        android:id="@+id/agreeButton"
-        style="@style/gme_button"
+        style="@style/MButton"
        android:layout_gravity="center"
        android:layout_marginTop="@dimen/_12sdp"
        android:layout_marginBottom="@dimen/_6sdp"
--- a/app/src/main/res/layout/fragment_verification_resend_money_v2.xml
+++ b/app/src/main/res/layout/fragment_verification_resend_money_v2.xml
@ -379,7 +379,7 @@

        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
            android:id="@+id/exRateCalculateButton"
-            style="@style/gme_button"
+            style="@style/MButton"
            android:layout_gravity="center"
            android:layout_marginBottom="20dp"
            android:layout_marginTop="20dp"
--- a/app/src/main/res/layout/fragment_verification_send_money_v2.xml
+++ b/app/src/main/res/layout/fragment_verification_send_money_v2.xml
@ -383,7 +383,7 @@

        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
            android:id="@+id/exRateCalculateButton"
-            style="@style/gme_button"
+            style="@style/MButton"
            android:layout_gravity="center"
            android:layout_marginBottom="20dp"
            android:layout_marginTop="20dp"
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@ -201,7 +201,43 @@

 <!--    Now every ui aspect will be controlled by style and theme-->

-    <style name="gme_button" parent="android:style/Widget.Button">
+    <style name="MFormBound">
+        <item name="android:paddingStart">@dimen/_10sdp</item>
+        <item name="android:paddingEnd">@dimen/_10sdp</item>
+        <item name="android:paddingTop">@dimen/_8sdp</item>
+        <item name="android:paddingBottom">@dimen/_8sdp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">match_parent</item>
+    </style>
+
+    <style name="MFormTitle">
+        <item name="android:textColor">@color/colorPrimary</item>
+        <item name="android:textSize">@dimen/h5</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="txtfontName">@string/bold</item>
+    </style>
+
+    <style name="MRegularFormTextView">
+        <item name="android:paddingTop">@dimen/_4sdp</item>
+        <item name="android:paddingBottom">@dimen/_4sdp</item>
+        <item name="android:textColor">@color/darkgray2</item>
+        <item name="android:textSize">@dimen/text_medium</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="txtfontName">@string/regular</item>
+    </style>
+
+    <style name="MFormLink">
+        <item name="android:textColor">@color/colorPrimary</item>
+        <item name="android:textSize">@dimen/text_small</item>
+        <item name="android:padding">@dimen/_4sdp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="txtfontName">@string/regular</item>
+    </style>
+
+    <style name="MButton" parent="android:style/Widget.Button">
        <item name="android:background">@drawable/ic_rounded_background_red_coloured</item>
        <item name="android:gravity">center</item>
        <item name="android:textSize">@dimen/button_text_size</item>
@ -211,9 +247,7 @@
        <item name="android:padding">@dimen/button_padding</item>
        <item name="android:textAllCaps">false</item>
        <item name="android:textColor">@color/white</item>
-
-
-
+        <item name="android:enabled">false</item>
    </style>

    <style name="MTextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
@ -234,8 +268,7 @@
    <style name="MTextInputLayoutForm" parent="MTextInputLayout">
        <item name="android:layout_marginTop">@dimen/form_input_margin_top</item>
        <item name="android:layout_marginBottom">@dimen/form_input_margin_bottom</item>
-        <item name="android:paddingStart">@dimen/form_input_padding_start</item>
-        <item name="android:paddingEnd">@dimen/form_input_padding_end</item>
+
    </style>

    <style name="MTextInputLayoutFormDropDown" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu" >
@ -245,8 +278,7 @@
        <item name="android:layout_width">match_parent</item>
        <item name="android:layout_marginTop">@dimen/form_input_margin_top</item>
        <item name="android:layout_marginBottom">@dimen/form_input_margin_bottom</item>
-        <item name="android:paddingStart">@dimen/form_input_padding_start</item>
-        <item name="android:paddingEnd">@dimen/form_input_padding_end</item>
+

    </style>