Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
linphone-android
Commits
e03dcf3f
Commit
e03dcf3f
authored
6 months ago
by
Sylvain Berfini
Browse files
Options
Download
Patches
Plain Diff
Increased touch area for IMDN notifications + hide keyboard when showing IMDN/Emoji bottom sheet
parent
d434ab72
master
feature/show_unsecure_conversation_event_at_top
feature/use_theme_main_color_for_icon_and_splashscreen
fix/insistent_notification
fix/restore_previous_release_ringtone_player
fix/telecom_default_audio_endpoint
release/6.0
6.1.0-alpha
6.0.0
6.0.0-beta
1 merge request
!1507
Increased touch area for IMDN notifications + hide keyboard when showing IMDN/Emoji bottom sheet
Pipeline
#82718
passed with stages
in 6 minutes and 21 seconds
Changes
4
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
+3
-1
...rg/linphone/ui/main/chat/fragment/ConversationFragment.kt
app/src/main/res/layout/chat_bubble_incoming.xml
+3
-3
app/src/main/res/layout/chat_bubble_incoming.xml
app/src/main/res/layout/chat_bubble_outgoing.xml
+3
-3
app/src/main/res/layout/chat_bubble_outgoing.xml
app/src/main/res/layout/help_debug_fragment.xml
+1
-1
app/src/main/res/layout/help_debug_fragment.xml
with
10 additions
and
8 deletions
app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
+
3
−
1
View file @
e03dcf3f
...
...
@@ -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
}
...
...
This diff is collapsed.
Click to expand it.
app/src/main/res/layout/chat_bubble_incoming.xml
+
3
−
3
View file @
e03dcf3f
...
...
@@ -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_marg
inTop=
"
2
dp"
android:
padd
in
g
Top=
"
7
dp"
android:contentDescription=
"@string/content_description_chat_bubble_delivery_status"
android:src=
"@{model.statusIcon, default=@drawable/checks}"
android:visibility=
"@{model.isFromGroup ? View.VISIBLE : View.GONE}"
...
...
This diff is collapsed.
Click to expand it.
app/src/main/res/layout/chat_bubble_outgoing.xml
+
3
−
3
View file @
e03dcf3f
...
...
@@ -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_marg
inTop=
"
2
dp"
android:
padd
in
g
Top=
"
7
dp"
android:src=
"@{model.statusIcon, default=@drawable/checks}"
android:contentDescription=
"@string/content_description_chat_bubble_delivery_status"
app:tint=
"?attr/color_main1_500"
/>
...
...
This diff is collapsed.
Click to expand it.
app/src/main/res/layout/help_debug_fragment.xml
+
1
−
1
View file @
e03dcf3f
...
...
@@ -213,7 +213,7 @@
<androidx.appcompat.widget.AppCompatTextView
style=
"@style/settings_title_style"
android:id=
"@+id/c
hange_ringtone
"
android:id=
"@+id/c
lear_friends_db
"
android:onClick=
"@{() -> viewModel.clearNativeFriendsDatabase()}"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
This diff is collapsed.
Click to expand it.
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets