From 594bcffd7cff9d7b746266f78546dd6a7ddfc273 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 8 Sep 2023 15:18:37 +0200 Subject: [PATCH] Added operation in progress layout --- .../viewmodel/AccountCreationViewModel.kt | 10 +- .../java/org/linphone/utils/DialogUtils.kt | 2 +- .../layout/assistant_register_fragment.xml | 560 +++++++++--------- .../main/res/layout/operation_in_progress.xml | 38 ++ app/src/main/res/values/colors.xml | 2 +- 5 files changed, 334 insertions(+), 278 deletions(-) create mode 100644 app/src/main/res/layout/operation_in_progress.xml diff --git a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt index 22f8e232b..794794aa0 100644 --- a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt +++ b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt @@ -220,6 +220,7 @@ class AccountCreationViewModel @UiThread constructor() : ViewModel(), CountryPic init { internationalPrefix.value = "+1" + operationInProgress.value = false coreContext.postOnCoreThread { core -> accountCreator = core.createAccountCreator(core.accountCreatorUrl) @@ -292,6 +293,8 @@ class AccountCreationViewModel @UiThread constructor() : ViewModel(), CountryPic @UiThread fun requestToken() { + operationInProgress.value = true + coreContext.postOnCoreThread { if (accountCreator.token == null) { Log.i("$TAG We don't have a creation token, let's request one") @@ -316,6 +319,7 @@ class AccountCreationViewModel @UiThread constructor() : ViewModel(), CountryPic @UiThread fun validateCode() { operationInProgress.value = true + val code = "${smsCodeFirstDigit.value}${smsCodeSecondDigit.value}${smsCodeThirdDigit.value}${smsCodeLastDigit.value}" Log.i("$TAG Activating account using code [$code]") accountCreator.activationCode = code @@ -332,11 +336,12 @@ class AccountCreationViewModel @UiThread constructor() : ViewModel(), CountryPic @WorkerThread private fun checkUsername() { + operationInProgress.postValue(true) + usernameError.postValue("") accountCreator.username = username.value.orEmpty().trim() accountCreator.domain = corePreferences.defaultDomain - operationInProgress.postValue(true) val status = accountCreator.isAccountExist Log.i("$TAG isAccountExist for username [${accountCreator.username}] returned $status") if (status != AccountCreator.Status.RequestOk) { @@ -360,6 +365,7 @@ class AccountCreationViewModel @UiThread constructor() : ViewModel(), CountryPic @WorkerThread private fun createAccount() { operationInProgress.postValue(true) + accountCreator.password = password.value.orEmpty().trim() val status = accountCreator.createAccount() @@ -383,6 +389,8 @@ class AccountCreationViewModel @UiThread constructor() : ViewModel(), CountryPic return } + operationInProgress.postValue(true) + val pushConfig = coreContext.core.pushNotificationConfig if (pushConfig != null) { Log.i( diff --git a/app/src/main/java/org/linphone/utils/DialogUtils.kt b/app/src/main/java/org/linphone/utils/DialogUtils.kt index c59e0dabe..4b0d0fc12 100644 --- a/app/src/main/java/org/linphone/utils/DialogUtils.kt +++ b/app/src/main/java/org/linphone/utils/DialogUtils.kt @@ -187,7 +187,7 @@ class DialogUtils { val d: Drawable = ColorDrawable( ContextCompat.getColor(dialog.context, R.color.dialog_background) ) - d.alpha = 166 + // d.alpha = 166 dialog.window ?.setLayout( WindowManager.LayoutParams.MATCH_PARENT, diff --git a/app/src/main/res/layout/assistant_register_fragment.xml b/app/src/main/res/layout/assistant_register_fragment.xml index 391bbee63..148293de8 100644 --- a/app/src/main/res/layout/assistant_register_fragment.xml +++ b/app/src/main/res/layout/assistant_register_fragment.xml @@ -26,305 +26,315 @@ type="org.linphone.ui.assistant.viewmodel.AccountCreationViewModel" /> - - + android:layout_height="match_parent"> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/operation_in_progress.xml b/app/src/main/res/layout/operation_in_progress.xml new file mode 100644 index 000000000..4a76dab1c --- /dev/null +++ b/app/src/main/res/layout/operation_in_progress.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 520fde760..4046720a6 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -18,7 +18,7 @@ #E1E1E1 #FFEACB #FFB266 - #22334D + #A622334D #C0D1D9 #EEF7F8