diff --git a/jami-android/app/src/main/java/cx/ring/fragments/ContactPickerFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/ContactPickerFragment.kt index 7bd025e9342e6544db14db43d74ef396dc0fe529..f80579a6f67396c427f2f59b8aec311abad86f87 100644 --- a/jami-android/app/src/main/java/cx/ring/fragments/ContactPickerFragment.kt +++ b/jami-android/app/src/main/java/cx/ring/fragments/ContactPickerFragment.kt @@ -16,18 +16,16 @@ */ package cx.ring.fragments -import android.app.Dialog import android.content.Context import android.os.Bundle import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.google.android.material.bottomsheet.BottomSheetDialog +import androidx.transition.AutoTransition +import androidx.transition.TransitionManager import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.google.android.material.chip.Chip -import cx.ring.R import cx.ring.adapters.ContactPickerAdapter import cx.ring.databinding.FragContactPickerBinding import cx.ring.viewholders.ContactPickerViewHolder.ContactPickerListeners @@ -53,15 +51,6 @@ class ContactPickerFragment : BottomSheetDialogFragment() { @Inject lateinit var mConversationFacade: ConversationFacade - override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val dialog = super.onCreateDialog(savedInstanceState) - (dialog as BottomSheetDialog).behavior.apply { - state = BottomSheetBehavior.STATE_EXPANDED - skipCollapsed = true - } - return dialog - } - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { mDisposableBag.add(mConversationFacade.getConversationViewModelList() .observeOn(AndroidSchedulers.mainThread()) @@ -71,7 +60,7 @@ class ContactPickerFragment : BottomSheetDialogFragment() { }){ e -> Log.e(TAG, "No contact to create a group!", e) }) } - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { binding = FragContactPickerBinding.inflate(layoutInflater, container, false) adapter = ContactPickerAdapter(null, object : ContactPickerListeners { override fun onItemClick(item: ConversationItemViewModel) { @@ -86,6 +75,7 @@ class ContactPickerFragment : BottomSheetDialogFragment() { item.isChecked = false adapter!!.update(item) val v = binding!!.selectedContacts.findViewWithTag<View>(item) + TransitionManager.beginDelayedTransition(binding!!.selectedContactsTooolbar, AutoTransition().setDuration(100)) if (v != null) binding!!.selectedContacts.removeView(v) } if (checked) { @@ -102,6 +92,7 @@ class ContactPickerFragment : BottomSheetDialogFragment() { tag = item setOnCloseIconClickListener { remover.run() } } + TransitionManager.beginDelayedTransition(binding!!.selectedContactsTooolbar, AutoTransition().setDuration(100)) binding!!.selectedContacts.addView(chip) } binding!!.createGroupBtn.isEnabled = true diff --git a/jami-android/app/src/main/res/layout/frag_contact_picker.xml b/jami-android/app/src/main/res/layout/frag_contact_picker.xml index 358c948d3b3b465e012eee4c03662542ecbe3c45..bd6d04886b460190ee7269828e004e20171faefe 100644 --- a/jami-android/app/src/main/res/layout/frag_contact_picker.xml +++ b/jami-android/app/src/main/res/layout/frag_contact_picker.xml @@ -5,15 +5,13 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".fragments.ContactPickerFragment" - android:animateLayoutChanges="true"> + tools:context=".fragments.ContactPickerFragment"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/selected_contacts_tooolbar" style="@style/Widget.Material3.AppBarLayout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:animateLayoutChanges="true" android:background="@color/transparent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -32,7 +30,6 @@ style="@style/Widget.Material3.ChipGroup" android:layout_width="match_parent" android:layout_height="wrap_content" - android:animateLayoutChanges="true" android:minHeight="100dp" android:paddingHorizontal="8dp"> @@ -59,7 +56,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="16dp" - android:animateLayoutChanges="true" android:enabled="false" android:text="@string/picker_btn" app:icon="@drawable/baseline_group_add_24"