From 477a902b0beafe0fd734185a6a648baea5e657af Mon Sep 17 00:00:00 2001
From: Preyea Regmi <preyearegmi@outlook.com>
Date: Mon, 24 Jun 2019 17:10:20 +0545
Subject: [PATCH] Splash dimensions fixes

---
 .idea/caches/build_file_checksums.ser         | Bin 662 -> 662 bytes
 app/build.gradle                              |   1 +
 .../splash_screen/view/SplashScreen.java      |   4 ++-
 .../layout/activity_splash_screen_key_1.xml   |  11 +++++---
 .../layout/activity_splash_screen_key_2.xml   |   9 ++++---
 app/src/main/res/layout/fragment_home_v2.xml  |   2 +-
 .../layout/fragment_splash_avd_viewpager.xml  |   8 +++---
 app/src/main/res/layout/home_menu_item_v2.xml |  24 +++++++++---------
 .../splash_language_selection_item_view.xml   |   2 +-
 9 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 5ced3b2af388a6c6ba1cc3191e72079fdefc7229..d4e48c35f9ab50b37e039fcf0e3124ac4e458c70 100644
GIT binary patch
delta 32
ocmbQnI*oP0Oy<{Gr5oqGWE9+-`P+wIg|X$jkF1PS`Gd0+0NUaWiU0rr

delta 32
qcmV+*0N?+X1(pSnnFFG@9<iM10TFIlr`;6OS$W<S-sf5Kh*x;)dk=yD

diff --git a/app/build.gradle b/app/build.gradle
index 2f3eedf9..77ef5d08 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -156,5 +156,6 @@ dependencies {
     implementation project(':securitykeypad')
     implementation project(path: ':SpinnerDatePickerLib-release')
     implementation 'com.intuit.sdp:sdp-android:1.0.6'
+    implementation 'com.intuit.ssp:ssp-android:1.0.6'
 }
 apply plugin: 'com.google.gms.google-services'
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 1961fc8f..46e7a937 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
@@ -21,6 +21,7 @@ import android.support.v4.view.ViewPager;
 import android.support.v4.view.ViewPropertyAnimatorListenerAdapter;
 import android.support.v7.widget.RecyclerView;
 import android.text.Html;
+import android.view.Gravity;
 import android.view.View;
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.AnticipateOvershootInterpolator;
@@ -176,8 +177,9 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
 
         for (int i = 0; i < dots.length; i++) {
             dots[i] = new TextView(this);
+            dots[i].setGravity(Gravity.CENTER);
             dots[i].setText(Html.fromHtml("&#8226;"));
-            dots[i].setTextSize(35);
+            dots[i].setTextSize(getContext().getResources().getDimension(R.dimen._10ssp));
             dots[i].setTextColor(ContextCompat.getColor(this, R.color.dot_dark));
             dotsLayout.addView(dots[i]);
         }
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 d64e3851..26dd8e72 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
@@ -55,7 +55,7 @@
         android:paddingBottom="@dimen/_10sdp"
         android:text="@string/select_language_text"
         android:textColor="@color/white"
-        android:textSize="21sp"
+        android:textSize="@dimen/_16ssp"
         app:layout_constraintBottom_toBottomOf="@+id/selectedLanguageIcon"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/selectedLanguageIcon"
@@ -91,9 +91,8 @@
 
     <LinearLayout
         android:id="@+id/layoutDots"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/_8sdp"
         android:gravity="center"
         android:orientation="horizontal"
         app:layout_constraintBottom_toTopOf="@+id/btn_login"
@@ -102,6 +101,7 @@
 
     </LinearLayout>
 
+
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
         android:id="@+id/btn_login"
         android:layout_width="@dimen/_150sdp"
@@ -110,6 +110,7 @@
         android:background="@drawable/ic_blue_button_with_white_border"
         android:text="@string/login_text"
         android:textAllCaps="false"
+        android:textSize="@dimen/_11ssp"
         android:textColor="@color/white"
         app:layout_constraintBottom_toTopOf="@+id/btn_new_user"
         app:layout_constraintEnd_toEndOf="@+id/btn_new_user"
@@ -119,12 +120,13 @@
         android:id="@+id/btn_new_user"
         android:layout_width="@dimen/_150sdp"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/_13sdp"
+        android:layout_marginBottom="@dimen/_8sdp"
         android:layout_marginEnd="@dimen/_8sdp"
         android:layout_marginStart="@dimen/_8sdp"
         android:background="@drawable/ic_red_button_with_white_border"
         android:text="@string/new_user_text"
         android:textAllCaps="false"
+        android:textSize="@dimen/_11ssp"
         android:textColor="@color/white"
         app:layout_constraintBottom_toTopOf="@+id/appVersionTxtView"
         app:layout_constraintEnd_toEndOf="parent"
@@ -139,6 +141,7 @@
         android:layout_marginEnd="@dimen/_8sdp"
         android:layout_marginBottom="@dimen/_8sdp"
         android:textColor="@color/white"
+        android:textSize="@dimen/_10ssp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
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 d65fa24f..ef21eddd 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
@@ -53,7 +53,7 @@
         android:layout_height="@dimen/_32sdp"
         android:layout_marginStart="@dimen/_14sdp"
         android:layout_marginTop="@dimen/_12sdp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginBottom="@dimen/_5sdp"
         android:src="@drawable/language"
         app:layout_constraintBottom_toBottomOf="@+id/iv_back"
         app:layout_constraintEnd_toStartOf="@id/selectedLanguageText"
@@ -69,7 +69,7 @@
         android:layout_marginStart="@dimen/_12sdp"
         android:text="@string/select_language_text"
         android:textColor="@color/white"
-        android:textSize="24sp"
+        android:textSize="@dimen/_16ssp"
         app:layout_constraintBottom_toBottomOf="@+id/selectedLanguageIcon"
         app:layout_constraintStart_toEndOf="@id/selectedLanguageIcon"
         app:layout_constraintTop_toTopOf="@+id/selectedLanguageIcon"
@@ -103,6 +103,7 @@
         android:background="@drawable/ic_blue_button_with_white_border"
         android:text="@string/login_text"
         android:textAllCaps="false"
+        android:textSize="@dimen/_11ssp"
         android:textColor="@color/white"
         app:layout_constraintEnd_toEndOf="@+id/btn_new_user"
         app:layout_constraintStart_toStartOf="@+id/btn_new_user"
@@ -112,11 +113,12 @@
         android:id="@+id/btn_new_user"
         android:layout_width="@dimen/_150sdp"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/splash_bottom_margin"
+        android:layout_marginBottom="@dimen/_8sdp"
         android:layout_marginEnd="@dimen/_8sdp"
         android:layout_marginStart="@dimen/_8sdp"
         android:background="@drawable/ic_red_button_with_white_border"
         android:text="@string/new_user_text"
+        android:textSize="@dimen/_11ssp"
         android:textAllCaps="false"
         android:textColor="@color/white"
         app:layout_constraintEnd_toEndOf="parent"
@@ -132,6 +134,7 @@
         android:layout_marginEnd="@dimen/_8sdp"
         android:layout_marginBottom="@dimen/_8sdp"
         android:textColor="@color/white"
+        android:textSize="@dimen/_10ssp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="parent"
diff --git a/app/src/main/res/layout/fragment_home_v2.xml b/app/src/main/res/layout/fragment_home_v2.xml
index d50eecd5..c2d6b470 100644
--- a/app/src/main/res/layout/fragment_home_v2.xml
+++ b/app/src/main/res/layout/fragment_home_v2.xml
@@ -316,7 +316,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:layout_marginTop="20dp" />
+                    android:layout_marginTop="@dimen/_11sdp" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_splash_avd_viewpager.xml b/app/src/main/res/layout/fragment_splash_avd_viewpager.xml
index b74cfd1b..e110a4fb 100644
--- a/app/src/main/res/layout/fragment_splash_avd_viewpager.xml
+++ b/app/src/main/res/layout/fragment_splash_avd_viewpager.xml
@@ -8,8 +8,8 @@
 
     <FrameLayout
         android:id="@+id/imageView5"
-        android:layout_width="@dimen/_125sdp"
-        android:layout_height="@dimen/_125sdp"
+        android:layout_width="@dimen/_130sdp"
+        android:layout_height="@dimen/_130sdp"
         android:layout_marginStart="@dimen/_8sdp"
         android:layout_marginEnd="@dimen/_8sdp"
         android:background="@drawable/splash_avd_cricular_bg"
@@ -17,7 +17,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.13">
+        app:layout_constraintVertical_bias="0.06999999">
 
         <ImageView
             android:id="@+id/avdMobileImage"
@@ -35,7 +35,7 @@
         android:paddingEnd="@dimen/_20sdp"
         android:text="@string/hassle_free_transfer_text"
         android:textColor="@color/white"
-        android:textSize="18sp"
+        android:textSize="@dimen/_14ssp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/imageView5" />
diff --git a/app/src/main/res/layout/home_menu_item_v2.xml b/app/src/main/res/layout/home_menu_item_v2.xml
index 9d8a3296..c0f71f67 100644
--- a/app/src/main/res/layout/home_menu_item_v2.xml
+++ b/app/src/main/res/layout/home_menu_item_v2.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="160dp"
+    android:layout_width="@dimen/_120sdp"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     app:cardBackgroundColor="@android:color/white"
-    app:cardElevation="3dp"
-    app:cardCornerRadius="12dp"
+    app:cardElevation="@dimen/_2sdp"
+    app:cardCornerRadius="@dimen/_8sdp"
     app:cardUseCompatPadding="true"
-    android:layout_height="170dp">
+    android:layout_height="@dimen/_135sdp">
 
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
@@ -15,9 +15,9 @@
 
         <ImageView
             android:id="@+id/image"
-            android:layout_width="70dp"
-            android:layout_height="70dp"
-            android:layout_marginTop="8dp"
+            android:layout_width="@dimen/_50sdp"
+            android:layout_height="@dimen/_50sdp"
+            android:layout_marginTop="@dimen/_5sdp"
             app:layout_constraintBottom_toTopOf="@+id/title"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
@@ -31,13 +31,13 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/image"
-            android:layout_marginBottom="8dp"
-            android:layout_marginTop="13dp"
-            android:paddingStart="5dp"
-            android:paddingEnd="5dp"
+            android:layout_marginBottom="@dimen/_5sdp"
+            android:layout_marginTop="@dimen/_9sdp"
+            android:paddingStart="@dimen/_4sdp"
+            android:paddingEnd="@dimen/_4sdp"
             android:gravity="center"
             app:txtfontName="@string/semibold"
-            android:textSize="13sp"
+            android:textSize="@dimen/_12ssp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/image"
             app:layout_constraintHorizontal_bias="0.5"
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 6cc74637..b79be6d7 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
@@ -32,7 +32,7 @@
         android:text="@string/select_language_text"
 
         android:textColor="@color/white"
-        android:textSize="18sp"
+        android:textSize="@dimen/_16ssp"
         app:layout_constraintBottom_toBottomOf="@+id/countryFlagImageView"
         app:layout_constraintStart_toEndOf="@+id/countryFlagImageView"
         app:layout_constraintTop_toTopOf="@+id/countryFlagImageView"