diff options
Diffstat (limited to 'src/main/res/layout')
| -rw-r--r-- | src/main/res/layout/activity_conversations.xml | 35 | ||||
| -rw-r--r-- | src/main/res/layout/fragment_conversations_overview.xml | 33 |
2 files changed, 48 insertions, 20 deletions
diff --git a/src/main/res/layout/activity_conversations.xml b/src/main/res/layout/activity_conversations.xml new file mode 100644 index 000000000..567b17ac9 --- /dev/null +++ b/src/main/res/layout/activity_conversations.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + ~ Copyright (c) 2018, Daniel Gultsch All rights reserved. + ~ + ~ Redistribution and use in source and binary forms, with or without modification, + ~ are permitted provided that the following conditions are met: + ~ + ~ 1. Redistributions of source code must retain the above copyright notice, this + ~ list of conditions and the following disclaimer. + ~ + ~ 2. Redistributions in binary form must reproduce the above copyright notice, + ~ this list of conditions and the following disclaimer in the documentation and/or + ~ other materials provided with the distribution. + ~ + ~ 3. Neither the name of the copyright holder nor the names of its contributors + ~ may be used to endorse or promote products derived from this software without + ~ specific prior written permission. + ~ + ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ~ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + ~ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + ~ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR + ~ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + ~ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + ~ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ~ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + ~ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + --> +<layout xmlns:android="http://schemas.android.com/apk/res/android"> + + <FrameLayout + android:id="@+id/main_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" /> +</layout>
\ No newline at end of file diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml index 493f962ec..336142428 100644 --- a/src/main/res/layout/fragment_conversations_overview.xml +++ b/src/main/res/layout/fragment_conversations_overview.xml @@ -1,14 +1,8 @@ -<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/content_view_spl" - android:layout_width="match_parent" - android:layout_height="match_parent"> +<layout xmlns:android="http://schemas.android.com/apk/res/android"> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_weight="1" - android:layout_height="match_parent" - android:background="@color/grey50" - android:orientation="vertical"> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> <ListView android:id="@+id/list" @@ -17,14 +11,13 @@ android:background="@color/grey50" android:divider="@color/black12" android:dividerHeight="1dp" /> - </LinearLayout> - <LinearLayout - android:id="@+id/selected_conversation" - android:layout_width="fill_parent" - android:layout_height="match_parent" - android:layout_weight="1" - android:orientation="vertical"> - </LinearLayout> - -</android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file + <android.support.design.widget.FloatingActionButton + android:id="@+id/fab" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="end|bottom" + android:layout_margin="16dp" + android:src="?attr/icon_new" /> + </FrameLayout> +</layout>
\ No newline at end of file |