From 0efeab4c059279fbaaa70dd540a3b312a45b017d Mon Sep 17 00:00:00 2001
From: Preyea Regmi <preyearegmi@outlook.com>
Date: Fri, 6 Mar 2020 12:27:11 +0545
Subject: [PATCH] Font size fixes in pre-boarding screens

---
 .../res/layout/activity_change_password.xml   |  6 ++---
 .../layout/activity_change_password_v2.xml    |  4 +---
 app/src/main/res/layout/activity_login_v2.xml |  3 +--
 .../main/res/layout/activity_register_v2.xml  | 23 +++++++++----------
 .../layout/activity_splash_screen_key_0.xml   |  1 -
 .../layout/activity_splash_screen_key_1.xml   | 13 ++---------
 .../res/layout/activity_user_bank_detail.xml  |  4 +---
 .../res/layout/activity_user_documents.xml    |  4 +---
 .../layout/activity_user_general_detail.xml   |  5 ++--
 app/src/main/res/values/dimens.xml            |  3 ++-
 app/src/main/res/values/styles.xml            |  6 ++++-
 11 files changed, 28 insertions(+), 44 deletions(-)

diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 92d14b6b..1d899d12 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -100,12 +100,10 @@
                    android:hint="Confirm your password"/>
            </LinearLayout>
            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
+               style="@style/gme_button"
                android:id="@+id/btn_submit"
-               android:layout_width="200dp"
-               android:layout_height="@dimen/button_height"
                android:text="Save"
-               android:layout_centerInParent="true"
-               android:onClick="onClickUpdatePassword"
+
                android:background="@drawable/ic_rounded_background_red_coloured"
                android:textColor="@color/white"
                android:textSize="18sp"
diff --git a/app/src/main/res/layout/activity_change_password_v2.xml b/app/src/main/res/layout/activity_change_password_v2.xml
index c65d219c..8f8081bc 100644
--- a/app/src/main/res/layout/activity_change_password_v2.xml
+++ b/app/src/main/res/layout/activity_change_password_v2.xml
@@ -110,13 +110,11 @@
                 android:layout_height="wrap_content" />
 
             <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
+                style="@style/gme_button"
                 android:id="@+id/btn_submit"
-                android:layout_width="200dp"
-                android:layout_height="@dimen/button_height"
                 android:text="@string/save_password_text"
                 android:background="@drawable/ic_rounded_background_red_coloured"
                 android:textColor="@color/white"
-                android:textSize="18sp"
                 android:textAllCaps="false"
                 android:layout_gravity="center"
 
diff --git a/app/src/main/res/layout/activity_login_v2.xml b/app/src/main/res/layout/activity_login_v2.xml
index eada407d..bc21e6b4 100644
--- a/app/src/main/res/layout/activity_login_v2.xml
+++ b/app/src/main/res/layout/activity_login_v2.xml
@@ -135,9 +135,8 @@
                     android:paddingTop="10dp"
                     android:layout_height="wrap_content">
                     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
+                        style="@style/gme_button"
                         android:id="@+id/btn_submit"
-                        android:layout_width="200dp"
-                        android:layout_height="50dp"
                         android:layout_gravity="center"
                         android:background="@drawable/red_morph_button_bg"
                         android:text="@string/login_text"
diff --git a/app/src/main/res/layout/activity_register_v2.xml b/app/src/main/res/layout/activity_register_v2.xml
index d4a1f35a..b5a6e4e1 100644
--- a/app/src/main/res/layout/activity_register_v2.xml
+++ b/app/src/main/res/layout/activity_register_v2.xml
@@ -49,7 +49,7 @@
                     android:paddingBottom="5dp"
                     android:text="@string/register_title_text"
                     android:textColor="@color/colorAccent"
-                    android:textSize="24sp"
+                    android:textSize="@dimen/h5"
                     app:txtfontName="@string/bold"/>
 
                 <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
@@ -79,7 +79,7 @@
                     android:paddingTop="8dp"
                     android:paddingBottom="2dp"
                     android:text="@string/login_user_id_text"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/text_normal"
                     app:txtfontName="@string/regular" />
                 <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
                     style="@style/editetxtsinglelineDone"
@@ -91,7 +91,7 @@
                     android:paddingBottom="@dimen/_6sdp"
                     android:paddingStart="@dimen/_6sdp"
                     android:paddingEnd="@dimen/_8sdp"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/text_medium"
                     android:minHeight="40dp"
                     android:hint="@string/userid_placeholder_text"
                     android:imeOptions="actionDone"
