Skip to content
Snippets Groups Projects
Commit 3811c5df authored by Adrien Béraud's avatar Adrien Béraud
Browse files

TwoPaneLayout: cleanup

Change-Id: I1f0b75dade62da6a482918e39ae52bad9350af1a
parent 40feb505
No related branches found
No related tags found
No related merge requests found
...@@ -58,7 +58,7 @@ import cx.ring.utils.getUiCustomizationFromConfigJson ...@@ -58,7 +58,7 @@ import cx.ring.utils.getUiCustomizationFromConfigJson
import cx.ring.viewmodel.WelcomeJamiViewModel import cx.ring.viewmodel.WelcomeJamiViewModel
import cx.ring.views.AvatarDrawable import cx.ring.views.AvatarDrawable
import cx.ring.views.AvatarFactory import cx.ring.views.AvatarFactory
import cx.ring.views.slidingpane.SlidingPaneLayout import cx.ring.views.twopane.TwoPaneLayout
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import io.reactivex.rxjava3.core.Single import io.reactivex.rxjava3.core.Single
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable
...@@ -141,10 +141,7 @@ class HomeActivity : AppCompatActivity(), ContactPickerFragment.OnContactedPicke ...@@ -141,10 +141,7 @@ class HomeActivity : AppCompatActivity(), ContactPickerFragment.OnContactedPicke
mBinding = ActivityHomeBinding.inflate(layoutInflater).also { binding -> mBinding = ActivityHomeBinding.inflate(layoutInflater).also { binding ->
setContentView(binding.root) setContentView(binding.root)
//supportActionBar?.title = "" //supportActionBar?.title = ""
binding.panel.lockMode = SlidingPaneLayout.LOCK_MODE_LOCKED binding.panel.addPanelListener(object : TwoPaneLayout.PanelListener {
binding.panel.addPanelSlideListener(object : SlidingPaneLayout.PanelSlideListener {
override fun onPanelSlide(panel: View, slideOffset: Float) {}
override fun onPanelOpened(panel: View) { override fun onPanelOpened(panel: View) {
conversationBackPressedCallback.isEnabled = true conversationBackPressedCallback.isEnabled = true
} }
...@@ -205,7 +202,7 @@ class HomeActivity : AppCompatActivity(), ContactPickerFragment.OnContactedPicke ...@@ -205,7 +202,7 @@ class HomeActivity : AppCompatActivity(), ContactPickerFragment.OnContactedPicke
super.onConfigurationChanged(newConfig) super.onConfigurationChanged(newConfig)
mBinding!!.panel.doOnNextLayout { mBinding!!.panel.doOnNextLayout {
it as SlidingPaneLayout it as TwoPaneLayout
if (it.isSlideable) { if (it.isSlideable) {
if (fConversation == null) { if (fConversation == null) {
...@@ -351,7 +348,7 @@ class HomeActivity : AppCompatActivity(), ContactPickerFragment.OnContactedPicke ...@@ -351,7 +348,7 @@ class HomeActivity : AppCompatActivity(), ContactPickerFragment.OnContactedPicke
ConversationPath.fromBundle(fConversation?.arguments)?.accountId ConversationPath.fromBundle(fConversation?.arguments)?.accountId
if (account.accountId != currentConversationAccountId) { if (account.accountId != currentConversationAccountId) {
mBinding!!.panel.doOnNextLayout { mBinding!!.panel.doOnNextLayout {
it as SlidingPaneLayout it as TwoPaneLayout
if (!it.isSlideable) showWelcomeFragment() if (!it.isSlideable) showWelcomeFragment()
} }
} }
......
package cx.ring.views.slidingpane package cx.ring.views.twopane
import android.app.Activity import android.app.Activity
import androidx.window.layout.FoldingFeature import androidx.window.layout.FoldingFeature
...@@ -7,7 +7,6 @@ import androidx.window.layout.WindowLayoutInfo ...@@ -7,7 +7,6 @@ import androidx.window.layout.WindowLayoutInfo
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.asCoroutineDispatcher import kotlinx.coroutines.asCoroutineDispatcher
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.flow.mapNotNull
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
......
...@@ -22,7 +22,7 @@ along with this program; if not, write to the Free Software ...@@ -22,7 +22,7 @@ along with this program; if not, write to the Free Software
android:fitsSystemWindows="false" android:fitsSystemWindows="false"
tools:context=".client.HomeActivity"> tools:context=".client.HomeActivity">
<cx.ring.views.slidingpane.SlidingPaneLayout <cx.ring.views.twopane.TwoPaneLayout
android:id="@+id/panel" android:id="@+id/panel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
...@@ -39,7 +39,7 @@ along with this program; if not, write to the Free Software ...@@ -39,7 +39,7 @@ along with this program; if not, write to the Free Software
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" /> android:layout_weight="1" />
</cx.ring.views.slidingpane.SlidingPaneLayout> </cx.ring.views.twopane.TwoPaneLayout>
<androidx.fragment.app.FragmentContainerView <androidx.fragment.app.FragmentContainerView
android:id="@+id/frame" android:id="@+id/frame"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment