diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-06-07 15:22:51 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-06-07 15:22:51 +0200 |
commit | f7d2e1560377b36d3730922a2fadaee05a570b49 (patch) | |
tree | 1c99bd75d863d82a82495fabe434892ee76b9842 /src/main/res/layout | |
parent | c5c5b417ddd66b4611b0493c0e0a8349adbd34a4 (diff) |
Related to FS#140, Logo implementation moved to FloatingActionButton
- Appcompat v7 dependency added
- References adjusted to work correctly with appcompat v7
Diffstat (limited to 'src/main/res/layout')
-rw-r--r-- | src/main/res/layout/fragment_conversations_overview.xml | 66 |
1 files changed, 60 insertions, 6 deletions
diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml index 2223219a..662c50e9 100644 --- a/src/main/res/layout/fragment_conversations_overview.xml +++ b/src/main/res/layout/fragment_conversations_overview.xml @@ -1,8 +1,14 @@ -<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" > + + <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fitsSystemWindows="true"> + <android.support.v4.widget.SlidingPaneLayout + android:id="@+id/content_view_spl" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingTop="?attr/actionBarSize"> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="@dimen/conversations_overview_width" @@ -18,7 +24,6 @@ android:divider="@color/black12" android:dividerHeight="1dp" /> </LinearLayout> - <LinearLayout android:id="@+id/selected_conversation" android:layout_width="fill_parent" @@ -27,4 +32,53 @@ android:orientation="vertical" > </LinearLayout> -</android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file + </android.support.v4.widget.SlidingPaneLayout> + + <android.support.design.widget.AppBarLayout + android:id="@+id/app_bar" + android:layout_width="match_parent" + android:layout_height="180dp" + android:fitsSystemWindows="true" + app:expanded="false" + android:theme="@style/ConversationsPlusTheme.AppBarOverlay"> + + <android.support.design.widget.CollapsingToolbarLayout + android:id="@+id/toolbar_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fitsSystemWindows="true" + app:contentScrim="?attr/colorPrimary" + app:layout_scrollFlags="scroll|exitUntilCollapsed"> + + <android.support.v7.widget.Toolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + app:layout_collapseMode="pin" + android:layout_marginLeft="72dp" + app:popupTheme="@style/ConversationsPlusTheme.PopupOverlay"> + <TextView + android:id="@+id/cplusTitle" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:text="@string/app_name" + android:gravity="center_vertical" + android:textSize="16dp"/> + </android.support.v7.widget.Toolbar> + + </android.support.design.widget.CollapsingToolbarLayout> + </android.support.design.widget.AppBarLayout> + + <android.support.design.widget.FloatingActionButton + android:id="@+id/fab" + android:layout_width="56dp" + android:layout_height="56dp" + android:layout_marginLeft="16dp" + android:layout_marginTop="16dp" + app:layout_anchorGravity="top|start" + android:padding="0dp" + app:borderWidth="0dp" + app:fabSize="normal" + android:visibility="gone"/> + + </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file |