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

Uniformized popup menus

Browse source
This commit is contained in:
Sylvain Berfini 2024-02-07 10:20:05 +01:00
parent 30ab1c2196
commit c71af9f23a
7 changed files with 105 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/layout/account_popup_menu.xml
View file

@ -22,7 +22,7 @@
android:onClick="@{manageProfileClickListener}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:layout_margin="@dimen/popup_menu_padding"
android:text="@string/drawer_menu_manage_account"
android:textSize="14sp"
android:textColor="?attr/color_main2_500"

32
app/src/main/res/layout/chat_conversation_popup_menu.xml
View file

@ -38,9 +38,8 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingEnd="20dp"
android:paddingStart="20dp"
android:paddingBottom="20dp"
android:paddingEnd="@dimen/popup_menu_padding"
android:paddingStart="@dimen/popup_menu_padding"
android:background="@drawable/shape_round_popup_menu_background">
<androidx.appcompat.widget.AppCompatTextView
@ -49,7 +48,7 @@
android:onClick="@{goToInfoClickListener}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="@dimen/popup_menu_item_top_margin"
android:text="@string/conversation_menu_go_to_info"
android:textSize="14sp"
android:textColor="?attr/color_main2_500"
@ -69,7 +68,7 @@
android:onClick="@{searchClickListener}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginTop="@dimen/popup_menu_item_top_margin"
android:text="@string/conversation_menu_search_in_messages"
android:textSize="14sp"
android:textColor="?attr/color_main2_500"
@ -89,7 +88,7 @@
android:onClick="@{muteClickListener}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginTop="@dimen/popup_menu_item_top_margin"
android:text="@string/conversation_action_mute"
android:textSize="14sp"
android:textColor="?attr/color_main2_500"
@ -110,7 +109,7 @@
android:onClick="@{unmuteClickListener}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginTop="@dimen/popup_menu_item_top_margin"
android:text="@string/conversation_action_unmute"
android:textSize="14sp"
android:textColor="?attr/color_main2_500"
@ -128,9 +127,9 @@
style="@style/default_text_style"
android:id="@+id/ephemeral"
android:onClick="@{configureEphemeralMessagesClickListener}"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginTop="@dimen/popup_menu_item_top_margin"
android:text="@string/conversation_menu_configure_ephemeral_messages"
android:textSize="14sp"
android:textColor="?attr/color_main2_500"
@ -151,7 +150,7 @@
android:onClick="@{mediasClickListener}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginTop="@dimen/popup_menu_item_top_margin"
android:text="@string/conversation_menu_media_files"
android:textSize="14sp"
android:textColor="?attr/color_main2_500"
@ -163,7 +162,18 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/ephemeral"
app:layout_constraintBottom_toBottomOf="parent"/>
app:layout_constraintBottom_toTopOf="@id/bottom_anchor"/>
<View
android:id="@+id/bottom_anchor"
android:layout_width="wrap_content"
android:layout_height="1dp"
android:layout_marginBottom="@dimen/popup_menu_item_top_margin"
app:layout_constraintWidth_max="@dimen/popup_menu_width"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/medias"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

29
app/src/main/res/layout/chat_participant_admin_popup_menu.xml
View file

@ -35,6 +35,8 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingEnd="@dimen/popup_menu_padding"
android:paddingStart="@dimen/popup_menu_padding"
android:background="@drawable/shape_round_popup_menu_background">
<androidx.appcompat.widget.AppCompatTextView
@ -43,9 +45,7 @@
android:onClick="@{seeContactProfileClickListener}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="@dimen/popup_menu_item_top_margin"
android:visibility="@{isParticipantContact ? View.VISIBLE : View.GONE}"
android:text="@string/conversation_info_menu_go_to_contact"
android:textSize="14sp"
@ -67,9 +67,7 @@
android:onClick="@{addToContactsClickListener}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="@dimen/popup_menu_item_top_margin"
android:visibility="@{isParticipantContact ? View.GONE : View.VISIBLE, default=gone}"
android:text="@string/conversation_info_menu_add_to_contacts"
android:textSize="14sp"
@ -91,9 +89,7 @@
android:onClick="@{setAdminClickListener}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="@dimen/popup_menu_item_top_margin"
android:visibility="@{isParticipantAdmin || !isMeAdmin ? View.GONE : View.VISIBLE}"
android:text="@string/conversation_info_admin_menu_set_participant_admin"
android:textSize="14sp"
@ -115,9 +111,7 @@
android:onClick="@{unsetAdminClickListener}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="@dimen/popup_menu_item_top_margin"
android:visibility="@{isParticipantAdmin &amp;&amp; isMeAdmin ? View.VISIBLE : View.GONE, default=gone}"
android:text="@string/conversation_info_admin_menu_unset_participant_admin"
android:textSize="14sp"
@ -137,9 +131,7 @@
android:id="@+id/separator"
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="16dp"
android:layout_marginTop="@dimen/popup_menu_item_top_margin"
android:background="?attr/color_main2_400"
android:visibility="@{isMeAdmin ? View.VISIBLE : View.GONE}"
app:layout_constraintStart_toStartOf="parent"
@ -153,9 +145,7 @@
android:onClick="@{removeParticipantClickListener}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="@dimen/popup_menu_item_top_margin"
android:text="@string/conversation_info_admin_menu_remove_participant"
android:textSize="14sp"
android:textColor="?attr/color_danger_500"
@ -175,7 +165,8 @@
android:id="@+id/bottom_anchor"
android:layout_width="wrap_content"
android:layout_height="1dp"
android:layout_marginBottom="20dp"
android:layout_marginBottom="@dimen/popup_menu_item_top_margin"
app:layout_constraintWidth_max="@dimen/popup_menu_width"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/remove_participant"

