Commit e03dcf3f authored by Sylvain Berfini's avatar Sylvain Berfini :cow:
Browse files

Increased touch area for IMDN notifications + hide keyboard when showing IMDN/Emoji bottom sheet

1 merge request!1507Increased touch area for IMDN notifications + hide keyboard when showing IMDN/Emoji bottom sheet
Pipeline #82718 passed with stages
in 6 minutes and 21 seconds
Showing with 10 additions and 8 deletions
......@@ -1120,9 +1120,11 @@ open class ConversationFragment : SlidingPaneChildFragment() {
showDelivery: Boolean = false,
showReactions: Boolean = false
) {
val bottomSheetBehavior = BottomSheetBehavior.from(binding.messageBottomSheet.root)
binding.sendArea.messageToSend.hideKeyboard()
val bottomSheetBehavior = BottomSheetBehavior.from(binding.messageBottomSheet.root)
bottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
binding.messageBottomSheet.setHandleClickedListener {
bottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
}
......
......@@ -228,7 +228,6 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:gravity="center_vertical|start"
android:orientation="horizontal">
......@@ -239,6 +238,7 @@
android:onLongClick="@{onLongClickListener}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="5dp"
android:text="@{model.time, default=`13:40`}"
android:textSize="12sp" />
......@@ -248,9 +248,9 @@
android:onClick="@{showDeliveryInfoClickListener}"
android:onLongClick="@{onLongClickListener}"
android:layout_width="@dimen/small_icon_size"
android:layout_height="@dimen/small_icon_size"
android:layout_height="match_parent"
android:layout_marginStart="5dp"
android:layout_marginTop="2dp"
android:paddingTop="7dp"
android:contentDescription="@string/content_description_chat_bubble_delivery_status"
android:src="@{model.statusIcon, default=@drawable/checks}"
android:visibility="@{model.isFromGroup ? View.VISIBLE : View.GONE}"
......
......@@ -200,7 +200,6 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:gravity="center_vertical"
android:orientation="horizontal">
......@@ -234,6 +233,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:paddingTop="5dp"
android:text="@{model.time, default=`13:40`}"
android:textSize="12sp" />
......@@ -243,9 +243,9 @@
android:onClick="@{showDeliveryInfoClickListener}"
android:onLongClick="@{onLongClickListener}"
android:layout_width="@dimen/small_icon_size"
android:layout_height="@dimen/small_icon_size"
android:layout_height="match_parent"
android:layout_marginStart="5dp"
android:layout_marginTop="2dp"
android:paddingTop="7dp"
android:src="@{model.statusIcon, default=@drawable/checks}"
android:contentDescription="@string/content_description_chat_bubble_delivery_status"
app:tint="?attr/color_main1_500" />
......
......@@ -213,7 +213,7 @@
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
android:id="@+id/change_ringtone"
android:id="@+id/clear_friends_db"
android:onClick="@{() -> viewModel.clearNativeFriendsDatabase()}"
android:layout_width="0dp"
android:layout_height="wrap_content"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment