5.0以下样式出错导致崩溃的问题；

aishang5wpj · May 26, 2016 · 6a58f31 · 6a58f31
1 parent ec560dd
commit 6a58f31
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 58 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -16,7 +16,8 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".main.MainActivity">
+            android:name=".main.MainActivity"
+            android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
@@ -33,12 +34,16 @@
             android:theme="@style/AppTheme.NoActionBar.Translucent">
 
         </activity>
-        <activity android:name=".main.picture.PictureDetailActivity">
+        <activity
+            android:name=".main.picture.PictureDetailActivity"
+            android:theme="@style/AppTheme.NoActionBar">
 
         </activity>
         <activity
             android:name=".main.movie.moviedetail.MovieDetailActivity"
-            android:theme="@style/AppTheme.NoActionBar.Translucent"></activity>
+            android:theme="@style/AppTheme.NoActionBar.Translucent">
+
+        </activity>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/aishang5wpj/juhenews/main/user/UserInfoActivity.java b/app/src/main/java/com/aishang5wpj/juhenews/main/user/UserInfoActivity.java
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
@@ -11,7 +11,8 @@
         android:layout_height="wrap_content"
         android:text="        本APP用来演示Material Design以及MVP设计模式在项目中的使用。\n
         app的实现过程中学习了Lauren同学发布在https://github.com/liuling07/SimpleNews项目中各种Metaril Design控件的使用，在此感谢原作者的付出。\n
-        除此之外，开发过程中本人加入了自己对Metaril Design、MVP的理解，同时带着处女座的情绪把app做成了现在这样还能看得过去的效果。\n
+        除此之外，app中的所有api均来自互联网，在此一并感谢相关人员的无私奉献，如有版权相关问题请及时告知，谢谢。\n
+        开发过程中本人加入了自己对Metaril Design、MVP的理解，同时带着处女座的情绪把app做成了现在这样还能看得过去的效果。\n
         欢迎大家交流。"
         android:textSize="16sp"/>
 

diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
@@ -1,15 +1,7 @@
 <resources>
 
-    <style name="AppTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="android:windowNoTitle">true</item>
-        <!-- 使用 API Level 22 編譯的話，要拿掉前綴字 -->
-        <item name="windowNoTitle">true</item>
-        <item name="android:windowContentTransitions">true</item>
-    </style>
-
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="AppTheme.Base">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>

diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
@@ -6,4 +6,5 @@
         <attr name="civ_border_overlay" format="boolean" />
         <attr name="civ_fill_color" format="color" />
     </declare-styleable>
+
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -15,4 +15,6 @@
     <color name="diver">#eeeeee</color>
     <color name="transparent">#00000000</color>
     <color name="red">#f00</color>
+    <color name="blue">#00f</color>
+    <color name="light_white">#DCDCDC</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -1,14 +1,7 @@
 <resources>
 
-    <style name="AppTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="android:windowNoTitle">true</item>
-        <!--Window color-->
-        <item name="android:windowBackground">@color/dim_foreground_material_dark</item>
-    </style>
-
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="AppTheme.Base">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
         <!--菜单选中时的文字颜色-->
         <item name="colorPrimary">@color/colorPrimary</item>