Commit c4b026d3 authored by Grigory Fedorov's avatar Grigory Fedorov

Bottom 1px separators for account groups and usual contact groups.

parent 17bc4108
...@@ -12,121 +12,136 @@ ...@@ -12,121 +12,136 @@
You should have received a copy of the GNU General Public License, You should have received a copy of the GNU General Public License,
along with this program. If not, see http://www.gnu.org/licenses/. along with this program. If not, see http://www.gnu.org/licenses/.
--> -->
<LinearLayout
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/contact_list_item_height" android:layout_height="@dimen/contact_list_item_height"
android:orientation="horizontal"
android:gravity="center_vertical"
android:background="@color/green_200" android:background="@color/green_200"
android:elevation="3dp" android:elevation="3dp"
> >
<ImageView <LinearLayout
android:id="@+id/account_color_indicator" android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:gravity="center_vertical"
>
android:layout_width="4dp" <ImageView
android:layout_height="@dimen/avatar_size_toolbar" android:id="@+id/account_color_indicator"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:layout_marginRight="2dp" android:layout_width="4dp"
android:layout_marginEnd="2dp" android:layout_height="@dimen/avatar_size_toolbar"
android:src="@color/red_500" android:layout_marginLeft="2dp"
android:visibility="invisible" android:layout_marginStart="2dp"
/> android:layout_marginRight="2dp"
android:layout_marginEnd="2dp"
android:src="@color/red_500"
android:visibility="invisible"
<ImageView />
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/avatar"
android:layout_width="@dimen/avatar_size_toolbar"
android:layout_height="@dimen/avatar_size_toolbar"
android:src="@drawable/ic_avatar_1"
/>
<LinearLayout <ImageView
android:layout_width="0dp" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent" android:id="@+id/avatar"
android:layout_weight="1" android:layout_width="@dimen/avatar_size_toolbar"
android:gravity="center_vertical" android:layout_height="@dimen/avatar_size_toolbar"
android:orientation="vertical" android:src="@drawable/ic_avatar_1"
android:paddingLeft="@dimen/active_chat_padding_left" />
>
<TextView
android:id="@+id/account_jid"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="marquee"
android:text="name@example.com"
android:textColor="?android:attr/textColorPrimary"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold"
/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:orientation="horizontal" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="vertical"
android:paddingLeft="@dimen/active_chat_padding_left"
> >
<TextView <TextView
android:id="@+id/account_status" android:id="@+id/account_jid"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:ellipsize="marquee" android:ellipsize="marquee"
android:text="Online" android:text="name@example.com"
/> android:textColor="?android:attr/textColorPrimary"
android:textAppearance="?android:attr/textAppearanceSmall"
<FrameLayout android:textStyle="bold"
android:layout_width="14dp" />
android:layout_height="14dp"
android:layout_gravity="center_vertical" <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
> >
<ImageView
android:id="@+id/offline_contacts_indicator" <TextView
android:layout_width="match_parent" android:id="@+id/account_status"
android:layout_height="match_parent" android:layout_width="0dp"
android:background="@drawable/ic_show_offline" android:layout_weight="1"
android:alpha="0.2" android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="marquee"
android:text="Online"
/> />
</FrameLayout>
<TextView <FrameLayout
android:id="@+id/contact_counter" android:layout_width="14dp"
android:layout_width="wrap_content" android:layout_height="14dp"
android:layout_height="wrap_content" android:layout_gravity="center_vertical"
android:singleLine="true" >
android:ellipsize="marquee" <ImageView
android:textColor="#32000000" android:id="@+id/offline_contacts_indicator"
android:textSize="12sp" android:layout_width="match_parent"
android:text="3/9" android:layout_height="match_parent"
android:paddingLeft="4dp" android:background="@drawable/ic_show_offline"
android:paddingRight="6dp" android:alpha="0.2"
/> />
</FrameLayout>
<TextView
android:id="@+id/contact_counter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="marquee"
android:textColor="#32000000"
android:textSize="12sp"
android:text="3/9"
android:paddingLeft="4dp"
android:paddingRight="6dp"
/>
</LinearLayout>
</LinearLayout> </LinearLayout>
<View
android:layout_width="1px"
android:layout_height="26dp"
android:background="@color/black"
android:alpha="0.1"
android:layout_gravity="center_vertical"
/>
<ImageView
android:id="@+id/account_status_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_status"
android:padding="16dp"
/>
</LinearLayout> </LinearLayout>
<View <View
android:layout_width="1px" android:layout_width="match_parent"
android:layout_height="26dp" android:layout_height="1px"
android:background="@color/black" android:background="@color/grey_500"
android:alpha="0.1" android:layout_alignParentBottom="true"
android:layout_gravity="center_vertical"
/>
<ImageView
android:id="@+id/account_status_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_status"
android:padding="16dp"
/> />
</LinearLayout> </RelativeLayout>
\ No newline at end of file \ No newline at end of file
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
</LinearLayout> </LinearLayout>
<View <View
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="1px" android:layout_height="1px"
android:background="@color/grey_400" android:background="@color/grey_400"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
......
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/expander_height" android:layout_height="@dimen/expander_height"
android:paddingRight="@dimen/active_chat_padding_right"
android:paddingEnd="@dimen/active_chat_padding_right"
android:elevation="2dp" android:elevation="2dp"
> >
...@@ -41,6 +39,9 @@ ...@@ -41,6 +39,9 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:alpha="0.2" android:alpha="0.2"
android:paddingRight="@dimen/active_chat_padding_right"
android:paddingEnd="@dimen/active_chat_padding_right"
/> />
<TextView <TextView
...@@ -57,4 +58,11 @@ ...@@ -57,4 +58,11 @@
android:layout_toStartOf="@id/group_offline_indicator" android:layout_toStartOf="@id/group_offline_indicator"
/> />
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/grey_400"
android:layout_alignParentBottom="true"
/>
</RelativeLayout> </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