TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-26 11:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use theme-defined weights instead of ThemeType.

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2015-07-01 08:13:09 -07:00
parent ce2f66ad17
commit 9bf7562d49
11 changed files with 63 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/attrs.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<attr name="theme_type" format="string"/>
<attr name="conversation_list_item_background_selected" format="reference"/>
<attr name="conversation_list_item_background_read" format="reference"/>
<attr name="conversation_list_item_background_unread" format="reference"/>
@@ -23,6 +22,10 @@
<attr name="centered_app_title_color" format="reference|color" />
<attr name="ic_arrow_forward" format="reference" />
<attr name="conversation_color_material_weight" format="string"/>
<attr name="actionbar_color_material_weight" format="string"/>
<attr name="statusbar_color_material_weight" format="string"/>
<attr name="conversation_background" format="reference|color"/>
<attr name="conversation_editor_background" format="reference|color"/>
<attr name="conversation_editor_text_color" format="reference|color"/>

20
res/values/themes.xml
View File

@@ -3,7 +3,10 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="TextSecure.LightNoActionBar" parent="@style/Theme.AppCompat.Light.NoActionBar">
<item name="theme_type">light</item>
<item name="conversation_color_material_weight">500</item>
<item name="actionbar_color_material_weight">500</item>
<item name="statusbar_color_material_weight">700</item>
<item name="actionBarStyle">@style/TextSecure.LightActionBar</item>
<item name="actionBarTabBarStyle">@style/TextSecure.LightActionBar.TabBar</item>
<item name="colorPrimary">@color/textsecure_primary</item>
@@ -13,7 +16,10 @@
</style>
<style name="TextSecure.DarkNoActionBar" parent="@style/Theme.AppCompat.NoActionBar">
<item name="theme_type">dark</item>
<item name="conversation_color_material_weight">900</item>
<item name="actionbar_color_material_weight">900</item>
<item name="statusbar_color_material_weight">700</item>
<item name="actionBarStyle">@style/TextSecure.DarkActionBar</item>
<item name="actionBarTabBarStyle">@style/TextSecure.DarkActionBar.TabBar</item>
<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
@@ -60,7 +66,10 @@
</style>
<style name="TextSecure.LightTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
<item name="theme_type">light</item>
<item name="conversation_color_material_weight">500</item>
<item name="actionbar_color_material_weight">500</item>
<item name="statusbar_color_material_weight">700</item>
<item name="actionBarStyle">@style/TextSecure.LightActionBar</item>
<item name="actionBarTabBarStyle">@style/TextSecure.LightActionBar.TabBar</item>
<item name="colorPrimary">@color/textsecure_primary</item>
@@ -174,7 +183,10 @@
</style>
<style name="TextSecure.DarkTheme" parent="@style/Theme.AppCompat">
<item name="theme_type">dark</item>
<item name="conversation_color_material_weight">900</item>
<item name="actionbar_color_material_weight">900</item>
<item name="statusbar_color_material_weight">700</item>
<item name="actionBarStyle">@style/TextSecure.DarkActionBar</item>
<item name="actionBarTabBarStyle">@style/TextSecure.DarkActionBar.TabBar</item>
<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>