mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Layout of start call as intended but perfomances not great...

Browse source
This commit is contained in:
Sylvain Berfini 2023-08-29 16:11:32 +02:00
parent 544ae39a95
commit 3c94068910
5 changed files with 102 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/linphone/ui/main/calls/adapter/SuggestionsListAdapter.kt
View file

@ -56,11 +56,11 @@ class SuggestionsListAdapter(
private class SuggestionDiffCallback : DiffUtil.ItemCallback<ContactAvatarModel>() {
override fun areItemsTheSame(oldItem: ContactAvatarModel, newItem: ContactAvatarModel): Boolean {
return oldItem.friend == newItem.friend
return oldItem.id == newItem.id
}
override fun areContentsTheSame(oldItem: ContactAvatarModel, newItem: ContactAvatarModel): Boolean {
return false
return true
}
}
}

36
app/src/main/java/org/linphone/ui/main/calls/fragment/StartCallFragment.kt
View file

@ -30,6 +30,7 @@ import androidx.navigation.navGraphViewModels
import androidx.recyclerview.widget.LinearLayoutManager
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.R
import org.linphone.core.tools.Log
import org.linphone.databinding.CallStartFragmentBinding
import org.linphone.ui.main.calls.adapter.SuggestionsListAdapter
import org.linphone.ui.main.calls.viewmodel.StartCallViewModel
@ -46,6 +47,10 @@ import org.linphone.utils.DialogUtils
@UiThread
class StartCallFragment : GenericFragment() {
companion object {
private const val TAG = "[Start Call Fragment]"
}
private lateinit var binding: CallStartFragmentBinding
private val viewModel: StartCallViewModel by navGraphViewModels(
@ -63,6 +68,9 @@ class StartCallFragment : GenericFragment() {
private lateinit var contactsAdapter: ContactsListAdapter
private lateinit var suggestionsAdapter: SuggestionsListAdapter
private var contactsListReady = false
private var suggestionsListReady = false
private val listener = object : ContactNumberOrAddressClickListener {
@UiThread
override fun onClicked(model: ContactNumberOrAddressModel) {
@ -131,17 +139,37 @@ class StartCallFragment : GenericFragment() {
contactsListViewModel.contactsList.observe(
viewLifecycleOwner
) {
contactsAdapter.submitList(it)
Log.i("$TAG Contacts list is ready with [${it.size}] items")
contactsAdapter.submitList(it) {
// Otherwise list won't show until keyboard is opened for example...
binding.contactsList.requestLayout()
}
viewModel.emptyContactsList.value = it.isEmpty()
(view.parent as? ViewGroup)?.doOnPreDraw {
startPostponedEnterTransition()
if (suggestionsListReady && !contactsListReady) {
Log.i("$TAG Suggestions list is also ready, start postponed enter transition")
(view.parent as? ViewGroup)?.doOnPreDraw {
startPostponedEnterTransition()
}
}
contactsListReady = true
}
suggestionsListViewModel.suggestionsList.observe(viewLifecycleOwner) {
suggestionsAdapter.submitList(it)
Log.i("$TAG Suggestions list is ready with [${it.size}] items")
suggestionsAdapter.submitList(it) {
// Otherwise list won't show until keyboard is opened for example...
binding.suggestionsList.requestLayout()
}
viewModel.emptySuggestionsList.value = it.isEmpty()
if (contactsListReady && !suggestionsListReady) {
Log.i("$TAG Contacts list is also ready, start postponed enter transition")
(view.parent as? ViewGroup)?.doOnPreDraw {
startPostponedEnterTransition()
}
}
suggestionsListReady = true
}
viewModel.searchFilter.observe(viewLifecycleOwner) { filter ->

17
app/src/main/java/org/linphone/ui/main/calls/viewmodel/SuggestionsListViewModel.kt
View file

@ -34,6 +34,7 @@ import org.linphone.core.SearchResult
import org.linphone.core.tools.Log
import org.linphone.ui.main.contacts.model.ContactAvatarModel
import org.linphone.ui.main.model.isInSecureMode
import org.linphone.utils.LinphoneUtils
class SuggestionsListViewModel @UiThread constructor() : ViewModel() {
companion object {
@ -101,10 +102,9 @@ class SuggestionsListViewModel @UiThread constructor() : ViewModel() {
for (result in results) {
val address = result.address
Log.i("$TAG ${address?.asStringUriOnly()}")
if (address != null) {
val friend = coreContext.core.findFriend(address)
Log.i("$TAG ${friend?.name}")
// We don't want Friends here as they would also be in contacts list
if (friend == null) {
// If user-input generated result (always last) already exists, don't show it again
@ -175,23 +175,14 @@ class SuggestionsListViewModel @UiThread constructor() : ViewModel() {
@WorkerThread
private fun createFriendFromSearchResult(searchResult: SearchResult): Friend {
val searchResultFriend = searchResult.friend
if (searchResultFriend != null) return searchResultFriend
val friend = coreContext.core.createFriend()
val address = searchResult.address
if (address != null) {
friend.address = address
}
val number = searchResult.phoneNumber
if (number != null) {
friend.addPhoneNumber(number)
if (address != null && address.username == number) {
friend.removeAddress(address)
}
friend.name = LinphoneUtils.getDisplayName(address)
friend.refKey = address.asStringUriOnly().hashCode().toString()
}
return friend

139
app/src/main/res/layout/call_start_fragment.xml
View file

@ -20,21 +20,21 @@
<ImageView
android:id="@+id/back"
android:onClick="@{backClickListener}"
android:layout_width="wrap_content"
android:layout_height="35dp"
android:layout_marginStart="10dp"
android:adjustViewBounds="true"
android:drawableTint="@color/primary_color"
android:onClick="@{backClickListener}"
android:padding="5dp"
android:src="@drawable/caret_left"
android:drawableTint="@color/primary_color"
app:layout_constraintBottom_toBottomOf="@id/title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
android:id="@+id/title"
style="@style/default_text_style_800"
android:layout_width="0dp"
android:layout_height="@dimen/top_bar_height"
android:layout_marginStart="10dp"
@ -45,54 +45,54 @@
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/back"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/background"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/gray_7"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/title"
app:layout_constraintBottom_toBottomOf="parent" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/title" />
<androidx.appcompat.widget.AppCompatEditText
style="@style/default_text_style"
android:id="@+id/search_bar"
style="@style/default_text_style"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:layout_marginStart="20dp"
android:layout_marginTop="30dp"
android:layout_marginEnd="20dp"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingStart="15dp"
android:paddingEnd="15dp"
android:background="@drawable/edit_text_background"
android:drawableStart="@drawable/magnifying_glass"
android:drawablePadding="10dp"
android:drawableTint="@color/gray_9"
android:background="@drawable/edit_text_background"
android:hint="Search contact or history call"
android:inputType="textPersonName|textNoSuggestions"
android:paddingStart="15dp"
android:paddingTop="10dp"
android:paddingEnd="15dp"
android:paddingBottom="10dp"
android:text="@={viewModel.searchFilter}"
android:textSize="14sp"
android:inputType="textPersonName|textNoSuggestions"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/title" />
<ImageView
android:onClick="@{() -> viewModel.clearFilter()}"
android:id="@+id/clear_field"
android:visibility="@{viewModel.searchFilter.length() > 0 ? View.VISIBLE : View.GONE, default=gone}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="15dp"
android:onClick="@{() -> viewModel.clearFilter()}"
android:src="@drawable/x"
app:tint="@color/gray_9"
app:layout_constraintTop_toTopOf="@id/search_bar"
android:visibility="@{viewModel.searchFilter.length() > 0 ? View.VISIBLE : View.GONE, default=gone}"
app:layout_constraintBottom_toBottomOf="@id/search_bar"
app:layout_constraintEnd_toEndOf="@id/search_bar"/>
app:layout_constraintEnd_toEndOf="@id/search_bar"
app:layout_constraintTop_toTopOf="@id/search_bar"
app:tint="@color/gray_9" />
<!-- margin start must be half the size of the group_call_icon below -->
@ -102,134 +102,121 @@
android:layout_height="0dp"
android:layout_marginStart="22dp"
android:background="@drawable/shape_gradient"
app:layout_constraintTop_toTopOf="@id/group_call_icon"
app:layout_constraintBottom_toBottomOf="@id/group_call_icon"
app:layout_constraintEnd_toEndOf="@id/group_call_label"
app:layout_constraintStart_toStartOf="@id/group_call_icon"
app:layout_constraintEnd_toEndOf="@id/group_call_label" />
app:layout_constraintTop_toTopOf="@id/group_call_icon" />
<ImageView
android:id="@+id/group_call_icon"
android:visibility="@{viewModel.searchFilter.length() > 0 ? View.GONE : View.VISIBLE}"
android:layout_width="44dp"
android:layout_height="44dp"
android:layout_marginStart="16dp"
android:layout_marginTop="28dp"
android:background="@drawable/shape_orange_round"
android:padding="10dp"
android:src="@drawable/users_three"
android:background="@drawable/shape_orange_round"
app:tint="@color/white"
android:visibility="@{viewModel.searchFilter.length() > 0 ? View.GONE : View.VISIBLE}"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/search_bar" />
app:layout_constraintTop_toBottomOf="@id/search_bar"
app:tint="@color/white" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
android:id="@+id/group_call_label"
android:visibility="@{viewModel.searchFilter.length() > 0 ? View.GONE : View.VISIBLE}"
style="@style/default_text_style_800"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="5dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="Create a group call"
android:textSize="16sp"
android:textColor="@color/black"
android:drawableEnd="@drawable/caret_right"
app:layout_constraintStart_toEndOf="@id/group_call_icon"
android:padding="5dp"
android:text="Create a group call"
android:textColor="@color/black"
android:textSize="16sp"
android:visibility="@{viewModel.searchFilter.length() > 0 ? View.GONE : View.VISIBLE}"
app:layout_constraintBottom_toBottomOf="@id/group_call_icon"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/group_call_icon"
app:layout_constraintBottom_toBottomOf="@id/group_call_icon"/>
app:layout_constraintStart_toEndOf="@id/group_call_icon"
app:layout_constraintTop_toTopOf="@id/group_call_icon" />
<ImageView
android:id="@+id/no_contacts_nor_suggestion_image"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:src="@drawable/illu"
android:layout_margin="10dp"
android:visibility="@{viewModel.emptyContactsList &amp;&amp; viewModel.emptySuggestionsList ? View.VISIBLE : View.GONE}"
app:layout_constraintHeight_max="200dp"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintVertical_chainStyle="packed"
android:src="@drawable/illu"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/no_contacts_nor_suggestion_label"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHeight_max="200dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/group_call_icon" />
app:layout_constraintTop_toBottomOf="@id/group_call_icon"
app:layout_constraintVertical_chainStyle="packed" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
android:id="@+id/no_contacts_nor_suggestion_label"
android:layout_width="wrap_content"
style="@style/default_text_style_800"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="No suggestion and no contact for the moment..."
android:textSize="16sp"
android:visibility="@{viewModel.emptyContactsList &amp;&amp; viewModel.emptySuggestionsList ? View.VISIBLE : View.GONE}"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/no_contacts_nor_suggestion_image" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
android:id="@+id/all_contacts_label"
android:layout_width="0dp"
style="@style/default_text_style_800"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="5dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:padding="5dp"
android:text="Contacts"
android:textSize="16sp"
android:visibility="@{viewModel.emptyContactsList ? View.GONE : View.VISIBLE}"
app:layout_constraintVertical_bias="0"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintVertical_bias="0"
app:layout_constraintTop_toBottomOf="@id/group_call_icon"
app:layout_constraintBottom_toTopOf="@id/contacts_list"/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/contacts_list"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:visibility="@{viewModel.emptyContactsList ? View.GONE : View.VISIBLE}"
app:layout_constraintVertical_bias="0"
app:layout_constraintVertical_weight="6"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constrainedHeight="true"
app:layout_constraintTop_toBottomOf="@id/all_contacts_label"
app:layout_constraintBottom_toTopOf="@id/suggestions_label"/>
app:layout_constraintBottom_toTopOf="@id/suggestions_label" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
android:id="@+id/suggestions_label"
android:layout_width="0dp"
style="@style/default_text_style_800"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="5dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:padding="5dp"
android:text="Suggestions"
android:textSize="16sp"
android:visibility="@{viewModel.emptySuggestionsList ? View.GONE : View.VISIBLE}"
app:layout_constraintVertical_bias="0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/contacts_list"
app:layout_constraintBottom_toTopOf="@id/suggestions_list"/>
app:layout_constraintBottom_toTopOf="@id/suggestions_list" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/suggestions_list"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:visibility="@{viewModel.emptySuggestionsList ? View.GONE : View.VISIBLE}"
app:layout_constraintVertical_bias="0"
app:layout_constraintVertical_weight="1"
app:layout_constraintHeight_max="220dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constrainedHeight="true"
app:layout_constraintTop_toBottomOf="@id/suggestions_label"
app:layout_constraintBottom_toBottomOf="parent"/>
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

1
app/src/main/res/layout/contact_list_cell.xml
View file

@ -23,6 +23,7 @@
android:onLongClick="@{onLongClickListener}"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:layout_marginStart="4dp"
android:layout_marginEnd="16dp">