@@ -114,7 +114,7 @@
                     android:layout_height="wrap_content"
                     android:paddingBottom="2dp"
                     android:text="@string/create_password_text"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/text_normal"
                     app:txtfontName="@string/regular" />
                 <com.gmeremit.online.gmeremittance_native.utils.security.securitykeypad.SecurityKeyboardView
                     android:id="@+id/securityKeyboardPassword"
@@ -137,7 +137,7 @@
                     android:layout_height="wrap_content"
                     android:paddingBottom="2dp"
                     android:text="@string/native_country_text"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/text_normal"
                     app:txtfontName="@string/regular" />
                 <FrameLayout
                     android:id="@+id/ed_native_country_container"
@@ -163,7 +163,7 @@
                         android:paddingEnd="@dimen/_8sdp"
                         app:applyASCIIFilter="false"
                         android:background="@android:color/transparent"
-                        android:textSize="16sp"
+                        android:textSize="@dimen/text_medium"
                         android:minHeight="40dp"
                         android:hint="@string/native_country_text"
                         android:imeOptions="actionDone"
@@ -190,7 +190,7 @@
                     android:paddingTop="8dp"
                     android:paddingBottom="2dp"
                     android:text="@string/mobile_text"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/text_normal"
                     app:txtfontName="@string/regular" />
                 <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
                     style="@style/editetxtsinglelineDone"
@@ -199,7 +199,7 @@
                     android:layout_height="wrap_content"
                     android:maxLines="1"
                     android:inputType="phone"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/text_medium"
                     android:minHeight="40dp"
                     android:paddingTop="@dimen/_6sdp"
                     android:paddingBottom="@dimen/_6sdp"
@@ -236,7 +236,7 @@
                         android:layout_gravity="center"
                         android:text="@string/already_have_account_text"
                         android:textColor="@color/darkgray"
-                        android:textSize="14sp"/>
+                        android:textSize="@dimen/text_small"                        />
 
                     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                         android:paddingBottom="5dp"
@@ -246,15 +246,14 @@
                         android:layout_height="wrap_content"
                         android:text="@string/login_text"
                         android:textColor="#2e3192"
-                        android:textSize="14sp"/>
+                        android:textSize="@dimen/text_small"                        />
                 </LinearLayout>
 
 
                 <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
+                    style="@style/gme_button"
                     android:id="@+id/btn_submit"
                     android:enabled="false"
-                    android:layout_width="200dp"
-                    android:layout_height="50dp"
                     android:layout_gravity="center"
                     android:layout_marginBottom="4dp"
                     android:layout_marginTop="4dp"
diff --git a/app/src/main/res/layout/activity_splash_screen_key_0.xml b/app/src/main/res/layout/activity_splash_screen_key_0.xml
index f03b78bb..1344d992 100644
--- a/app/src/main/res/layout/activity_splash_screen_key_0.xml
+++ b/app/src/main/res/layout/activity_splash_screen_key_0.xml
@@ -407,7 +407,6 @@
             android:layout_marginEnd="@dimen/_8sdp"
             android:textAllCaps="false"
             android:textColor="@color/white"
-            android:textSize="@dimen/button_text_size"
             app:layout_constraintBottom_toBottomOf="@+id/btn_rgstr"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
diff --git a/app/src/main/res/layout/activity_splash_screen_key_1.xml b/app/src/main/res/layout/activity_splash_screen_key_1.xml
index 83e59903..6a1e1aa6 100644
--- a/app/src/main/res/layout/activity_splash_screen_key_1.xml
+++ b/app/src/main/res/layout/activity_splash_screen_key_1.xml
@@ -96,18 +96,13 @@
         app:layout_constraintTop_toBottomOf="@id/selectedLanguageText"/>
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
-        style="@style/gme_button"
         android:id="@+id/btn_rgstr"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+
         android:layout_marginStart="@dimen/_8sdp"
         android:layout_marginTop="@dimen/_18sdp"
         android:layout_marginEnd="@dimen/_8sdp"
-        android:textAllCaps="false"
-        android:textColor="@color/white"
-        android:textSize="@dimen/_11ssp"
-        android:background="@drawable/ic_red_button_with_white_border"
-        android:text="@string/new_user_text"
         app:layout_constraintEnd_toStartOf="@+id/btn_lgn"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/languageRv"
