Skip to content

Commit

Permalink
remove prefix android: of colorPrimary、colorPrimaryDark and so on in …
Browse files Browse the repository at this point in the history
…compat theme
  • Loading branch information
cgspine committed Dec 26, 2017
1 parent 2c2bac3 commit a5a7976
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
8 changes: 0 additions & 8 deletions qmui/src/main/res/values-v21/qmui_themes_compat.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,7 @@
<resources>

<style name="AppConfigTheme.Compat" parent="AppBaseTheme.Compat" >
<item name="android:colorPrimary">?attr/qmui_config_color_blue</item>
<item name="android:colorPrimaryDark">?attr/qmui_config_color_blue</item>
<item name="android:colorAccent">?attr/qmui_config_color_blue</item>
<item name="android:textColorPrimary">?attr/qmui_config_color_blue</item>
<item name="android:textColorSecondary">?attr/qmui_config_color_blue</item> <!--返回箭头也是用这个颜色-->
<item name="android:windowBackground">@color/qmui_config_color_white</item>
<item name="android:navigationBarColor">?attr/qmui_config_color_black</item>
<item name="android:colorControlNormal">@color/qmui_config_color_white</item>
<item name="android:editTextColor">?attr/qmui_config_color_black</item>
<!-- 该行会影响顶部条收起时效果,为false时,状态栏颜色不会被改变 -->
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
</style>
Expand Down
12 changes: 11 additions & 1 deletion qmui/src/main/res/values/qmui_themes_compat.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,17 @@
<item name="android:textViewStyle">@style/TextView.Compat</item>
</style>

<style name="AppConfigTheme.Compat" parent="AppBaseTheme.Compat"/>

<style name="AppConfigTheme.Compat" parent="AppBaseTheme.Compat" >
<item name="colorPrimary">?attr/qmui_config_color_blue</item>
<item name="colorPrimaryDark">?attr/qmui_config_color_blue</item>
<item name="colorAccent">?attr/qmui_config_color_blue</item>
<item name="colorControlNormal">@color/qmui_config_color_white</item>
<item name="android:textColorPrimary">?attr/qmui_config_color_blue</item>
<item name="android:textColorSecondary">?attr/qmui_config_color_blue</item> <!--返回箭头也是用这个颜色-->
<item name="android:windowBackground">@color/qmui_config_color_white</item>
<item name="android:editTextColor">?attr/qmui_config_color_black</item>
</style>

<style name="QMUI.Compat" parent="AppConfigTheme.Compat">
<item name="qmui_content_padding_horizontal">@dimen/qmui_content_padding_horizontal
Expand Down

0 comments on commit a5a7976

Please sign in to comment.