Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed crash on lollipop+

This commit is contained in:
Mariotaku Lee 2015-04-26 13:06:22 +08:00
parent e9af6b662e
commit ca05126422
7 changed files with 60 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
twidere/src/main/res/values-v21/styles.xml
View File

@ -30,4 +30,5 @@
<item name="android:elevation">@dimen/elevation_card</item>
<item name="android:outlineProvider">none</item>
</style>
</resources>

1
twidere/src/main/res/values-v21/styles_base.xml
View File

@ -19,5 +19,4 @@
-->
<resources>
</resources>

31
twidere/src/main/res/values-v21/themes_base_appcompat.xml Normal file
View File

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Twidere - Twitter client for Android
~
~ Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<style name="Theme.Compat.Base.Dialog" parent="Theme.AppCompat.Dialog">
<item name="android:textColorTertiary">@color/tertiary_text_mtrl_dark</item>
<item name="android:textColorTertiaryInverse">@color/tertiary_text_mtrl_light</item>
</style>
<style name="Theme.Compat.Base.Light.Dialog" parent="Theme.AppCompat.Light.Dialog">
<item name="android:textColorTertiary">@color/tertiary_text_mtrl_light</item>
<item name="android:textColorTertiaryInverse">@color/tertiary_text_mtrl_dark</item>
</style>
</resources>

10
twidere/src/main/res/values/styles.xml
View File

@ -63,4 +63,14 @@
<style name="Widget.ProfileType" parent="Widget.Base">
<item name="android:scaleType">centerInside</item>
</style>
<style name="Widget.Twidere.ActionMode.Light" parent="Widget.Base.ActionMode.Light">
<!--<item name="android:background"></item>-->
<!--<item name="android:backgroundSplit"></item>-->
</style>
<style name="Widget.Twidere.ActionMode.Dark" parent="Widget.Base.ActionMode.Dark">
<!--<item name="android:background"></item>-->
<!--<item name="android:backgroundSplit"></item>-->
</style>
</resources>

11
twidere/src/main/res/values/styles_base.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Twidere - Twitter client for Android
~
~ Copyright (C) 2012-2014 Mariotaku Lee <mariotaku.lee@gmail.com>
@ -20,4 +19,12 @@
<resources>
<style name="Widget.Base.ActionMode.Light" parent="android:Widget.DeviceDefault.Light.ActionMode">
<item name="android:height">?actionBarSize</item>
</style>
<style name="Widget.Base.ActionMode.Dark" parent="android:Widget.DeviceDefault.ActionMode">
<item name="android:height">?actionBarSize</item>
</style>
</resources>

13
twidere/src/main/res/values/themes.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="Theme"/>
<style name="Theme" />
<style name="Theme.Launcher" parent="android:Theme.NoDisplay">
<item name="android:windowAnimationStyle">@android:style/Animation.Activity</item>
@ -14,7 +14,7 @@
<item name="android:windowBackground">@android:color/black</item>
</style>
<style name="Theme.Blank.Dialog" parent="Theme.Compat.Base.Dialog"/>
<style name="Theme.Blank.Dialog" parent="Theme.Compat.Base.Dialog" />
<style name="Theme.Twidere.Dark" parent="Theme.Compat.Base">
@ -150,7 +150,8 @@
<item name="windowActionBar">false</item>
<item name="windowActionModeOverlay">false</item>
<item name="android:actionBarSize">?actionBarSize</item>
<item name="android:actionModeStyle">@style/Widget.Twidere.ActionMode.Dark</item>
<item name="android:windowNoTitle">true</item>
<item name="android:panelColorBackground">#3c3c3c</item>
@ -177,7 +178,8 @@
<item name="windowActionBar">false</item>
<item name="windowActionModeOverlay">false</item>
<item name="android:actionBarSize">?actionBarSize</item>
<item name="android:actionModeStyle">@style/Widget.Twidere.ActionMode.Light</item>
<item name="android:windowNoTitle">true</item>
<item name="android:panelColorBackground">#e5e5e5</item>
@ -264,8 +266,7 @@
<item name="android:windowNoDisplay">true</item>
</style>
<style name="Theme.Test" parent="Theme.Compat.Base">
</style>
<style name="Theme.Test" parent="Theme.Compat.Base"></style>
<style name="Theme.Nyan" parent="Theme.Compat.Base.NoActionBar">
<item name="android:windowBackground">@color/nyan_background</item>

2
twidere/src/main/res/values/themes_base_appcompat.xml
View File

@ -38,6 +38,7 @@
<style name="Theme.Compat.Base.Dialog" parent="Theme.AppCompat.Dialog">
<item name="android:textColorTertiary">@color/tertiary_text_mtrl_dark</item>
<item name="android:textColorTertiaryInverse">@color/tertiary_text_mtrl_light</item>
<item name="android:actionBarSize">?actionBarSize</item>
</style>
<style name="Theme.Compat.Base.Light" parent="Theme.AppCompat.Light">
@ -58,5 +59,6 @@
<style name="Theme.Compat.Base.Light.Dialog" parent="Theme.AppCompat.Light.Dialog">
<item name="android:textColorTertiary">@color/tertiary_text_mtrl_light</item>
<item name="android:textColorTertiaryInverse">@color/tertiary_text_mtrl_dark</item>
<item name="android:actionBarSize">?actionBarSize</item>
</style>
</resources>