diff options
Diffstat (limited to 'src/main/res/values')
| -rw-r--r-- | src/main/res/values/dimens.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values/themes.xml | 39 |
2 files changed, 26 insertions, 14 deletions
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 |