69
app/src/main/res/layout/contacts_list_filter_popup_menu.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<layout
<layout xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
@ -20,69 +20,56 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingEnd="@dimen/popup_menu_padding"
android:paddingStart="@dimen/popup_menu_padding"
android:background="@drawable/shape_round_popup_menu_background">
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:id="@+id/no_filter"
android:onClick="@{noFilterClickListener}"
style="@style/default_text_style"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="5dp"
android:layout_marginTop="@dimen/popup_menu_item_top_margin"
android:text="@string/contacts_list_filter_popup_see_all"
android:textSize="14sp"
android:textColor="?attr/color_main2_500"
app:layout_constraintVertical_chainStyle="packed"
android:drawablePadding="5dp"
android:drawableEnd="@drawable/check"
android:drawableTint="@{seeAllSelected ? @color/green_success_500 : @color/transparent_color, default=@color/transparent_color}"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/no_filter_selected"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/linphone_filter"/>
<ImageView
android:id="@+id/no_filter_selected"
android:onClick="@{noFilterClickListener}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/check"
android:visibility="@{seeAllSelected ? View.VISIBLE : View.INVISIBLE, default=invisible}"
app:tint="?attr/color_success_500"
app:layout_constraintTop_toTopOf="@id/no_filter"
app:layout_constraintBottom_toBottomOf="@id/no_filter"
app:layout_constraintStart_toStartOf="@id/linphone_filter_selected"
app:layout_constraintEnd_toEndOf="@id/linphone_filter_selected"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:id="@+id/linphone_filter"
android:onClick="@{linphoneOnlyClickListener}"
style="@style/default_text_style"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_marginBottom="20dp"
android:layout_marginStart="20dp"
android:layout_marginTop="@dimen/popup_menu_item_top_margin"
android:text="@string/contacts_list_filter_popup_see_linphone_only"
android:textSize="14sp"
android:textColor="?attr/color_main2_500"
android:drawablePadding="5dp"
android:drawableEnd="@drawable/check"
android:drawableTint="@{seeAllSelected ? @color/transparent_color : @color/green_success_500, default=@color/green_success_500}"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/no_filter"
app:layout_constraintBottom_toBottomOf="parent"/>
<ImageView
android:id="@+id/linphone_filter_selected"
android:onClick="@{linphoneOnlyClickListener}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:layout_marginEnd="20dp"
android:src="@drawable/check"
android:visibility="@{seeAllSelected ? View.INVISIBLE : View.VISIBLE}"
app:tint="?attr/color_success_500"
app:layout_constraintTop_toTopOf="@id/linphone_filter"
app:layout_constraintBottom_toBottomOf="@id/linphone_filter"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/linphone_filter"/>
app:layout_constraintTop_toBottomOf="@id/no_filter"
app:layout_constraintBottom_toTopOf="@id/bottom_anchor"/>
<View
android:id="@+id/bottom_anchor"
android:layout_width="wrap_content"
android:layout_height="1dp"
android:layout_marginBottom="@dimen/popup_menu_item_top_margin"
app:layout_constraintWidth_max="@dimen/popup_menu_width"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/linphone_filter"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

32
app/src/main/res/layout/history_contact_popup_menu.xml
View file

