Skip to content

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

Contact List layout changed for tablet mode.

parent b0140a88
Hide whitespace changes
Inline Side-by-side
Showing with 152 additions and 104 deletions
app/src/main/res/layout-w820dp/contact_list.xml
View file @ b41b562c
......@@ -46,7 +46,7 @@
android:name="com.xabber.android.ui.ContactListFragment"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_weight="2"
tools:layout="@layout/contact_list_fragment"
/>
......@@ -54,7 +54,7 @@
android:id="@+id/chat_container"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="2"
android:layout_weight="3"
>
......
app/src/main/res/layout-w820dp/contact_list_fragment.xml 0 → 100644
View file @ b41b562c
<?xml version="1.0" encoding="utf-8"?><!--
Copyright (c) 2013, Redsolution LTD. All rights reserved.
This file is part of Xabber project; you can redistribute it and/or
modify it under the terms of the GNU General Public License, Version 3.
Xabber is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License,
along with this program. If not, see http://www.gnu.org/licenses/.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/grey_400"
android:orientation="horizontal">
<include
layout="@layout/account_action_buttons"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|right" />
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ListView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@null"
android:dividerHeight="0dp"
android:drawSelectorOnTop="true"
tools:listitem="@layout/contact_list_item" />
<include layout="@layout/connecting_accounts_layout" />
</FrameLayout>
</LinearLayout>
app/src/main/res/layout/account_action_buttons.xml 0 → 100644
View file @ b41b562c
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:fab="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/account_action_buttons_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:showIn="@layout/contact_list_fragment">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<FrameLayout
android:id="@+id/fab_up_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<com.melnykov.fab.FloatingActionButton
android:id="@+id/fab_up"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="34dp"
android:clickable="false"
android:src="@drawable/ic_chat_white_24dp"
fab:fab_colorNormal="@color/red_500"
fab:fab_colorPressed="@color/red_700"
fab:fab_colorRipple="@color/color_primary_light"
fab:fab_type="mini" />
</FrameLayout>
<LinearLayout
android:id="@+id/account_action_buttons"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:orientation="vertical" />
</LinearLayout>
</ScrollView>
\ No newline at end of file
app/src/main/res/layout/connecting_accounts_layout.xml 0 → 100644
View file @ b41b562c
<?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:id="@+id/info"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
tools:showIn="@layout/contact_list_fragment">
<ImageView
android:id="@+id/connected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/ic_connect"
tools:ignore="ContentDescription" />
<ImageView
android:id="@+id/disconnected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/ic_disconnect"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/connected"
android:layout_centerHorizontal="true"
android:text="@string/application_state_starting"
android:textColor="?android:attr/textColorSecondary" />
<Button
android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/text"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dip"
android:text="@string/application_action_waiting" />
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/contact_list_fragment.xml
View file @ b41b562c
......@@ -13,8 +13,7 @@
You should have received a copy of the GNU General Public License,
along with this program. If not, see http://www.gnu.org/licenses/.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:fab="http://schemas.android.com/apk/res-auto"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
......@@ -29,107 +28,13 @@
android:drawSelectorOnTop="true"
tools:listitem="@layout/contact_list_item" />
<RelativeLayout
android:id="@+id/info"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical" >
<ImageView
android:id="@+id/connected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/ic_connect"
tools:ignore="ContentDescription" />
<ImageView
android:id="@+id/disconnected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/ic_disconnect"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/connected"
android:layout_centerHorizontal="true"
android:text="@string/application_state_starting"
android:textColor="?android:attr/textColorSecondary" />
<Button
android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/text"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dip"
android:text="@string/application_action_waiting" />
</RelativeLayout>
<ScrollView
android:id="@+id/account_action_buttons_container"
<include layout="@layout/connecting_accounts_layout" />
<include
layout="@layout/account_action_buttons"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginRight="18dp"
>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
>
<FrameLayout
android:id="@+id/fab_up_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
>
<com.melnykov.fab.FloatingActionButton
android:id="@+id/fab_up"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="34dp"
android:clickable="false"
android:src="@drawable/ic_chat_white_24dp"
fab:fab_colorNormal="@color/red_500"
fab:fab_colorPressed="@color/red_700"
fab:fab_colorRipple="@color/color_primary_light"
fab:fab_type="mini"
/>
</FrameLayout>
<LinearLayout
android:id="@+id/account_action_buttons"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:orientation="vertical"
>
</LinearLayout>
</LinearLayout>
</ScrollView>
android:layout_gravity="bottom|right"
android:layout_marginRight="18dp" />
</RelativeLayout>
</FrameLayout>
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