Removed unused code + attempt to workaround ANR since last dependencies update
This commit is contained in:
parent
7bd85a6f53
commit
70575d73ba
4 changed files with 9 additions and 43 deletions
|
@ -28,8 +28,12 @@ import androidx.core.view.doOnPreDraw
|
||||||
import androidx.databinding.DataBindingUtil
|
import androidx.databinding.DataBindingUtil
|
||||||
import androidx.databinding.ViewDataBinding
|
import androidx.databinding.ViewDataBinding
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
|
import androidx.lifecycle.lifecycleScope
|
||||||
import androidx.navigation.fragment.findNavController
|
import androidx.navigation.fragment.findNavController
|
||||||
import com.google.android.material.transition.MaterialSharedAxis
|
import com.google.android.material.transition.MaterialSharedAxis
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.launch
|
||||||
|
import kotlinx.coroutines.withContext
|
||||||
import org.linphone.LinphoneApplication.Companion.corePreferences
|
import org.linphone.LinphoneApplication.Companion.corePreferences
|
||||||
import org.linphone.core.tools.Log
|
import org.linphone.core.tools.Log
|
||||||
|
|
||||||
|
@ -40,7 +44,11 @@ abstract class GenericFragment<T : ViewDataBinding> : Fragment() {
|
||||||
|
|
||||||
protected val onBackPressedCallback = object : OnBackPressedCallback(true) {
|
protected val onBackPressedCallback = object : OnBackPressedCallback(true) {
|
||||||
override fun handleOnBackPressed() {
|
override fun handleOnBackPressed() {
|
||||||
goBack()
|
lifecycleScope.launch {
|
||||||
|
withContext(Dispatchers.Main) {
|
||||||
|
goBack()
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -145,18 +145,6 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
binding.slidingPane.lockMode = SlidingPaneLayout.LOCK_MODE_LOCKED
|
binding.slidingPane.lockMode = SlidingPaneLayout.LOCK_MODE_LOCKED
|
||||||
binding.slidingPane.addPanelSlideListener(object : SlidingPaneLayout.PanelSlideListener {
|
|
||||||
override fun onPanelSlide(panel: View, slideOffset: Float) { }
|
|
||||||
|
|
||||||
override fun onPanelOpened(panel: View) { }
|
|
||||||
|
|
||||||
override fun onPanelClosed(panel: View) {
|
|
||||||
if (binding.slidingPane.isSlideable) {
|
|
||||||
// (requireActivity() as MainActivity).showTabsFragment()
|
|
||||||
coreContext.notificationsManager.currentlyDisplayedChatRoomAddress = null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
/* End of shared view model & sliding pane related */
|
/* End of shared view model & sliding pane related */
|
||||||
|
|
||||||
|
|
|
@ -139,21 +139,6 @@ class MasterContactsFragment : MasterFragment<ContactMasterFragmentBinding, Cont
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
binding.slidingPane.lockMode = SlidingPaneLayout.LOCK_MODE_LOCKED
|
binding.slidingPane.lockMode = SlidingPaneLayout.LOCK_MODE_LOCKED
|
||||||
/*binding.slidingPane.addPanelSlideListener(object : SlidingPaneLayout.PanelSlideListener {
|
|
||||||
override fun onPanelSlide(panel: View, slideOffset: Float) { }
|
|
||||||
|
|
||||||
override fun onPanelOpened(panel: View) {
|
|
||||||
if (binding.slidingPane.isSlideable) {
|
|
||||||
(requireActivity() as MainActivity).hideTabsFragment()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onPanelClosed(panel: View) {
|
|
||||||
if (binding.slidingPane.isSlideable) {
|
|
||||||
(requireActivity() as MainActivity).showTabsFragment()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})*/
|
|
||||||
|
|
||||||
/* End of shared view model & sliding pane related */
|
/* End of shared view model & sliding pane related */
|
||||||
|
|
||||||
|
|
|
@ -126,21 +126,6 @@ class MasterCallLogsFragment : MasterFragment<HistoryMasterFragmentBinding, Call
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
binding.slidingPane.lockMode = SlidingPaneLayout.LOCK_MODE_LOCKED
|
binding.slidingPane.lockMode = SlidingPaneLayout.LOCK_MODE_LOCKED
|
||||||
/*binding.slidingPane.addPanelSlideListener(object : SlidingPaneLayout.PanelSlideListener {
|
|
||||||
override fun onPanelSlide(panel: View, slideOffset: Float) { }
|
|
||||||
|
|
||||||
override fun onPanelOpened(panel: View) {
|
|
||||||
if (binding.slidingPane.isSlideable) {
|
|
||||||
(requireActivity() as MainActivity).hideTabsFragment()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onPanelClosed(panel: View) {
|
|
||||||
if (binding.slidingPane.isSlideable) {
|
|
||||||
(requireActivity() as MainActivity).showTabsFragment()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})*/
|
|
||||||
|
|
||||||
/* End of shared view model & sliding pane related */
|
/* End of shared view model & sliding pane related */
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue