103 chaning support phone number (#104)

* added the right support number * Update LoginViewModel.kt * update * Update LoginScreen.kt * Update LoginScreen.kt * Update LoginScreen.kt
d-tree-org · Aug 22, 2024 · 22180b3 · 22180b3
1 parent 31e60ec
commit 22180b3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/login/LoginScreen.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/login/LoginScreen.kt
@@ -98,7 +98,9 @@ fun LoginScreen(loginViewModel: LoginViewModel) {
   val password by loginViewModel.password.observeAsState("")
   val loginErrorState by loginViewModel.loginErrorState.observeAsState(null)
   val showProgressBar by loginViewModel.showProgressBar.observeAsState(false)
+  val applicationConfiguration by loginViewModel.applicationConfiguration.observeAsState()
   val context = LocalContext.current
+  val phoneNumber = applicationConfiguration?.supportPhoneNumber
 
   LoginPage(
     username = username,
@@ -109,6 +111,7 @@ fun LoginScreen(loginViewModel: LoginViewModel) {
     onLoginButtonClicked = { loginViewModel.login(context = context) },
     loginErrorState = loginErrorState,
     showProgressBar = showProgressBar,
+    phoneNumber = phoneNumber,
   )
 }
 
@@ -123,6 +126,7 @@ fun LoginPage(
   modifier: Modifier = Modifier,
   loginErrorState: LoginErrorState? = null,
   showProgressBar: Boolean = false,
+  phoneNumber: String? = null,
 ) {
   var showPassword by remember { mutableStateOf(false) }
   val backgroundColor = Color.White
@@ -146,6 +150,7 @@ fun LoginPage(
       ForgotPasswordDialog(
         forgotPassword = forgotPassword,
         onDismissDialog = { showForgotPasswordDialog = false },
+        phoneNumber = phoneNumber,
       )
     }
     Column(
@@ -347,6 +352,7 @@ fun LoginPage(
 fun ForgotPasswordDialog(
   forgotPassword: () -> Unit,
   onDismissDialog: () -> Unit,
+  phoneNumber: String?,
   modifier: Modifier = Modifier,
 ) {
   AlertDialog(
@@ -359,7 +365,9 @@ fun ForgotPasswordDialog(
       )
     },
     text = {
-      Text(text = stringResource(R.string.call_supervisor, "012-3456-789"), fontSize = 16.sp)
+      if (phoneNumber != null) {
+        Text(text = stringResource(R.string.call_supervisor, phoneNumber), fontSize = 16.sp)
+      }
     },
     buttons = {
       Row(

diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/login/LoginViewModel.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/login/LoginViewModel.kt
@@ -38,6 +38,7 @@ import org.jetbrains.annotations.TestOnly
 import org.smartregister.fhircore.engine.auth.AccountAuthenticator
 import org.smartregister.fhircore.engine.configuration.ConfigurationRegistry
 import org.smartregister.fhircore.engine.configuration.app.AppConfigService
+import org.smartregister.fhircore.engine.configuration.app.ApplicationConfiguration
 import org.smartregister.fhircore.engine.data.local.DefaultRepository
 import org.smartregister.fhircore.engine.data.remote.fhir.resource.FhirResourceDataSource
 import org.smartregister.fhircore.engine.data.remote.fhir.resource.FhirResourceService
@@ -106,6 +107,14 @@ constructor(
   val loadingConfig: LiveData<Boolean>
     get() = _loadingConfig
 
+  private val _applicationConfiguration = MutableLiveData<ApplicationConfiguration>()
+  val applicationConfiguration: LiveData<ApplicationConfiguration>
+    get() = _applicationConfiguration
+
+  init {
+    _applicationConfiguration.value = configurationRegistry.getAppConfigs()
+  }
+
   private suspend fun fetchAccessToken(
     username: String,
     password: CharArray,
@@ -265,8 +274,9 @@ constructor(
   }
 
   fun forgotPassword() {
-    // TODO load supervisor contact e.g.
-    _launchDialPad.value = "tel:0123456789"
+    applicationConfiguration.value?.let { config ->
+      _launchDialPad.value = "tel:${config.supportPhoneNumber}"
+    }
   }
 
   @TestOnly