From d9bf14474300ef65da5d6d3b4e8d87d2737b7766 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 18 Aug 2020 13:15:26 +0200 Subject: [PATCH] Updated dependencies, use SwitchMaterial instead of Switch and fixed enter button not going to next field in assistant --- app/build.gradle | 6 +++--- .../activities/assistant/fragments/AbstractPhoneFragment.kt | 2 +- .../main/chat/fragments/DetailChatRoomFragment.kt | 2 +- .../activities/main/dialer/fragments/DialerFragment.kt | 2 +- app/src/main/java/org/linphone/utils/DataBindingUtils.kt | 3 ++- .../main/res/layout/assistant_account_login_fragment.xml | 6 +++--- .../layout/assistant_email_account_creation_fragment.xml | 6 +++--- .../res/layout/assistant_generic_account_login_fragment.xml | 6 +++--- .../layout/assistant_phone_account_creation_fragment.xml | 4 ++-- .../res/layout/assistant_phone_account_linking_fragment.xml | 2 +- app/src/main/res/layout/settings_widget_switch.xml | 2 +- build.gradle | 2 +- 12 files changed, 22 insertions(+), 21 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 72299583c..0dd98db9d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -147,10 +147,10 @@ repositories { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.appcompat:appcompat:1.2.0' implementation "androidx.media:media:1.1.0" implementation 'androidx.fragment:fragment-ktx:1.2.5' - implementation 'androidx.core:core-ktx:1.3.0' + implementation 'androidx.core:core-ktx:1.3.1' implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0' implementation 'androidx.navigation:navigation-ui-ktx:2.3.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' @@ -159,7 +159,7 @@ dependencies { implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'com.google.android:flexbox:2.0.0' implementation 'com.github.bumptech.glide:glide:4.11.0' - implementation 'com.google.android.material:material:1.1.0' + implementation 'com.google.android.material:material:1.2.0' if (firebaseEnabled()) { implementation 'com.google.firebase:firebase-messaging:19.0.1' diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/AbstractPhoneFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/AbstractPhoneFragment.kt index 5232b22b8..4d8dac9cc 100644 --- a/app/src/main/java/org/linphone/activities/assistant/fragments/AbstractPhoneFragment.kt +++ b/app/src/main/java/org/linphone/activities/assistant/fragments/AbstractPhoneFragment.kt @@ -66,7 +66,7 @@ abstract class AbstractPhoneFragment : Fragment() { } protected fun showPhoneNumberInfoDialog() { - MaterialAlertDialogBuilder(context) + MaterialAlertDialogBuilder(requireContext()) .setTitle(getString(R.string.assistant_phone_number_info_title)) .setMessage( getString(R.string.assistant_phone_number_link_info_content) + "\n" + diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt index 1c51ce13f..32e4c2e1f 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt @@ -446,7 +446,7 @@ class DetailChatRoomFragment : MasterFragment() { // TODO: hide ephemeral menu if not all participants support the feature builder.setCallback(object : MenuBuilder.Callback { - override fun onMenuModeChange(menu: MenuBuilder?) {} + override fun onMenuModeChange(menu: MenuBuilder) {} override fun onMenuItemSelected(menu: MenuBuilder, item: MenuItem): Boolean { return when (item.itemId) { diff --git a/app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt b/app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt index 381f9efff..2dd2096bf 100644 --- a/app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt @@ -168,7 +168,7 @@ class DialerFragment : Fragment() { } private fun displayDebugPopup() { - val alertDialog = MaterialAlertDialogBuilder(context) + val alertDialog = MaterialAlertDialogBuilder(requireContext()) alertDialog.setTitle(getString(R.string.debug_popup_title)) if (corePreferences.debugLogs) { alertDialog.setItems(resources.getStringArray(R.array.popup_send_log)) { _, which -> diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt index 5a8bf05c4..dcbd01b25 100644 --- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt +++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt @@ -39,6 +39,7 @@ import com.bumptech.glide.load.engine.GlideException import com.bumptech.glide.request.RequestListener import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.request.target.Target +import com.google.android.material.switchmaterial.SwitchMaterial import org.linphone.BR import org.linphone.LinphoneApplication.Companion.corePreferences import org.linphone.R @@ -131,7 +132,7 @@ fun setLayoutToLeftOf(view: View, oldTargetId: Int, newTargetId: Int) { @BindingAdapter("onClickToggleSwitch") fun switchSetting(view: View, switchId: Int) { - val switch: Switch = view.findViewById(switchId) + val switch: SwitchMaterial = view.findViewById(switchId) view.setOnClickListener { switch.isChecked = !switch.isChecked } } diff --git a/app/src/main/res/layout/assistant_account_login_fragment.xml b/app/src/main/res/layout/assistant_account_login_fragment.xml index 3be3dcad0..cd01272a5 100644 --- a/app/src/main/res/layout/assistant_account_login_fragment.xml +++ b/app/src/main/res/layout/assistant_account_login_fragment.xml @@ -125,7 +125,7 @@ - diff --git a/app/src/main/res/layout/assistant_email_account_creation_fragment.xml b/app/src/main/res/layout/assistant_email_account_creation_fragment.xml index fefa653e2..ce93f0710 100644 --- a/app/src/main/res/layout/assistant_email_account_creation_fragment.xml +++ b/app/src/main/res/layout/assistant_email_account_creation_fragment.xml @@ -62,7 +62,7 @@ assistantUsernameValidation="@{true}" errorMessage="@={viewModel.usernameError}" android:text="@={viewModel.username}" - android:imeOptions="actionDone" + android:imeOptions="actionNext" android:singleLine="true" android:inputType="text|textNoSuggestions" android:background="@color/transparent_color" @@ -80,7 +80,7 @@ errorMessage="@={viewModel.emailError}" emailConfirmationValidation="@{true}" android:text="@={viewModel.email}" - android:imeOptions="actionDone" + android:imeOptions="actionNext" android:singleLine="true" android:inputType="text|textEmailAddress" android:background="@color/transparent_color" @@ -99,7 +99,7 @@ errorMessage="@={viewModel.passwordError}" passwordConfirmationValidation="@{passwordConfirmation}" android:text="@={viewModel.password}" - android:imeOptions="actionDone" + android:imeOptions="actionNext" android:singleLine="true" android:inputType="textPassword" android:background="@color/transparent_color" diff --git a/app/src/main/res/layout/assistant_generic_account_login_fragment.xml b/app/src/main/res/layout/assistant_generic_account_login_fragment.xml index 2927c0676..3bfde3277 100644 --- a/app/src/main/res/layout/assistant_generic_account_login_fragment.xml +++ b/app/src/main/res/layout/assistant_generic_account_login_fragment.xml @@ -61,7 +61,7 @@ - diff --git a/app/src/main/res/layout/assistant_phone_account_linking_fragment.xml b/app/src/main/res/layout/assistant_phone_account_linking_fragment.xml index 449220c4c..4aa028a18 100644 --- a/app/src/main/res/layout/assistant_phone_account_linking_fragment.xml +++ b/app/src/main/res/layout/assistant_phone_account_linking_fragment.xml @@ -125,7 +125,7 @@ -