Fix for Android 5 + a setting migration I didn't consider

mkorcha · Mar 18, 2015 · b8c2e7e · b8c2e7e
1 parent 5d9f4a9
commit b8c2e7e
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 3 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
 
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name" >
+            android:label="@string/app_name">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/app/src/main/java/com/mikekorcha/mediabuttonoverlay/services/OverlayService.java b/app/src/main/java/com/mikekorcha/mediabuttonoverlay/services/OverlayService.java
@@ -83,6 +83,13 @@ else if(player.equals("Default Music Player")) {
             }
         }
 
+        try {
+            sharedPrefs.getFloat("opacity", 0.5f);
+        }
+        catch(ClassCastException e) {
+            sharedPrefs.edit().putFloat("opacity", sharedPrefs.getInt("opacity", 0) / 100);
+        }
+
         windowManager = (WindowManager) this.getSystemService(Context.WINDOW_SERVICE);
 
         vibrator = (Vibrator) this.getSystemService(Context.VIBRATOR_SERVICE);

diff --git a/app/src/main/res/res/drawable-mdpi/ic_start.png b/app/src/main/res/res/drawable-mdpi/ic_start.png
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- colorPrimary is used for the default action bar background -->
+        <item name="colorPrimary">@color/primary</item>
+
+        <!-- colorPrimaryDark is used for the status bar -->
+        <item name="colorPrimaryDark">@color/primaryDark</item>
+
+        <!-- colorAccent is used as the default value for colorControlActivated
+             which is used to tint widgets -->
+        <item name="colorAccent">@color/accent</item>
+
+        <!-- You can also set colorControlNormal, colorControlActivated
+             colorControlHighlight & colorSwitchThumbNormal. -->
+    </style>
+
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <resources>
 
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
@@ -17,4 +16,4 @@
              colorControlHighlight & colorSwitchThumbNormal. -->
     </style>
 
-</resources>
+</resources>