@ -29,6 +29,8 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingEnd="@dimen/popup_menu_padding"
android:paddingStart="@dimen/popup_menu_padding"
android:background="@drawable/shape_round_popup_menu_background">
<androidx.appcompat.widget.AppCompatTextView
@ -38,9 +40,7 @@
android:id="@+id/add_to_contact"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="@dimen/popup_menu_item_top_margin"
android:gravity="start|center_vertical"
android:text="@string/menu_add_address_to_contacts"
android:textSize="14sp"
@ -61,9 +61,7 @@
android:id="@+id/go_to_contact"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="@dimen/popup_menu_item_top_margin"
android:gravity="start|center_vertical"
android:text="@string/menu_see_existing_contact"
android:textSize="14sp"
@ -82,9 +80,7 @@
android:id="@+id/copy_number"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="@dimen/popup_menu_item_top_margin"
android:gravity="start|center_vertical"
android:text="@string/menu_copy_sip_address"
android:textSize="14sp"
@ -101,12 +97,9 @@
android:onClick="@{deleteAllHistoryClickListener}"
style="@style/default_text_style"
android:id="@+id/delete_history"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_marginBottom="20dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="@dimen/popup_menu_item_top_margin"
android:gravity="start|center_vertical"
android:text="@string/menu_delete_history"
android:textSize="14sp"
@ -120,6 +113,17 @@
app:layout_constraintTop_toBottomOf="@id/copy_number"
app:layout_constraintBottom_toBottomOf="parent"/>
<View
android:id="@+id/bottom_anchor"
android:layout_width="wrap_content"
android:layout_height="1dp"
android:layout_marginBottom="@dimen/popup_menu_item_top_margin"
app:layout_constraintWidth_max="@dimen/popup_menu_width"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/delete_history"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

23
app/src/main/res/layout/history_list_popup_menu.xml
View file

@ -14,24 +14,39 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingEnd="@dimen/popup_menu_padding"
android:paddingStart="@dimen/popup_menu_padding"
android:background="@drawable/shape_round_popup_menu_background">
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{deleteAllHistoryClickListener}"
style="@style/default_text_style"
android:layout_width="wrap_content"
android:id="@+id/delete"
android:onClick="@{deleteAllHistoryClickListener}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:layout_marginTop="@dimen/popup_menu_item_top_margin"
android:text="@string/menu_delete_history"
android:textSize="14sp"
android:textColor="?attr/color_danger_500"
android:drawableStart="@drawable/trash_simple"
android:drawablePadding="5dp"
app:drawableTint="?attr/color_danger_500"
app:layout_constraintWidth_max="@dimen/popup_menu_width"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
app:layout_constraintBottom_toTopOf="@id/bottom_anchor"/>
<View
android:id="@+id/bottom_anchor"
android:layout_width="wrap_content"
android:layout_height="1dp"
android:layout_marginBottom="@dimen/popup_menu_item_top_margin"
app:layout_constraintWidth_max="@dimen/popup_menu_width"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/delete"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

15
app/src/main/res/values/dimen.xml
View file

@ -41,6 +41,14 @@
<dimen name="top_bar_height">55dp</dimen>
<dimen name="toast_top_margin">70dp</dimen> <!-- 15dp + top_bar_height -->
<dimen name="toast_max_width">400dp</dimen>
<dimen name="toast_text_max_width">300dp</dimen>
<dimen name="button_max_width">400dp</dimen>
<dimen name="dialog_max_width">400dp</dimen>
<dimen name="text_input_max_width">400dp</dimen>
<dimen name="popup_menu_width">250dp</dimen>
<dimen name="popup_menu_padding">15dp</dimen>
<dimen name="popup_menu_item_top_margin">20dp</dimen>
<dimen name="call_top_bar_text_height">28dp</dimen>
<dimen name="call_top_bar_info_height">48dp</dimen> <!-- Size of top text + top & bottom margins -->
@ -56,13 +64,6 @@
<dimen name="call_conference_active_speaker_miniature_size">120dp</dimen>
<dimen name="meeting_list_decoration_height">66dp</dimen>
<dimen name="toast_max_width">400dp</dimen>
<dimen name="toast_text_max_width">300dp</dimen>
<dimen name="button_max_width">400dp</dimen>
<dimen name="dialog_max_width">400dp</dimen>
<dimen name="text_input_max_width">400dp</dimen>
<dimen name="meeting_margin">8dp</dimen>
<dimen name="chat_bubble_grouped_top_margin">2dp</dimen>