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

rollback to appcompat v20

Browse Source 
v21 appears to just not be ready for production given the bugs.
// FREEBIE
This commit is contained in:
Jake McGinty
2014-11-24 19:09:33 +02:00
parent bf19307916
commit bf69a90b69
4 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/values/styles.xml
View File

@@ -16,16 +16,25 @@
<!-- ActionBar styles -->
<style name="TextSecure.DarkActionBar"
parent="@style/Widget.AppCompat.ActionBar">
<item name="android:icon">@drawable/actionbar_icon_holo_dark</item>
<item name="icon">@drawable/actionbar_icon_holo_dark</item>
<item name="background">@color/gray95</item>
<item name="elevation">2dp</item>
<item name="android:logo">@drawable/actionbar_icon_holo_dark</item>
<item name="logo">@drawable/actionbar_icon_holo_dark</item>
</style>
<style name="TextSecure.LightActionBar"
parent="@style/Widget.AppCompat.ActionBar">
<item name="android:icon">@drawable/actionbar_icon_holo_light</item>
<item name="icon">@drawable/actionbar_icon_holo_light</item>
<item name="android:background">@color/gray5</item>
<item name="background">@color/gray5</item>
<item name="elevation">2dp</item>
<item name="android:logo">@drawable/actionbar_icon_holo_light</item>
<item name="logo">@drawable/actionbar_icon_holo_light</item>
<item name="android:titleTextStyle">@style/TextSecure.TitleTextStyle</item>
<item name="titleTextStyle">@style/TextSecure.TitleTextStyle</item>
<item name="android:subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>
<item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>
</style>
<style name="TextSecure.ClearTitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
@@ -43,7 +52,8 @@
<style name="TextSecure.IntroActionBar" parent="Widget.AppCompat.Light.ActionBar.Solid">
<item name="background">@drawable/background_pattern_repeat</item>
<item name="elevation">0dp</item>
<item name="titleTextStyle">@style/TextSecure.ClearTitleTextStyle</item>
<item name="icon">@android:color/transparent</item>
</style>
<style name="transparent_progress">

18
res/values/themes.xml
View File

@@ -1,17 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="TextSecure.IntroTheme" parent="@style/Theme.AppCompat.Light">
<item name="colorPrimary">@android:color/transparent</item>
<!--<item name="colorPrimary">@android:color/transparent</item>-->
<item name="actionBarStyle">@style/TextSecure.IntroActionBar</item>
<item name="android:windowContentOverlay">@null</item>
</style>
<style name="TextSecure.LightTheme" parent="@style/Theme.AppCompat.Light">
<item name="logo">@drawable/actionbar_icon_holo_light</item>
<item name="android:logo">@drawable/actionbar_icon_holo_light</item>
<item name="android:actionBarStyle">@style/TextSecure.LightActionBar</item>
<item name="actionBarStyle">@style/TextSecure.LightActionBar</item>
<item name="colorPrimary">@color/gray5</item>
<item name="colorPrimaryDark">@color/gray95</item>
<item name="colorAccent">#ff259b24</item>
<item name="android:windowContentOverlay">@drawable/compat_actionbar_shadow_background</item>
<item name="conversation_list_item_background_read">@drawable/conversation_list_item_background_read_light</item>
<item name="conversation_list_item_background_unread">@drawable/conversation_list_item_background_unread_light</item>
<item name="conversation_list_item_background_selected">@drawable/list_selected_holo_light</item>
@@ -84,10 +83,11 @@
</style>
<style name="TextSecure.DarkTheme" parent="@style/Theme.AppCompat">
<item name="logo">@drawable/actionbar_icon_holo_dark</item>
<item name="android:logo">@drawable/actionbar_icon_holo_dark</item>
<item name="android:actionBarStyle">@style/TextSecure.DarkActionBar</item>
<item name="actionBarStyle">@style/TextSecure.DarkActionBar</item>
<item name="colorPrimary">@color/gray95</item>
<item name="colorPrimaryDark">@color/gray95</item>
<item name="colorAccent">#ff259b24</item>
<item name="conversation_list_item_background_read">@drawable/conversation_list_item_background_read_dark</item>
<item name="conversation_list_item_background_unread">@drawable/conversation_list_item_background_unread_dark</item>
<item name="conversation_list_item_background_selected">@drawable/list_selected_holo_dark</item>
@@ -160,7 +160,7 @@
</style>
<style name="TextSecure.Light.Dialog"
parent="Theme.AppCompat.Light.Dialog"
parent="Theme.AppCompat.Light.DialogWhenLarge"
tools:ignore="NewApi">
<item name="android:windowFrame">@null</item>
<item name="android:windowTitleStyle">@style/TextSecureDialogWindowTitle</item>