From c0e226c4c9e5ee0b7f3f968c22b1bceb6c767a23 Mon Sep 17 00:00:00 2001
From: Preyea Regmi <preyearegmi@outlook.com>
Date: Fri, 6 Mar 2020 11:47:45 +0545
Subject: [PATCH] Splash font size fixes for large screen devices

---
 .../presenter/ExchangeRatePresenter.java      |  1 -
 .../splash_screen/view/SplashScreen.java      |  4 ++-
 app/src/main/res/layout/activity_login_v2.xml |  2 +-
 .../layout/activity_splash_screen_key_0.xml   | 27 ++++++++++---------
 .../layout/activity_splash_screen_key_1.xml   | 10 +++----
 .../layout/activity_splash_screen_key_2.xml   |  7 ++---
 ...ash_exchange_paymentmode_rv_viewholder.xml |  2 +-
 .../splash_language_selection_item_view.xml   | 18 +++++--------
 app/src/main/res/values/dimens.xml            |  3 ++-
 app/src/main/res/values/styles.xml            |  7 +++++
 10 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/exrate/presenter/ExchangeRatePresenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/exrate/presenter/ExchangeRatePresenter.java
index 214c3961..ee15244b 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/exrate/presenter/ExchangeRatePresenter.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/exrate/presenter/ExchangeRatePresenter.java
@@ -159,7 +159,6 @@ public class ExchangeRatePresenter extends BasePresenter implements ExchangeRate
     }
 
     private CountryPaymentServiceSeedValueModel getDefaultValueByCountryPaymentService(CountryPaymentService countryPaymentService) {
-        //Default preferredLanguage = "NP"
         String preferredLanguage = "NP";
         String preferredCurrency;
         if (countryPaymentService != null) {
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java
index bd746256..5379e3e0 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java
@@ -22,6 +22,8 @@ import androidx.core.view.ViewCompat;
 import androidx.core.view.ViewPropertyAnimatorListenerAdapter;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.StaggeredGridLayoutManager;
+
+import android.os.Handler;
 import android.text.Editable;
 import android.view.GestureDetector;
 import android.view.KeyEvent;
@@ -666,7 +668,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
                     isExrateViewVisible = true;
                     isAnimationOnProgress = false;
                     userNavigatedToLanguageView = false;
-                    exRatePresenter.onExRateViewLoadedSuccessfully();
+                    new Handler().postDelayed(()-> exRatePresenter.onExRateViewLoadedSuccessfully(),150);
 
                 }
             });
diff --git a/app/src/main/res/layout/activity_login_v2.xml b/app/src/main/res/layout/activity_login_v2.xml
index 9ecba1ed..eada407d 100644
--- a/app/src/main/res/layout/activity_login_v2.xml
+++ b/app/src/main/res/layout/activity_login_v2.xml
@@ -141,7 +141,7 @@
                         android:layout_gravity="center"
                         android:background="@drawable/red_morph_button_bg"
                         android:text="@string/login_text"
-                        android:textSize="@dimen/button_label"
+                        android:textSize="@dimen/button_text_size"
 
                         android:textAllCaps="false"
                         android:textColor="@color/white"
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 80cd7d3b..f03b78bb 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
@@ -51,7 +51,9 @@
             app:layout_constraintEnd_toStartOf="@id/selectedLanguageText"
             app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="parent" />
+            app:layout_constraintTop_toBottomOf="parent"/>
+
+        <!--            app:layout_constraintTop_toBottomOf="parent"-->
 
         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
             android:id="@+id/selectedLanguageText"
@@ -63,7 +65,7 @@
             android:paddingBottom="@dimen/_10sdp"
             android:text="@string/select_language_text"
             android:textColor="@color/white"
-            android:textSize="@dimen/_15ssp"
+            android:textSize="@dimen/text_big"
             app:layout_constraintBottom_toBottomOf="@+id/selectedLanguageIcon"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/selectedLanguageIcon"
@@ -106,13 +108,12 @@
                 android:id="@+id/gmeTextView12"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-
                 android:gravity="start|left"
                 android:paddingTop="@dimen/_4sdp"
                 android:paddingBottom="@dimen/_4sdp"
                 android:text="@string/todays_rate_text"
                 android:textColor="@color/dark_gray"
