packg rename (#75)

app/build.gradle

@@ -11,7 +11,7 @@ android {
     compileSdkVersion 29
     buildToolsVersion "29.0.2"
     defaultConfig {
-        applicationId "com.navi.medici.androidCustomerApp"
+        applicationId "com.navi"
         minSdkVersion 21
         targetSdkVersion 29
         versionCode 1
@@ -38,10 +38,10 @@ android {
     productFlavors {
         qa {
             dimension "app"
-            applicationId "com.navi.medici.androidCustomerApp.qa"
+            applicationId "com.navi.qa"
         }
         dev {
-            applicationId "com.navi.medici.androidCustomerApp.dev"
+            applicationId "com.navi.dev"
             dimension "app"
         }
         prod {

app/src/androidTest/java/com/navi/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp
+package com.navi
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.navi.medici.androidCustomerApp">
+    package="com.navi">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

app/src/main/java/com/navi/adapters/EmiScheduleAdapter.kt

@@ -1,23 +1,29 @@
-package com.navi.medici.androidCustomerApp.adapters
+/*
+ * *
+ *  * Copyright (c) 2019 . All rights reserved @Navi
+ *
+ */
+
+package com.navi.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.navi.medici.androidCustomerApp.databinding.EmiScheduleCardBinding
-import com.navi.medici.androidCustomerApp.models.EmiSchedule
+import com.navi.databinding.EmiScheduleCardBinding
+import com.navi.models.EmiSchedule
 import java.text.SimpleDateFormat
 import java.util.*
 
 
 class EmiScheduleAdapter(private val context: Context) :
-    RecyclerView.Adapter<EmiScheduleAdapter.EmiScheduleViewHolder>() {
+    RecyclerView.Adapter<com.navi.adapters.EmiScheduleAdapter.EmiScheduleViewHolder>() {
     private val emiScheduleList = mutableListOf<EmiSchedule>()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EmiScheduleViewHolder {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): com.navi.adapters.EmiScheduleAdapter.EmiScheduleViewHolder {
         val layoutInflater = LayoutInflater.from(parent.context)
         val view = EmiScheduleCardBinding.inflate(layoutInflater, parent, false)
-        return EmiScheduleViewHolder(view)
+        return com.navi.adapters.EmiScheduleAdapter.EmiScheduleViewHolder(view)
     }
 
     fun setLoans(emiScheduleList: List<EmiSchedule>) {
@@ -28,7 +34,7 @@ class EmiScheduleAdapter(private val context: Context) :
 
     override fun getItemCount() = emiScheduleList.count()
 
-    override fun onBindViewHolder(holder: EmiScheduleViewHolder, position: Int) {
+    override fun onBindViewHolder(holder: com.navi.adapters.EmiScheduleAdapter.EmiScheduleViewHolder, position: Int) {
         val emiSchedule = emiScheduleList[position]
         holder.binding.apply {
             emiNoTxt.text = (position + 1).toString()

app/src/main/java/com/navi/adapters/LoanDetailsTabAdapter.kt

@@ -1,10 +1,16 @@
-package com.navi.medici.androidCustomerApp.adapters
+/*
+ * *
+ *  * Copyright (c) 2019 . All rights reserved @Navi
+ *
+ */
+
+package com.navi.adapters
 
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
-import com.navi.medici.androidCustomerApp.ui.fragments.EmiScheduleFragment
-import com.navi.medici.androidCustomerApp.ui.fragments.LoanDetailsFragment
+import com.navi.ui.fragments.EmiScheduleFragment
+import com.navi.ui.fragments.LoanDetailsFragment
 
 class LoanDetailsTabAdapter(fm: FragmentManager) :
     FragmentPagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {

app/src/main/java/com/navi/adapters/LoanReasonAdapter.kt

@@ -1,10 +1,10 @@
-package com.navi.medici.androidCustomerApp.adapters
+package com.navi.adapters
 
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.BaseAdapter
-import com.navi.medici.androidCustomerApp.databinding.LoanReasonBinding
+import com.navi.databinding.LoanReasonBinding
 
 class LoanReasonAdapter(private var loanReasonList: List<String>) :
     BaseAdapter() {

app/src/main/java/com/navi/adapters/MyLoansAdapter.kt

@@ -1,21 +1,27 @@
-package com.navi.medici.androidCustomerApp.adapters
+/*
+ * *
+ *  * Copyright (c) 2019 . All rights reserved @Navi
+ *
+ */
+
+package com.navi.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.navi.medici.androidCustomerApp.R
-import com.navi.medici.androidCustomerApp.models.response.MyLoansResponse
-import com.navi.medici.androidCustomerApp.databinding.LoanCardBinding
+import com.navi.R
+import com.navi.databinding.LoanCardBinding
+import com.navi.models.response.MyLoansResponse
 
 class MyLoansAdapter(private val context: Context) :
-    RecyclerView.Adapter<MyLoansAdapter.MyLoansViewHolder>() {
+    RecyclerView.Adapter<com.navi.adapters.MyLoansAdapter.MyLoansViewHolder>() {
     private val loans = mutableListOf<MyLoansResponse>()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyLoansViewHolder {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): com.navi.adapters.MyLoansAdapter.MyLoansViewHolder {
         val layoutInflater = LayoutInflater.from(parent.context)
         val view = LoanCardBinding.inflate(layoutInflater, parent, false)
-        return MyLoansViewHolder(view)
+        return com.navi.adapters.MyLoansAdapter.MyLoansViewHolder(view)
     }
 
     fun setLoans(loans: List<MyLoansResponse>) {
@@ -26,7 +32,7 @@ class MyLoansAdapter(private val context: Context) :
 
     override fun getItemCount() = loans.count()
 
-    override fun onBindViewHolder(holder: MyLoansViewHolder, position: Int) {
+    override fun onBindViewHolder(holder: com.navi.adapters.MyLoansAdapter.MyLoansViewHolder, position: Int) {
         val loan = loans[position]
         holder.binding.apply {
             loanAmountText.text =

app/src/main/java/com/navi/adapters/OccupationAdapter.kt

@@ -1,11 +1,11 @@
-package com.navi.medici.androidCustomerApp.adapters
+package com.navi.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.BaseAdapter
-import com.navi.medici.androidCustomerApp.databinding.OccupationBinding
+import com.navi.databinding.OccupationBinding
 
 class OccupationAdapter(
     private val context: Context,

app/src/main/java/com/navi/app/NaviApplication.kt

@@ -1,14 +1,14 @@
 /*
  * *
- *  * Copyright (c) 2019 . All rights reserved.
+ *  * Copyright (c) 2019 . All rights reserved @Navi
  *
  */
 
-package com.navi.medici.androidCustomerApp.app
+package com.navi.app
 
 import androidx.multidex.MultiDexApplication
 import com.facebook.stetho.Stetho
-import com.navi.medici.androidCustomerApp.BuildConfig
+import com.navi.BuildConfig
 import timber.log.Timber
 
 class NaviApplication : MultiDexApplication() {

app/src/main/java/com/navi/common/BaseActivity.kt

@@ -4,7 +4,7 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.common
+package com.navi.common
 
 import android.view.MenuItem
 import android.view.View
@@ -12,7 +12,7 @@ import android.widget.TextView
 import androidx.annotation.LayoutRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
-import com.navi.medici.androidCustomerApp.R
+import com.navi.R
 
 abstract class BaseActivity : AppCompatActivity(), Toolbar.OnMenuItemClickListener {
 

app/src/main/java/com/navi/common/BaseFragment.kt

@@ -4,7 +4,7 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.common
+package com.navi.common
 
 import androidx.fragment.app.Fragment
 

app/src/main/java/com/navi/common/PreferenceManager.kt

@@ -0,0 +1,75 @@
+/*
+ * *
+ *  * Copyright (c) 2019 . All rights reserved @Navi
+ *
+ */
+
+package com.navi.common
+
+import android.content.Context
+
+object PreferenceManager {
+    fun getUserId(context: Context): String? {
+        return com.navi.common.PreferenceWrapper.getStringPreference(
+            context,
+            com.navi.common.PreferenceNames.USER_ID
+        )
+    }
+
+    fun getCustomerId(context: Context): String? {
+        return com.navi.common.PreferenceWrapper.getStringPreference(
+            context,
+            com.navi.common.PreferenceNames.CUSTOMER_ID
+        )
+    }
+
+    fun getLoanApplicationId(context: Context): String? {
+        return com.navi.common.PreferenceWrapper.getStringPreference(
+            context,
+            com.navi.common.PreferenceNames.LOAN_APPLICATION_ID
+        )
+    }
+
+    fun saveCustomerId(customerId: String?, context: Context) {
+        com.navi.common.PreferenceWrapper.setStringPreference(
+            context,
+            com.navi.common.PreferenceNames.CUSTOMER_ID,
+            customerId
+        )
+    }
+
+    fun saveUserId(userId: String?, context: Context) {
+        com.navi.common.PreferenceWrapper.setStringPreference(
+            context,
+            com.navi.common.PreferenceNames.USER_ID,
+            userId
+        )
+    }
+
+    fun saveApplicationId(applicationId: String?, context: Context) {
+        com.navi.common.PreferenceWrapper.setStringPreference(
+            context,
+            com.navi.common.PreferenceNames.LOAN_APPLICATION_ID,
+            applicationId
+        )
+    }
+
+    fun saveNameOfUser(name: String, context: Context) {
+        com.navi.common.PreferenceWrapper.setStringPreference(
+            context,
+            com.navi.common.PreferenceNames.NAME_OF_USER,
+            name
+        )
+    }
+
+    fun getNameOfUser(context: Context): String? {
+        return com.navi.common.PreferenceWrapper.getStringPreference(
+            context,
+            com.navi.common.PreferenceNames.NAME_OF_USER
+        )
+    }
+
+    fun clearPrefData() {
+        com.navi.common.PreferenceWrapper.clearPrefData()
+    }
+}

app/src/main/java/com/navi/common/PreferenceNames.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.common
+package com.navi.common
 
 enum class PreferenceNames {
     SESSION_TOKEN,

app/src/main/java/com/navi/common/PreferenceWrapper.kt

@@ -1,9 +1,14 @@
-package com.navi.medici.androidCustomerApp.common
+/*
+ * *
+ *  * Copyright (c) 2019 . All rights reserved @Navi
+ *
+ */
+
+package com.navi.common
 
 import android.content.Context
 import android.content.SharedPreferences
-import com.navi.medici.androidCustomerApp.app.NaviApplication
-import com.navi.medici.androidCustomerApp.utils.log
+import com.navi.utils.log
 import java.lang.Exception
 
 object PreferenceWrapper {
@@ -24,15 +29,15 @@ object PreferenceWrapper {
     }
 
 
-    fun getIntPreference(context: Context, preference: PreferenceNames): Int {
+    fun getIntPreference(context: Context, preference:PreferenceNames): Int {
         val sharedPref: SharedPreferences =
-            context.getSharedPreferences(PREFS_FILENAME, Context.MODE_PRIVATE)
+            context.getSharedPreferences(com.navi.common.PreferenceWrapper.PREFS_FILENAME, Context.MODE_PRIVATE)
         return sharedPref.getInt(preference.name, 0)
     }
 
-    fun setIntPreference(context: Context, preference: PreferenceNames, value: Int) {
+    fun setIntPreference(context: Context, preference: com.navi.common.PreferenceNames, value: Int) {
         val sharedPref: SharedPreferences =
-            context.getSharedPreferences(PREFS_FILENAME, Context.MODE_PRIVATE)
+            context.getSharedPreferences(com.navi.common.PreferenceWrapper.PREFS_FILENAME, Context.MODE_PRIVATE)
         val editor = sharedPref.edit()
         editor.putInt(preference.name, value)
         editor.apply()
@@ -58,7 +63,7 @@ object PreferenceWrapper {
     fun clearPrefData() {
         try {
             val sharedPref: SharedPreferences =
-                NaviApplication.instance.getSharedPreferences(PREFS_FILENAME, Context.MODE_PRIVATE)
+                com.navi.app.NaviApplication.instance.getSharedPreferences(PREFS_FILENAME, Context.MODE_PRIVATE)
             val editor = sharedPref.edit()
             editor.clear()
             editor.commit()

app/src/main/java/com/navi/common/customview/CustomViewPager.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.common.customview
+package com.navi.common.customview
 
 import android.content.Context
 import android.util.AttributeSet

app/src/main/java/com/navi/common/customview/FocusView.kt

@@ -4,7 +4,7 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.common.customview
+package com.navi.common.customview
 
 import android.content.Context
 import android.graphics.Canvas

app/src/main/java/com/navi/common/customview/TextViewMedium.kt

@@ -4,7 +4,7 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.common.customview
+package com.navi.common.customview
 
 class TextViewMedium {
 }

app/src/main/java/com/navi/common/customview/TextViewRegular.kt

@@ -4,7 +4,7 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.common.customview
+package com.navi.common.customview
 
 class TextViewRegular {
 }

app/src/main/java/com/navi/customcamera/CameraActionListener.kt

@@ -4,7 +4,7 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.customcamera
+package com.navi.customcamera
 
 import com.otaliastudios.cameraview.CameraException
 import com.otaliastudios.cameraview.PictureResult

app/src/main/java/com/navi/customcamera/CameraEventListener.kt

@@ -4,7 +4,7 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.customcamera
+package com.navi.customcamera
 
 import android.graphics.PointF
 import com.otaliastudios.cameraview.*

app/src/main/java/com/navi/customcamera/CameraUtils.kt

@@ -4,7 +4,7 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.customcamera
+package com.navi.customcamera
 
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory

app/src/main/java/com/navi/customcamera/Resolution.kt

@@ -4,7 +4,7 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.customcamera
+package com.navi.customcamera
 
 data class Resolution(
     val width: Int,

app/src/main/java/com/navi/customcamera/ResolutionHelper.kt

@@ -4,7 +4,7 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.customcamera
+package com.navi.customcamera
 
 class ResolutionHelper {
 

app/src/main/java/com/navi/kyc/activities/SelfieCaptureActivity.kt

@@ -4,30 +4,29 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.kyc.activities
+package com.navi.kyc.activities
 
 import android.graphics.Bitmap
 import android.os.Bundle
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.MutableLiveData
-import com.navi.medici.androidCustomerApp.R
-import com.navi.medici.androidCustomerApp.common.BaseActivity
-import com.navi.medici.androidCustomerApp.customcamera.CameraActionListener
-import com.navi.medici.androidCustomerApp.customcamera.CameraEventListener
-import com.navi.medici.androidCustomerApp.customcamera.getCameraCaptureImageBitmap
-import com.navi.medici.androidCustomerApp.databinding.SelfieCaptureActivityBinding
-import com.navi.medici.androidCustomerApp.utils.log
-import com.navi.medici.androidCustomerApp.utils.observeNullable
 import com.otaliastudios.cameraview.CameraException
 import com.otaliastudios.cameraview.PictureResult
 import com.otaliastudios.cameraview.controls.Preview
 import android.app.Activity
 import android.content.Intent
-import com.navi.medici.androidCustomerApp.utils.Constants.DATA
-import com.navi.medici.androidCustomerApp.utils.putBitmapIntoFileAndGetFileName
+import com.navi.R
+import com.navi.customcamera.CameraActionListener
+import com.navi.customcamera.CameraEventListener
+import com.navi.customcamera.getCameraCaptureImageBitmap
+import com.navi.databinding.SelfieCaptureActivityBinding
+import com.navi.utils.Constants.DATA
+import com.navi.utils.log
+import com.navi.utils.observeNullable
+import com.navi.utils.putBitmapIntoFileAndGetFileName
 
 
-class SelfieCaptureActivity : BaseActivity() {
+class SelfieCaptureActivity : com.navi.common.BaseActivity() {
 
     private lateinit var binding: SelfieCaptureActivityBinding
     private val captureImageBitmap = MutableLiveData<Bitmap>()

app/src/main/java/com/navi/manager/LocationManager.kt

@@ -1,4 +1,10 @@
-package com.navi.medici.androidCustomerApp.manager
+/*
+ * *
+ *  * Copyright (c) 2019 . All rights reserved @Navi
+ *
+ */
+
+package com.navi.manager
 
 import android.app.Activity
 import android.app.Application
@@ -8,16 +14,15 @@ import android.os.Looper
 import com.google.android.gms.common.api.ResolvableApiException
 import com.google.android.gms.location.*
 import com.google.android.gms.tasks.Task
-import com.navi.medici.androidCustomerApp.app.NaviApplication
-import com.navi.medici.androidCustomerApp.manager.repositories.UserDataRepository
-import com.navi.medici.androidCustomerApp.models.UserLocation
+import com.navi.manager.repositories.UserDataRepository
+import com.navi.models.UserLocation
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 class LocationManager : Application.ActivityLifecycleCallbacks {
     private val fusedLocationClient =
-        LocationServices.getFusedLocationProviderClient(NaviApplication.instance)
+        LocationServices.getFusedLocationProviderClient(com.navi.app.NaviApplication.instance)
     private val locationCallback = locationCallback()
     private val coroutineScope = CoroutineScope(Dispatchers.Default)
 
@@ -55,7 +60,7 @@ class LocationManager : Application.ActivityLifecycleCallbacks {
         val locationSettingsRequestBuilder =
             LocationSettingsRequest.Builder().addLocationRequest(locationRequest)
         val settingsClient =
-            LocationServices.getSettingsClient(NaviApplication.instance)
+            LocationServices.getSettingsClient(com.navi.app.NaviApplication.instance)
         val locationSettingsResponseTask =
             settingsClient.checkLocationSettings(locationSettingsRequestBuilder.build())
 

app/src/main/java/com/navi/manager/PermissionsManager.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.manager
+package com.navi.manager
 
 import android.app.Activity
 import android.content.pm.PackageManager

app/src/main/java/com/navi/manager/WorkManager.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.manager
+package com.navi.manager
 
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequest

app/src/main/java/com/navi/manager/repositories/UserDataRepository.kt

@@ -1,11 +1,18 @@
-package com.navi.medici.androidCustomerApp.manager.repositories
+/*
+ * *
+ *  * Copyright (c) 2019 . All rights reserved @Navi
+ *
+ */
+
+package com.navi.manager.repositories
+
+import com.navi.models.UserCallLog
+import com.navi.models.UserInstalledApp
+import com.navi.models.UserLocation
+import com.navi.models.UserSms
+import com.navi.network.retrofit.ResponseCallback
+import com.navi.utils.retrofitService
 
-import com.navi.medici.androidCustomerApp.models.UserCallLog
-import com.navi.medici.androidCustomerApp.models.UserInstalledApp
-import com.navi.medici.androidCustomerApp.models.UserLocation
-import com.navi.medici.androidCustomerApp.models.UserSms
-import com.navi.medici.androidCustomerApp.network.retrofit.ResponseCallback
-import com.navi.medici.androidCustomerApp.utils.retrofitService
 
 class UserDataRepository : ResponseCallback() {
     suspend fun postInstalledApps(installedApps: List<UserInstalledApp>) =

app/src/main/java/com/navi/manager/workers/UserCallLogWorker.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.manager.workers
+package com.navi.manager.workers
 
 import android.content.Context
 import android.database.Cursor
@@ -6,9 +6,9 @@ import android.net.Uri
 import android.provider.CallLog
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
-import com.navi.medici.androidCustomerApp.manager.repositories.UserDataRepository
-import com.navi.medici.androidCustomerApp.models.UserCallLog
-import com.navi.medici.androidCustomerApp.utils.Constants.USER_DATA_PAYLOAD_SIZE
+import com.navi.manager.repositories.UserDataRepository
+import com.navi.models.UserCallLog
+import com.navi.utils.Constants.USER_DATA_PAYLOAD_SIZE
 
 class UserCallLogWorker(context: Context, params: WorkerParameters) :
     CoroutineWorker(context, params) {

app/src/main/java/com/navi/manager/workers/UserSmsWorker.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.manager.workers
+package com.navi.manager.workers
 
 import android.content.Context
 import android.database.Cursor
@@ -6,9 +6,9 @@ import android.net.Uri
 import android.provider.Telephony
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
-import com.navi.medici.androidCustomerApp.manager.repositories.UserDataRepository
-import com.navi.medici.androidCustomerApp.models.UserSms
-import com.navi.medici.androidCustomerApp.utils.Constants.USER_DATA_PAYLOAD_SIZE
+import com.navi.manager.repositories.UserDataRepository
+import com.navi.models.UserSms
+import com.navi.utils.Constants.USER_DATA_PAYLOAD_SIZE
 
 class UserSmsWorker(context: Context, workerParameters: WorkerParameters) :
     CoroutineWorker(context, workerParameters) {

app/src/main/java/com/navi/medici/androidCustomerApp/common/PreferenceManager.kt

@@ -1,69 +0,0 @@
-package com.navi.medici.androidCustomerApp.common
-
-import android.content.Context
-
-object PreferenceManager {
-    fun getUserId(context: Context): String? {
-        return PreferenceWrapper.getStringPreference(
-            context,
-            PreferenceNames.USER_ID
-        )
-    }
-
-    fun getCustomerId(context: Context): String? {
-        return PreferenceWrapper.getStringPreference(
-            context,
-            PreferenceNames.CUSTOMER_ID
-        )
-    }
-
-    fun getLoanApplicationId(context: Context): String? {
-        return PreferenceWrapper.getStringPreference(
-            context,
-            PreferenceNames.LOAN_APPLICATION_ID
-        )
-    }
-
-    fun saveCustomerId(customerId: String?, context: Context) {
-        PreferenceWrapper.setStringPreference(
-            context,
-            PreferenceNames.CUSTOMER_ID,
-            customerId
-        )
-    }
-
-    fun saveUserId(userId: String?, context: Context) {
-        PreferenceWrapper.setStringPreference(
-            context,
-            PreferenceNames.USER_ID,
-            userId
-        )
-    }
-
-    fun saveApplicationId(applicationId: String?, context: Context) {
-        PreferenceWrapper.setStringPreference(
-            context,
-            PreferenceNames.LOAN_APPLICATION_ID,
-            applicationId
-        )
-    }
-
-    fun saveNameOfUser(name: String, context: Context) {
-        PreferenceWrapper.setStringPreference(
-            context,
-            PreferenceNames.NAME_OF_USER,
-            name
-        )
-    }
-
-    fun getNameOfUser(context: Context): String? {
-        return PreferenceWrapper.getStringPreference(
-            context,
-            PreferenceNames.NAME_OF_USER
-        )
-    }
-
-    fun clearPrefData() {
-        PreferenceWrapper.clearPrefData()
-    }
-}

app/src/main/java/com/navi/medici/androidCustomerApp/repositories/CkycRepository.kt

@@ -1,10 +0,0 @@
-package com.navi.medici.androidCustomerApp.repositories
-
-import com.navi.medici.androidCustomerApp.models.request.CkycRequest
-import com.navi.medici.androidCustomerApp.network.retrofit.ResponseCallback
-import com.navi.medici.androidCustomerApp.utils.retrofitService
-
-class CkycRepository : ResponseCallback() {
-    suspend fun submitCkycDetails(loanApplicationId: String, ckycRequest: CkycRequest) =
-        apiResponseCallback(retrofitService().submitCkycDetails(loanApplicationId, ckycRequest))
-}

app/src/main/java/com/navi/medici/androidCustomerApp/repositories/InputPanRepository.kt

@@ -1,10 +0,0 @@
-package com.navi.medici.androidCustomerApp.repositories
-
-import com.navi.medici.androidCustomerApp.models.request.InputPanRequest
-import com.navi.medici.androidCustomerApp.network.retrofit.ResponseCallback
-import com.navi.medici.androidCustomerApp.utils.retrofitService
-
-class InputPanRepository(): ResponseCallback() {
-    suspend fun submitPan(inputPanRequest: InputPanRequest) =
-        apiResponseCallback(retrofitService().submitPan(inputPanRequest))
-}

app/src/main/java/com/navi/medici/androidCustomerApp/repositories/MyLoansRepository.kt

@@ -1,9 +0,0 @@
-package com.navi.medici.androidCustomerApp.repositories
-
-import com.navi.medici.androidCustomerApp.network.retrofit.ResponseCallback
-import com.navi.medici.androidCustomerApp.utils.retrofitService
-
-class MyLoansRepository : ResponseCallback() {
-    suspend fun fetchMyLoans(customerId: String) =
-        apiResponseCallback(retrofitService().fetchMyLoans(customerId))
-}

app/src/main/java/com/navi/models/Address.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models
+package com.navi.models
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/ApplicationSummary.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models
+package com.navi.models
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/EmiSchedule.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models
+package com.navi.models
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/LoanAmount.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models
+package com.navi.models
 
 class LoanAmount(
     val min: Money,

app/src/main/java/com/navi/models/LoanApplicationDetail.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models
+package com.navi.models
 
 import com.google.gson.annotations.SerializedName
 import java.math.BigDecimal

app/src/main/java/com/navi/models/LoanReason.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models
+package com.navi.models
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/Money.kt

@@ -1,7 +1,14 @@
-package com.navi.medici.androidCustomerApp.models
+/*
+ * *
+ *  * Copyright (c) 2019 . All rights reserved @Navi
+ *
+ */
+
+package com.navi.models
+
+import com.navi.R
+import com.navi.app.NaviApplication
 
-import com.navi.medici.androidCustomerApp.R
-import com.navi.medici.androidCustomerApp.app.NaviApplication
 
 data class Money(
     val currency: String?,

app/src/main/java/com/navi/models/OfferResponse.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models
+package com.navi.models
 
 import com.google.gson.annotations.SerializedName
 import java.math.BigDecimal

app/src/main/java/com/navi/models/OfferSelected.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models
+package com.navi.models
 
 import com.google.gson.annotations.SerializedName
 import java.math.BigDecimal

app/src/main/java/com/navi/models/OfferTenure.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models
+package com.navi.models
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/TenureDetails.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models
+package com.navi.models
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/TenureUnit.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models
+package com.navi.models
 
 
 enum class TenureUnit(val unit: String) {

app/src/main/java/com/navi/models/UserCallLog.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models
+package com.navi.models
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/UserInstalledApp.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models
+package com.navi.models
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/UserLocation.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models
+package com.navi.models
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/UserSms.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models
+package com.navi.models
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/enums/Permission.kt

@@ -1,8 +1,14 @@
-package com.navi.medici.androidCustomerApp.models.enums
+/*
+ * *
+ *  * Copyright (c) 2019 . All rights reserved @Navi
+ *
+ */
+
+package com.navi.models.enums
 
 import android.Manifest
-import com.navi.medici.androidCustomerApp.R
-import com.navi.medici.androidCustomerApp.app.NaviApplication
+import com.navi.R
+import com.navi.app.NaviApplication
 
 enum class Permission(
     val qualifier: String,

app/src/main/java/com/navi/models/request/AddBankAccountRequest.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models.request
+package com.navi.models.request
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/request/CkycRequest.kt

@@ -1,7 +1,7 @@
-package com.navi.medici.androidCustomerApp.models.request
+package com.navi.models.request
 
 import com.google.gson.annotations.SerializedName
-import com.navi.medici.androidCustomerApp.models.Address
+import com.navi.models.Address
 
 data class CkycRequest(
     @SerializedName("mother_name") val motherName: String?,

app/src/main/java/com/navi/models/request/InputNameRequest.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models.request
+package com.navi.models.request
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/request/InputPanRequest.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models.request
+package com.navi.models.request
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/request/LoanApplicationRequest.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models.request
+package com.navi.models.request
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/request/LoginRequest.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models.request
+package com.navi.models.request
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/request/MyLoansRequest.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models.request
+package com.navi.models.request
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/request/OtpRequest.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models.request
+package com.navi.models.request
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/request/RegisterRequest.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models.request
+package com.navi.models.request
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/response/BankDetails.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models.response
+package com.navi.models.response
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/response/CreateApplicationResponse.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models.response
+package com.navi.models.response
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/response/InputPanResponse.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models.response
+package com.navi.models.response
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/response/LoginResponse.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models.response
+package com.navi.models.response
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/response/MyLoansResponse.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models.response
+package com.navi.models.response
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/response/OfferAcceptResponse.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models.response
+package com.navi.models.response
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/response/OtpResponse.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models.response
+package com.navi.models.response
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/response/SuccessResponse.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models.response
+package com.navi.models.response
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/response/UploadDocumentResponse.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models.response
+package com.navi.models.response
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/models/response/UploadPanResponse.kt

@@ -1,4 +1,4 @@
-package com.navi.medici.androidCustomerApp.models.response
+package com.navi.models.response
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/network/ApiConstants.kt

@@ -4,7 +4,7 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.network
+package com.navi.network
 
 object ApiConstants {
 

app/src/main/java/com/navi/network/GenericResponse.kt

@@ -4,7 +4,7 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.network
+package com.navi.network
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/navi/network/RepoResult.kt

@@ -4,7 +4,7 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.network
+package com.navi.network
 
 data class RepoResult<T>(
     var response: GenericResponse<T> = GenericResponse(data = null),

app/src/main/java/com/navi/network/retrofit/ResponseCallback.kt

@@ -4,19 +4,18 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.network.retrofit
+package com.navi.network.retrofit
 
-import com.navi.medici.androidCustomerApp.R
-import com.navi.medici.androidCustomerApp.app.NaviApplication
-import com.navi.medici.androidCustomerApp.network.ApiConstants.API_ERROR_NO_USER_FOUND
-import com.navi.medici.androidCustomerApp.network.ApiConstants.API_SUCCESS_CODE
-import com.navi.medici.androidCustomerApp.network.ApiConstants.API_CODE_ERROR
-import com.navi.medici.androidCustomerApp.network.ApiConstants.API_CODE_SOCKET_TIMEOUT
-import com.navi.medici.androidCustomerApp.network.ApiConstants.API_SUCCESS_CODE_201
-import com.navi.medici.androidCustomerApp.network.GenericResponse
-import com.navi.medici.androidCustomerApp.network.RepoResult
-import com.navi.medici.androidCustomerApp.utils.deleteCache
-import com.navi.medici.androidCustomerApp.utils.log
+import com.navi.R
+import com.navi.network.ApiConstants.API_CODE_ERROR
+import com.navi.network.ApiConstants.API_CODE_SOCKET_TIMEOUT
+import com.navi.network.ApiConstants.API_ERROR_NO_USER_FOUND
+import com.navi.network.ApiConstants.API_SUCCESS_CODE
+import com.navi.network.ApiConstants.API_SUCCESS_CODE_201
+import com.navi.network.GenericResponse
+import com.navi.network.RepoResult
+import com.navi.utils.deleteCache
+import com.navi.utils.log
 import retrofit2.Response
 import timber.log.Timber
 import java.net.ConnectException
@@ -62,11 +61,11 @@ abstract class ResponseCallback {
         result.exception = e
         if (e is java.net.UnknownHostException || e is ConnectException) {
             result.response.message =
-                NaviApplication.instance.applicationContext.getString(R.string.no_internet)
+                com.navi.app.NaviApplication.instance.applicationContext.getString(R.string.no_internet)
             result.response.statusCode = (API_CODE_ERROR)
         } else if (e is SocketTimeoutException) {
             result.response.message =
-                NaviApplication.instance.applicationContext.getString(R.string.internet_too_slow)
+                com.navi.app.NaviApplication.instance.applicationContext.getString(R.string.internet_too_slow)
             result.response.statusCode = (API_CODE_SOCKET_TIMEOUT)
         } else {
             try {

app/src/main/java/com/navi/network/retrofit/RetrofitProvider.kt

@@ -4,19 +4,16 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.network.retrofit
+package com.navi.network.retrofit
 
 import android.os.Build
 import com.facebook.stetho.okhttp3.StethoInterceptor
-import com.navi.medici.androidCustomerApp.BuildConfig
-import com.navi.medici.androidCustomerApp.R
-import com.navi.medici.androidCustomerApp.app.NaviApplication
-import com.navi.medici.androidCustomerApp.common.PreferenceNames
-import com.navi.medici.androidCustomerApp.common.PreferenceWrapper
-import com.navi.medici.androidCustomerApp.network.ApiConstants.API_CONNECT_TIMEOUT_VALUE
-import com.navi.medici.androidCustomerApp.network.ApiConstants.API_READ_TIMEOUT_VALUE
-import com.navi.medici.androidCustomerApp.utils.defaultLocale
-import com.navi.medici.androidCustomerApp.utils.deviceId
+import com.navi.BuildConfig
+import com.navi.R
+import com.navi.network.ApiConstants.API_CONNECT_TIMEOUT_VALUE
+import com.navi.network.ApiConstants.API_READ_TIMEOUT_VALUE
+import com.navi.utils.defaultLocale
+import com.navi.utils.deviceId
 import okhttp3.CertificatePinner
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
@@ -41,7 +38,7 @@ class RetrofitProvider private constructor() {
         val defaultRetrofitClient: Retrofit = createRetrofitClient(defaultOkHttpClientBuilder)
 
         private fun createCertificatePinner(): CertificatePinner {
-            val host = NaviApplication.instance.getString(R.string.base_url)
+            val host = com.navi.app.NaviApplication.instance.getString(R.string.base_url)
                 .replace("https://", "")
             return CertificatePinner.Builder().add(host, "sha256/satish") // add hash key here
                 .build()
@@ -49,7 +46,7 @@ class RetrofitProvider private constructor() {
 
         private fun createRetrofitClient(okttpClientBuilder: OkHttpClient.Builder) =
             Retrofit.Builder()
-                .baseUrl(NaviApplication.instance.getString(R.string.base_url))
+                .baseUrl(com.navi.app.NaviApplication.instance.getString(R.string.base_url))
                 .addConverterFactory(GsonConverterFactory.create())
                 .client(okttpClientBuilder.build())
                 .build()
@@ -83,9 +80,9 @@ class RetrofitProvider private constructor() {
                     add("osVersion", "Android_" + Build.VERSION.RELEASE)
                     add("deviceId", deviceId)
                     add("defaultLocale", defaultLocale)
-                    PreferenceWrapper.getStringPreference(
-                        NaviApplication.instance,
-                        PreferenceNames.SESSION_TOKEN
+                    com.navi.common.PreferenceWrapper.getStringPreference(
+                        com.navi.app.NaviApplication.instance,
+                        com.navi.common.PreferenceNames.SESSION_TOKEN
                     )?.let {
                         add("X-Session-Token", it)
                     }

app/src/main/java/com/navi/network/retrofit/RetrofitService.kt

@@ -4,34 +4,12 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.network.retrofit
+package com.navi.network.retrofit
 
-import com.navi.medici.androidCustomerApp.models.ApplicationSummary
-import com.navi.medici.androidCustomerApp.models.OfferResponse
-import com.navi.medici.androidCustomerApp.models.OfferSelected
-import com.navi.medici.androidCustomerApp.models.UserCallLog
-import com.navi.medici.androidCustomerApp.models.UserInstalledApp
-import com.navi.medici.androidCustomerApp.models.UserLocation
-import com.navi.medici.androidCustomerApp.models.UserSms
-import com.navi.medici.androidCustomerApp.models.request.AddBankAccountRequest
-import com.navi.medici.androidCustomerApp.models.request.CkycRequest
-import com.navi.medici.androidCustomerApp.models.request.InputNameRequest
-import com.navi.medici.androidCustomerApp.models.request.InputPanRequest
-import com.navi.medici.androidCustomerApp.models.request.LoanApplicationRequest
-import com.navi.medici.androidCustomerApp.models.request.LoginRequest
-import com.navi.medici.androidCustomerApp.models.request.OtpRequest
-import com.navi.medici.androidCustomerApp.models.request.RegisterRequest
-import com.navi.medici.androidCustomerApp.models.response.BankDetails
-import com.navi.medici.androidCustomerApp.models.response.CreateApplicationResponse
-import com.navi.medici.androidCustomerApp.models.response.InputPanResponse
-import com.navi.medici.androidCustomerApp.models.response.LoginResponse
-import com.navi.medici.androidCustomerApp.models.response.MyLoansResponse
-import com.navi.medici.androidCustomerApp.models.response.OfferAcceptResponse
-import com.navi.medici.androidCustomerApp.models.response.OtpResponse
-import com.navi.medici.androidCustomerApp.models.response.SuccessResponse
-import com.navi.medici.androidCustomerApp.models.response.UploadDocumentResponse
-import com.navi.medici.androidCustomerApp.models.response.UploadPanResponse
-import com.navi.medici.androidCustomerApp.network.GenericResponse
+import com.navi.models.*
+import com.navi.models.request.*
+import com.navi.models.response.*
+import com.navi.network.GenericResponse
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import retrofit2.Response

app/src/main/java/com/navi/permission/activities/PermissionActivity.kt

@@ -1,18 +1,17 @@
-package com.navi.medici.androidCustomerApp.permission.activities
+package com.navi.permission.activities
 
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Bundle
 import androidx.databinding.DataBindingUtil
-import com.navi.medici.androidCustomerApp.R
-import com.navi.medici.androidCustomerApp.common.BaseActivity
-import com.navi.medici.androidCustomerApp.databinding.ActivityPermissionBinding
-import com.navi.medici.androidCustomerApp.manager.PermissionsManager
-import com.navi.medici.androidCustomerApp.models.enums.Permission
-import com.navi.medici.androidCustomerApp.permission.adapters.PermissionAdapter
-import com.navi.medici.androidCustomerApp.registration.RegistrationActivity
+import com.navi.R
+import com.navi.databinding.ActivityPermissionBinding
+import com.navi.manager.PermissionsManager
+import com.navi.models.enums.Permission
+import com.navi.permission.adapters.PermissionAdapter
+import com.navi.registration.RegistrationActivity
 
-class PermissionActivity : BaseActivity() {
+class PermissionActivity : com.navi.common.BaseActivity() {
     private lateinit var binding: ActivityPermissionBinding
     override val screenName: String
         get() = ""

app/src/main/java/com/navi/permission/adapters/PermissionAdapter.kt

@@ -1,4 +1,10 @@
-package com.navi.medici.androidCustomerApp.permission.adapters
+/*
+ * *
+ *  * Copyright (c) 2019 . All rights reserved @Navi
+ *
+ */
+
+package com.navi.permission.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
@@ -6,9 +12,9 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.BaseAdapter
 import androidx.databinding.DataBindingUtil
-import com.navi.medici.androidCustomerApp.R
-import com.navi.medici.androidCustomerApp.databinding.ListItemPermissionBinding
-import com.navi.medici.androidCustomerApp.models.enums.Permission
+import com.navi.R
+import com.navi.databinding.ListItemPermissionBinding
+import com.navi.models.enums.Permission
 
 class PermissionAdapter(
     private val context: Context,

app/src/main/java/com/navi/registration/LoginFragment.kt

@@ -4,7 +4,7 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.registration
+package com.navi.registration
 
 import android.content.Context
 import android.content.Intent
@@ -17,19 +17,16 @@ import androidx.core.widget.addTextChangedListener
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
-import com.navi.medici.androidCustomerApp.R
-import com.navi.medici.androidCustomerApp.common.BaseFragment
-import com.navi.medici.androidCustomerApp.common.PreferenceNames
-import com.navi.medici.androidCustomerApp.common.PreferenceWrapper
-import com.navi.medici.androidCustomerApp.databinding.LoginFragmentBinding
-import com.navi.medici.androidCustomerApp.registration.listeners.RegistrationScreenListener
-import com.navi.medici.androidCustomerApp.registration.viewmodel.LoginPageVM
-import com.navi.medici.androidCustomerApp.utils.Constants.PRIVACY_POLICY
-import com.navi.medici.androidCustomerApp.utils.Constants.TERMS_AND_CONDITIONS
-import com.navi.medici.androidCustomerApp.utils.log
-import com.navi.medici.androidCustomerApp.utils.makeLinks
+import com.navi.R
+import com.navi.databinding.LoginFragmentBinding
+import com.navi.registration.listeners.RegistrationScreenListener
+import com.navi.registration.viewmodel.LoginPageVM
+import com.navi.utils.Constants.PRIVACY_POLICY
+import com.navi.utils.Constants.TERMS_AND_CONDITIONS
+import com.navi.utils.log
+import com.navi.utils.makeLinks
 
-class LoginFragment : BaseFragment() {
+class LoginFragment : com.navi.common.BaseFragment() {
 
     private lateinit var binding: LoginFragmentBinding
     private val loginFragmentVM by lazy {
@@ -52,9 +49,9 @@ class LoginFragment : BaseFragment() {
         loginFragmentVM.otpTokenAndPhone.observe(this, loggedInObserver())
 
         binding.phoneEdit.addTextChangedListener {
-            PreferenceWrapper.getStringPreference(
+            com.navi.common.PreferenceWrapper.getStringPreference(
                 requireContext(),
-                PreferenceNames.IMEI
+                com.navi.common.PreferenceNames.IMEI
             )?.let { imei ->
                 loginFragmentVM.onChangePhoneNumber(
                     it.toString(),
@@ -78,9 +75,9 @@ class LoginFragment : BaseFragment() {
 
     private fun loggedInObserver(): Observer<Pair<String, String>> {
         return Observer { otpTokenAndPhone ->
-            PreferenceWrapper.setStringPreference(
+            com.navi.common.PreferenceWrapper.setStringPreference(
                 requireContext(),
-                PreferenceNames.PHONE_NUMBER,
+                com.navi.common.PreferenceNames.PHONE_NUMBER,
                 otpTokenAndPhone.second
             )
             regScreenListener?.onLoginSuccess(otpTokenAndPhone.first)

app/src/main/java/com/navi/registration/OtpFragment.kt

@@ -4,7 +4,7 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.registration
+package com.navi.registration
 
 import android.content.Context
 import android.os.Bundle
@@ -16,16 +16,13 @@ import androidx.core.widget.addTextChangedListener
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
-import com.navi.medici.androidCustomerApp.R
-import com.navi.medici.androidCustomerApp.common.BaseFragment
-import com.navi.medici.androidCustomerApp.common.PreferenceManager
-import com.navi.medici.androidCustomerApp.common.PreferenceNames
-import com.navi.medici.androidCustomerApp.common.PreferenceWrapper
-import com.navi.medici.androidCustomerApp.databinding.OtpFragmentBinding
-import com.navi.medici.androidCustomerApp.registration.listeners.RegistrationScreenListener
-import com.navi.medici.androidCustomerApp.registration.viewmodel.OtpPageVM
+import com.navi.R
+import com.navi.databinding.OtpFragmentBinding
+import com.navi.registration.listeners.RegistrationScreenListener
+import com.navi.registration.viewmodel.OtpPageVM
 
-class OtpFragment : BaseFragment() {
+
+class OtpFragment : com.navi.common.BaseFragment() {
 
     private lateinit var binding: OtpFragmentBinding
     private val otpFragmentVM by lazy {
@@ -45,9 +42,9 @@ class OtpFragment : BaseFragment() {
     }
 
     private fun init() {
-        val phoneNumber = PreferenceWrapper.getStringPreference(
+        val phoneNumber = com.navi.common.PreferenceWrapper.getStringPreference(
             requireContext(),
-            PreferenceNames.PHONE_NUMBER
+            com.navi.common.PreferenceNames.PHONE_NUMBER
         )
         binding.phoneLabelText.text = getString(
             R.string.otp_label,
@@ -74,7 +71,7 @@ class OtpFragment : BaseFragment() {
     private fun verifiedOtpObserver(): Observer<Boolean> {
         return Observer {
             if (it) {
-                PreferenceManager.saveUserId(otpFragmentVM.userId, requireActivity())
+                com.navi.common.PreferenceManager.saveUserId(otpFragmentVM.userId, requireActivity())
                 regScreenListener?.onOtpSuccess()
             } else {
                 Toast.makeText(requireContext(), "Invalid OTP", Toast.LENGTH_SHORT).show()

app/src/main/java/com/navi/registration/RegistrationActivity.kt

@@ -4,7 +4,7 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.registration
+package com.navi.registration
 
 import android.Manifest
 import android.content.Intent
@@ -12,26 +12,25 @@ import android.os.Bundle
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.work.PeriodicWorkRequestBuilder
-import com.navi.medici.androidCustomerApp.R
-import com.navi.medici.androidCustomerApp.common.BaseActivity
-import com.navi.medici.androidCustomerApp.databinding.RegistrationActivityBinding
-import com.navi.medici.androidCustomerApp.manager.LocationManager
-import com.navi.medici.androidCustomerApp.manager.PermissionsManager
-import com.navi.medici.androidCustomerApp.manager.WorkManager
-import com.navi.medici.androidCustomerApp.manager.repositories.UserDataRepository
-import com.navi.medici.androidCustomerApp.manager.workers.UserCallLogWorker
-import com.navi.medici.androidCustomerApp.manager.workers.UserSmsWorker
-import com.navi.medici.androidCustomerApp.models.UserInstalledApp
-import com.navi.medici.androidCustomerApp.registration.listeners.RegistrationScreenListener
-import com.navi.medici.androidCustomerApp.ui.activities.InputNameActivity
-import com.navi.medici.androidCustomerApp.utils.Constants.REPEAT_INTERVAL_FOR_PERIODIC_WORKER_IN_MINUTES
-import com.navi.medici.androidCustomerApp.utils.log
+import com.navi.R
+import com.navi.databinding.RegistrationActivityBinding
+import com.navi.manager.LocationManager
+import com.navi.manager.PermissionsManager
+import com.navi.manager.WorkManager
+import com.navi.manager.repositories.UserDataRepository
+import com.navi.manager.workers.UserCallLogWorker
+import com.navi.manager.workers.UserSmsWorker
+import com.navi.models.UserInstalledApp
+import com.navi.registration.listeners.RegistrationScreenListener
+import com.navi.ui.activities.InputNameActivity
+import com.navi.utils.Constants.REPEAT_INTERVAL_FOR_PERIODIC_WORKER_IN_MINUTES
+import com.navi.utils.log
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.util.concurrent.TimeUnit
 
-class RegistrationActivity : BaseActivity(), RegistrationScreenListener {
+class RegistrationActivity : com.navi.common.BaseActivity(), RegistrationScreenListener {
     private lateinit var binding: RegistrationActivityBinding
     private val coroutineScope = CoroutineScope(Dispatchers.Default)
 

app/src/main/java/com/navi/registration/SplashActivity.kt

@@ -4,7 +4,7 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.registration
+package com.navi.registration
 
 import android.Manifest
 import android.content.Intent
@@ -15,16 +15,14 @@ import android.widget.Toast
 import androidx.core.app.ActivityCompat
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
-import com.navi.medici.androidCustomerApp.R
-import com.navi.medici.androidCustomerApp.common.PreferenceNames
-import com.navi.medici.androidCustomerApp.common.PreferenceWrapper
-import com.navi.medici.androidCustomerApp.common.BaseActivity
-import com.navi.medici.androidCustomerApp.registration.viewmodel.SplashVM
-import com.navi.medici.androidCustomerApp.tutorial.TutorialActivity
-import com.navi.medici.androidCustomerApp.utils.getDeviceIdentifier
-import com.navi.medici.androidCustomerApp.utils.showServiceNotAvailableToast
+import com.navi.R
+import com.navi.registration.viewmodel.SplashVM
+import com.navi.tutorial.TutorialActivity
+import com.navi.utils.getDeviceIdentifier
+import com.navi.utils.showServiceNotAvailableToast
 
-class SplashActivity : BaseActivity() {
+
+class SplashActivity : com.navi.common.BaseActivity() {
 
     private val splashScreenVM by lazy {
         ViewModelProviders.of(this).get(SplashVM::class.java)
@@ -67,9 +65,9 @@ class SplashActivity : BaseActivity() {
                 if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                     getDeviceIdentifier()?.let {
                         splashScreenVM.checkDevice(it)
-                        PreferenceWrapper.setStringPreference(
+                        com.navi.common.PreferenceWrapper.setStringPreference(
                             this,
-                            PreferenceNames.IMEI,
+                            com.navi.common.PreferenceNames.IMEI,
                             it
                         )
                     } ?: run {
@@ -90,9 +88,9 @@ class SplashActivity : BaseActivity() {
 
     private fun gotoLoginScreen() {
         Handler().postDelayed({
-            val nextActivityClass = if (PreferenceWrapper.getBooleanPreference(
+            val nextActivityClass = if (com.navi.common.PreferenceWrapper.getBooleanPreference(
                     this,
-                    PreferenceNames.NOT_FIRST_TIME_USER
+                    com.navi.common.PreferenceNames.NOT_FIRST_TIME_USER
                 )
             )
                 RegistrationActivity::class.java

app/src/main/java/com/navi/registration/listeners/RegistrationScreenListener.kt

@@ -4,7 +4,7 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.registration.listeners
+package com.navi.registration.listeners
 
 interface RegistrationScreenListener {
 

app/src/main/java/com/navi/registration/repositories/RegisterRepository.kt

@@ -1,10 +1,11 @@
-package com.navi.medici.androidCustomerApp.registration.repositories
+package com.navi.registration.repositories
+
+import com.navi.models.request.LoginRequest
+import com.navi.models.request.OtpRequest
+import com.navi.models.request.RegisterRequest
+import com.navi.network.retrofit.ResponseCallback
+import com.navi.utils.retrofitService
 
-import com.navi.medici.androidCustomerApp.models.request.LoginRequest
-import com.navi.medici.androidCustomerApp.models.request.OtpRequest
-import com.navi.medici.androidCustomerApp.models.request.RegisterRequest
-import com.navi.medici.androidCustomerApp.network.retrofit.ResponseCallback
-import com.navi.medici.androidCustomerApp.utils.retrofitService
 
 class RegisterRepository : ResponseCallback() {
 

app/src/main/java/com/navi/registration/viewmodel/LoginPageVM.kt

@@ -4,13 +4,13 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.registration.viewmodel
+package com.navi.registration.viewmodel
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.navi.medici.androidCustomerApp.models.request.LoginRequest
-import com.navi.medici.androidCustomerApp.registration.repositories.RegisterRepository
+import com.navi.models.request.LoginRequest
+import com.navi.registration.repositories.RegisterRepository
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

app/src/main/java/com/navi/registration/viewmodel/OtpPageVM.kt

@@ -4,16 +4,14 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.registration.viewmodel
+package com.navi.registration.viewmodel
 
 import android.content.Context
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.navi.medici.androidCustomerApp.common.PreferenceNames
-import com.navi.medici.androidCustomerApp.common.PreferenceWrapper
-import com.navi.medici.androidCustomerApp.models.request.OtpRequest
-import com.navi.medici.androidCustomerApp.registration.repositories.RegisterRepository
+import com.navi.models.request.OtpRequest
+import com.navi.registration.repositories.RegisterRepository
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -34,9 +32,9 @@ class OtpPageVM : ViewModel() {
             val response = registerRepository.verifyOtp(otpRequest)
             Timber.i("otp response $response")
             if (response.exception == null) {
-                PreferenceWrapper.setStringPreference(
+                com.navi.common.PreferenceWrapper.setStringPreference(
                     context,
-                    PreferenceNames.SESSION_TOKEN,
+                    com.navi.common.PreferenceNames.SESSION_TOKEN,
                     response.response.data?.sessionToken
                 )
                 userId = response.response.data?.userId

app/src/main/java/com/navi/registration/viewmodel/SplashVM.kt

@@ -4,16 +4,16 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.registration.viewmodel
+package com.navi.registration.viewmodel
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.navi.medici.androidCustomerApp.models.request.RegisterRequest
-import com.navi.medici.androidCustomerApp.models.response.SuccessResponse
-import com.navi.medici.androidCustomerApp.network.RepoResult
-import com.navi.medici.androidCustomerApp.registration.repositories.RegisterRepository
-import com.navi.medici.androidCustomerApp.utils.Constants.CHANNEL_ID
+import com.navi.models.request.RegisterRequest
+import com.navi.models.response.SuccessResponse
+import com.navi.network.RepoResult
+import com.navi.registration.repositories.RegisterRepository
+import com.navi.utils.Constants.CHANNEL_ID
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

app/src/main/java/com/navi/repositories/AddAccountRepository.kt

@@ -1,8 +1,9 @@
-package com.navi.medici.androidCustomerApp.repositories
+package com.navi.repositories
+
+import com.navi.models.request.AddBankAccountRequest
+import com.navi.network.retrofit.ResponseCallback
+import com.navi.utils.retrofitService
 
-import com.navi.medici.androidCustomerApp.models.request.AddBankAccountRequest
-import com.navi.medici.androidCustomerApp.network.retrofit.ResponseCallback
-import com.navi.medici.androidCustomerApp.utils.retrofitService
 
 class AddAccountRepository : ResponseCallback() {
     suspend fun getBank(ifsc: String) = apiResponseCallback(retrofitService().getBank(ifsc))

app/src/main/java/com/navi/repositories/CkycRepository.kt

@@ -0,0 +1,11 @@
+package com.navi.repositories
+
+import com.navi.models.request.CkycRequest
+import com.navi.network.retrofit.ResponseCallback
+import com.navi.utils.retrofitService
+
+
+class CkycRepository : ResponseCallback() {
+    suspend fun submitCkycDetails(loanApplicationId: String, ckycRequest: CkycRequest) =
+        apiResponseCallback(retrofitService().submitCkycDetails(loanApplicationId, ckycRequest))
+}

app/src/main/java/com/navi/repositories/InputNameRepository.kt

@@ -1,9 +1,10 @@
-package com.navi.medici.androidCustomerApp.repositories
+package com.navi.repositories
+
+import com.navi.models.request.InputNameRequest
+import com.navi.models.request.LoanApplicationRequest
+import com.navi.network.retrofit.ResponseCallback
+import com.navi.utils.retrofitService
 
-import com.navi.medici.androidCustomerApp.models.request.InputNameRequest
-import com.navi.medici.androidCustomerApp.models.request.LoanApplicationRequest
-import com.navi.medici.androidCustomerApp.network.retrofit.ResponseCallback
-import com.navi.medici.androidCustomerApp.utils.retrofitService
 
 class InputNameRepository() : ResponseCallback() {
     suspend fun createApplication(loanApplicationRequest: LoanApplicationRequest) =

app/src/main/java/com/navi/repositories/InputPanRepository.kt

@@ -0,0 +1,17 @@
+/*
+ * *
+ *  * Copyright (c) 2019 . All rights reserved @Navi
+ *
+ */
+
+package com.navi.repositories
+
+import com.navi.models.request.InputPanRequest
+import com.navi.network.retrofit.ResponseCallback
+import com.navi.utils.retrofitService
+
+
+class InputPanRepository(): ResponseCallback() {
+    suspend fun submitPan(inputPanRequest: InputPanRequest) =
+        apiResponseCallback(retrofitService().submitPan(inputPanRequest))
+}

app/src/main/java/com/navi/repositories/KycDocumentUploadRepository.kt

@@ -1,7 +1,7 @@
-package com.navi.medici.androidCustomerApp.repositories
+package com.navi.repositories
 
-import com.navi.medici.androidCustomerApp.network.retrofit.ResponseCallback
-import com.navi.medici.androidCustomerApp.utils.retrofitService
+import com.navi.network.retrofit.ResponseCallback
+import com.navi.utils.retrofitService
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import retrofit2.http.Part

app/src/main/java/com/navi/repositories/LoanApplicationRepository.kt

@@ -1,8 +1,15 @@
-package com.navi.medici.androidCustomerApp.repositories
+/*
+ * *
+ *  * Copyright (c) 2019 . All rights reserved @Navi
+ *
+ */
+
+package com.navi.repositories
+
+import com.navi.models.OfferSelected
+import com.navi.network.retrofit.ResponseCallback
+import com.navi.utils.retrofitService
 
-import com.navi.medici.androidCustomerApp.models.OfferSelected
-import com.navi.medici.androidCustomerApp.network.retrofit.ResponseCallback
-import com.navi.medici.androidCustomerApp.utils.retrofitService
 
 class LoanApplicationRepository : ResponseCallback() {
     suspend fun offerAccept(loanApplicationId: String) =

app/src/main/java/com/navi/repositories/MyLoansRepository.kt

@@ -0,0 +1,16 @@
+/*
+ * *
+ *  * Copyright (c) 2019 . All rights reserved @Navi
+ *
+ */
+
+package com.navi.repositories
+
+import com.navi.network.retrofit.ResponseCallback
+import com.navi.utils.retrofitService
+
+
+class MyLoansRepository : ResponseCallback() {
+    suspend fun fetchMyLoans(customerId: String) =
+        apiResponseCallback(retrofitService().fetchMyLoans(customerId))
+}

app/src/main/java/com/navi/repositories/UploadPanRepository.kt

@@ -1,7 +1,13 @@
-package com.navi.medici.androidCustomerApp.repositories
+/*
+ * *
+ *  * Copyright (c) 2019 . All rights reserved @Navi
+ *
+ */
 
-import com.navi.medici.androidCustomerApp.network.retrofit.ResponseCallback
-import com.navi.medici.androidCustomerApp.utils.retrofitService
+package com.navi.repositories
+
+import com.navi.network.retrofit.ResponseCallback
+import com.navi.utils.retrofitService
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import retrofit2.http.Part

app/src/main/java/com/navi/tutorial/TutorialActivity.kt

@@ -4,7 +4,7 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.tutorial
+package com.navi.tutorial
 
 import android.content.Intent
 import android.os.Bundle
@@ -12,13 +12,11 @@ import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
 import androidx.viewpager.widget.ViewPager
-import com.navi.medici.androidCustomerApp.R
-import com.navi.medici.androidCustomerApp.common.PreferenceNames
-import com.navi.medici.androidCustomerApp.common.PreferenceWrapper
-import com.navi.medici.androidCustomerApp.databinding.ActivityTutorialBinding
-import com.navi.medici.androidCustomerApp.permission.activities.PermissionActivity
-import com.navi.medici.androidCustomerApp.tutorial.adapter.TutorialAdapter
-import com.navi.medici.androidCustomerApp.tutorial.adapter.TutorialAdapter.Companion.tutorialScreens
+import com.navi.R
+import com.navi.databinding.ActivityTutorialBinding
+import com.navi.permission.activities.PermissionActivity
+import com.navi.tutorial.adapter.TutorialAdapter
+import com.navi.tutorial.adapter.TutorialAdapter.Companion.tutorialScreens
 
 class TutorialActivity : AppCompatActivity() {
 
@@ -34,9 +32,9 @@ class TutorialActivity : AppCompatActivity() {
 
         val navigateToPermissionsScreenListener = View.OnClickListener { _ ->
             val intent = Intent(this, PermissionActivity::class.java)
-            PreferenceWrapper.setBooleanPreference(
+            com.navi.common.PreferenceWrapper.setBooleanPreference(
                 this,
-                PreferenceNames.NOT_FIRST_TIME_USER,
+                com.navi.common.PreferenceNames.NOT_FIRST_TIME_USER,
                 true
             )
             startActivity(intent)

app/src/main/java/com/navi/tutorial/adapter/TutorialAdapter.kt

@@ -4,13 +4,13 @@
  *
  */
 
-package com.navi.medici.androidCustomerApp.tutorial.adapter
+package com.navi.tutorial.adapter
 
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.viewpager.widget.PagerAdapter
-import com.navi.medici.androidCustomerApp.R
+import com.navi.R
 
 class TutorialAdapter : PagerAdapter() {
 

app/src/main/java/com/navi/ui/activities/BottomNavigationActivity.kt

@@ -1,20 +1,19 @@
-package com.navi.medici.androidCustomerApp.ui.activities
+/*
+ * *
+ *  * Copyright (c) 2019 . All rights reserved @Navi
+ *
+ */
+
+package com.navi.ui.activities
 
 import android.os.Bundle
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
-import com.navi.medici.androidCustomerApp.R
-import com.navi.medici.androidCustomerApp.common.BaseActivity
-import com.navi.medici.androidCustomerApp.databinding.ActivityBottomNavigationBinding
-import com.navi.medici.androidCustomerApp.ui.fragments.AddAccountFragment
-import com.navi.medici.androidCustomerApp.ui.fragments.CkycFragment
-import com.navi.medici.androidCustomerApp.ui.fragments.LoanDisbursedFragment
-import com.navi.medici.androidCustomerApp.ui.fragments.MoneyTransferCheckFragment
-import com.navi.medici.androidCustomerApp.ui.fragments.MyLoansFragment
-import com.navi.medici.androidCustomerApp.ui.fragments.OfferAcceptFragment
-import com.navi.medici.androidCustomerApp.ui.fragments.PreliminaryOfferFragment
+import com.navi.R
+import com.navi.databinding.ActivityBottomNavigationBinding
+import com.navi.ui.fragments.*
 
-class BottomNavigationActivity : BaseActivity() {
+class BottomNavigationActivity : com.navi.common.BaseActivity() {
 
     private lateinit var binding: ActivityBottomNavigationBinding
     override val screenName: String

app/src/main/java/com/navi/ui/activities/InputNameActivity.kt

@@ -1,4 +1,10 @@
-package com.navi.medici.androidCustomerApp.ui.activities
+/*
+ * *
+ *  * Copyright (c) 2019 . All rights reserved @Navi
+ *
+ */
+
+package com.navi.ui.activities
 
 import android.content.Intent
 import android.net.Uri
@@ -9,14 +15,13 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
-import com.navi.medici.androidCustomerApp.R
-import com.navi.medici.androidCustomerApp.common.PreferenceManager
-import com.navi.medici.androidCustomerApp.databinding.ActivityInputNameBinding
-import com.navi.medici.androidCustomerApp.useridentity.activities.UploadPanActivity
-import com.navi.medici.androidCustomerApp.utils.Constants.PRIVACY_POLICY
-import com.navi.medici.androidCustomerApp.utils.Constants.TERMS_AND_CONDITIONS
-import com.navi.medici.androidCustomerApp.utils.makeLinks
-import com.navi.medici.androidCustomerApp.viewModels.InputNameVM
+import com.navi.R
+import com.navi.databinding.ActivityInputNameBinding
+import com.navi.useridentity.activities.UploadPanActivity
+import com.navi.utils.Constants.PRIVACY_POLICY
+import com.navi.utils.Constants.TERMS_AND_CONDITIONS
+import com.navi.utils.makeLinks
+import com.navi.viewModels.InputNameVM
 
 class InputNameActivity : AppCompatActivity() {
 
@@ -31,7 +36,7 @@ class InputNameActivity : AppCompatActivity() {
         inputNameVM.nameSubmitted.observe(this, nameSubmittedObserver())
 
         inputNameVM.createApplication(
-            PreferenceManager.getUserId(this) ?: "123", "123"
+            com.navi.common.PreferenceManager.getUserId(this) ?: "123", "123"
         )
 
         binding.termsConditionsText.makeLinks(
@@ -52,7 +57,7 @@ class InputNameActivity : AppCompatActivity() {
 
     private fun nameSubmittedObserver(): Observer<Boolean> {
         return Observer {
-            PreferenceManager.saveNameOfUser(binding.nameEdit.text.toString(), this)
+            com.navi.common.PreferenceManager.saveNameOfUser(binding.nameEdit.text.toString(), this)
             if (it) {
                 val intent = Intent(this, UploadPanActivity::class.java)
                 startActivity(intent)

app/src/main/java/com/navi/ui/fragments/AddAccountFragment.kt

@@ -1,4 +1,10 @@
-package com.navi.medici.androidCustomerApp.ui.fragments
+/*
+ * *
+ *  * Copyright (c) 2019 . All rights reserved @Navi
+ *
+ */
+
+package com.navi.ui.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -7,15 +13,13 @@ import android.view.ViewGroup
 import androidx.core.widget.addTextChangedListener
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
-import com.navi.medici.androidCustomerApp.R
-import com.navi.medici.androidCustomerApp.common.BaseFragment
-import com.navi.medici.androidCustomerApp.common.PreferenceManager
-import com.navi.medici.androidCustomerApp.databinding.AddAccountFragmentBinding
-import com.navi.medici.androidCustomerApp.models.response.BankDetails
-import com.navi.medici.androidCustomerApp.ui.activities.BottomNavigationActivity
-import com.navi.medici.androidCustomerApp.viewModels.AddAccountVM
+import com.navi.R
+import com.navi.databinding.AddAccountFragmentBinding
+import com.navi.models.response.BankDetails
+import com.navi.ui.activities.BottomNavigationActivity
+import com.navi.viewModels.AddAccountVM
 
-class AddAccountFragment : BaseFragment(), View.OnClickListener {
+class AddAccountFragment : com.navi.common.BaseFragment(), View.OnClickListener {
     private lateinit var binding: AddAccountFragmentBinding
     private val viewModel by lazy { ViewModelProviders.of(this).get(AddAccountVM::class.java) }
 
@@ -32,7 +36,7 @@ class AddAccountFragment : BaseFragment(), View.OnClickListener {
 
     private fun initUi() {
         context?.let { context ->
-            PreferenceManager.getNameOfUser(context)?.let {
+            com.navi.common.PreferenceManager.getNameOfUser(context)?.let {
                 binding.bottomLayout.accountHolderNameText.text = it
             }
         }