xiongxiaohe 8 年 前
コミット
acae216bfa
共有2 個のファイルを変更した31 個の追加28 個の削除を含む
  1. 28 28
      app/src/main/res/values-v23/style_theme.xml
  2. 3 0
      app/src/main/res/values/styles.xml

+ 28 - 28
app/src/main/res/values-v23/style_theme.xml

@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!--<style name="AppTheme" parent="Theme.AppCompat.Light">-->
-        <!--<item name="android:windowContentOverlay">@null</item>-->
-        <!--<item name="android:windowLightStatusBar">true</item>-->
-        <!--<item name="colorPrimary">@color/colorPrimary</item>-->
-        <!--<item name="colorPrimaryDark">@color/colorPrimaryDark</item>-->
-        <!--<item name="colorAccent">@color/colorAccent</item>-->
-        <!--<item name="colorControlHighlight">@color/black</item>-->
-        <!--<item name="main_color">@color/theme_app_main</item>-->
-        <!--<item name="main_color_dark">@color/theme_app_dark</item>-->
-        <!--<item name="main_color_mid">@color/theme_app_mid</item>-->
-        <!--<item name="main_color_accent">@color/theme_app_highlight</item>-->
-        <!--<item name="main_color_light">@color/theme_app_highlight_more</item>-->
-        <!--<item name="star_unselect">@drawable/xina</item>-->
-        <!--<item name="star_select">@drawable/xinb</item>-->
-        <!--<item name="windowActionBar">false</item>-->
-        <!--<item name="windowNoTitle">true</item>-->
-        <!--&lt;!&ndash;下面的属性全是为了兼容安卓4.0!多了好多文件啊&ndash;&gt;-->
-        <!--<item name="line_short">@drawable/sp_line_vertical</item>-->
-        <!--<item name="star_style">@style/ratingbar_main</item>-->
-        <!--<item name="radio_btn">@drawable/sel_circle_dot</item>-->
-        <!--<item name="button_full_normal">@drawable/selector_button_full_main</item>-->
-        <!--<item name="full.button">@style/full.button_main</item>-->
-        <!--<item name="small.button">@style/small.button_main</item>-->
-        <!--<item name="sp_dot_rota">@drawable/sp_dot_rota_main</item>-->
-        <!--<item name="theme_bg_btn_corner">@drawable/theme_bg_btn_corner_main</item>-->
-        <!--<item name="sp_search_edt">@drawable/sp_search_edt_main</item>-->
-        <!--<item name="btn_color">@color/btn_color_main</item>-->
-    <!--</style>-->
+    <style name="AppTheme" parent="Theme.AppCompat.Light">
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorControlHighlight">@color/black</item>
+        <item name="main_color">@color/theme_app_main</item>
+        <item name="main_color_dark">@color/theme_app_dark</item>
+        <item name="main_color_mid">@color/theme_app_mid</item>
+        <item name="main_color_accent">@color/theme_app_highlight</item>
+        <item name="main_color_light">@color/theme_app_highlight_more</item>
+        <item name="star_unselect">@drawable/xina</item>
+        <item name="star_select">@drawable/xinb</item>
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <!--下面的属性全是为了兼容安卓4.0!多了好多文件啊-->
+        <item name="line_short">@drawable/sp_line_vertical</item>
+        <item name="star_style">@style/ratingbar_main</item>
+        <item name="radio_btn">@drawable/sel_circle_dot</item>
+        <item name="button_full_normal">@drawable/selector_button_full_main</item>
+        <item name="full.button">@style/full.button_main</item>
+        <item name="small.button">@style/small.button_main</item>
+        <item name="sp_dot_rota">@drawable/sp_dot_rota_main</item>
+        <item name="theme_bg_btn_corner">@drawable/theme_bg_btn_corner_main</item>
+        <item name="sp_search_edt">@drawable/sp_search_edt_main</item>
+        <item name="btn_color">@color/btn_color_main</item>
+    </style>
 </resources>

+ 3 - 0
app/src/main/res/values/styles.xml

@@ -52,6 +52,9 @@
         <item name="colorPrimary">@color/theme_app_mid</item>
         <item name="colorPrimaryDark">@color/theme_app_mid</item>
         <item name="android:windowBackground">@color/theme_app_mid</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowIsTranslucent"> false </item>
+        <item name="android:windowDisablePreview">true</item>
     </style>