-                android:textSize="@dimen/_11ssp"
+                android:textSize="@dimen/text_medium"
                 app:layout_constraintBottom_toTopOf="@+id/paymentModeRV"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -163,7 +164,7 @@
                         android:paddingTop="@dimen/_2sdp"
                         android:text="@string/you_send_text"
                         android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_12ssp" />
+                        android:textSize="@dimen/text_medium" />
 
                     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
                         android:id="@+id/sendAmountEdTxt"
@@ -211,7 +212,7 @@
                             android:paddingRight="@dimen/_4sdp"
                             android:text="KRW"
                             android:textColor="@color/white"
-                            android:textSize="@dimen/_10ssp"
+                            android:textSize="@dimen/text_medium"
                             android:textStyle="bold" />
 
                         <View
@@ -304,7 +305,7 @@
                         android:paddingTop="@dimen/_2sdp"
                         android:text="@string/receipient_gets_text"
                         android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_12ssp" />
+                        android:textSize="@dimen/text_medium" />
 
                     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
                         android:id="@+id/receiveAmountEdTxt"
@@ -355,7 +356,7 @@
                             android:paddingRight="@dimen/_2sdp"
                             android:text="@string/na_text"
                             android:textColor="@color/white"
-                            android:textSize="@dimen/_10ssp"
+                            android:textSize="@dimen/text_medium"
                             android:textStyle="bold" />
 
                         <ImageView
@@ -376,6 +377,7 @@
 
 
         <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"
@@ -384,9 +386,7 @@
             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"
@@ -397,6 +397,7 @@
             />
 
         <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"
@@ -406,7 +407,7 @@
             android:layout_marginEnd="@dimen/_8sdp"
             android:textAllCaps="false"
             android:textColor="@color/white"
-            android:textSize="@dimen/_11ssp"
+            android:textSize="@dimen/button_text_size"
             app:layout_constraintBottom_toBottomOf="@+id/btn_rgstr"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
@@ -420,7 +421,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/white"
-            android:textSize="@dimen/_10ssp"
+            android:textSize="@dimen/text_small"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/fab_chat"
@@ -453,7 +454,7 @@
             android:background="@drawable/circular_white_bg"
             android:gravity="center"
             android:textColor="@color/colorPrimary"
-            android:textSize="@dimen/_7ssp"
+            android:textSize="@dimen/text_mircoscopic"
             android:visibility="invisible"
             app:layout_constraintBottom_toTopOf="@+id/fab_chat"
             app:layout_constraintEnd_toEndOf="@+id/fab_chat"
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 97f0b97f..83e59903 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
@@ -57,7 +57,7 @@
         android:paddingBottom="@dimen/_10sdp"
         android:text="@string/select_language_text"
         android:textColor="@color/white"
-        android:textSize="@dimen/_15ssp"
+        android:textSize="@dimen/text_big"
         app:layout_constraintBottom_toBottomOf="@+id/selectedLanguageIcon"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/selectedLanguageIcon"
@@ -96,6 +96,7 @@
         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"
@@ -106,7 +107,6 @@
         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"
@@ -117,6 +117,7 @@
         />
 
     <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"
@@ -126,7 +127,6 @@
         android:layout_marginEnd="@dimen/_8sdp"
         android:textAllCaps="false"
         android:textColor="@color/white"
-        android:textSize="@dimen/_11ssp"
         app:layout_constraintBottom_toBottomOf="@+id/btn_rgstr"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
@@ -140,7 +140,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="@color/white"
-        android:textSize="@dimen/_10ssp"
+        android:textSize="@dimen/text_small"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/fab_chat"
@@ -173,7 +173,7 @@
         android:background="@drawable/circular_white_bg"
         android:gravity="center"
         android:textColor="@color/colorPrimary"
-        android:textSize="@dimen/_7ssp"
+        android:textSize="@dimen/text_mircoscopic"
         android:visibility="invisible"
         app:layout_constraintBottom_toTopOf="@+id/fab_chat"
         app:layout_constraintEnd_toEndOf="@+id/fab_chat"
diff --git a/app/src/main/res/layout/activity_splash_screen_key_2.xml b/app/src/main/res/layout/activity_splash_screen_key_2.xml
index 85615831..04d52d3f 100644
--- a/app/src/main/res/layout/activity_splash_screen_key_2.xml
+++ b/app/src/main/res/layout/activity_splash_screen_key_2.xml
@@ -70,7 +70,7 @@
         android:layout_marginStart="@dimen/_12sdp"
         android:text="@string/select_language_text"
         android:textColor="@color/white"
