Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated dependencies, use SwitchMaterial instead of Switch and fixed enter button not going to next field in assistant

Browse source
This commit is contained in:
Sylvain Berfini 2020-08-18 13:15:26 +02:00
parent 2f4b8ae760
commit 0cb96fa59e
12 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle
View file

@ -150,10 +150,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'
@ -162,7 +162,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'

2
app/src/main/java/org/linphone/activities/assistant/fragments/AbstractPhoneFragment.kt
View file

@ -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" +

2
app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
View file

@ -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) {

2
app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt
View file

@ -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 ->

3
app/src/main/java/org/linphone/utils/DataBindingUtils.kt
View file

@ -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 }
}

6
app/src/main/res/layout/assistant_account_login_fragment.xml
View file

@ -125,7 +125,7 @@
<com.google.android.material.textfield.TextInputEditText
assistantPhoneNumberPrefixValidation="@{true}"
android:text="@={viewModel.prefix}"
android:imeOptions="actionDone"
android:imeOptions="actionNext"
android:singleLine="true"
android:inputType="phone"
android:background="@color/transparent_color"
@ -183,7 +183,7 @@
<com.google.android.material.textfield.TextInputEditText
android:text="@={viewModel.username}"
android:imeOptions="actionDone"
android:imeOptions="actionNext"
android:singleLine="true"
android:inputType="text|textNoSuggestions"
android:background="@color/transparent_color"
@ -229,7 +229,7 @@
android:gravity="center"
android:paddingTop="10dp">
<Switch
<com.google.android.material.switchmaterial.SwitchMaterial
android:checked="@={viewModel.loginWithUsernamePassword}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>

6
app/src/main/res/layout/assistant_email_account_creation_fragment.xml
View file

@ -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"

6
app/src/main/res/layout/assistant_generic_account_login_fragment.xml
View file

@ -61,7 +61,7 @@
<com.google.android.material.textfield.TextInputEditText
android:text="@={viewModel.username}"
android:imeOptions="actionDone"
android:imeOptions="actionNext"
android:singleLine="true"
android:inputType="text|textNoSuggestions"
android:background="@color/transparent_color"
@ -78,7 +78,7 @@
<com.google.android.material.textfield.TextInputEditText
android:text="@={viewModel.password}"
android:imeOptions="actionDone"
android:imeOptions="actionNext"
android:singleLine="true"
android:inputType="textPassword"
android:background="@color/transparent_color"
@ -94,7 +94,7 @@
<com.google.android.material.textfield.TextInputEditText
android:text="@={viewModel.domain}"
android:imeOptions="actionDone"
android:imeOptions="actionNext"
android:singleLine="true"
android:inputType="textUri"
android:background="@color/transparent_color"

4
app/src/main/res/layout/assistant_phone_account_creation_fragment.xml
View file

@ -115,7 +115,7 @@
<com.google.android.material.textfield.TextInputEditText
assistantPhoneNumberPrefixValidation="@{true}"
android:text="@={viewModel.prefix}"
android:imeOptions="actionDone"
android:imeOptions="actionNext"
android:singleLine="true"
android:inputType="phone"
android:background="@color/transparent_color"
@ -151,7 +151,7 @@
android:gravity="center"
android:paddingTop="10dp">
<Switch
<com.google.android.material.switchmaterial.SwitchMaterial
android:checked="@={viewModel.useUsername}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>

2
app/src/main/res/layout/assistant_phone_account_linking_fragment.xml
View file

@ -125,7 +125,7 @@
<com.google.android.material.textfield.TextInputEditText
assistantPhoneNumberPrefixValidation="@{true}"
android:text="@={viewModel.prefix}"
android:imeOptions="actionDone"
android:imeOptions="actionNext"
android:singleLine="true"
android:inputType="phone"
android:background="@color/transparent_color"

2
app/src/main/res/layout/settings_widget_switch.xml
View file

@ -28,7 +28,7 @@
android:orientation="vertical"
android:gravity="center_vertical|left">
<Switch
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/setting_switch"
android:enabled="@{enabled ?? true}"
android:checked="@={checked}"

2
build.gradle
View file

@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.3.72'
ext.kotlin_version = '1.4.0'
repositories {
google()