From 7e0322abb564f9e181973ceb430cc9921b09006c Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 28 Oct 2021 13:16:55 +0200 Subject: [PATCH] Bumped dependencies + required code changes + updated CHANGELOG from release/4.5 --- CHANGELOG.md | 5 ++ app/build.gradle | 14 ++--- .../activities/assistant/AssistantActivity.kt | 15 ++--- .../fragments/AccountLoginFragment.kt | 4 +- .../EchoCancellerCalibrationFragment.kt | 2 +- .../fragments/EmailAccountCreationFragment.kt | 4 +- .../EmailAccountValidationFragment.kt | 4 +- .../fragments/GenericAccountLoginFragment.kt | 4 +- .../fragments/PhoneAccountCreationFragment.kt | 4 +- .../fragments/PhoneAccountLinkingFragment.kt | 4 +- .../PhoneAccountValidationFragment.kt | 4 +- .../assistant/fragments/QrCodeFragment.kt | 4 +- .../fragments/RemoteProvisioningFragment.kt | 4 +- .../assistant/fragments/WelcomeFragment.kt | 2 +- .../viewmodels/AccountLoginViewModel.kt | 2 +- .../EmailAccountCreationViewModel.kt | 2 +- .../EmailAccountValidationViewModel.kt | 2 +- .../viewmodels/GenericLoginViewModel.kt | 2 +- .../PhoneAccountCreationViewModel.kt | 2 +- .../PhoneAccountLinkingViewModel.kt | 2 +- .../PhoneAccountValidationViewModel.kt | 2 +- .../linphone/activities/call/CallActivity.kt | 4 +- .../activities/call/OutgoingCallActivity.kt | 2 +- .../call/fragments/ControlsFragment.kt | 8 +-- .../call/fragments/StatisticsFragment.kt | 2 +- .../call/fragments/StatusFragment.kt | 4 +- .../call/fragments/VideoRenderingFragment.kt | 6 +- .../call/viewmodels/CallViewModel.kt | 2 +- .../call/viewmodels/IncomingCallViewModel.kt | 2 +- .../chat_bubble/ChatBubbleActivity.kt | 2 +- .../linphone/activities/main/MainActivity.kt | 4 +- .../activities/main/about/AboutFragment.kt | 2 +- .../fragments/ChatRoomCreationFragment.kt | 4 +- .../chat/fragments/DetailChatRoomFragment.kt | 2 +- .../main/chat/fragments/DevicesFragment.kt | 2 +- .../main/chat/fragments/EphemeralFragment.kt | 2 +- .../main/chat/fragments/GroupInfoFragment.kt | 2 +- .../main/chat/fragments/ImdnFragment.kt | 2 +- .../chat/fragments/MasterChatRoomsFragment.kt | 4 +- .../viewmodels/ChatMessageSendingViewModel.kt | 2 +- .../viewmodels/ChatMessagesListViewModel.kt | 2 +- .../main/chat/viewmodels/ChatRoomViewModel.kt | 2 +- .../chat/viewmodels/DevicesListViewModel.kt | 2 +- .../chat/viewmodels/EphemeralViewModel.kt | 2 +- .../chat/viewmodels/GroupInfoViewModel.kt | 2 +- .../main/chat/viewmodels/ImdnViewModel.kt | 2 +- .../main/chat/views/RichEditText.kt | 2 +- .../fragments/ContactEditorFragment.kt | 2 +- .../fragments/DetailContactFragment.kt | 2 +- .../fragments/MasterContactsFragment.kt | 4 +- .../viewmodels/ContactEditorViewModel.kt | 2 +- .../contact/viewmodels/ContactViewModel.kt | 2 +- .../main/dialer/fragments/DialerFragment.kt | 4 +- .../files/adapters/PdfPagesListAdapter.kt | 14 ++--- .../files/fragments/GenericViewerFragment.kt | 2 +- .../files/viewmodels/AudioFileViewModel.kt | 2 +- .../files/viewmodels/ImageFileViewModel.kt | 2 +- .../main/files/viewmodels/PdfFileViewModel.kt | 2 +- .../files/viewmodels/TextFileViewModel.kt | 2 +- .../files/viewmodels/VideoFileViewModel.kt | 2 +- .../main/fragments/MasterFragment.kt | 2 +- .../main/fragments/StatusFragment.kt | 4 +- .../activities/main/fragments/TabsFragment.kt | 4 +- .../fragments/DetailCallLogFragment.kt | 2 +- .../fragments/MasterCallLogsFragment.kt | 6 +- .../history/viewmodels/CallLogViewModel.kt | 2 +- .../fragments/RecordingsFragment.kt | 2 +- .../fragments/AccountSettingsFragment.kt | 4 +- .../fragments/AdvancedSettingsFragment.kt | 2 +- .../fragments/AudioSettingsFragment.kt | 2 +- .../fragments/CallSettingsFragment.kt | 2 +- .../fragments/ChatSettingsFragment.kt | 2 +- .../fragments/ContactsSettingsFragment.kt | 2 +- .../fragments/GenericSettingFragment.kt | 2 +- .../fragments/NetworkSettingsFragment.kt | 2 +- .../settings/fragments/SettingsFragment.kt | 4 +- .../fragments/TunnelSettingsFragment.kt | 2 +- .../fragments/VideoSettingsFragment.kt | 2 +- .../viewmodels/AccountSettingsViewModel.kt | 2 +- .../sidemenu/fragments/SideMenuFragment.kt | 4 +- .../res/layout-land/main_activity_content.xml | 60 +++++++++---------- .../main/res/layout/assistant_activity.xml | 39 +++++------- .../main/res/layout/file_pdf_viewer_cell.xml | 26 +++----- .../main/res/layout/main_activity_content.xml | 60 +++++++++---------- build.gradle | 2 +- 85 files changed, 210 insertions(+), 233 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2767e9970..8d361ca4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,11 @@ Group changes to describe their impact on the project, as follows: ### Removed - Global push notification setting in Network, use the switch in each Account instead +## [4.5.5] - 2021-10-28 + +### Changed +- SDK updated to 5.0.45 + ## [4.5.4] - 2021-10-19 ### Changed diff --git a/app/build.gradle b/app/build.gradle index c57757371..bf4097fe6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -214,20 +214,20 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.appcompat:appcompat:1.3.1' - implementation 'androidx.media:media:1.4.1' - implementation 'androidx.fragment:fragment-ktx:1.4.0-alpha08' - implementation 'androidx.core:core-ktx:1.7.0-alpha02' + implementation 'androidx.media:media:1.4.3' + implementation 'androidx.fragment:fragment-ktx:1.4.0-beta01' + implementation 'androidx.core:core-ktx:1.7.0' - def nav_version = "2.4.0-alpha08" + def nav_version = "2.4.0-beta01" implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" implementation "androidx.navigation:navigation-ui-ktx:$nav_version" implementation "androidx.slidingpanelayout:slidingpanelayout:1.2.0-beta01" - implementation "androidx.window:window:1.0.0-beta02" + implementation "androidx.window:window:1.0.0-beta03" - implementation 'androidx.constraintlayout:constraintlayout:2.1.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.1' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0' implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation "androidx.security:security-crypto-ktx:1.1.0-alpha03" diff --git a/app/src/main/java/org/linphone/activities/assistant/AssistantActivity.kt b/app/src/main/java/org/linphone/activities/assistant/AssistantActivity.kt index da8259ea3..f3524463d 100644 --- a/app/src/main/java/org/linphone/activities/assistant/AssistantActivity.kt +++ b/app/src/main/java/org/linphone/activities/assistant/AssistantActivity.kt @@ -20,32 +20,33 @@ package org.linphone.activities.assistant import android.os.Bundle -import androidx.databinding.DataBindingUtil +import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.lifecycle.ViewModelProvider import com.google.android.material.snackbar.Snackbar import org.linphone.R import org.linphone.activities.GenericActivity import org.linphone.activities.SnackBarActivity import org.linphone.activities.assistant.viewmodels.SharedAssistantViewModel -import org.linphone.databinding.AssistantActivityBinding class AssistantActivity : GenericActivity(), SnackBarActivity { - private lateinit var binding: AssistantActivityBinding private lateinit var sharedViewModel: SharedAssistantViewModel + private lateinit var coordinator: CoordinatorLayout override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - binding = DataBindingUtil.setContentView(this, R.layout.assistant_activity) + setContentView(R.layout.assistant_activity) - sharedViewModel = ViewModelProvider(this).get(SharedAssistantViewModel::class.java) + sharedViewModel = ViewModelProvider(this)[SharedAssistantViewModel::class.java] + + coordinator = findViewById(R.id.coordinator) } override fun showSnackBar(resourceId: Int) { - Snackbar.make(binding.coordinator, resourceId, Snackbar.LENGTH_LONG).show() + Snackbar.make(coordinator, resourceId, Snackbar.LENGTH_LONG).show() } override fun showSnackBar(message: String) { - Snackbar.make(binding.coordinator, message, Snackbar.LENGTH_LONG).show() + Snackbar.make(coordinator, message, Snackbar.LENGTH_LONG).show() } } diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt index 31889298e..1a6e1f264 100644 --- a/app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt +++ b/app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt @@ -49,10 +49,10 @@ class AccountLoginFragment : AbstractPhoneFragment() { binding.lifecycleOwner = viewLifecycleOwner sharedViewModel = requireActivity().run { - ViewModelProvider(this).get(SharedAssistantViewModel::class.java) + ViewModelProvider(this)[SharedAssistantViewModel::class.java] } - viewModel = ViewModelProvider(this).get(QrCodeViewModel::class.java) + viewModel = ViewModelProvider(this)[QrCodeViewModel::class.java] binding.viewModel = viewModel viewModel.qrCodeFoundEvent.observe( diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/RemoteProvisioningFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/RemoteProvisioningFragment.kt index 42b4ba124..3dad2ddc6 100644 --- a/app/src/main/java/org/linphone/activities/assistant/fragments/RemoteProvisioningFragment.kt +++ b/app/src/main/java/org/linphone/activities/assistant/fragments/RemoteProvisioningFragment.kt @@ -44,10 +44,10 @@ class RemoteProvisioningFragment : GenericFragment() { binding.lifecycleOwner = viewLifecycleOwner - viewModel = ViewModelProvider(this).get(WelcomeViewModel::class.java) + viewModel = ViewModelProvider(this)[WelcomeViewModel::class.java] binding.viewModel = viewModel binding.setCreateAccountClickListener { diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/AccountLoginViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/AccountLoginViewModel.kt index c4b6c3de0..01d80a054 100644 --- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/AccountLoginViewModel.kt +++ b/app/src/main/java/org/linphone/activities/assistant/viewmodels/AccountLoginViewModel.kt @@ -30,7 +30,7 @@ class AccountLoginViewModelFactory(private val accountCreator: AccountCreator) : ViewModelProvider.NewInstanceFactory() { @Suppress("UNCHECKED_CAST") - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { return AccountLoginViewModel(accountCreator) as T } } diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/EmailAccountCreationViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/EmailAccountCreationViewModel.kt index 301a639ab..6c9e873ff 100644 --- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/EmailAccountCreationViewModel.kt +++ b/app/src/main/java/org/linphone/activities/assistant/viewmodels/EmailAccountCreationViewModel.kt @@ -34,7 +34,7 @@ class EmailAccountCreationViewModelFactory(private val accountCreator: AccountCr ViewModelProvider.NewInstanceFactory() { @Suppress("UNCHECKED_CAST") - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { return EmailAccountCreationViewModel(accountCreator) as T } } diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/EmailAccountValidationViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/EmailAccountValidationViewModel.kt index 273120f44..6032efaeb 100644 --- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/EmailAccountValidationViewModel.kt +++ b/app/src/main/java/org/linphone/activities/assistant/viewmodels/EmailAccountValidationViewModel.kt @@ -32,7 +32,7 @@ class EmailAccountValidationViewModelFactory(private val accountCreator: Account ViewModelProvider.NewInstanceFactory() { @Suppress("UNCHECKED_CAST") - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { return EmailAccountValidationViewModel(accountCreator) as T } } diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/GenericLoginViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/GenericLoginViewModel.kt index 314482d15..89fe487f7 100644 --- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/GenericLoginViewModel.kt +++ b/app/src/main/java/org/linphone/activities/assistant/viewmodels/GenericLoginViewModel.kt @@ -33,7 +33,7 @@ class GenericLoginViewModelFactory(private val accountCreator: AccountCreator) : ViewModelProvider.NewInstanceFactory() { @Suppress("UNCHECKED_CAST") - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { return GenericLoginViewModel(accountCreator) as T } } diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountCreationViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountCreationViewModel.kt index 12f533426..72a1ce6bd 100644 --- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountCreationViewModel.kt +++ b/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountCreationViewModel.kt @@ -36,7 +36,7 @@ class PhoneAccountCreationViewModelFactory(private val accountCreator: AccountCr ViewModelProvider.NewInstanceFactory() { @Suppress("UNCHECKED_CAST") - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { return PhoneAccountCreationViewModel(accountCreator) as T } } diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountLinkingViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountLinkingViewModel.kt index da93c4c7d..f30cba209 100644 --- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountLinkingViewModel.kt +++ b/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountLinkingViewModel.kt @@ -30,7 +30,7 @@ class PhoneAccountLinkingViewModelFactory(private val accountCreator: AccountCre ViewModelProvider.NewInstanceFactory() { @Suppress("UNCHECKED_CAST") - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { return PhoneAccountLinkingViewModel(accountCreator) as T } } diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountValidationViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountValidationViewModel.kt index f8818d561..34b88a4ba 100644 --- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountValidationViewModel.kt +++ b/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountValidationViewModel.kt @@ -32,7 +32,7 @@ class PhoneAccountValidationViewModelFactory(private val accountCreator: Account ViewModelProvider.NewInstanceFactory() { @Suppress("UNCHECKED_CAST") - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { return PhoneAccountValidationViewModel(accountCreator) as T } } diff --git a/app/src/main/java/org/linphone/activities/call/CallActivity.kt b/app/src/main/java/org/linphone/activities/call/CallActivity.kt index 0044f6973..09ea2bb8a 100644 --- a/app/src/main/java/org/linphone/activities/call/CallActivity.kt +++ b/app/src/main/java/org/linphone/activities/call/CallActivity.kt @@ -55,10 +55,10 @@ class CallActivity : ProximitySensorActivity() { binding = DataBindingUtil.setContentView(this, R.layout.call_activity) binding.lifecycleOwner = this - viewModel = ViewModelProvider(this).get(ControlsFadingViewModel::class.java) + viewModel = ViewModelProvider(this)[ControlsFadingViewModel::class.java] binding.controlsFadingViewModel = viewModel - sharedViewModel = ViewModelProvider(this).get(SharedCallViewModel::class.java) + sharedViewModel = ViewModelProvider(this)[SharedCallViewModel::class.java] sharedViewModel.toggleDrawerEvent.observe( this, diff --git a/app/src/main/java/org/linphone/activities/call/OutgoingCallActivity.kt b/app/src/main/java/org/linphone/activities/call/OutgoingCallActivity.kt index 99bdaca4b..5c1c9fe82 100644 --- a/app/src/main/java/org/linphone/activities/call/OutgoingCallActivity.kt +++ b/app/src/main/java/org/linphone/activities/call/OutgoingCallActivity.kt @@ -76,7 +76,7 @@ class OutgoingCallActivity : ProximitySensorActivity() { )[CallViewModel::class.java] binding.viewModel = viewModel - controlsViewModel = ViewModelProvider(this).get(ControlsViewModel::class.java) + controlsViewModel = ViewModelProvider(this)[ControlsViewModel::class.java] binding.controlsViewModel = controlsViewModel viewModel.callEndedEvent.observe( diff --git a/app/src/main/java/org/linphone/activities/call/fragments/ControlsFragment.kt b/app/src/main/java/org/linphone/activities/call/fragments/ControlsFragment.kt index 71f7d03dc..859b47611 100644 --- a/app/src/main/java/org/linphone/activities/call/fragments/ControlsFragment.kt +++ b/app/src/main/java/org/linphone/activities/call/fragments/ControlsFragment.kt @@ -69,21 +69,21 @@ class ControlsFragment : GenericFragment() { useMaterialSharedAxisXForwardAnimation = false sharedViewModel = requireActivity().run { - ViewModelProvider(this).get(SharedCallViewModel::class.java) + ViewModelProvider(this)[SharedCallViewModel::class.java] } callsViewModel = requireActivity().run { - ViewModelProvider(this).get(CallsViewModel::class.java) + ViewModelProvider(this)[CallsViewModel::class.java] } binding.viewModel = callsViewModel controlsViewModel = requireActivity().run { - ViewModelProvider(this).get(ControlsViewModel::class.java) + ViewModelProvider(this)[ControlsViewModel::class.java] } binding.controlsViewModel = controlsViewModel conferenceViewModel = requireActivity().run { - ViewModelProvider(this).get(ConferenceViewModel::class.java) + ViewModelProvider(this)[ConferenceViewModel::class.java] } binding.conferenceViewModel = conferenceViewModel diff --git a/app/src/main/java/org/linphone/activities/call/fragments/StatisticsFragment.kt b/app/src/main/java/org/linphone/activities/call/fragments/StatisticsFragment.kt index cadba7321..ea1bbbfa2 100644 --- a/app/src/main/java/org/linphone/activities/call/fragments/StatisticsFragment.kt +++ b/app/src/main/java/org/linphone/activities/call/fragments/StatisticsFragment.kt @@ -38,7 +38,7 @@ class StatisticsFragment : GenericFragment() { binding.lifecycleOwner = viewLifecycleOwner useMaterialSharedAxisXForwardAnimation = false - viewModel = ViewModelProvider(this).get(StatisticsListViewModel::class.java) + viewModel = ViewModelProvider(this)[StatisticsListViewModel::class.java] binding.viewModel = viewModel } diff --git a/app/src/main/java/org/linphone/activities/call/fragments/StatusFragment.kt b/app/src/main/java/org/linphone/activities/call/fragments/StatusFragment.kt index 7d7fd4f98..0213bb9cf 100644 --- a/app/src/main/java/org/linphone/activities/call/fragments/StatusFragment.kt +++ b/app/src/main/java/org/linphone/activities/call/fragments/StatusFragment.kt @@ -48,11 +48,11 @@ class StatusFragment : GenericFragment() { binding.lifecycleOwner = viewLifecycleOwner useMaterialSharedAxisXForwardAnimation = false - viewModel = ViewModelProvider(this).get(StatusViewModel::class.java) + viewModel = ViewModelProvider(this)[StatusViewModel::class.java] binding.viewModel = viewModel sharedViewModel = requireActivity().run { - ViewModelProvider(this).get(SharedCallViewModel::class.java) + ViewModelProvider(this)[SharedCallViewModel::class.java] } binding.setStatsClickListener { diff --git a/app/src/main/java/org/linphone/activities/call/fragments/VideoRenderingFragment.kt b/app/src/main/java/org/linphone/activities/call/fragments/VideoRenderingFragment.kt index 1498ca318..c7f980c52 100644 --- a/app/src/main/java/org/linphone/activities/call/fragments/VideoRenderingFragment.kt +++ b/app/src/main/java/org/linphone/activities/call/fragments/VideoRenderingFragment.kt @@ -49,16 +49,16 @@ class VideoRenderingFragment : GenericFragment() { binding.lifecycleOwner = this controlsFadingViewModel = requireActivity().run { - ViewModelProvider(this).get(ControlsFadingViewModel::class.java) + ViewModelProvider(this)[ControlsFadingViewModel::class.java] } binding.controlsFadingViewModel = controlsFadingViewModel callsViewModel = requireActivity().run { - ViewModelProvider(this).get(CallsViewModel::class.java) + ViewModelProvider(this)[CallsViewModel::class.java] } conferenceViewModel = requireActivity().run { - ViewModelProvider(this).get(ConferenceViewModel::class.java) + ViewModelProvider(this)[ConferenceViewModel::class.java] } binding.conferenceViewModel = conferenceViewModel diff --git a/app/src/main/java/org/linphone/activities/call/viewmodels/CallViewModel.kt b/app/src/main/java/org/linphone/activities/call/viewmodels/CallViewModel.kt index 3d317634a..d779b5fcc 100644 --- a/app/src/main/java/org/linphone/activities/call/viewmodels/CallViewModel.kt +++ b/app/src/main/java/org/linphone/activities/call/viewmodels/CallViewModel.kt @@ -42,7 +42,7 @@ class CallViewModelFactory(private val call: Call) : ViewModelProvider.NewInstanceFactory() { @Suppress("UNCHECKED_CAST") - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { return CallViewModel(call) as T } } diff --git a/app/src/main/java/org/linphone/activities/call/viewmodels/IncomingCallViewModel.kt b/app/src/main/java/org/linphone/activities/call/viewmodels/IncomingCallViewModel.kt index 64d4dc3fd..639a43a22 100644 --- a/app/src/main/java/org/linphone/activities/call/viewmodels/IncomingCallViewModel.kt +++ b/app/src/main/java/org/linphone/activities/call/viewmodels/IncomingCallViewModel.kt @@ -31,7 +31,7 @@ class IncomingCallViewModelFactory(private val call: Call) : ViewModelProvider.NewInstanceFactory() { @Suppress("UNCHECKED_CAST") - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { return IncomingCallViewModel(call) as T } } diff --git a/app/src/main/java/org/linphone/activities/chat_bubble/ChatBubbleActivity.kt b/app/src/main/java/org/linphone/activities/chat_bubble/ChatBubbleActivity.kt index 149e746d8..0169412cc 100644 --- a/app/src/main/java/org/linphone/activities/chat_bubble/ChatBubbleActivity.kt +++ b/app/src/main/java/org/linphone/activities/chat_bubble/ChatBubbleActivity.kt @@ -108,7 +108,7 @@ class ChatBubbleActivity : GenericActivity() { )[ChatMessageSendingViewModel::class.java] binding.chatSendingViewModel = chatSendingViewModel - val listSelectionViewModel = ViewModelProvider(this).get(ListTopBarViewModel::class.java) + val listSelectionViewModel = ViewModelProvider(this)[ListTopBarViewModel::class.java] adapter = ChatMessagesListAdapter(listSelectionViewModel, this) // SubmitList is done on a background thread // We need this adapter data observer to know when to scroll diff --git a/app/src/main/java/org/linphone/activities/main/MainActivity.kt b/app/src/main/java/org/linphone/activities/main/MainActivity.kt index bdaf74447..bd2aabd1e 100644 --- a/app/src/main/java/org/linphone/activities/main/MainActivity.kt +++ b/app/src/main/java/org/linphone/activities/main/MainActivity.kt @@ -115,10 +115,10 @@ class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestin binding = DataBindingUtil.setContentView(this, R.layout.main_activity) binding.lifecycleOwner = this - sharedViewModel = ViewModelProvider(this).get(SharedMainViewModel::class.java) + sharedViewModel = ViewModelProvider(this)[SharedMainViewModel::class.java] binding.viewModel = sharedViewModel - callOverlayViewModel = ViewModelProvider(this).get(CallOverlayViewModel::class.java) + callOverlayViewModel = ViewModelProvider(this)[CallOverlayViewModel::class.java] binding.callOverlayViewModel = callOverlayViewModel sharedViewModel.toggleDrawerEvent.observe( diff --git a/app/src/main/java/org/linphone/activities/main/about/AboutFragment.kt b/app/src/main/java/org/linphone/activities/main/about/AboutFragment.kt index 6c7db9ac2..497c26f95 100644 --- a/app/src/main/java/org/linphone/activities/main/about/AboutFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/about/AboutFragment.kt @@ -38,7 +38,7 @@ class AboutFragment : SecureFragment() { binding.lifecycleOwner = viewLifecycleOwner - viewModel = ViewModelProvider(this).get(AboutViewModel::class.java) + viewModel = ViewModelProvider(this)[AboutViewModel::class.java] binding.viewModel = viewModel binding.setBackClickListener { goBack() } diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/ChatRoomCreationFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/ChatRoomCreationFragment.kt index 67bb73c45..714f8834d 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/fragments/ChatRoomCreationFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/ChatRoomCreationFragment.kt @@ -54,14 +54,14 @@ class ChatRoomCreationFragment : SecureFragment binding.lifecycleOwner = viewLifecycleOwner sharedViewModel = requireActivity().run { - ViewModelProvider(this).get(SharedMainViewModel::class.java) + ViewModelProvider(this)[SharedMainViewModel::class.java] } useMaterialSharedAxisXForwardAnimation = sharedViewModel.isSlidingPaneSlideable.value == false val createGroup = arguments?.getBoolean("createGroup") ?: false - viewModel = ViewModelProvider(this).get(ChatRoomCreationViewModel::class.java) + viewModel = ViewModelProvider(this)[ChatRoomCreationViewModel::class.java] viewModel.createGroupChat.value = createGroup viewModel.isEncrypted.value = sharedViewModel.createEncryptedChatRoom 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 b7cfa67ab..273cf82f2 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 @@ -113,7 +113,7 @@ class DetailChatRoomFragment : MasterFragment() { binding.lifecycleOwner = viewLifecycleOwner sharedViewModel = requireActivity().run { - ViewModelProvider(this).get(SharedMainViewModel::class.java) + ViewModelProvider(this)[SharedMainViewModel::class.java] } val chatRoom = sharedViewModel.selectedChatRoom.value diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/EphemeralFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/EphemeralFragment.kt index a9714551e..3eed8654b 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/fragments/EphemeralFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/EphemeralFragment.kt @@ -46,7 +46,7 @@ class EphemeralFragment : SecureFragment() { binding.lifecycleOwner = viewLifecycleOwner sharedViewModel = requireActivity().run { - ViewModelProvider(this).get(SharedMainViewModel::class.java) + ViewModelProvider(this)[SharedMainViewModel::class.java] } val chatRoom = sharedViewModel.selectedChatRoom.value diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/GroupInfoFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/GroupInfoFragment.kt index 42e695f8d..7777b379a 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/fragments/GroupInfoFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/GroupInfoFragment.kt @@ -57,7 +57,7 @@ class GroupInfoFragment : SecureFragment() { binding.lifecycleOwner = viewLifecycleOwner sharedViewModel = requireActivity().run { - ViewModelProvider(this).get(SharedMainViewModel::class.java) + ViewModelProvider(this)[SharedMainViewModel::class.java] } val chatRoom: ChatRoom? = sharedViewModel.selectedGroupChatRoom.value diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/ImdnFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/ImdnFragment.kt index cfdd7ee38..d59a75438 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/fragments/ImdnFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/ImdnFragment.kt @@ -50,7 +50,7 @@ class ImdnFragment : SecureFragment() { binding.lifecycleOwner = viewLifecycleOwner sharedViewModel = requireActivity().run { - ViewModelProvider(this).get(SharedMainViewModel::class.java) + ViewModelProvider(this)[SharedMainViewModel::class.java] } val chatRoom = sharedViewModel.selectedChatRoom.value diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt index 1ab6aa80d..54968d878 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt @@ -98,13 +98,13 @@ class MasterChatRoomsFragment : MasterFragment create(modelClass: Class): T { + override fun create(modelClass: Class): T { return ChatMessageSendingViewModel(chatRoom) as T } } diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessagesListViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessagesListViewModel.kt index b97b5ecac..61a74bad6 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessagesListViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessagesListViewModel.kt @@ -36,7 +36,7 @@ class ChatMessagesListViewModelFactory(private val chatRoom: ChatRoom) : ViewModelProvider.NewInstanceFactory() { @Suppress("UNCHECKED_CAST") - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { return ChatMessagesListViewModel(chatRoom) as T } } diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt index 5194d5f08..e91decdc7 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt @@ -40,7 +40,7 @@ class ChatRoomViewModelFactory(private val chatRoom: ChatRoom) : ViewModelProvider.NewInstanceFactory() { @Suppress("UNCHECKED_CAST") - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { return ChatRoomViewModel(chatRoom) as T } } diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/DevicesListViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/DevicesListViewModel.kt index d6618552c..3f61d5497 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/DevicesListViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/DevicesListViewModel.kt @@ -31,7 +31,7 @@ class DevicesListViewModelFactory(private val chatRoom: ChatRoom) : ViewModelProvider.NewInstanceFactory() { @Suppress("UNCHECKED_CAST") - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { return DevicesListViewModel(chatRoom) as T } } diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/EphemeralViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/EphemeralViewModel.kt index 34e39a478..3704ef1ae 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/EphemeralViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/EphemeralViewModel.kt @@ -32,7 +32,7 @@ class EphemeralViewModelFactory(private val chatRoom: ChatRoom) : ViewModelProvider.NewInstanceFactory() { @Suppress("UNCHECKED_CAST") - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { return EphemeralViewModel(chatRoom) as T } } diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt index 3e57ab89f..aa5795d7a 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt @@ -36,7 +36,7 @@ class GroupInfoViewModelFactory(private val chatRoom: ChatRoom?) : ViewModelProvider.NewInstanceFactory() { @Suppress("UNCHECKED_CAST") - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { return GroupInfoViewModel(chatRoom) as T } } diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ImdnViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ImdnViewModel.kt index 29c9d6f54..d5595d240 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ImdnViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ImdnViewModel.kt @@ -32,7 +32,7 @@ class ImdnViewModelFactory(private val chatMessage: ChatMessage) : ViewModelProvider.NewInstanceFactory() { @Suppress("UNCHECKED_CAST") - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { return ImdnViewModel(chatMessage) as T } } diff --git a/app/src/main/java/org/linphone/activities/main/chat/views/RichEditText.kt b/app/src/main/java/org/linphone/activities/main/chat/views/RichEditText.kt index f69a750c8..f6978ce32 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/views/RichEditText.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/views/RichEditText.kt @@ -58,7 +58,7 @@ class RichEditText : AppCompatEditText { Log.i("[Rich Edit Text] Received URI: $uri") val activity = context as Activity val sharedViewModel = activity.run { - ViewModelProvider(activity as ViewModelStoreOwner).get(SharedMainViewModel::class.java) + ViewModelProvider(activity as ViewModelStoreOwner)[SharedMainViewModel::class.java] } sharedViewModel.richContentUri.value = Event(uri) } diff --git a/app/src/main/java/org/linphone/activities/main/contact/fragments/ContactEditorFragment.kt b/app/src/main/java/org/linphone/activities/main/contact/fragments/ContactEditorFragment.kt index 28309ef1a..ac738abd4 100644 --- a/app/src/main/java/org/linphone/activities/main/contact/fragments/ContactEditorFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/contact/fragments/ContactEditorFragment.kt @@ -61,7 +61,7 @@ class ContactEditorFragment : GenericFragment(), S binding.lifecycleOwner = viewLifecycleOwner sharedViewModel = requireActivity().run { - ViewModelProvider(this).get(SharedMainViewModel::class.java) + ViewModelProvider(this)[SharedMainViewModel::class.java] } viewModel = ViewModelProvider( diff --git a/app/src/main/java/org/linphone/activities/main/contact/fragments/DetailContactFragment.kt b/app/src/main/java/org/linphone/activities/main/contact/fragments/DetailContactFragment.kt index b96b96814..5c39ad78e 100644 --- a/app/src/main/java/org/linphone/activities/main/contact/fragments/DetailContactFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/contact/fragments/DetailContactFragment.kt @@ -55,7 +55,7 @@ class DetailContactFragment : GenericFragment() { binding.lifecycleOwner = viewLifecycleOwner sharedViewModel = requireActivity().run { - ViewModelProvider(this).get(SharedMainViewModel::class.java) + ViewModelProvider(this)[SharedMainViewModel::class.java] } binding.sharedMainViewModel = sharedViewModel diff --git a/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt b/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt index 0d629f01e..ff87f2483 100644 --- a/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt @@ -72,13 +72,13 @@ class MasterContactsFragment : MasterFragment create(modelClass: Class): T { + override fun create(modelClass: Class): T { return ContactEditorViewModel(contact) as T } } diff --git a/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactViewModel.kt b/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactViewModel.kt index e757cf9b4..c78c578b5 100644 --- a/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactViewModel.kt @@ -43,7 +43,7 @@ class ContactViewModelFactory(private val contact: Contact) : ViewModelProvider.NewInstanceFactory() { @Suppress("UNCHECKED_CAST") - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { return ContactViewModel(contact) as T } } 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 96b400e8f..44992d638 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 @@ -66,11 +66,11 @@ class DialerFragment : SecureFragment() { binding.lifecycleOwner = viewLifecycleOwner - viewModel = ViewModelProvider(this).get(DialerViewModel::class.java) + viewModel = ViewModelProvider(this)[DialerViewModel::class.java] binding.viewModel = viewModel sharedViewModel = requireActivity().run { - ViewModelProvider(this).get(SharedMainViewModel::class.java) + ViewModelProvider(this)[SharedMainViewModel::class.java] } useMaterialSharedAxisXForwardAnimation = false diff --git a/app/src/main/java/org/linphone/activities/main/files/adapters/PdfPagesListAdapter.kt b/app/src/main/java/org/linphone/activities/main/files/adapters/PdfPagesListAdapter.kt index 6271e131f..895292a2a 100644 --- a/app/src/main/java/org/linphone/activities/main/files/adapters/PdfPagesListAdapter.kt +++ b/app/src/main/java/org/linphone/activities/main/files/adapters/PdfPagesListAdapter.kt @@ -20,20 +20,18 @@ package org.linphone.activities.main.files.adapters import android.view.LayoutInflater +import android.view.View import android.view.ViewGroup -import androidx.databinding.DataBindingUtil import androidx.recyclerview.widget.RecyclerView import org.linphone.R import org.linphone.activities.main.files.viewmodels.PdfFileViewModel -import org.linphone.databinding.FilePdfViewerCellBinding class PdfPagesListAdapter(private val pdfViewModel: PdfFileViewModel) : RecyclerView.Adapter() { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PdfPageViewHolder { - val binding: FilePdfViewerCellBinding = DataBindingUtil.inflate( - LayoutInflater.from(parent.context), + val view = LayoutInflater.from(parent.context).inflate( R.layout.file_pdf_viewer_cell, parent, false ) - return PdfPageViewHolder(binding) + return PdfPageViewHolder(view) } override fun getItemCount(): Int { @@ -44,11 +42,9 @@ class PdfPagesListAdapter(private val pdfViewModel: PdfFileViewModel) : Recycler holder.bind(position) } - inner class PdfPageViewHolder(private val binding: FilePdfViewerCellBinding) : RecyclerView.ViewHolder(binding.root) { + inner class PdfPageViewHolder(private val view: View) : RecyclerView.ViewHolder(view) { fun bind(index: Int) { - with(binding) { - pdfViewModel.loadPdfPageInto(index, pdfImage) - } + pdfViewModel.loadPdfPageInto(index, view.findViewById(R.id.pdf_image)) } } } diff --git a/app/src/main/java/org/linphone/activities/main/files/fragments/GenericViewerFragment.kt b/app/src/main/java/org/linphone/activities/main/files/fragments/GenericViewerFragment.kt index 5613944d5..661dd21cc 100644 --- a/app/src/main/java/org/linphone/activities/main/files/fragments/GenericViewerFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/files/fragments/GenericViewerFragment.kt @@ -36,7 +36,7 @@ abstract class GenericViewerFragment : SecureFragment() super.onViewCreated(view, savedInstanceState) sharedViewModel = requireActivity().run { - ViewModelProvider(this).get(SharedMainViewModel::class.java) + ViewModelProvider(this)[SharedMainViewModel::class.java] } isSecure = arguments?.getBoolean("Secure") ?: false diff --git a/app/src/main/java/org/linphone/activities/main/files/viewmodels/AudioFileViewModel.kt b/app/src/main/java/org/linphone/activities/main/files/viewmodels/AudioFileViewModel.kt index 237ed0d75..e822cbe41 100644 --- a/app/src/main/java/org/linphone/activities/main/files/viewmodels/AudioFileViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/files/viewmodels/AudioFileViewModel.kt @@ -31,7 +31,7 @@ class AudioFileViewModelFactory(private val content: Content) : ViewModelProvider.NewInstanceFactory() { @Suppress("UNCHECKED_CAST") - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { return AudioFileViewModel(content) as T } } diff --git a/app/src/main/java/org/linphone/activities/main/files/viewmodels/ImageFileViewModel.kt b/app/src/main/java/org/linphone/activities/main/files/viewmodels/ImageFileViewModel.kt index 2279a94fa..bddf64d5e 100644 --- a/app/src/main/java/org/linphone/activities/main/files/viewmodels/ImageFileViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/files/viewmodels/ImageFileViewModel.kt @@ -27,7 +27,7 @@ class ImageFileViewModelFactory(private val content: Content) : ViewModelProvider.NewInstanceFactory() { @Suppress("UNCHECKED_CAST") - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { return ImageFileViewModel(content) as T } } diff --git a/app/src/main/java/org/linphone/activities/main/files/viewmodels/PdfFileViewModel.kt b/app/src/main/java/org/linphone/activities/main/files/viewmodels/PdfFileViewModel.kt index de34b35c4..34df29d60 100644 --- a/app/src/main/java/org/linphone/activities/main/files/viewmodels/PdfFileViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/files/viewmodels/PdfFileViewModel.kt @@ -35,7 +35,7 @@ class PdfFileViewModelFactory(private val content: Content) : ViewModelProvider.NewInstanceFactory() { @Suppress("UNCHECKED_CAST") - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { return PdfFileViewModel(content) as T } } diff --git a/app/src/main/java/org/linphone/activities/main/files/viewmodels/TextFileViewModel.kt b/app/src/main/java/org/linphone/activities/main/files/viewmodels/TextFileViewModel.kt index b39413320..fd79d5f6f 100644 --- a/app/src/main/java/org/linphone/activities/main/files/viewmodels/TextFileViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/files/viewmodels/TextFileViewModel.kt @@ -36,7 +36,7 @@ class TextFileViewModelFactory(private val content: Content) : ViewModelProvider.NewInstanceFactory() { @Suppress("UNCHECKED_CAST") - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { return TextFileViewModel(content) as T } } diff --git a/app/src/main/java/org/linphone/activities/main/files/viewmodels/VideoFileViewModel.kt b/app/src/main/java/org/linphone/activities/main/files/viewmodels/VideoFileViewModel.kt index 7602c185a..b9510c0cd 100644 --- a/app/src/main/java/org/linphone/activities/main/files/viewmodels/VideoFileViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/files/viewmodels/VideoFileViewModel.kt @@ -27,7 +27,7 @@ class VideoFileViewModelFactory(private val content: Content) : ViewModelProvider.NewInstanceFactory() { @Suppress("UNCHECKED_CAST") - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { return VideoFileViewModel(content) as T } } diff --git a/app/src/main/java/org/linphone/activities/main/fragments/MasterFragment.kt b/app/src/main/java/org/linphone/activities/main/fragments/MasterFragment.kt index ea45e4f00..a6f86e180 100644 --- a/app/src/main/java/org/linphone/activities/main/fragments/MasterFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/fragments/MasterFragment.kt @@ -53,7 +53,7 @@ abstract class MasterFragment() { binding.lifecycleOwner = viewLifecycleOwner useMaterialSharedAxisXForwardAnimation = false - viewModel = ViewModelProvider(this).get(StatusViewModel::class.java) + viewModel = ViewModelProvider(this)[StatusViewModel::class.java] binding.viewModel = viewModel sharedViewModel = requireActivity().run { - ViewModelProvider(this).get(SharedMainViewModel::class.java) + ViewModelProvider(this)[SharedMainViewModel::class.java] } sharedViewModel.accountRemoved.observe( diff --git a/app/src/main/java/org/linphone/activities/main/fragments/TabsFragment.kt b/app/src/main/java/org/linphone/activities/main/fragments/TabsFragment.kt index 582ec5e8d..d56133590 100644 --- a/app/src/main/java/org/linphone/activities/main/fragments/TabsFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/fragments/TabsFragment.kt @@ -50,11 +50,11 @@ class TabsFragment : GenericFragment(), NavController.OnDes useMaterialSharedAxisXForwardAnimation = false sharedViewModel = requireActivity().run { - ViewModelProvider(this).get(SharedMainViewModel::class.java) + ViewModelProvider(this)[SharedMainViewModel::class.java] } viewModel = requireActivity().run { - ViewModelProvider(this).get(TabsViewModel::class.java) + ViewModelProvider(this)[TabsViewModel::class.java] } binding.viewModel = viewModel diff --git a/app/src/main/java/org/linphone/activities/main/history/fragments/DetailCallLogFragment.kt b/app/src/main/java/org/linphone/activities/main/history/fragments/DetailCallLogFragment.kt index 3cb18dec7..dc2599280 100644 --- a/app/src/main/java/org/linphone/activities/main/history/fragments/DetailCallLogFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/history/fragments/DetailCallLogFragment.kt @@ -50,7 +50,7 @@ class DetailCallLogFragment : GenericFragment() { binding.lifecycleOwner = viewLifecycleOwner sharedViewModel = requireActivity().run { - ViewModelProvider(this).get(SharedMainViewModel::class.java) + ViewModelProvider(this)[SharedMainViewModel::class.java] } binding.sharedMainViewModel = sharedViewModel diff --git a/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt b/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt index 1ca2ecd1a..b597d21e4 100644 --- a/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt @@ -89,13 +89,13 @@ class MasterCallLogsFragment : MasterFragment create(modelClass: Class): T { + override fun create(modelClass: Class): T { return CallLogViewModel(callLog) as T } } diff --git a/app/src/main/java/org/linphone/activities/main/recordings/fragments/RecordingsFragment.kt b/app/src/main/java/org/linphone/activities/main/recordings/fragments/RecordingsFragment.kt index d9e66eb6e..582debc2d 100644 --- a/app/src/main/java/org/linphone/activities/main/recordings/fragments/RecordingsFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/recordings/fragments/RecordingsFragment.kt @@ -51,7 +51,7 @@ class RecordingsFragment : MasterFragment binding.lifecycleOwner = viewLifecycleOwner binding.sharedMainViewModel = sharedViewModel - viewModel = ViewModelProvider(this).get(CallSettingsViewModel::class.java) + viewModel = ViewModelProvider(this)[CallSettingsViewModel::class.java] binding.viewModel = viewModel binding.setBackClickListener { goBack() } diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/ChatSettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/ChatSettingsFragment.kt index 501a5f9bb..e04d7f2a3 100644 --- a/app/src/main/java/org/linphone/activities/main/settings/fragments/ChatSettingsFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/settings/fragments/ChatSettingsFragment.kt @@ -44,7 +44,7 @@ class ChatSettingsFragment : GenericSettingFragment binding.lifecycleOwner = viewLifecycleOwner binding.sharedMainViewModel = sharedViewModel - viewModel = ViewModelProvider(this).get(ChatSettingsViewModel::class.java) + viewModel = ViewModelProvider(this)[ChatSettingsViewModel::class.java] binding.viewModel = viewModel binding.setBackClickListener { goBack() } diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/ContactsSettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/ContactsSettingsFragment.kt index 8a9047e87..acb9a6556 100644 --- a/app/src/main/java/org/linphone/activities/main/settings/fragments/ContactsSettingsFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/settings/fragments/ContactsSettingsFragment.kt @@ -45,7 +45,7 @@ class ContactsSettingsFragment : GenericSettingFragment : GenericFragment( override fun onViewCreated(view: View, savedInstanceState: Bundle?) { sharedViewModel = requireActivity().run { - ViewModelProvider(this).get(SharedMainViewModel::class.java) + ViewModelProvider(this)[SharedMainViewModel::class.java] } useMaterialSharedAxisXForwardAnimation = sharedViewModel.isSlidingPaneSlideable.value == false diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/NetworkSettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/NetworkSettingsFragment.kt index 3809c5f23..8363f40bb 100644 --- a/app/src/main/java/org/linphone/activities/main/settings/fragments/NetworkSettingsFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/settings/fragments/NetworkSettingsFragment.kt @@ -39,7 +39,7 @@ class NetworkSettingsFragment : GenericSettingFragment() { /* Shared view model & sliding pane related */ sharedViewModel = requireActivity().run { - ViewModelProvider(this).get(SharedMainViewModel::class.java) + ViewModelProvider(this)[SharedMainViewModel::class.java] } view.doOnPreDraw { sharedViewModel.isSlidingPaneSlideable.value = binding.slidingPane.isSlideable } @@ -106,7 +106,7 @@ class SettingsFragment : SecureFragment() { /* End of shared view model & sliding pane related */ - viewModel = ViewModelProvider(this).get(SettingsViewModel::class.java) + viewModel = ViewModelProvider(this)[SettingsViewModel::class.java] binding.viewModel = viewModel binding.setBackClickListener { goBack() } diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/TunnelSettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/TunnelSettingsFragment.kt index 779e81dbe..a3ff4ef28 100644 --- a/app/src/main/java/org/linphone/activities/main/settings/fragments/TunnelSettingsFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/settings/fragments/TunnelSettingsFragment.kt @@ -39,7 +39,7 @@ class TunnelSettingsFragment : GenericSettingFragment create(modelClass: Class): T { + override fun create(modelClass: Class): T { for (account in coreContext.core.accountList) { if (account.params.identityAddress?.asStringUriOnly() == identity) { return AccountSettingsViewModel(account) as T diff --git a/app/src/main/java/org/linphone/activities/main/sidemenu/fragments/SideMenuFragment.kt b/app/src/main/java/org/linphone/activities/main/sidemenu/fragments/SideMenuFragment.kt index eccfca55e..84183526d 100644 --- a/app/src/main/java/org/linphone/activities/main/sidemenu/fragments/SideMenuFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/sidemenu/fragments/SideMenuFragment.kt @@ -59,11 +59,11 @@ class SideMenuFragment : GenericFragment() { binding.lifecycleOwner = viewLifecycleOwner - viewModel = ViewModelProvider(this).get(SideMenuViewModel::class.java) + viewModel = ViewModelProvider(this)[SideMenuViewModel::class.java] binding.viewModel = viewModel sharedViewModel = requireActivity().run { - ViewModelProvider(this).get(SharedMainViewModel::class.java) + ViewModelProvider(this)[SharedMainViewModel::class.java] } sharedViewModel.accountRemoved.observe( diff --git a/app/src/main/res/layout-land/main_activity_content.xml b/app/src/main/res/layout-land/main_activity_content.xml index c27810590..b02e2e27b 100644 --- a/app/src/main/res/layout-land/main_activity_content.xml +++ b/app/src/main/res/layout-land/main_activity_content.xml @@ -1,45 +1,41 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_alignParentBottom="true"> - + + android:layout_toRightOf="@id/tabs_fragment"> - - + android:layout_height="match_parent"> - + android:layout_height="match_parent" + android:name="androidx.navigation.fragment.NavHostFragment" + app:defaultNavHost="true" + app:navGraph="@navigation/main_nav_graph" + tools:layout="@layout/dialer_fragment" /> - + - + - + - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/assistant_activity.xml b/app/src/main/res/layout/assistant_activity.xml index 120528f40..3b2192ec4 100644 --- a/app/src/main/res/layout/assistant_activity.xml +++ b/app/src/main/res/layout/assistant_activity.xml @@ -1,31 +1,24 @@ - + - - - - - + android:layout_height="match_parent" + android:background="?attr/backgroundColor"> - + app:defaultNavHost="true" + app:navGraph="@navigation/assistant_nav_graph" /> - + - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/file_pdf_viewer_cell.xml b/app/src/main/res/layout/file_pdf_viewer_cell.xml index 109068b33..de433d575 100644 --- a/app/src/main/res/layout/file_pdf_viewer_cell.xml +++ b/app/src/main/res/layout/file_pdf_viewer_cell.xml @@ -1,20 +1,12 @@ - + - - - + - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/main_activity_content.xml b/app/src/main/res/layout/main_activity_content.xml index 9b969c525..cfa78ab12 100644 --- a/app/src/main/res/layout/main_activity_content.xml +++ b/app/src/main/res/layout/main_activity_content.xml @@ -1,45 +1,41 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_alignParentBottom="true"> - + + android:layout_above="@id/tabs_fragment"> - - + android:layout_height="match_parent"> - + android:layout_height="match_parent" + android:name="androidx.navigation.fragment.NavHostFragment" + app:defaultNavHost="true" + app:navGraph="@navigation/main_nav_graph" + tools:layout="@layout/dialer_fragment" /> - + - + - + - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/build.gradle b/build.gradle index fef2c0434..a8907faaa 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { } // for com.github.chrisbanes:PhotoView } dependencies { - classpath 'com.android.tools.build:gradle:7.0.2' + classpath 'com.android.tools.build:gradle:7.0.3' classpath 'com.google.gms:google-services:4.3.10' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jlleitschuh.gradle:ktlint-gradle:10.1.0"