@@ -117,16 +112,12 @@
         />
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
-        style="@style/gme_button"
         android:id="@+id/btn_lgn"
-        android:text="@string/login_text"
-        android:background="@drawable/ic_blue_button_with_white_border"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+
         android:layout_marginStart="@dimen/_8sdp"
         android:layout_marginEnd="@dimen/_8sdp"
-        android:textAllCaps="false"
-        android:textColor="@color/white"
         app:layout_constraintBottom_toBottomOf="@+id/btn_rgstr"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
diff --git a/app/src/main/res/layout/activity_user_bank_detail.xml b/app/src/main/res/layout/activity_user_bank_detail.xml
index f4cae188..a342660b 100644
--- a/app/src/main/res/layout/activity_user_bank_detail.xml
+++ b/app/src/main/res/layout/activity_user_bank_detail.xml
@@ -182,13 +182,11 @@
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
         android:id="@+id/btn_submit"
-        android:layout_width="200dp"
-        android:layout_height="@dimen/button_height"
+        style="@style/gme_button"
         android:text="Done"
         android:layout_centerInParent="true"
         android:background="@drawable/ic_rounded_background_red_coloured"
         android:textColor="@color/white"
-        android:textSize="18sp"
         android:textAllCaps="false"
         android:layout_gravity="center"
         android:layout_marginBottom="30dp"
diff --git a/app/src/main/res/layout/activity_user_documents.xml b/app/src/main/res/layout/activity_user_documents.xml
index a9787919..f05b115f 100644
--- a/app/src/main/res/layout/activity_user_documents.xml
+++ b/app/src/main/res/layout/activity_user_documents.xml
@@ -259,14 +259,12 @@
 
           <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
               android:id="@+id/btn_submit"
-              android:layout_width="200dp"
-              android:layout_height="@dimen/button_height"
+              style="@style/gme_button"
               android:text="Done"
               android:visibility="gone"
               android:layout_centerInParent="true"
               android:background="@drawable/ic_rounded_background_red_coloured"
               android:textColor="@color/white"
-              android:textSize="18sp"
               android:textAllCaps="false"
               android:layout_gravity="center"
               android:layout_marginBottom="30dp"
diff --git a/app/src/main/res/layout/activity_user_general_detail.xml b/app/src/main/res/layout/activity_user_general_detail.xml
index 6cc8cb71..2662c695 100644
--- a/app/src/main/res/layout/activity_user_general_detail.xml
+++ b/app/src/main/res/layout/activity_user_general_detail.xml
@@ -404,8 +404,7 @@
 
             <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
                 android:id="@+id/btn_submit"
-                android:layout_width="200dp"
-                android:layout_height="@dimen/button_height"
+                style="@style/gme_button"
                 android:layout_centerInParent="true"
                 android:layout_gravity="center"
                 android:layout_marginBottom="30dp"
@@ -414,7 +413,7 @@
                 android:text="Done"
                 android:textAllCaps="false"
                 android:textColor="@color/white"
-                android:textSize="18sp"/>
+                />
 
 
         </LinearLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 2cf271ae..c812eca3 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,7 +3,7 @@
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="topbar_imagesize">45dp</dimen>
     <dimen name="topbar_textsize">11sp</dimen>
-    <dimen name="button_height">50dp</dimen>
+
     <dimen name="kycTextUpperMargin">@dimen/_3sdp</dimen>
     <dimen name="kycimagedocumentmargin">7dp</dimen>
     <dimen name="splash_bottom_margin">32dp</dimen>
@@ -26,6 +26,7 @@
     
     <dimen name="button_text_size">@dimen/_13ssp</dimen>
     <dimen name="button_min_height">@dimen/_40sdp</dimen>
+    <dimen name="button_width">@dimen/_175sdp</dimen>
 
 
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 88be0f5e..fe528a55 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -42,10 +42,14 @@
     </style>
 
 
-    <style name="gme_button" parent="@android:style/Widget.EditText">
+    <style name="gme_button" parent="android:style/Widget.Button">
+
         <item name="android:minHeight">@dimen/button_min_height</item>
         <item name="android:gravity">center</item>
         <item name="android:textSize">@dimen/button_text_size</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">@dimen/button_width</item>
+
     </style>