Skip to content

X
xabber-android
Commit 53daa1f3 authored by Grigory Fedorov's avatar Grigory Fedorov
Browse files
Options

Fix for #486 contact list "you" moved to the right for RTL locales.

parent 6608f5ae
Show whitespace changes
Inline Side-by-side
Showing with 117 additions and 58 deletions
app/src/main/res/layout-ldrtl/contact_list_item_second_line.xml 0 → 100644
View file @ 53daa1f3
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
tools:showIn="@layout/contact_list_item">
<TextView
android:id="@+id/second_line_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="marquee"
android:text="second line message long text"
android:layout_toLeftOf="@id/outgoing_message_indicator"
/>
<TextView
android:id="@+id/outgoing_message_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="marquee"
android:text="@string/sender_is_you"
android:visibility="visible"
android:textColor="@color/green_500"
android:layout_toLeftOf="@id/small_right_icon"
/>
<ImageView
android:id="@+id/small_right_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_show_offline_small"
android:alpha="0.2"
android:layout_toLeftOf="@id/small_right_text"
android:layout_alignBottom="@id/second_line_message"
android:layout_marginBottom="2dp" />
<TextView
android:id="@+id/small_right_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="marquee"
android:textColor="#32000000"
android:textSize="10sp"
android:layout_gravity="bottom"
android:text="right text"
android:paddingLeft="2dp"
android:paddingRight="6dp"
android:layout_alignParentRight="true"
android:layout_alignBaseline="@id/second_line_message" />
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/contact_list_item.xml
View file @ 53daa1f3
...@@ -68,64 +68,7 @@ ...@@ -68,64 +68,7 @@
android:textStyle="bold" android:textStyle="bold"
/> />
<RelativeLayout <include layout="@layout/contact_list_item_second_line" />
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
>
<TextView
android:id="@+id/outgoing_message_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="marquee"
android:text="@string/sender_is_you"
android:visibility="visible"
android:textColor="@color/green_500"
/>
<TextView
android:id="@+id/second_line_message"
android:layout_width="match_parent"
android:layout_weight="1"
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="marquee"
android:text="second line message long text"
android:layout_toRightOf="@+id/outgoing_message_indicator"
android:layout_toLeftOf="@+id/small_right_icon"
/>
<ImageView
android:id="@+id/small_right_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_show_offline_small"
android:alpha="0.2"
android:layout_toLeftOf="@+id/small_right_text"
android:layout_alignBottom="@+id/second_line_message"
android:layout_marginBottom="2dp"
/>
<TextView
android:id="@+id/small_right_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="marquee"
android:textColor="#32000000"
android:textSize="10sp"
android:layout_gravity="bottom"
android:text="right text"
android:paddingLeft="2dp"
android:paddingRight="6dp"
android:layout_alignParentRight="true"
android:layout_alignBaseline="@+id/second_line_message"
/>
</RelativeLayout>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/contact_list_item_second_line.xml 0 → 100644
View file @ 53daa1f3
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
tools:showIn="@layout/contact_list_item">
<TextView
android:id="@+id/outgoing_message_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="marquee"
android:text="@string/sender_is_you"
android:visibility="visible"
android:textColor="@color/green_500" />
<TextView
android:id="@+id/second_line_message"
android:layout_width="match_parent"
android:layout_weight="1"
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="marquee"
android:text="second line message long text"
android:layout_toRightOf="@+id/outgoing_message_indicator"
android:layout_toLeftOf="@+id/small_right_icon" />
<ImageView
android:id="@+id/small_right_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_show_offline_small"
android:alpha="0.2"
android:layout_toLeftOf="@+id/small_right_text"
android:layout_alignBottom="@+id/second_line_message"
android:layout_marginBottom="2dp" />
<TextView
android:id="@+id/small_right_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="marquee"
android:textColor="#32000000"
android:textSize="10sp"
android:layout_gravity="bottom"
android:text="right text"
android:paddingLeft="2dp"
android:paddingRight="6dp"
android:layout_alignParentRight="true"
android:layout_alignBaseline="@+id/second_line_message" />
</RelativeLayout>
\ No newline at end of file
Markdown is supported
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

Technounit-GROUP 2023