Skip to content
Snippets Groups Projects
Commit 4283b2d8 authored by Adrien Béraud's avatar Adrien Béraud Committed by Adrien Béraud
Browse files

conversation: improve loading experience

Change-Id: Ia1bdd216e3837e690b12fcae44e841fa585c18dc
parent bc606e1b
Branches
Tags
No related merge requests found
...@@ -37,6 +37,7 @@ import androidx.core.view.doOnNextLayout ...@@ -37,6 +37,7 @@ import androidx.core.view.doOnNextLayout
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentTransaction import androidx.fragment.app.FragmentTransaction
import androidx.fragment.app.commit
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import cx.ring.R import cx.ring.R
...@@ -428,13 +429,10 @@ class HomeActivity : AppCompatActivity(), ContactPickerFragment.OnContactedPicke ...@@ -428,13 +429,10 @@ class HomeActivity : AppCompatActivity(), ContactPickerFragment.OnContactedPicke
fun showWelcomeFragment() { fun showWelcomeFragment() {
val welcomeJamiFragment = WelcomeJamiFragment() val welcomeJamiFragment = WelcomeJamiFragment()
supportFragmentManager.beginTransaction() supportFragmentManager.commit {
.replace( setReorderingAllowed(true)
R.id.conversation, replace(R.id.conversation, welcomeJamiFragment, welcomeJamiFragment::class.java.simpleName)
welcomeJamiFragment, }
welcomeJamiFragment::class.java.simpleName
)
.commit()
fWelcomeJami = welcomeJamiFragment fWelcomeJami = welcomeJamiFragment
fConversation = null fConversation = null
} }
...@@ -467,7 +465,7 @@ class HomeActivity : AppCompatActivity(), ContactPickerFragment.OnContactedPicke ...@@ -467,7 +465,7 @@ class HomeActivity : AppCompatActivity(), ContactPickerFragment.OnContactedPicke
intent?.let { conversation.handleShareIntent(it) } intent?.let { conversation.handleShareIntent(it) }
}.commit() }.commit()
fConversation = conversation fConversation = conversation
mBinding!!.panel.openPane() mBinding?.panel?.openPane()
} }
fun goToAdvancedSettings() { fun goToAdvancedSettings() {
......
...@@ -136,6 +136,12 @@ class ConversationFragment : BaseSupportFragment<ConversationPresenter, Conversa ...@@ -136,6 +136,12 @@ class ConversationFragment : BaseSupportFragment<ConversationPresenter, Conversa
mAdapter?.let { adapter -> mAdapter?.let { adapter ->
adapter.updateDataset(conversation.toMutableList()) adapter.updateDataset(conversation.toMutableList())
loading = false loading = false
binding?.histList?.doOnNextLayout {
it.animate()
.alpha(1f)
.setDuration(220)
.start()
}
} }
} }
...@@ -1015,6 +1021,7 @@ class ConversationFragment : BaseSupportFragment<ConversationPresenter, Conversa ...@@ -1015,6 +1021,7 @@ class ConversationFragment : BaseSupportFragment<ConversationPresenter, Conversa
} }
} }
// fun blockContactRequest() { // fun blockContactRequest() {
// presenter.onBlockIncomingContactRequest() // presenter.onBlockIncomingContactRequest()
// } // }
......
...@@ -161,7 +161,9 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. ...@@ -161,7 +161,9 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
android:listSelector="@color/transparent" android:listSelector="@color/transparent"
android:paddingBottom="60dp" android:paddingBottom="60dp"
android:transcriptMode="normal" android:transcriptMode="normal"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" android:alpha="0"
app:layoutManager="LinearLayoutManager"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
app:stackFromEnd="true" app:stackFromEnd="true"
tools:listitem="@layout/item_conv_msg_peer" /> tools:listitem="@layout/item_conv_msg_peer" />
...@@ -328,7 +330,6 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. ...@@ -328,7 +330,6 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:animateLayoutChanges="true"
android:background="@drawable/textmsg_bg_input" android:background="@drawable/textmsg_bg_input"
android:orientation="vertical"> android:orientation="vertical">
......
...@@ -19,6 +19,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. ...@@ -19,6 +19,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="72dp" android:layout_height="72dp"
android:background="@drawable/background_item_smartlist" android:background="@drawable/background_item_smartlist"
android:foreground="?attr/selectableItemBackground"
android:descendantFocusability="blocksDescendants" android:descendantFocusability="blocksDescendants"
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingTop="8dp" android:paddingTop="8dp"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment