From fb652abca46d52a5afe8b45f111bd1d87d9632e8 Mon Sep 17 00:00:00 2001 From: Anup Date: Fri, 3 Jul 2020 18:49:58 +0530 Subject: [PATCH] [CM_APP_0]PHR_585 Hide Aysuhman Bharat id for NHA --- build.gradle | 2 ++ .../jataayu/provider/viewmodel/ProviderSearchViewModel.kt | 3 +++ .../provider/src/main/res/layout/provider_search_fragment.xml | 2 ++ .../jataayu/user/account/ui/fragment/ProfileFragment.kt | 1 + .../account/ui/fragment/ReadValuesToRecoverCmidFragment.kt | 1 + .../jataayu/user/account/viewmodel/CreateAccountViewModel.kt | 2 ++ .../user/account/viewmodel/ProfileFragmentViewModel.kt | 3 +++ .../user/account/viewmodel/ReadValuesFragmentViewModel.kt | 4 ++-- user/account/src/main/res/layout/fragment_create_account.xml | 1 + user/account/src/main/res/layout/fragment_read_values.xml | 1 + user/account/src/main/res/layout/fragment_view_profile.xml | 1 + 11 files changed, 19 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 276fa5a5..996a6afa 100644 --- a/build.gradle +++ b/build.gradle @@ -42,11 +42,13 @@ subprojects { ncg { dimension "branding" resValue "string", "application_name", "Jataayu NCG" + buildConfigField "boolean", "is_ncg", "true" // applicationId "com.ncg" } nhs { dimension "branding" resValue "string", "application_name", "Jataayu NHS" + buildConfigField "boolean", "is_ncg", "false" // applicationId "com.nhs" } } diff --git a/features/provider/src/main/java/in/projecteka/jataayu/provider/viewmodel/ProviderSearchViewModel.kt b/features/provider/src/main/java/in/projecteka/jataayu/provider/viewmodel/ProviderSearchViewModel.kt index 1ab5cf86..6dbed561 100644 --- a/features/provider/src/main/java/in/projecteka/jataayu/provider/viewmodel/ProviderSearchViewModel.kt +++ b/features/provider/src/main/java/in/projecteka/jataayu/provider/viewmodel/ProviderSearchViewModel.kt @@ -1,5 +1,6 @@ package `in`.projecteka.jataayu.provider.viewmodel +import `in`.projecteka.jataayu.core.BuildConfig import `in`.projecteka.jataayu.core.model.* import `in`.projecteka.jataayu.core.repository.UserAccountsRepository import `in`.projecteka.jataayu.network.utils.* @@ -37,6 +38,8 @@ class ProviderSearchViewModel(private val providerRepository: ProviderRepository val otpText = ObservableField() val errorLbl = ObservableField() val setEnableButton = ObservableBoolean() + var showAyushmanId = ObservableBoolean(BuildConfig.is_ncg) + companion object { const val OTP_LENGTH = 6 diff --git a/features/provider/src/main/res/layout/provider_search_fragment.xml b/features/provider/src/main/res/layout/provider_search_fragment.xml index 5abff945..1ec7d458 100644 --- a/features/provider/src/main/res/layout/provider_search_fragment.xml +++ b/features/provider/src/main/res/layout/provider_search_fragment.xml @@ -463,6 +463,7 @@ android:layout_marginTop="@dimen/content_margin_medium" android:drawablePadding="@dimen/content_padding_medium" android:text="@string/ayushman_bharat_id" + app:toggledVisibility="@{viewModel.showAyushmanId}" android:textSize="@dimen/text_size_small" app:layout_constraintTop_toBottomOf="@id/gender" app:layout_constraintStart_toStartOf="parent" @@ -476,6 +477,7 @@ android:drawablePadding="@dimen/content_padding_small" android:textSize="@dimen/text_size_medium" android:text="@{ayushmanId}" + app:toggledVisibility="@{viewModel.showAyushmanId}" app:layout_constraintTop_toBottomOf="@id/ayushman_bharat_id_lbl" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/user/account/src/main/java/in/projecteka/jataayu/user/account/ui/fragment/ProfileFragment.kt b/user/account/src/main/java/in/projecteka/jataayu/user/account/ui/fragment/ProfileFragment.kt index 622b100b..4d945e9a 100644 --- a/user/account/src/main/java/in/projecteka/jataayu/user/account/ui/fragment/ProfileFragment.kt +++ b/user/account/src/main/java/in/projecteka/jataayu/user/account/ui/fragment/ProfileFragment.kt @@ -2,6 +2,7 @@ package `in`.projecteka.jataayu.user.account.ui.fragment import `in`.projecteka.jataayu.core.ConsentScopeType import `in`.projecteka.jataayu.network.utils.Loading +import `in`.projecteka.jataayu.user.account.R import `in`.projecteka.jataayu.user.account.databinding.FragmentViewProfileBinding import `in`.projecteka.jataayu.user.account.viewmodel.ProfileFragmentViewModel import `in`.projecteka.jataayu.user.account.viewmodel.ProfileFragmentViewModel.Companion.KEY_SCOPE_TYPE diff --git a/user/account/src/main/java/in/projecteka/jataayu/user/account/ui/fragment/ReadValuesToRecoverCmidFragment.kt b/user/account/src/main/java/in/projecteka/jataayu/user/account/ui/fragment/ReadValuesToRecoverCmidFragment.kt index cb7f4633..9ffd6de1 100644 --- a/user/account/src/main/java/in/projecteka/jataayu/user/account/ui/fragment/ReadValuesToRecoverCmidFragment.kt +++ b/user/account/src/main/java/in/projecteka/jataayu/user/account/ui/fragment/ReadValuesToRecoverCmidFragment.kt @@ -49,6 +49,7 @@ class ReadValuesToRecoverCmidFragment : Fragment(), AdapterView.OnItemSelectedLi initSpinner() } + private fun initSpinner() { val arrayAdapter = ArrayAdapter( activity!!, diff --git a/user/account/src/main/java/in/projecteka/jataayu/user/account/viewmodel/CreateAccountViewModel.kt b/user/account/src/main/java/in/projecteka/jataayu/user/account/viewmodel/CreateAccountViewModel.kt index 5d8a030f..c62b8b32 100644 --- a/user/account/src/main/java/in/projecteka/jataayu/user/account/viewmodel/CreateAccountViewModel.kt +++ b/user/account/src/main/java/in/projecteka/jataayu/user/account/viewmodel/CreateAccountViewModel.kt @@ -1,5 +1,6 @@ package `in`.projecteka.jataayu.user.account.viewmodel +import `in`.projecteka.jataayu.core.BuildConfig import `in`.projecteka.jataayu.presentation.ui.viewmodel.BaseViewModel import `in`.projecteka.jataayu.user.account.R import `in`.projecteka.jataayu.util.repository.PreferenceRepository @@ -33,6 +34,7 @@ class CreateAccountViewModel : BaseViewModel(), ChipGroup.OnCheckedChangeListene val showErrorAyushmanId = ObservableBoolean(false) val showErrorGender = ObservableBoolean(false) val submitEnabled = ObservableBoolean(false) + var showAyushmanId = ObservableBoolean(BuildConfig.is_ncg) fun validateFields(): Boolean { diff --git a/user/account/src/main/java/in/projecteka/jataayu/user/account/viewmodel/ProfileFragmentViewModel.kt b/user/account/src/main/java/in/projecteka/jataayu/user/account/viewmodel/ProfileFragmentViewModel.kt index 01d4eeeb..18a86d5c 100644 --- a/user/account/src/main/java/in/projecteka/jataayu/user/account/viewmodel/ProfileFragmentViewModel.kt +++ b/user/account/src/main/java/in/projecteka/jataayu/user/account/viewmodel/ProfileFragmentViewModel.kt @@ -5,6 +5,7 @@ import `in`.projecteka.jataayu.network.utils.PayloadLiveData import `in`.projecteka.jataayu.network.utils.fetch import `in`.projecteka.jataayu.network.utils.partialFailure import `in`.projecteka.jataayu.presentation.ui.viewmodel.BaseViewModel +import `in`.projecteka.jataayu.user.account.BuildConfig import `in`.projecteka.jataayu.user.account.R import `in`.projecteka.jataayu.util.livedata.SingleLiveEvent import `in`.projecteka.jataayu.util.repository.CredentialsRepository @@ -23,6 +24,7 @@ class ProfileFragmentViewModel(val repository: UserAccountsRepository, var pinCreateOrEdit = ObservableField(R.string.create) var showPinNotCreated = ObservableBoolean(true) + var showAyushmanId = ObservableBoolean(BuildConfig.is_ncg) companion object { private const val INDIA_COUNTRY_CODE = "+91" @@ -81,4 +83,5 @@ class ProfileFragmentViewModel(val repository: UserAccountsRepository, showPinNotCreated.set(false) } } + } \ No newline at end of file diff --git a/user/account/src/main/java/in/projecteka/jataayu/user/account/viewmodel/ReadValuesFragmentViewModel.kt b/user/account/src/main/java/in/projecteka/jataayu/user/account/viewmodel/ReadValuesFragmentViewModel.kt index 72654d0c..0972d36f 100644 --- a/user/account/src/main/java/in/projecteka/jataayu/user/account/viewmodel/ReadValuesFragmentViewModel.kt +++ b/user/account/src/main/java/in/projecteka/jataayu/user/account/viewmodel/ReadValuesFragmentViewModel.kt @@ -8,6 +8,7 @@ import `in`.projecteka.jataayu.core.repository.UserAccountsRepository import `in`.projecteka.jataayu.network.utils.PayloadLiveData import `in`.projecteka.jataayu.network.utils.fetch import `in`.projecteka.jataayu.presentation.ui.viewmodel.BaseViewModel +import `in`.projecteka.jataayu.user.account.BuildConfig import `in`.projecteka.jataayu.user.account.R import `in`.projecteka.jataayu.util.repository.PreferenceRepository import `in`.projecteka.jataayu.util.repository.PreferenceRepository.Companion.COUNTRY_CODE_SEPARATOR @@ -49,11 +50,10 @@ class ReadValuesFragmentViewModel(private val repository: UserAccountsRepository val showErrorName = ObservableBoolean(false) val showErrorGender = ObservableBoolean(false) val showErrorMobile = ObservableBoolean(false) - + var showAyushmanId = ObservableBoolean(BuildConfig.is_ncg) val recoverCmidResponse = PayloadLiveData() - fun validateFields(): Boolean { val listOfEvents: List = listOf( diff --git a/user/account/src/main/res/layout/fragment_create_account.xml b/user/account/src/main/res/layout/fragment_create_account.xml index eb0d1bb9..19362056 100644 --- a/user/account/src/main/res/layout/fragment_create_account.xml +++ b/user/account/src/main/res/layout/fragment_create_account.xml @@ -165,6 +165,7 @@ android:layout_marginTop="@dimen/content_margin_extra_small" app:layout_constraintStart_toStartOf="parent" android:hint="@string/ayushman_bharat_id" + app:toggledVisibility="@{viewModel.showAyushmanId}" android:id="@+id/til_ayushman_id" app:layout_constraintTop_toBottomOf="@+id/til_yob" style="@style/TextInputLayout"> diff --git a/user/account/src/main/res/layout/fragment_read_values.xml b/user/account/src/main/res/layout/fragment_read_values.xml index b06ab218..926775f8 100644 --- a/user/account/src/main/res/layout/fragment_read_values.xml +++ b/user/account/src/main/res/layout/fragment_read_values.xml @@ -202,6 +202,7 @@ app:layout_constraintStart_toStartOf="parent" android:hint="@string/ayushman_bharat_id" app:layout_constraintTop_toBottomOf="@+id/cg_gender" + app:toggledVisibility="@{viewModel.showAyushmanId}" style="@style/TextInputLayout">