-        android:textSize="@dimen/_15ssp"
+        android:textSize="@dimen/text_large"
         app:layout_constraintBottom_toBottomOf="@+id/selectedLanguageIcon"
         app:layout_constraintStart_toEndOf="@id/selectedLanguageIcon"
         app:layout_constraintTop_toTopOf="@+id/selectedLanguageIcon"
@@ -91,6 +91,7 @@
         app:layout_constraintTop_toBottomOf="@+id/selectedLanguageIcon" />
 
     <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"
@@ -109,6 +110,7 @@
         app:layout_constraintTop_toBottomOf="parent" />
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
+        style="@style/gme_button"
         android:id="@+id/btn_lgn"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -118,7 +120,6 @@
         android:text="@string/new_user_text"
         android:textAllCaps="false"
         android:textColor="@color/white"
-        android:textSize="@dimen/_11ssp"
         app:layout_constraintBottom_toBottomOf="@+id/btn_rgstr"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
@@ -131,7 +132,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/_10sdp"
         android:textColor="@color/white"
-        android:textSize="@dimen/_10ssp"
+        android:textSize="@dimen/text_small"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/btn_lgn"
diff --git a/app/src/main/res/layout/splash_exchange_paymentmode_rv_viewholder.xml b/app/src/main/res/layout/splash_exchange_paymentmode_rv_viewholder.xml
index 7053f80e..0ccc2b92 100644
--- a/app/src/main/res/layout/splash_exchange_paymentmode_rv_viewholder.xml
+++ b/app/src/main/res/layout/splash_exchange_paymentmode_rv_viewholder.xml
@@ -12,7 +12,7 @@
     android:gravity="center"
     android:padding="@dimen/_4sdp"
     android:textColor="@color/darkgray"
-    android:textSize="@dimen/_11ssp"
+    android:textSize="@dimen/text_normal"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/splash_language_selection_item_view.xml b/app/src/main/res/layout/splash_language_selection_item_view.xml
index 51f91158..7f3d8347 100644
--- a/app/src/main/res/layout/splash_language_selection_item_view.xml
+++ b/app/src/main/res/layout/splash_language_selection_item_view.xml
@@ -9,12 +9,9 @@
 
     <ImageView
         android:id="@+id/countryFlagImageView"
-        android:layout_width="55dp"
-        android:layout_height="45dp"
-        android:layout_marginBottom="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
+        android:layout_width="@dimen/_43sdp"
+        android:layout_height="@dimen/_40sdp"
+        android:layout_margin="@dimen/_5sdp"
         android:src="@drawable/flag_south_korea"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -26,13 +23,12 @@
         android:id="@+id/countryLanguageText"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginBottom="@dimen/_6sdp"
+        android:layout_marginStart="@dimen/_6sdp"
+        android:layout_marginTop="@dimen/_6sdp"
         android:text="@string/select_language_text"
-
         android:textColor="@color/white"
-        android:textSize="@dimen/_14ssp"
+        android:textSize="@dimen/_15ssp"
         app:layout_constraintBottom_toBottomOf="@+id/countryFlagImageView"
         app:layout_constraintStart_toEndOf="@+id/countryFlagImageView"
         app:layout_constraintTop_toTopOf="@+id/countryFlagImageView"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 19f70d63..2cf271ae 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -24,7 +24,8 @@
     <dimen name="text_tiny">@dimen/_9ssp</dimen>
     <dimen name="text_mircoscopic">@dimen/_8ssp</dimen>
     
-    <dimen name="button_label">@dimen/_13ssp</dimen>
+    <dimen name="button_text_size">@dimen/_13ssp</dimen>
+    <dimen name="button_min_height">@dimen/_40sdp</dimen>
 
 
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4d078636..88be0f5e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -42,6 +42,13 @@
     </style>
 
 
+    <style name="gme_button" parent="@android:style/Widget.EditText">
+        <item name="android:minHeight">@dimen/button_min_height</item>
+        <item name="android:gravity">center</item>
+        <item name="android:textSize">@dimen/button_text_size</item>
+    </style>
+
+
 
     <style name="gme_form_text_input_layout" parent="Widget.Design.TextInputLayout">