empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix some sizing issues in the recipient bottom sheet.

Browse source
This commit is contained in:
Greyson Parrelli 2021-11-05 00:20:35 -04:00
parent 4e2e525509
commit c26c455b3c
4 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/ButtonStripPreference.kt
View file

@ -88,11 +88,6 @@ object ButtonStripPreference {
audioCall.setOnClickListener { model.onAudioClick() }
mute.setOnClickListener { model.onMuteClick() }
search.setOnClickListener { model.onSearchClick() }
val firstButton: View? = listOf(messageContainer, videoContainer, audioContainer, muteContainer, searchContainer).firstOrNull { it.visible }
if (firstButton != null) {
ViewUtil.setLeftMargin(firstButton, context.resources.getDimensionPixelSize(R.dimen.conversation_settings_button_strip_spacing))
}
}
}

27
app/src/main/res/layout/conversation_settings_button_strip.xml
View file

@ -16,7 +16,8 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_marginEnd="@dimen/conversation_settings_button_strip_spacing"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:orientation="vertical"
android:gravity="center_horizontal">
@ -24,6 +25,8 @@
android:id="@+id/message"
android:layout_width="@dimen/conversation_settings_button_strip_button_size"
android:layout_height="@dimen/conversation_settings_button_strip_button_size"
android:layout_marginStart="@dimen/conversation_settings_button_strip_spacing_half"
android:layout_marginEnd="@dimen/conversation_settings_button_strip_spacing_half"
android:background="@drawable/selectable_icon_button"
android:contentDescription="@string/ConversationSettingsFragment__message"
android:padding="@dimen/conversation_settings_button_strip_button_padding"
@ -46,7 +49,8 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_marginEnd="@dimen/conversation_settings_button_strip_spacing"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:orientation="vertical"
android:gravity="center_horizontal">
@ -54,6 +58,8 @@
android:id="@+id/start_video"
android:layout_width="@dimen/conversation_settings_button_strip_button_size"
android:layout_height="@dimen/conversation_settings_button_strip_button_size"
android:layout_marginStart="@dimen/conversation_settings_button_strip_spacing_half"
android:layout_marginEnd="@dimen/conversation_settings_button_strip_spacing_half"
android:background="@drawable/selectable_icon_button"
android:contentDescription="@string/ConversationSettingsFragment__start_video_call"
android:padding="@dimen/conversation_settings_button_strip_button_padding"
@ -76,7 +82,8 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_marginEnd="@dimen/conversation_settings_button_strip_spacing"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:orientation="vertical"
android:gravity="center_horizontal">
@ -84,6 +91,8 @@
android:id="@+id/start_audio"
android:layout_width="@dimen/conversation_settings_button_strip_button_size"
android:layout_height="@dimen/conversation_settings_button_strip_button_size"
android:layout_marginStart="@dimen/conversation_settings_button_strip_spacing_half"
android:layout_marginEnd="@dimen/conversation_settings_button_strip_spacing_half"
android:background="@drawable/selectable_icon_button"
android:contentDescription="@string/ConversationSettingsFragment__start_audio_call"
android:padding="@dimen/conversation_settings_button_strip_button_padding"
@ -106,7 +115,8 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_marginEnd="@dimen/conversation_settings_button_strip_spacing"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:orientation="vertical"
android:gravity="center_horizontal">
@ -114,6 +124,8 @@
android:id="@+id/mute"
android:layout_width="@dimen/conversation_settings_button_strip_button_size"
android:layout_height="@dimen/conversation_settings_button_strip_button_size"
android:layout_marginStart="@dimen/conversation_settings_button_strip_spacing_half"
android:layout_marginEnd="@dimen/conversation_settings_button_strip_spacing_half"
android:background="@drawable/selectable_icon_button"
android:contentDescription="@string/ConversationSettingsFragment__mute"
android:padding="@dimen/conversation_settings_button_strip_button_padding"
@ -139,7 +151,8 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_marginEnd="@dimen/conversation_settings_button_strip_spacing"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:orientation="vertical"
android:gravity="center_horizontal">
@ -147,6 +160,8 @@
android:id="@+id/search"
android:layout_width="@dimen/conversation_settings_button_strip_button_size"
android:layout_height="@dimen/conversation_settings_button_strip_button_size"
android:layout_marginStart="@dimen/conversation_settings_button_strip_spacing_half"
android:layout_marginEnd="@dimen/conversation_settings_button_strip_spacing_half"
android:background="@drawable/selectable_icon_button"
android:contentDescription="@string/ConversationSettingsFragment__search"
android:padding="@dimen/conversation_settings_button_strip_button_padding"
@ -155,7 +170,7 @@
<TextView
android:id="@+id/search_label"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/ConversationSettingsFragment__search"

1
app/src/main/res/values-sw360dp/dimens.xml
View file

@ -25,6 +25,7 @@
<dimen name="chat_colors_preview_bubble_max_width">260dp</dimen>
<dimen name="conversation_settings_button_strip_spacing">32dp</dimen>
<dimen name="conversation_settings_button_strip_spacing_half">16dp</dimen>
<dimen name="conversation_settings_button_strip_button_size">56dp</dimen>
<dimen name="conversation_settings_button_strip_button_padding">16dp</dimen>

2
app/src/main/res/values/dimens.xml
View file

@ -196,7 +196,9 @@
<dimen name="chat_colors_preview_bubble_max_width">240dp</dimen>
<dimen name="conversation_settings_button_strip_container_spacing">4dp</dimen>
<dimen name="conversation_settings_button_strip_spacing">16dp</dimen>
<dimen name="conversation_settings_button_strip_spacing_half">8dp</dimen>
<dimen name="conversation_settings_button_strip_button_size">48dp</dimen>
<dimen name="conversation_settings_button_strip_button_padding">12dp</dimen>