From 96517903acca9f123c116c0021d2de0864d71fb3 Mon Sep 17 00:00:00 2001
From: Preyea Regmi <preyearegmi@outlook.com>
Date: Mon, 17 Jun 2019 11:51:29 +0545
Subject: [PATCH] Splash view scaled properly

---
 .idea/caches/build_file_checksums.ser         | Bin 662 -> 662 bytes
 app/build.gradle                              |   2 +-
 .../res/layout/activity_splash_screen.xml     |   4 +-
 .../layout/activity_splash_screen_key_1.xml   |  54 +++++++++---------
 .../layout/activity_splash_screen_key_2.xml   |  48 ++++++++--------
 .../layout/fragment_splash_avd_viewpager.xml  |  14 ++---
 6 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 47a7f734d2cfaf94da86ed4472e73bacebc53a03..d4efee0caef98987ab4451254dae75e0611f3540 100644
GIT binary patch
delta 33
rcmV++0N($W1(pSnm;__H%=NLH=>ZXLS*P6;(^+}m72fAr^N3e?51bI`

delta 33
pcmbQnI*oP03>NPU)+-z5ykry%o6dD2KmQzuWpbzc%lGNg6#(GV4k!Qs

diff --git a/app/build.gradle b/app/build.gradle
index 3f4ec479..2f3eedf9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -139,7 +139,6 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:3.8.0'
     implementation 'com.squareup.picasso:picasso:2.71828'
     implementation 'com.leavjenn.smoothdaterangepicker:library:0.2.0'
-    implementation 'com.github.kapilmhr:SizesDP:1.1'
     implementation 'de.hdodenhof:circleimageview:2.2.0'
     implementation 'com.jakewharton:butterknife:8.8.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
@@ -156,5 +155,6 @@ dependencies {
     implementation 'com.mtramin:rxfingerprint:2.2.1'
     implementation project(':securitykeypad')
     implementation project(path: ':SpinnerDatePickerLib-release')
+    implementation 'com.intuit.sdp:sdp-android:1.0.6'
 }
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/res/layout/activity_splash_screen.xml b/app/src/main/res/layout/activity_splash_screen.xml
index 81efb333..9baed019 100644
--- a/app/src/main/res/layout/activity_splash_screen.xml
+++ b/app/src/main/res/layout/activity_splash_screen.xml
@@ -22,14 +22,14 @@
         android:id="@+id/layoutDots"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/_20kdp"
+        android:layout_marginBottom="@dimen/_20sdp"
         android:gravity="center"
         android:orientation="horizontal" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/_20kdp"
+        android:layout_marginTop="@dimen/_20sdp"
         android:gravity="center"
         android:orientation="vertical"
         android:paddingBottom="28dp">
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 07472ada..d64e3851 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
@@ -12,10 +12,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:adjustViewBounds="false"
-        android:paddingBottom="16dp"
-        android:paddingEnd="10dp"
-        android:paddingStart="16dp"
-        android:paddingTop="26dp"
+        android:paddingBottom="@dimen/_16sdp"
+        android:paddingEnd="@dimen/_10sdp"
+        android:paddingStart="@dimen/_16sdp"
+        android:paddingTop="@dimen/_26sdp"
         android:scaleType="center"
         android:src="@drawable/ic_back_white"
         android:alpha="0"
@@ -24,11 +24,11 @@
 
     <ImageView
         android:id="@+id/imageView2"
-        android:layout_width="166dp"
+        android:layout_width="@dimen/_166sdp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="32dp"
+        android:layout_marginEnd="@dimen/_8sdp"
+        android:layout_marginStart="@dimen/_8sdp"
+        android:layout_marginTop="@dimen/_27sdp"
         android:src="@drawable/ic_logo_white_large"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -36,9 +36,9 @@
 
     <ImageView
         android:id="@+id/selectedLanguageIcon"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:layout_marginTop="24dp"
+        android:layout_width="@dimen/_36sdp"
+        android:layout_height="@dimen/_36sdp"
+        android:layout_marginTop="@dimen/_15sdp"
         android:src="@drawable/flag_default"
         app:layout_constraintEnd_toStartOf="@id/selectedLanguageText"
         app:layout_constraintHorizontal_chainStyle="packed"
@@ -49,10 +49,10 @@
         android:id="@+id/selectedLanguageText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="12dp"
-        android:layout_marginEnd="8dp"
-        android:paddingTop="10dp"
-        android:paddingBottom="10dp"
+        android:layout_marginStart="@dimen/_12sdp"
+        android:layout_marginEnd="@dimen/_8sdp"
+        android:paddingTop="@dimen/_10sdp"
+        android:paddingBottom="@dimen/_10sdp"
         android:text="@string/select_language_text"
         android:textColor="@color/white"
         android:textSize="21sp"
@@ -65,13 +65,13 @@
 
     <android.support.v7.widget.RecyclerView
         android:clipToPadding = "false"
-        android:paddingTop="15dp"
+        android:paddingTop="@dimen/_15sdp"
         android:scrollbars="vertical"
         android:id="@+id/languageRv"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:background="#33000000"
-        android:layout_marginTop="18dp"
+        android:layout_marginTop="@dimen/_18sdp"
         android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -93,7 +93,7 @@
         android:id="@+id/layoutDots"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
+        android:layout_marginBottom="@dimen/_8sdp"
         android:gravity="center"
         android:orientation="horizontal"
         app:layout_constraintBottom_toTopOf="@+id/btn_login"
@@ -104,9 +104,9 @@
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
         android:id="@+id/btn_login"
-        android:layout_width="200dp"
+        android:layout_width="@dimen/_150sdp"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
+        android:layout_marginBottom="@dimen/_8sdp"
         android:background="@drawable/ic_blue_button_with_white_border"
         android:text="@string/login_text"
         android:textAllCaps="false"
@@ -117,11 +117,11 @@
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
         android:id="@+id/btn_new_user"
-        android:layout_width="200dp"
+        android:layout_width="@dimen/_150sdp"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="18dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp"
+        android:layout_marginBottom="@dimen/_13sdp"
+        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"
@@ -135,9 +135,9 @@
         android:id="@+id/appVersionTxtView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginStart="@dimen/_8sdp"
+        android:layout_marginEnd="@dimen/_8sdp"
+        android:layout_marginBottom="@dimen/_8sdp"
         android:textColor="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="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 9a571b4d..7df5a3ad 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
@@ -10,10 +10,10 @@
         android:id="@+id/iv_back"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingBottom="16dp"
-        android:paddingEnd="16dp"
-        android:paddingStart="16dp"
-        android:paddingTop="18dp"
+        android:paddingBottom="@dimen/_16sdp"
+        android:paddingEnd="@dimen/_16sdp"
+        android:paddingStart="@dimen/_16sdp"
+        android:paddingTop="@dimen/_18sdp"
         android:scaleType="center"
         android:src="@drawable/ic_back_white"
         android:alpha="0"
@@ -22,11 +22,11 @@
 
     <ImageView
         android:id="@+id/imageView2"
-        android:layout_width="166dp"
+        android:layout_width="@dimen/_166sdp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="32dp"
+        android:layout_marginEnd="@dimen/_8sdp"
+        android:layout_marginStart="@dimen/_8sdp"
+        android:layout_marginTop="@dimen/_32sdp"
         android:src="@drawable/ic_logo_white_large"
         app:layout_constraintBottom_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -36,10 +36,10 @@
         android:id="@+id/languageRv"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginTop="13dp"
+        android:layout_marginTop="@dimen/_13sdp"
         android:background="#33000000"
         android:clipToPadding="false"
-        android:paddingTop="15dp"
+        android:paddingTop="@dimen/_15sdp"
         android:scrollbars="vertical"
         android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -49,10 +49,10 @@
 
     <ImageView
         android:id="@+id/selectedLanguageIcon"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_marginStart="14dp"
-        android:layout_marginTop="16dp"
+        android:layout_width="@dimen/_32sdp"
+        android:layout_height="@dimen/_32sdp"
+        android:layout_marginStart="@dimen/_14sdp"
+        android:layout_marginTop="@dimen/_16sdp"
         android:src="@drawable/language"
         app:layout_constraintEnd_toStartOf="@id/selectedLanguageText"
         app:layout_constraintHorizontal_chainStyle="packed"
@@ -64,7 +64,7 @@
         android:id="@+id/selectedLanguageText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="12dp"
+        android:layout_marginStart="@dimen/_12sdp"
         android:text="@string/select_language_text"
         android:textColor="@color/white"
         android:textSize="24sp"
@@ -86,7 +86,7 @@
         android:id="@+id/layoutDots"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
+        android:layout_marginBottom="@dimen/_8sdp"
         android:gravity="center"
         android:orientation="horizontal"
         app:layout_constraintEnd_toEndOf="parent"
@@ -95,9 +95,9 @@
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
         android:id="@+id/btn_login"
-        android:layout_width="200dp"
+        android:layout_width="@dimen/_150sdp"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
+        android:layout_marginBottom="@dimen/_8sdp"
         android:background="@drawable/ic_blue_button_with_white_border"
         android:text="@string/login_text"
         android:textAllCaps="false"
@@ -108,11 +108,11 @@
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
         android:id="@+id/btn_new_user"
-        android:layout_width="200dp"
+        android:layout_width="@dimen/_150sdp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/splash_bottom_margin"
-        android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp"
+        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"
@@ -126,9 +126,9 @@
         android:id="@+id/appVersionTxtView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginStart="@dimen/_8sdp"
+        android:layout_marginEnd="@dimen/_8sdp"
+        android:layout_marginBottom="@dimen/_8sdp"
         android:textColor="@color/white"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
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 9b8f7cdd..b74cfd1b 100644
--- a/app/src/main/res/layout/fragment_splash_avd_viewpager.xml
+++ b/app/src/main/res/layout/fragment_splash_avd_viewpager.xml
@@ -8,10 +8,10 @@
 
     <FrameLayout
         android:id="@+id/imageView5"
-        android:layout_width="150dp"
-        android:layout_height="150dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
+        android:layout_width="@dimen/_125sdp"
+        android:layout_height="@dimen/_125sdp"
+        android:layout_marginStart="@dimen/_8sdp"
+        android:layout_marginEnd="@dimen/_8sdp"
         android:background="@drawable/splash_avd_cricular_bg"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -29,10 +29,10 @@
         android:id="@+id/gmeTextView2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="@dimen/_14sdp"
         android:gravity="center"
-        android:paddingStart="20dp"
-        android:paddingEnd="20dp"
+        android:paddingStart="@dimen/_20sdp"
+        android:paddingEnd="@dimen/_20sdp"
         android:text="@string/hassle_free_transfer_text"
         android:textColor="@color/white"
         android:textSize="18sp"