diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-03-20 21:33:54 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-03-20 21:33:54 +0100 |
commit | 76e10f17a62f867116c146d7be9da3ea8dfc311d (patch) | |
tree | 63ca6a8902078517e5dd8447a78decb65f3fa6f0 /src/main/res/values/themes.xml | |
parent | 7df82563ab8650e3694a2b64acc9864e443078f3 (diff) | |
parent | 17d279b9c3f7dfa716592cca9f5fb2c9f3dd3cf6 (diff) |
Merge branch 'app_compat'
Diffstat (limited to 'src/main/res/values/themes.xml')
-rw-r--r-- | src/main/res/values/themes.xml | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index a20b5c6c6..b70fe0bd7 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -1,19 +1,30 @@ <?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="ConversationsTheme" parent="Theme.AppCompat.Light.DarkActionBar"> + <item name="colorPrimary">@color/primary</item> + <item name="colorPrimaryDark">@color/primary_dark</item> + <item name="colorAccent">@color/accent</item> + + <item name="color_text_primary">@color/black87</item> + <item name="color_text_secondary">@color/black54</item> + + <item name="color_background_primary">@color/grey50</item> + <item name="color_background_secondary">@color/grey200</item> + + <item name="android:windowActionModeOverlay">true</item> + <item name="android:actionModeBackground">@color/accent</item> + <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_white_24dp</item> + <item name="TextSizeInfo">12sp</item> <item name="TextSizeBody">14sp</item> + <item name="TextSeparation">5sp</item> <item name="IconSize">16sp</item> <item name="TextSizeHeadline">18sp</item> - <item name="TextSeparation">5sp</item> - <item name="color_text_primary">@color/black87</item> - <item name="color_text_secondary">@color/black54</item> + <!--<item type="reference" name="infocard_border">@drawable/infocard_border</item>--> + <item name="divider">@color/black12</item> <item name="icon_add_group">@drawable/ic_group_add_white_24dp</item> <item name="icon_add_person">@drawable/ic_person_add_white_24dp</item> @@ -38,8 +49,10 @@ <item name="icon_import_export">@drawable/ic_import_export_white_24dp</item> <item name="icon_share">@drawable/ic_share_white_24dp</item> <item name="icon_scan_qr_code">@drawable/ic_barcode_scan_white_24dp</item> + <item type="reference" name="icon_enable_undecided_device">@drawable/ic_new_releases_black_24dp</item> <item name="dialog_horizontal_padding">16dp</item> <item name="dialog_vertical_padding">16dp</item> + <item type="float" name="icon_alpha">0.54</item> <item name="ic_attach_camera">@drawable/ic_attach_camera</item> <item name="ic_attach_document">@drawable/ic_attach_document</item> @@ -61,29 +74,15 @@ <item name="TextSizeHeadline">20sp</item> </style> - <style name="ConversationsActionBar" parent="@android:style/Widget.Holo.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> - </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> - - <style name="ConversationsActionBarTabs" parent="@android:style/Widget.Holo.ActionBar.TabView"> - <item name="android:background">@drawable/actionbar_tab_indicator</item> - </style> - - <style name="ConversationsDialog" parent="@android:style/Theme.Holo.Light.Dialog"> + <style name="ConversationsDialog" parent="Theme.AppCompat.Light.Dialog"> <item name="android:windowNoTitle">true</item> <item name="TextSizeInfo">12sp</item> <item name="TextSizeBody">14sp</item> <item name="TextSizeHeadline">18sp</item> </style> + <style name="ConversationsTheme.NoActionBar.FullScreen" parent="Theme.AppCompat.Light.NoActionBar"> + <item name="android:windowFullscreen">true</item> + </style> + </resources>
\ No newline at end of file |