aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/layout/fragment_conversations_overview.xml66
-rw-r--r--src/main/res/menu/start_conversation.xml4
-rw-r--r--src/main/res/values-v21/themes.xml2
-rw-r--r--src/main/res/values/dimens.xml1
-rw-r--r--src/main/res/values/themes.xml39
5 files changed, 89 insertions, 23 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
diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml
index a89d71ff..89ffbaa4 100644
--- a/src/main/res/menu/start_conversation.xml
+++ b/src/main/res/menu/start_conversation.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_search"
- android:actionLayout="@layout/actionview_search"
+ app:actionLayout="@layout/actionview_search"
android:icon="?attr/icon_search"
android:showAsAction="collapseActionView|always"
android:title="@string/search" />
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
index 57cb9dc3..7a60e789 100644
--- a/src/main/res/values-v21/themes.xml
+++ b/src/main/res/values-v21/themes.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <style name="ConversationsTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
+ <style name="ConversationsTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
<item name="android:colorPrimary">@color/primary</item>
<item name="android:colorPrimaryDark">@color/primary_dark</item>
<item name="android:colorAccent">@color/accent</item>
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index 99a292fd..dcb00025 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -10,4 +10,5 @@
<dimen name="ambilwarna_hueWidth">30dp</dimen>
<dimen name="ambilwarna_spacer">8dp</dimen>
<dimen name="action_bar_title_text_size">18dp</dimen> <!-- redefinition here, because no access to original from android -->
+ <dimen name="design_fab_image_size">56dp</dimen>
</resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 0deb3a6e..e1f8b5b8 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <style name="ConversationsTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
- <item name="android:actionBarStyle">@style/ConversationsActionBar</item>
- <item name="android:actionBarWidgetTheme">@style/ConversationsActionBarWidget</item>
- <item name="android:actionBarTabStyle">@style/ConversationsActionBarTabs</item>
+ <style name="ConversationsPlusTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
<item name="TextSizeInfo">12sp</item>
<item name="TextSizeBody">14sp</item>
<item name="TextSizeHeadline">20sp</item>
+ <item name="colorPrimary">@color/primary</item>
+ <item name="colorPrimaryDark">@color/primaryTextOnDark</item>
+ <item name="colorAccent">@color/secondaryBackground</item>
<item name="EmojiconSizeBody">19sp</item>
<item name="EmojiconSizeInput">24sp</item>
@@ -36,28 +36,39 @@
<item name="attr/icon_share">@drawable/ic_action_share</item>
</style>
- <style name="ConversationsTheme.LargerText" parent="ConversationsTheme">
+ <style name="ConversationsPlusTheme.LargerText" parent="ConversationsPlusTheme">
<item name="TextSizeInfo">14sp</item>
<item name="TextSizeBody">16sp</item>
<item name="TextSizeHeadline">22sp</item>
<item name="EmojiconSizeBody">22sp</item>
</style>
- <style name="ConversationsActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
+ <style name="ConversationsPlusTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+ <style name="ConversationsPlusTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
+ <style name="ConversationsPlusTheme.NoActionBar">
+ <item name="windowActionBar">false</item>
+ <item name="windowNoTitle">true</item>
+ </style>
+
+ <style name="ConversationsPlusTheme.ActionBar">
+ <item name="android:actionBarStyle">@style/ConversationsActionBar</item>
+ <item name="android:actionBarWidgetTheme">@style/ConversationsActionBarWidget</item>
+ <item name="android:actionBarTabStyle">@style/ConversationsActionBarTabs</item>
+ </style>
+
+ <style name="ConversationsActionBar" parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
<item name="android:background">@color/primary</item>
<item name="android:backgroundStacked">@color/primary_dark</item>
<item name="android:displayOptions">showHome|homeAsUp|showTitle</item>
<item name="android:icon">@android:color/transparent</item>
- <item name="android:windowActionBarOverlay">true</item>
</style>
-
- <style name="ConversationsActionBarWidget" parent="android:Theme.Holo.Light">
- <item name="android:popupMenuStyle">@android:style/Widget.Holo.Light.PopupMenu</item>
- <item name="android:dropDownListViewStyle">@android:style/Widget.Holo.Light.ListView.DropDown</item>
+ <style name="ConversationsActionBarWidget" parent="@style/Theme.AppCompat.Light">
+ <item name="android:popupMenuStyle">@style/Widget.AppCompat.Light.PopupMenu</item>
+ <item name="android:dropDownListViewStyle">@style/Widget.AppCompat.Light.ListView.DropDown</item>
</style>
-
- <style name="ConversationsActionBarTabs" parent="@android:style/Widget.Holo.ActionBar.TabView">
+ <style name="ConversationsActionBarTabs" parent="@style/Widget.AppCompat.ActionBar.TabView">
<item name="android:background">@drawable/actionbar_tab_indicator</item>
</style>
-
</resources> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 11:48:18 +0000