Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
bbfeb193
Unverified
Commit
bbfeb193
authored
May 24, 2018
by
Filipe de Lima Brito
Committed by
GitHub
May 24, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1301 from divyanshub024/rtl-layout-fix
[BUG] RTL layout fixed for chatroom
parents
5513c619
aa532ab2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
41 additions
and
37 deletions
+41
-37
item_file_attachment.xml
app/src/main/res/layout/item_file_attachment.xml
+1
-0
item_message.xml
app/src/main/res/layout/item_message.xml
+14
-12
item_message_attachment.xml
app/src/main/res/layout/item_message_attachment.xml
+21
-25
message_url_preview.xml
app/src/main/res/layout/message_url_preview.xml
+5
-0
No files found.
app/src/main/res/layout/item_file_attachment.xml
View file @
bbfeb193
...
@@ -25,6 +25,7 @@
...
@@ -25,6 +25,7 @@
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
android:textDirection=
"locale"
tools:text=
"This is a very, very, very long filename, to test how the layout will work on very very very long filenames.pdf"
/>
tools:text=
"This is a very, very, very long filename, to test how the layout will work on very very very long filenames.pdf"
/>
<include
<include
...
...
app/src/main/res/layout/item_message.xml
View file @
bbfeb193
...
@@ -13,21 +13,13 @@
...
@@ -13,21 +13,13 @@
android:paddingStart=
"@dimen/screen_edge_left_and_right_padding"
android:paddingStart=
"@dimen/screen_edge_left_and_right_padding"
android:paddingTop=
"@dimen/message_item_top_and_bottom_padding"
>
android:paddingTop=
"@dimen/message_item_top_and_bottom_padding"
>
<include
android:id=
"@+id/layout_avatar"
layout=
"@layout/avatar"
android:layout_width=
"40dp"
android:layout_height=
"40dp"
android:layout_marginTop=
"5dp"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/new_messages_notif"
/>
<LinearLayout
<LinearLayout
android:id=
"@+id/new_messages_notif"
android:id=
"@+id/new_messages_notif"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:orientation=
"horizontal"
android:orientation=
"horizontal"
android:visibility=
"gone"
android:visibility=
"gone"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
tools:visibility=
"visible"
>
tools:visibility=
"visible"
>
...
@@ -55,13 +47,22 @@
...
@@ -55,13 +47,22 @@
android:background=
"@color/red"
/>
android:background=
"@color/red"
/>
</LinearLayout>
</LinearLayout>
<include
android:id=
"@+id/layout_avatar"
layout=
"@layout/avatar"
android:layout_width=
"40dp"
android:layout_height=
"40dp"
android:layout_marginTop=
"5dp"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/new_messages_notif"
/>
<LinearLayout
<LinearLayout
android:id=
"@+id/top_container"
android:id=
"@+id/top_container"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"16dp"
android:layout_marginStart=
"16dp"
android:orientation=
"horizontal"
android:orientation=
"horizontal"
app:layout_constraint
Left_toRight
Of=
"@+id/layout_avatar"
app:layout_constraint
Start_toEnd
Of=
"@+id/layout_avatar"
app:layout_constraintTop_toBottomOf=
"@+id/new_messages_notif"
>
app:layout_constraintTop_toBottomOf=
"@+id/new_messages_notif"
>
<TextView
<TextView
...
@@ -108,9 +109,10 @@
...
@@ -108,9 +109,10 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"2dp"
android:layout_marginBottom=
"2dp"
android:layout_marginTop=
"5dp"
android:layout_marginTop=
"5dp"
app:layout_constraint
Left_toLef
tOf=
"@+id/top_container"
app:layout_constraint
Start_toStar
tOf=
"@+id/top_container"
app:layout_constraint
Right_toRight
Of=
"parent"
app:layout_constraint
End_toEnd
Of=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/top_container"
app:layout_constraintTop_toBottomOf=
"@+id/top_container"
android:textDirection=
"locale"
tools:text=
"This is a multiline chat message from Bertie that will take more than just one line of text. I have sure that everything is amazing!"
/>
tools:text=
"This is a multiline chat message from Bertie that will take more than just one line of text. I have sure that everything is amazing!"
/>
<include
<include
...
...
app/src/main/res/layout/item_message_attachment.xml
View file @
bbfeb193
...
@@ -23,31 +23,27 @@
...
@@ -23,31 +23,27 @@
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
app:layout_constraintTop_toTopOf=
"parent"
/>
<LinearLayout
<TextView
android:id=
"@+id/top_container"
android:id=
"@+id/text_sender"
android:layout_width=
"0dp"
style=
"@style/Sender.Name.TextView"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"8dp"
android:textColor=
"@color/colorPrimary"
android:orientation=
"horizontal"
tools:text=
"Ronald Perkins"
app:layout_constraintLeft_toRightOf=
"@+id/quote_bar"
app:layout_constraintStart_toEndOf=
"@+id/quote_bar"
app:layout_constraintTop_toBottomOf=
"@id/new_messages_notif"
>
app:layout_constraintTop_toTopOf=
"parent"
android:layout_marginStart=
"8dp"
/>
<TextView
android:id=
"@+id/text_sender"
style=
"@style/Sender.Name.TextView"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textColor=
"@color/colorPrimary"
tools:text=
"Ronald Perkins"
/>
<TextView
<TextView
android:id=
"@+id/text_message_time"
android:id=
"@+id/text_message_time"
style=
"@style/Timestamp.TextView"
style=
"@style/Timestamp.TextView"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"10dp"
android:layout_marginStart=
"10dp"
tools:text=
"11:45 PM"
/>
tools:text=
"11:45 PM"
</LinearLayout>
app:layout_constraintStart_toEndOf=
"@+id/text_sender"
app:layout_constraintTop_toTopOf=
"@+id/text_sender"
app:layout_constraintBottom_toBottomOf=
"@+id/text_sender"
/>
<TextView
<TextView
android:id=
"@+id/text_content"
android:id=
"@+id/text_content"
...
@@ -57,8 +53,8 @@
...
@@ -57,8 +53,8 @@
android:ellipsize=
"end"
android:ellipsize=
"end"
android:singleLine=
"true"
android:singleLine=
"true"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"@+id/t
op_contain
er"
app:layout_constraintStart_toStartOf=
"@+id/t
ext_send
er"
app:layout_constraintTop_toBottomOf=
"@+id/t
op_contain
er"
app:layout_constraintTop_toBottomOf=
"@+id/t
ext_send
er"
tools:text=
"This is a multiline chat message from Bertie that will take more than just one line of text. I have sure that everything is amazing!"
/>
tools:text=
"This is a multiline chat message from Bertie that will take more than just one line of text. I have sure that everything is amazing!"
/>
<include
<include
...
...
app/src/main/res/layout/message_url_preview.xml
View file @
bbfeb193
...
@@ -13,6 +13,8 @@
...
@@ -13,6 +13,8 @@
android:id=
"@+id/image_preview"
android:id=
"@+id/image_preview"
android:layout_width=
"70dp"
android:layout_width=
"70dp"
android:layout_height=
"50dp"
android:layout_height=
"50dp"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:actualImageScaleType=
"centerCrop"
/>
app:actualImageScaleType=
"centerCrop"
/>
<TextView
<TextView
...
@@ -23,6 +25,7 @@
...
@@ -23,6 +25,7 @@
android:textColor=
"@color/colorSecondaryText"
android:textColor=
"@color/colorSecondaryText"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toEndOf=
"@+id/image_preview"
app:layout_constraintStart_toEndOf=
"@+id/image_preview"
android:textDirection=
"locale"
tools:text=
"www.uol.com.br"
/>
tools:text=
"www.uol.com.br"
/>
<TextView
<TextView
...
@@ -33,6 +36,7 @@
...
@@ -33,6 +36,7 @@
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"@+id/text_host"
app:layout_constraintStart_toStartOf=
"@+id/text_host"
app:layout_constraintTop_toBottomOf=
"@id/text_host"
app:layout_constraintTop_toBottomOf=
"@id/text_host"
android:textDirection=
"locale"
tools:text=
"Web page title"
/>
tools:text=
"Web page title"
/>
<TextView
<TextView
...
@@ -42,6 +46,7 @@
...
@@ -42,6 +46,7 @@
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"@+id/text_host"
app:layout_constraintStart_toStartOf=
"@+id/text_host"
app:layout_constraintTop_toBottomOf=
"@id/text_title"
app:layout_constraintTop_toBottomOf=
"@id/text_title"
android:textDirection=
"locale"
tools:text=
"description"
/>
tools:text=
"description"
/>
<include
<include
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment