Merge branch 'develop' into feature/create-profile-bottom-sheet

2020-01-10 17:22:10 +05:30
parent 9d083e916c 480a22dfc6
commit cfab767b55
33 changed files with 86 additions and 60 deletions
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,7 +46,7 @@
            android:name=".useridentity.activities.UploadPanActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name=".dashboard.activities.DashboardActivity"
+            android:name=".dashboard_old.activities.DashboardActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="adjustPan" />
        <activity
--- a/app/src/main/java/com/navi/account/fragments/AddAccountFragment.kt
+++ b/app/src/main/java/com/navi/account/fragments/AddAccountFragment.kt
@@ -9,7 +9,7 @@ import androidx.lifecycle.ViewModelProviders
 import com.navi.R
 import com.navi.account.viewmodels.AddAccountVM
 import com.navi.common.BaseFragment
-import com.navi.dashboard.activities.DashboardActivity
+import com.navi.dashboard_old.activities.DashboardActivity
 import com.navi.databinding.AddAccountFragmentBinding
 import com.navi.sharedpref.PreferenceManager
 import com.navi.utils.Constants
--- a/app/src/main/java/com/navi/account/fragments/SearchIfscFragment.kt
+++ b/app/src/main/java/com/navi/account/fragments/SearchIfscFragment.kt
@@ -15,7 +15,7 @@ import com.navi.account.viewmodels.SearchIfscVM
 import com.navi.app.NaviApplication
 import com.navi.common.BaseFragment
 import com.navi.databinding.SearchIfscFragmentBinding
-import com.navi.dashboard.activities.DashboardActivity
+import com.navi.dashboard_old.activities.DashboardActivity

 class SearchIfscFragment : BaseFragment(), View.OnClickListener {
    private lateinit var binding: SearchIfscFragmentBinding
--- a/app/src/main/java/com/navi/common/customview/ActionButtonView.kt
+++ b/app/src/main/java/com/navi/common/customview/ActionButtonView.kt
@@ -18,6 +18,7 @@ import androidx.core.content.ContextCompat
 import androidx.databinding.DataBindingUtil
 import com.navi.R
 import com.navi.databinding.ActionButtonViewBinding
+import com.navi.utils.dpToPx
 import com.navi.utils.log

 class ActionButtonView @JvmOverloads constructor(
@@ -75,13 +76,20 @@ class ActionButtonView @JvmOverloads constructor(
        }
    }

-    fun setViewBg(bg: Drawable?) {
-        bg?.let {
-            binding.actionTv.background = it
+    fun setViewBg(cornerRadiusId: Int? = null, bgColor: Int? = null, bgDrawable: Drawable? = null) {
+        bgColor?.apply {
+            binding.actionTv.setBackgroundResource(this)
+        }
+        cornerRadiusId?.apply {
+            setBgCorner(this)
+        }
+        bgDrawable?.apply {
+            binding.actionTv.background = this
        }
    }

-    fun setViewBg(color: Int) {
-        binding.actionTv.setBackgroundResource(color)
+    private fun setBgCorner(radiusId: Int) {
+        val r = resources.getInteger(radiusId)
+        binding.actionButtonViewLay.radius = dpToPx(r).toFloat()
    }
 }
--- a/app/src/main/java/com/navi/dashboard/DashboardActivity.kt
+++ b/app/src/main/java/com/navi/dashboard/DashboardActivity.kt
@@ -0,0 +1,10 @@
+package com.navi.dashboard
+
+import com.navi.common.BaseActivity
+
+class DashboardActivity : BaseActivity() {
+
+
+    override val screenName: String
+        get() = ""
+}
--- a/app/src/main/java/com/navi/dashboard_old/activities/DashboardActivity.kt
+++ b/app/src/main/java/com/navi/dashboard_old/activities/DashboardActivity.kt
@@ -4,7 +4,7 @@
 *
 */

-package com.navi.dashboard.activities
+package com.navi.dashboard_old.activities

 import android.content.Intent
 import android.os.Bundle
@@ -13,7 +13,7 @@ import androidx.fragment.app.Fragment
 import com.navi.R
 import com.navi.account.fragments.AddAccountFragment
 import com.navi.account.fragments.SearchIfscFragment
-import com.navi.dashboard.adapter.DrawerMenuAdapter
+import com.navi.dashboard_old.adapter.DrawerMenuAdapter
 import com.navi.databinding.ActivityDashboardBinding
 import com.navi.offers.activities.PartnerOffersActivity
 import com.navi.ui.fragments.BankAccountsFragment
--- a/app/src/main/java/com/navi/dashboard_old/activities/DashboardBaseActivity.kt
+++ b/app/src/main/java/com/navi/dashboard_old/activities/DashboardBaseActivity.kt
@@ -4,7 +4,7 @@
 *
 */

-package com.navi.dashboard.activities
+package com.navi.dashboard_old.activities

 import android.view.View
 import android.widget.ImageView
@@ -18,7 +18,7 @@ import androidx.core.view.GravityCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.navi.R
-import com.navi.dashboard.adapter.DrawerMenuAdapter
+import com.navi.dashboard_old.adapter.DrawerMenuAdapter
 import com.navi.utils.orFalse


--- a/app/src/main/java/com/navi/dashboard_old/adapter/DrawerMenuAdapter.kt
+++ b/app/src/main/java/com/navi/dashboard_old/adapter/DrawerMenuAdapter.kt
@@ -4,7 +4,7 @@
 *
 */

-package com.navi.dashboard.adapter
+package com.navi.dashboard_old.adapter

 import android.content.Context
 import android.view.LayoutInflater
--- a/app/src/main/java/com/navi/permission/fragments/PermissionConsentFragment.kt
+++ b/app/src/main/java/com/navi/permission/fragments/PermissionConsentFragment.kt
@@ -30,6 +30,7 @@ class PermissionConsentFragment : BaseFragment(), View.OnClickListener {
            R.color.white,
            R.drawable.ic_check_svg
        )
+        binding.approvePermissionsButton.setViewBg(R.integer.abv_radius_large)
        binding.approvePermissionsButton.setOnClickListener(this)

        binding.denyPermissionsButton.setProperties(
@@ -38,7 +39,7 @@ class PermissionConsentFragment : BaseFragment(), View.OnClickListener {
            R.drawable.ic_close_svg,
            R.color.red
        )
-        binding.denyPermissionsButton.setViewBg(R.color.view_background_color_one)
+        binding.denyPermissionsButton.setViewBg(R.integer.abv_radius_large, R.color.view_background_color_one)
        binding.denyPermissionsButton.setOnClickListener(this)

        binding.goToTopButton.setOnClickListener(this)
--- a/app/src/main/java/com/navi/permission/fragments/PermissionDescriptionFragment.kt
+++ b/app/src/main/java/com/navi/permission/fragments/PermissionDescriptionFragment.kt
@@ -34,6 +34,7 @@ class PermissionDescriptionFragment : BaseFragment(), View.OnClickListener {
            R.color.white,
            R.drawable.ic_check_svg
        )
+        binding.approvePermissionsButton.setViewBg(R.integer.abv_radius_large)
        binding.approvePermissionsButton.setOnClickListener(this)
        binding.denyPermissionsButton.setOnClickListener(this)

--- a/app/src/main/java/com/navi/tutorial/TutorialActivity.kt
+++ b/app/src/main/java/com/navi/tutorial/TutorialActivity.kt
@@ -83,8 +83,10 @@ class TutorialActivity : AppCompatActivity() {
            R.drawable.ic_arrow_right_svg,
            R.color.red
        )
-        binding.nextButton.setViewBg(R.color.view_background_color_one)
+        binding.nextButton.setViewBg(R.integer.abv_radius_large, R.color.view_background_color_one)
        binding.getStartedButton.setProperties(getString(R.string.get_started))
+        binding.getStartedButton.setViewBg(R.integer.abv_radius_large)
+
    }

    private fun getNextItemIndex() = binding.viewPager.currentItem + 1
--- a/app/src/main/java/com/navi/ui/fragments/BankAccountsFragment.kt
+++ b/app/src/main/java/com/navi/ui/fragments/BankAccountsFragment.kt
@@ -11,7 +11,7 @@ import com.navi.R
 import com.navi.adapters.BankAccountsAdapter
 import com.navi.databinding.BankAccountsFragmentBinding
 import com.navi.models.response.MyProfileResponse
-import com.navi.dashboard.activities.DashboardActivity
+import com.navi.dashboard_old.activities.DashboardActivity
 import com.navi.viewModels.BankAccountsVM

 class BankAccountsFragment : com.navi.common.BaseFragment() {
--- a/app/src/main/java/com/navi/ui/fragments/CkycFragment.kt
+++ b/app/src/main/java/com/navi/ui/fragments/CkycFragment.kt
@@ -9,7 +9,7 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
 import com.navi.R
 import com.navi.common.BaseFragment
-import com.navi.dashboard.activities.DashboardActivity
+import com.navi.dashboard_old.activities.DashboardActivity
 import com.navi.databinding.CkycFragmentBinding
 import com.navi.models.request.CkycRequest
 import com.navi.utils.toast
--- a/app/src/main/java/com/navi/ui/fragments/HomeFragment.kt
+++ b/app/src/main/java/com/navi/ui/fragments/HomeFragment.kt
@@ -9,7 +9,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.navi.R
 import com.navi.adapters.ActiveLoansAdapter
 import com.navi.common.BaseFragment
-import com.navi.dashboard.activities.DashboardActivity
+import com.navi.dashboard_old.activities.DashboardActivity
 import com.navi.databinding.HomeFragmentBinding
 import com.navi.myLoanDetails.activities.MyLoanDetailsActivity
 import com.navi.utils.observeNonNull
--- a/app/src/main/java/com/navi/ui/fragments/KycDocumentUploadFragment.kt
+++ b/app/src/main/java/com/navi/ui/fragments/KycDocumentUploadFragment.kt
@@ -30,7 +30,7 @@ import com.bumptech.glide.Glide
 import com.navi.R
 import com.navi.databinding.KycDocumentUploadFragmentBinding
 import com.navi.kyc.activities.SelfieCaptureActivity
-import com.navi.dashboard.activities.DashboardActivity
+import com.navi.dashboard_old.activities.DashboardActivity
 import com.navi.firebasedb.*
 import com.navi.network.ApiErrorTagType
 import com.navi.sharedpref.PreferenceManager
--- a/app/src/main/java/com/navi/ui/fragments/LoanDisbursedFragment.kt
+++ b/app/src/main/java/com/navi/ui/fragments/LoanDisbursedFragment.kt
@@ -8,7 +8,7 @@ import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import com.navi.R
 import com.navi.databinding.LoanDisbursedFragmentBinding
-import com.navi.dashboard.activities.DashboardActivity
+import com.navi.dashboard_old.activities.DashboardActivity

 class LoanDisbursedFragment : Fragment() {
    lateinit var binding: LoanDisbursedFragmentBinding
--- a/app/src/main/java/com/navi/ui/fragments/MoneyTransferCheckFragment.kt
+++ b/app/src/main/java/com/navi/ui/fragments/MoneyTransferCheckFragment.kt
@@ -13,7 +13,7 @@ import android.view.View
 import android.view.ViewGroup
 import com.navi.R
 import com.navi.databinding.MoneyTransferCheckFragmentBinding
-import com.navi.dashboard.activities.DashboardActivity
+import com.navi.dashboard_old.activities.DashboardActivity

 class MoneyTransferCheckFragment : com.navi.common.BaseFragment(), View.OnClickListener {
    private lateinit var binding: MoneyTransferCheckFragmentBinding
--- a/app/src/main/java/com/navi/ui/fragments/MyProfileFragment.kt
+++ b/app/src/main/java/com/navi/ui/fragments/MyProfileFragment.kt
@@ -10,7 +10,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.navi.R
 import com.navi.app.NaviApplication
 import com.navi.common.BaseFragment
-import com.navi.dashboard.activities.DashboardActivity
+import com.navi.dashboard_old.activities.DashboardActivity
 import com.navi.databinding.MyProfileFragmentBinding
 import com.navi.medici.androidCustomerApp.adapters.MyProfileSettingsAdapter
 import com.navi.medici.androidCustomerApp.models.MyProfileSettingItem
--- a/app/src/main/java/com/navi/ui/fragments/OfferAcceptFragment.kt
+++ b/app/src/main/java/com/navi/ui/fragments/OfferAcceptFragment.kt
@@ -21,7 +21,7 @@ import com.navi.adapters.LoanDetailsTabAdapter
 import com.navi.common.ApiPollScheduler
 import com.navi.common.BaseFragment
 import com.navi.databinding.OfferAcceptFragmentBinding
-import com.navi.dashboard.activities.DashboardActivity
+import com.navi.dashboard_old.activities.DashboardActivity
 import com.navi.firebasedb.*
 import com.navi.sharedpref.PreferenceManager
 import com.navi.utils.LOAN_APPLICATION_ID
--- a/app/src/main/java/com/navi/ui/fragments/PreliminaryOfferFragment.kt
+++ b/app/src/main/java/com/navi/ui/fragments/PreliminaryOfferFragment.kt
@@ -22,7 +22,7 @@ import androidx.lifecycle.ViewModelProviders
 import com.navi.R
 import com.navi.common.ApiPollScheduler
 import com.navi.common.BaseFragment
-import com.navi.dashboard.activities.DashboardActivity
+import com.navi.dashboard_old.activities.DashboardActivity
 import com.navi.databinding.PreliminaryOfferFragmentBinding
 import com.navi.firebasedb.*
 import com.navi.models.Money
--- a/app/src/main/java/com/navi/useridentity/activities/UserBasicDetailActivity.kt
+++ b/app/src/main/java/com/navi/useridentity/activities/UserBasicDetailActivity.kt
@@ -9,7 +9,7 @@ import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.ViewModelProviders
 import com.navi.R
 import com.navi.common.BaseActivity
-import com.navi.dashboard.activities.DashboardActivity
+import com.navi.dashboard_old.activities.DashboardActivity
 import com.navi.databinding.ActivityUserBasicDetailsBinding
 import com.navi.models.Address
 import com.navi.models.Money
--- a/app/src/main/java/com/navi/utils/Utility.kt
+++ b/app/src/main/java/com/navi/utils/Utility.kt
@@ -9,6 +9,7 @@ package com.navi.utils
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import android.content.res.Resources
 import android.provider.Settings
 import android.view.View
 import android.view.inputmethod.InputMethodManager
@@ -79,4 +80,8 @@ fun toggleKeyboard(context: Context) {
    (context.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager)?.apply {
        toggleSoftInput(InputMethodManager.SHOW_FORCED, 0)
    }
+}
+
+fun dpToPx(inpDp: Int): Int {
+    return (inpDp * Resources.getSystem().displayMetrics.density).toInt()
 }
--- a/app/src/main/res/drawable/ic_logo_with_text_svg.xml
+++ b/app/src/main/res/drawable/ic_logo_with_text_svg.xml
@@ -1,16 +0,0 @@
-<!--
-  ~ /**
-  ~  * Copyright (c) 2020 . All rights reserved @Navi
-  ~  */
-  -->
-
-<vector android:autoMirrored="true" android:height="56dp"
-    android:viewportHeight="56" android:viewportWidth="159"
-    android:width="159dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#F33" android:fillType="evenOdd" android:pathData="M43.409,0h-30.74C5.7,0 0,5.712 0,12.694v0.546c0,6.982 5.7,12.694 12.669,12.694h30.74c6.968,0 12.669,-5.712 12.669,-12.694v-0.546C56.078,5.712 50.377,0 43.408,0"/>
-    <path android:fillColor="#FFF" android:fillType="evenOdd" android:pathData="M23.722,16.622c0,1.362 -1.62,2.328 -3.076,1.357l-5.156,-5.162c0,1.374 -0.002,2.925 -0.003,3.792 -0.001,1.003 -0.817,1.82 -1.818,1.82a1.821,1.821 0,0 1,-1.818 -1.822V8.392c0,-0.497 0.194,-0.965 0.547,-1.317 0.352,-0.352 0.81,-0.543 1.317,-0.542 0.504,0.002 0.968,0.195 1.316,0.544l0.192,0.192 2.045,2.048 -0.013,0.013 6.467,6.48v0.812zM23.722,14.43l-3.616,-3.623 0.003,-2.477a1.805,1.805 0,0 1,1.8 -1.802h0.012c0.993,0 1.801,0.81 1.801,1.805v6.098zM44.2,16.78a1.819,1.819 0,0 1,-1.815 1.818c-1.001,0 -1.815,-0.815 -1.815,-1.818l0.001,-2.637 3.629,-3.637v6.274zM44.21,8.552c-0.002,0.024 -0.008,0.048 -0.01,0.072v0.503l-3.628,3.635v-0.006a8255.5,8255.5 0,0 1,-5.152 5.16c-0.396,0.397 -0.9,0.61 -1.409,0.61a1.848,1.848 0,0 1,-1.783 -1.373c-0.174,-0.651 0.026,-1.344 0.536,-1.854 2.794,-2.804 5.59,-5.606 8.389,-8.406 0.268,-0.268 0.59,-0.414 0.93,-0.423l0.102,-0.002a1.976,1.976 0,0 1,1.455 0.597c0.302,0.308 0.493,0.709 0.55,1.132l0.01,-0.006v0.077c0.008,0.08 0.013,0.162 0.01,0.244v0.04z"/>
-    <path android:fillColor="#F33" android:fillType="evenOdd" android:pathData="M43.285,29.501H12.792C5.756,29.501 0,35.27 0,42.32v0.298c0,7.05 5.756,12.818 12.792,12.818h30.493c7.036,0 12.793,-5.768 12.793,-12.818v-0.298c0,-7.05 -5.757,-12.818 -12.793,-12.818"/>
-    <path android:fillColor="#FFF" android:fillType="evenOdd" android:pathData="M12.397,38.637c0,-1.002 0.814,-1.818 1.815,-1.818 1,0 1.814,0.815 1.815,1.817l-0.001,2.638 -3.629,3.636v-6.273zM23.845,40.118a9583.459,9583.459 0,0 1,-8.39 8.406,1.378 1.378,0 0,1 -0.927,0.423l-0.1,0.002h-0.038a1.998,1.998 0,0 1,-1.422 -0.597,2.002 2.002,0 0,1 -0.55,-1.132l-0.01,0.006v-0.077a1.912,1.912 0,0 1,-0.01 -0.244l0.002,-0.067c0.001,-0.019 0.007,-0.036 0.009,-0.055v-0.493l3.628,-3.635v0.005c1.716,-1.72 3.433,-3.44 5.151,-5.159 0.792,-0.793 1.958,-0.822 2.713,-0.065 0.747,0.748 0.723,1.901 -0.056,2.682M40.027,47.267a1.84,1.84 0,0 1,-1.837 1.84h-0.003a1.841,1.841 0,0 1,-1.837 -1.84v-8.212c0,-1.015 0.825,-1.84 1.837,-1.84 1.016,0 1.84,0.825 1.84,1.84v8.212zM23.722,16.622c0,1.362 -1.62,2.328 -3.076,1.357l-5.156,-5.162c0,1.374 -0.002,2.925 -0.003,3.792 -0.001,1.003 -0.817,1.82 -1.818,1.82a1.821,1.821 0,0 1,-1.818 -1.822V8.392c0,-0.497 0.194,-0.965 0.547,-1.317 0.352,-0.352 0.81,-0.543 1.317,-0.542 0.504,0.002 0.968,0.195 1.316,0.544l0.192,0.192 2.045,2.048 -0.013,0.013 6.467,6.48v0.812zM23.722,14.43l-3.616,-3.623 0.003,-2.477a1.805,1.805 0,0 1,1.8 -1.802h0.012c0.993,0 1.801,0.81 1.801,1.805v6.098zM44.2,16.78a1.819,1.819 0,0 1,-1.815 1.818c-1.001,0 -1.815,-0.815 -1.815,-1.818l0.001,-2.637 3.629,-3.637v6.274zM44.21,8.552c-0.002,0.024 -0.008,0.048 -0.01,0.072v0.503l-3.628,3.635v-0.006a8255.5,8255.5 0,0 1,-5.152 5.16c-0.396,0.397 -0.9,0.61 -1.409,0.61a1.848,1.848 0,0 1,-1.783 -1.373c-0.174,-0.651 0.026,-1.344 0.536,-1.854 2.794,-2.804 5.59,-5.606 8.389,-8.406 0.268,-0.268 0.59,-0.414 0.93,-0.423l0.102,-0.002a1.976,1.976 0,0 1,1.455 0.597c0.302,0.308 0.493,0.709 0.55,1.132l0.01,-0.006v0.077c0.008,0.08 0.013,0.162 0.01,0.244v0.04z"/>
-    <path android:fillColor="#FFF" android:fillType="evenOdd" android:pathData="M12.397,38.637c0,-1.002 0.814,-1.818 1.815,-1.818 1,0 1.814,0.815 1.815,1.817l-0.001,2.638 -3.629,3.636v-6.273zM23.845,40.118a9583.459,9583.459 0,0 1,-8.39 8.406,1.378 1.378,0 0,1 -0.927,0.423l-0.1,0.002h-0.038a1.998,1.998 0,0 1,-1.422 -0.597,2.002 2.002,0 0,1 -0.55,-1.132l-0.01,0.006v-0.077a1.912,1.912 0,0 1,-0.01 -0.244l0.002,-0.067c0.001,-0.019 0.007,-0.036 0.009,-0.055v-0.493l3.628,-3.635v0.005c1.716,-1.72 3.433,-3.44 5.151,-5.159 0.792,-0.793 1.958,-0.822 2.713,-0.065 0.747,0.748 0.723,1.901 -0.056,2.682M40.027,47.267a1.84,1.84 0,0 1,-1.837 1.84h-0.003a1.841,1.841 0,0 1,-1.837 -1.84v-8.212c0,-1.015 0.825,-1.84 1.837,-1.84 1.016,0 1.84,0.825 1.84,1.84v8.212z"/>
-    <path android:fillColor="#4B4968" android:fillType="evenOdd" android:pathData="M90.815,39.672v15.763h-6.344L84.471,39.977c0,-2.034 -0.389,-3.516 -1.167,-4.449 -0.778,-0.932 -1.979,-1.398 -3.603,-1.398 -1.928,0 -3.484,0.619 -4.668,1.856 -1.185,1.238 -1.776,2.873 -1.776,4.907v14.542h-6.292L66.965,37.028c0,-2.711 -0.136,-5.135 -0.407,-7.27h5.938l0.456,4.22c0.88,-1.56 2.072,-2.763 3.578,-3.61 1.505,-0.848 3.205,-1.272 5.1,-1.272 6.122,0 9.185,3.526 9.185,10.576M112.584,48.672c1.15,-1.457 1.726,-3.509 1.726,-6.152 0,-2.712 -0.576,-4.797 -1.726,-6.254 -1.15,-1.458 -2.79,-2.187 -4.922,-2.187 -2.098,0 -3.73,0.755 -4.897,2.262 -1.167,1.51 -1.75,3.603 -1.75,6.28 0,2.644 0.583,4.678 1.75,6.102 1.168,1.424 2.816,2.136 4.948,2.136 2.097,0 3.721,-0.729 4.871,-2.187zM120.552,29.757v25.678h-6.242v-4.119c-0.779,1.424 -1.895,2.534 -3.35,3.33 -1.454,0.797 -3.112,1.196 -4.973,1.196 -2.232,0 -4.211,-0.542 -5.936,-1.627 -1.726,-1.085 -3.063,-2.627 -4.01,-4.628 -0.947,-2 -1.42,-4.322 -1.42,-6.966s0.482,-4.99 1.446,-7.042c0.964,-2.05 2.309,-3.644 4.034,-4.78 1.726,-1.135 3.687,-1.703 5.886,-1.703 1.86,0 3.519,0.4 4.974,1.195 1.454,0.797 2.57,1.906 3.349,3.33v-3.864h6.242zM143.894,29.808h6.292l-11.214,25.627h-5.531l-11.063,-25.627h6.647l7.359,18.407zM154.98,19.465h0.258a3.357,3.357 0,0 1,3.355 3.361,3.357 3.357,0 0,1 -3.355,3.36h-0.259a3.357,3.357 0,0 1,-3.354 -3.36,3.357 3.357,0 0,1 3.354,-3.361M151.962,55.435h6.293L158.255,29.757h-6.293z"/>
-</vector>
--- a/app/src/main/res/layout/action_button_view.xml
+++ b/app/src/main/res/layout/action_button_view.xml
@@ -15,14 +15,14 @@
        android:layout_margin="@dimen/action_view_margin"
        android:clipToPadding="false"
        android:elevation="@dimen/action_view_elevation"
-        app:cardCornerRadius="@dimen/action_view_radius">
+        app:cardCornerRadius="@dimen/action_view_radius_default">

        <TextView
            android:id="@+id/action_tv"
            style="@style/ActionTextViewStyle"
            android:layout_width="match_parent"
            android:layout_height="@dimen/action_view_height"
-            android:background="@drawable/bg_gradient_action_view_red"
+            android:background="@color/abv_bg_color_default"
            tools:text="Verify" />

    </androidx.cardview.widget.CardView>
--- a/app/src/main/res/layout/activity_splash_screen.xml
+++ b/app/src/main/res/layout/activity_splash_screen.xml
@@ -7,10 +7,9 @@

    <ImageView
        android:id="@+id/logo_image"
-        android:layout_width="@dimen/splash_logo_width"
+        android:layout_width="wrap_content"
        android:layout_height="@dimen/splash_logo_height"
        android:layout_centerInParent="true"
        android:adjustViewBounds="true"
-        app:srcCompat="@drawable/navi_logo_unit_cmyk" />
-
+        app:srcCompat="@drawable/ic_navi_logo_with_name_svg" />
 </RelativeLayout>
--- a/app/src/main/res/layout/activity_tutorial.xml
+++ b/app/src/main/res/layout/activity_tutorial.xml
@@ -12,12 +12,11 @@

        <ImageView
            android:id="@+id/logo"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/layout_dp_120"
-            android:layout_marginEnd="@dimen/layout_dp_120"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/splash_logo_height"
            android:adjustViewBounds="true"
            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
            app:srcCompat="@drawable/ic_navi_logo_with_name_svg" />
@@ -26,6 +25,8 @@
            android:id="@+id/viewPager"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/layout_dp_20"
+            android:layout_marginBottom="@dimen/layout_dp_20"
            app:layout_constrainedHeight="true"
            app:layout_constraintBottom_toTopOf="@id/tab_layout"
            app:layout_constraintTop_toBottomOf="@+id/logo" />
@@ -36,8 +37,7 @@
            android:layout_height="wrap_content"
            android:layout_alignParentBottom="true"
            android:layout_centerHorizontal="true"
-            android:layout_marginTop="@dimen/layout_dp_36"
-            android:layout_marginBottom="@dimen/layout_dp_36"
+            android:layout_marginBottom="@dimen/layout_dp_20"
            app:layout_constraintBottom_toTopOf="@+id/button_layout"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
@@ -51,7 +51,7 @@
            android:layout_height="wrap_content"
            android:layout_marginStart="@dimen/layout_dp_72"
            android:layout_marginEnd="@dimen/layout_dp_72"
-            android:layout_marginBottom="@dimen/layout_dp_100"
+            android:layout_marginBottom="@dimen/layout_dp_56"
            android:orientation="horizontal"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
--- a/app/src/main/res/layout/dashboard_content_view.xml
+++ b/app/src/main/res/layout/dashboard_content_view.xml
@@ -6,7 +6,7 @@
    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        tools:context=".dashboard.activities.DashboardActivity">
+        tools:context=".dashboard_old.activities.DashboardActivity">

        <include
            android:id="@+id/toolbar"
--- a/app/src/main/res/layout/tutorial_screen_1.xml
+++ b/app/src/main/res/layout/tutorial_screen_1.xml
@@ -11,10 +11,14 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center_horizontal"
-        android:layout_marginBottom="@dimen/layout_dp_24"
+        android:layout_marginStart="@dimen/layout_dp_32"
+        android:layout_marginTop="@dimen/layout_dp_20"
+        android:layout_marginEnd="@dimen/layout_dp_32"
+        android:layout_marginBottom="@dimen/layout_dp_20"
        android:adjustViewBounds="true"
        android:src="@drawable/tutorial_1_icon"
        app:layout_constrainedHeight="true"
+        app:layout_constrainedWidth="true"
        app:layout_constraintBottom_toTopOf="@+id/heading_text"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
--- a/app/src/main/res/layout/tutorial_screen_2.xml
+++ b/app/src/main/res/layout/tutorial_screen_2.xml
@@ -11,10 +11,14 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center_horizontal"
-        android:layout_marginBottom="@dimen/layout_dp_24"
+        android:layout_marginStart="@dimen/layout_dp_32"
+        android:layout_marginTop="@dimen/layout_dp_20"
+        android:layout_marginEnd="@dimen/layout_dp_32"
+        android:layout_marginBottom="@dimen/layout_dp_20"
        android:adjustViewBounds="true"
        android:src="@drawable/tutorial_1_icon"
        app:layout_constrainedHeight="true"
+        app:layout_constrainedWidth="true"
        app:layout_constraintBottom_toTopOf="@+id/heading_text"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
--- a/app/src/main/res/layout/tutorial_screen_3.xml
+++ b/app/src/main/res/layout/tutorial_screen_3.xml
@@ -11,10 +11,14 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center_horizontal"
-        android:layout_marginBottom="@dimen/layout_dp_24"
+        android:layout_marginStart="@dimen/layout_dp_32"
+        android:layout_marginTop="@dimen/layout_dp_20"
+        android:layout_marginEnd="@dimen/layout_dp_32"
+        android:layout_marginBottom="@dimen/layout_dp_20"
        android:adjustViewBounds="true"
        android:src="@drawable/tutorial_1_icon"
        app:layout_constrainedHeight="true"
+        app:layout_constrainedWidth="true"
        app:layout_constraintBottom_toTopOf="@+id/heading_text"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -37,4 +37,6 @@
    <color name="view_background_color_one">#33A3A3AB</color>
    <color name="view_background_color_two">#FBFBFB</color>
    <color name="view_background_color_three">#334B4968</color>
+
+    <color name="abv_bg_color_default">#FF3333</color>
 </resources>
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -46,9 +46,7 @@
    <dimen name="coupon_code_radius">8dp</dimen>
    <dimen name="partner_offer_logo_height">32dp</dimen>

-    <dimen name="splash_logo_height">120dp</dimen>
-    <dimen name="splash_logo_width">200dp</dimen>
-    <dimen name="action_view_radius">30dp</dimen>
+    <dimen name="splash_logo_height">56dp</dimen>
    <dimen name="action_view_padding">32dp</dimen>
    <dimen name="action_view_elevation">2dp</dimen>

@@ -101,4 +99,5 @@
    <dimen name="tab_dot_border">1dp</dimen>

    <dimen name="action_view_margin">8dp</dimen>
+    <dimen name="action_view_radius_default">10dp</dimen>
 </resources>
--- a/app/src/main/res/values/integers.xml
+++ b/app/src/main/res/values/integers.xml
@@ -8,4 +8,7 @@
    <integer name="anim_dur_large">500</integer>
    <integer name="pan_length">10</integer>

+    <integer name="abv_radius_default">10</integer>
+    <integer name="abv_radius_large">30</integer>
+
 </resources>