refactor #2458: registration screen to compose

openMF · Dec 28, 2023 · e37e9b7 · e37e9b7
1 parent 0d8255e
commit e37e9b7
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 53 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -97,7 +97,6 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.googlecode.libphonenumber:libphonenumber:7.0.4'
     implementation "androidx.lifecycle:lifecycle-extensions:$rootProject.lifecycleExtensionsVersion"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$rootProject.lifecycleVersion"
     kapt "com.github.Raizlabs.DBFlow:dbflow-processor:$rootProject.dbflowVersion"
@@ -118,7 +117,6 @@ dependencies {
     //Country Code picker
     implementation "com.hbb20:ccp:$rootProject.countryCodePicker"
     implementation 'com.github.ParveshSandila:CountryCodeChooser:1.0'
-    implementation("com.github.jump-sdk:jetpack_compose_country_code_picker_emoji:2.2.6")
 
     //Square dependencies
     implementation("com.squareup.retrofit2:retrofit:$rootProject.retrofitVersion") {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -72,7 +72,7 @@
             android:windowSoftInputMode="adjustResize" />
 
         <activity
-            android:name="org.mifos.mobile.ui.activities.RegistrationActivity"
+            android:name="org.mifos.mobile.ui.registration.RegistrationActivity"
             android:configChanges="orientation|screenSize"
             android:windowSoftInputMode="adjustResize" />
 

diff --git a/app/src/main/java/org/mifos/mobile/ui/fragments/RegistrationVerificationFragment.kt b/app/src/main/java/org/mifos/mobile/ui/fragments/RegistrationVerificationFragment.kt
@@ -18,7 +18,7 @@ import org.mifos.mobile.ui.login.LoginActivity
 import org.mifos.mobile.ui.fragments.base.BaseFragment
 import org.mifos.mobile.utils.RegistrationUiState
 import org.mifos.mobile.utils.Toaster
-import org.mifos.mobile.viewModels.RegistrationViewModel
+import org.mifos.mobile.ui.registration.RegistrationViewModel
 
 /**
  * Created by dilpreet on 31/7/17.

diff --git a/app/src/main/java/org/mifos/mobile/ui/login/LoginActivity.kt b/app/src/main/java/org/mifos/mobile/ui/login/LoginActivity.kt
@@ -14,7 +14,7 @@ import org.mifos.mobile.MifosSelfServiceApp.Companion.context
 import org.mifos.mobile.R
 import org.mifos.mobile.core.ui.theme.MifosMobileTheme
 import org.mifos.mobile.ui.activities.PassCodeActivity
-import org.mifos.mobile.ui.activities.RegistrationActivity
+import org.mifos.mobile.ui.registration.RegistrationActivity
 import org.mifos.mobile.ui.activities.base.BaseActivity
 import org.mifos.mobile.utils.Constants
 import org.mifos.mobile.utils.LoginUiState

diff --git a/...ile/ui/activities/RegistrationActivity.kt → ...e/ui/registration/RegistrationActivity.kt b/...ile/ui/activities/RegistrationActivity.kt → ...e/ui/registration/RegistrationActivity.kt
@@ -1,11 +1,10 @@
-package org.mifos.mobile.ui.activities
+package org.mifos.mobile.ui.registration
 
-import android.content.DialogInterface
 import android.os.Bundle
 import org.mifos.mobile.R
 import org.mifos.mobile.databinding.ActivityRegistrationBinding
 import org.mifos.mobile.ui.activities.base.BaseActivity
-import org.mifos.mobile.ui.fragments.RegistrationFragment
+import org.mifos.mobile.ui.registration.RegistrationFragment
 import org.mifos.mobile.utils.MaterialDialog
 
 class RegistrationActivity : BaseActivity() {

diff --git a/...bile/ui/fragments/RegistrationFragment.kt → ...e/ui/registration/RegistrationFragment.kt b/...bile/ui/fragments/RegistrationFragment.kt → ...e/ui/registration/RegistrationFragment.kt
@@ -1,7 +1,6 @@
-package org.mifos.mobile.ui.fragments
+package org.mifos.mobile.ui.registration
 
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -11,21 +10,17 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
-import com.google.i18n.phonenumbers.NumberParseException
-import com.google.i18n.phonenumbers.PhoneNumberUtil
-import com.google.i18n.phonenumbers.Phonenumber
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 import org.mifos.mobile.R
 import org.mifos.mobile.core.ui.theme.MifosMobileTheme
 import org.mifos.mobile.ui.activities.base.BaseActivity
+import org.mifos.mobile.ui.fragments.RegistrationVerificationFragment
 import org.mifos.mobile.ui.fragments.base.BaseFragment
-import org.mifos.mobile.ui.registration.RegistrationScreen
 import org.mifos.mobile.utils.Network
 import org.mifos.mobile.utils.PasswordStrength
 import org.mifos.mobile.utils.RegistrationUiState
 import org.mifos.mobile.utils.Toaster
-import org.mifos.mobile.viewModels.RegistrationViewModel
 
 /**
  * Created by dilpreet on 31/7/17.
@@ -229,17 +224,7 @@ class RegistrationFragment : BaseFragment() {
                 return false
             }
 
-            (!isPhoneNumberValid(
-                phoneNumberContent,
-                getIsoCountryCodeFromCountryCode(countryCodeContent)
-            )) -> {
-                Log.d("COUNTRY_CODE",getIsoCountryCodeFromCountryCode(countryCodeContent).toString())
-                Toaster.show(view, getString(R.string.invalid_phn_number))
-                return false
-            }
-
             else -> true
-
         }
     }
 
@@ -263,30 +248,6 @@ class RegistrationFragment : BaseFragment() {
         hideMifosProgressDialog()
     }
 
-    private fun getIsoCountryCodeFromCountryCode(countryCode: String): String? {
-        val phoneNumberUtil = PhoneNumberUtil.getInstance()
-        return try {
-            val phoneNumber = phoneNumberUtil.parse("+$countryCode$phoneNumberContent", "")
-            Log.d("PHONE_NUM",phoneNumber.toString())
-            val regionCode = phoneNumberUtil.getRegionCodeForNumber(phoneNumber)
-            regionCode
-        } catch (e: Exception) {
-            e.printStackTrace()
-            null
-        }
-    }
-
-    private fun isPhoneNumberValid(phoneNumber: String?, countryCode: String?): Boolean {
-        val phoneUtil: PhoneNumberUtil = PhoneNumberUtil.getInstance()
-        try {
-            val numberProto: Phonenumber.PhoneNumber = phoneUtil.parse(phoneNumber, countryCode)
-            return phoneUtil.isValidNumber(numberProto)
-        } catch (e: NumberParseException) {
-            System.err.println("NumberParseException was thrown: $e")
-        }
-        return false
-    }
-
     companion object {
         fun newInstance(): RegistrationFragment {
             return RegistrationFragment()

diff --git a/...obile/viewModels/RegistrationViewModel.kt → .../ui/registration/RegistrationViewModel.kt b/...obile/viewModels/RegistrationViewModel.kt → .../ui/registration/RegistrationViewModel.kt
@@ -1,8 +1,6 @@
-package org.mifos.mobile.viewModels
+package org.mifos.mobile.ui.registration
 
 import androidx.core.util.PatternsCompat
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel

diff --git a/app/src/test/java/org/mifos/mobile/viewModels/RegistrationViewModelTest.kt b/app/src/test/java/org/mifos/mobile/viewModels/RegistrationViewModelTest.kt
@@ -9,6 +9,7 @@ import okhttp3.ResponseBody
 import org.junit.*
 import org.junit.runner.RunWith
 import org.mifos.mobile.repositories.UserAuthRepository
+import org.mifos.mobile.ui.registration.RegistrationViewModel
 import org.mifos.mobile.util.RxSchedulersOverrideRule
 import org.mifos.mobile.utils.RegistrationUiState
 import org.mockito.Mock

diff --git a/build.gradle b/build.gradle
@@ -48,7 +48,7 @@ task clean(type: Delete) {
 
 ext {
     // Sdk and tools
-    minSdkVersion = 22
+    minSdkVersion = 24
     targetSdkVersion = 34
     compileSdkVersion = 34