fix typo in appfilter, remove some wallpapers

1C3 · Jun 5, 2016 · f047ccb · f047ccb
1 parent e2b48cf
commit f047ccb
Show file tree

Hide file tree

Showing 22 changed files with 112 additions and 108 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "ovh.ice.icecons"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 11
-        versionName "2.7"
+        versionCode 12
+        versionName "2.8"
     }
     buildTypes {
         release {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -3,8 +3,8 @@
     package="ovh.ice.icecons"
     android:minSdkVersion="16"
     android:targetSdkVersion="23"
-    android:versionCode="11"
-    android:versionName="2.7">
+    android:versionCode="12"
+    android:versionName="2.8">
 
     <uses-permission android:name="android.permission.SET_WALLPAPER" />
     <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />

diff --git a/app/src/main/java/ovh/ice/icecons/MainActivity.java b/app/src/main/java/ovh/ice/icecons/MainActivity.java
@@ -1,11 +1,14 @@
 package ovh.ice.icecons;
 
+import android.annotation.TargetApi;
 import android.content.Intent;
 import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.transition.Fade;
+import android.transition.Transition;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/ovh/ice/icecons/WallpaperActivity.java b/app/src/main/java/ovh/ice/icecons/WallpaperActivity.java
@@ -20,9 +20,7 @@ public class WallpaperActivity extends AppCompatActivity {
             R.drawable.wall_5, R.drawable.wall_6,
             R.drawable.wall_7, R.drawable.wall_8,
             R.drawable.wall_9, R.drawable.wall_10,
-            R.drawable.wall_11, R.drawable.wall_12,
-            R.drawable.wall_13, R.drawable.wall_14,
-            R.drawable.wall_15, R.drawable.wall_16
+            R.drawable.wall_11, R.drawable.wall_12
     };
 
     private ArrayList<LinearLayout> layoutList = new ArrayList<>();
@@ -36,7 +34,7 @@ protected void onCreate( Bundle savedInstanceState ) {
         if( IceScreenUtils.isPortrait( getApplicationContext() ) )
             createLayout( 2 );
         else {
-            createLayout( 4 );
+            createLayout( 3 );
         }
     }
 

diff --git a/app/src/main/res/drawable-nodpi/wall_10.jpg b/app/src/main/res/drawable-nodpi/wall_10.jpg
diff --git a/app/src/main/res/drawable-nodpi/wall_11.jpg b/app/src/main/res/drawable-nodpi/wall_11.jpg
diff --git a/app/src/main/res/drawable-nodpi/wall_12.jpg b/app/src/main/res/drawable-nodpi/wall_12.jpg
diff --git a/app/src/main/res/drawable-nodpi/wall_13.jpg b/app/src/main/res/drawable-nodpi/wall_13.jpg
diff --git a/app/src/main/res/drawable-nodpi/wall_14.jpg b/app/src/main/res/drawable-nodpi/wall_14.jpg
diff --git a/app/src/main/res/drawable-nodpi/wall_15.jpg b/app/src/main/res/drawable-nodpi/wall_15.jpg
diff --git a/app/src/main/res/drawable-nodpi/wall_16.jpg b/app/src/main/res/drawable-nodpi/wall_16.jpg
diff --git a/app/src/main/res/drawable-nodpi/wall_2.jpg b/app/src/main/res/drawable-nodpi/wall_2.jpg
diff --git a/app/src/main/res/drawable-nodpi/wall_3.jpg b/app/src/main/res/drawable-nodpi/wall_3.jpg
diff --git a/app/src/main/res/drawable-nodpi/wall_4.jpg b/app/src/main/res/drawable-nodpi/wall_4.jpg
diff --git a/app/src/main/res/drawable-nodpi/wall_5.jpg b/app/src/main/res/drawable-nodpi/wall_5.jpg
diff --git a/app/src/main/res/drawable-nodpi/wall_6.jpg b/app/src/main/res/drawable-nodpi/wall_6.jpg
diff --git a/app/src/main/res/drawable-nodpi/wall_7.jpg b/app/src/main/res/drawable-nodpi/wall_7.jpg
diff --git a/app/src/main/res/drawable-nodpi/wall_8.jpg b/app/src/main/res/drawable-nodpi/wall_8.jpg
diff --git a/app/src/main/res/drawable-nodpi/wall_9.jpg b/app/src/main/res/drawable-nodpi/wall_9.jpg
diff --git a/app/src/main/res/xml/appfilter.xml b/app/src/main/res/xml/appfilter.xml
@@ -149,7 +149,7 @@
     <item component="ComponentInfo{org.sufficientlysecure.viewer/org.ebookdroid.ui.library.RecentActivity}" drawable="book" />
 
     <!-- Doodle -->
-    <item component="ComponentInfo{com.doodle.android/com.doodle.activites.SplashActivity}" drawable="doodle" />
+    <item component="ComponentInfo{com.doodle.android/com.doodle.activities.SplashActivity}" drawable="doodle" />
 
     <!-- Downloads -->
     <item component="ComponentInfo{com.android.providers.downloads.ui/com.android.providers.downloads.ui.DownloadList}" drawable="downloads" />
@@ -684,7 +684,7 @@
     <item component="ComponentInfo{com.xabber.android/com.xabber.android.ui.activity.ContactList}" drawable="xabber" />
 
     <!-- /system/ App Mover -->
-    <item component="ComponentInfo{de.j4velin.systemappmover/de.j4velin.systemappmover.MoverActivity}" drawable="gag"/>
+    <item component="ComponentInfo{de.j4velin.systemappmover/de.j4velin.systemappmover.MoverActivity}" drawable="systemappmover"/>
 
     <!-- 9gag -->
     <item component="ComponentInfo{com.ninegag.android.app/com.ninegag.android.app.ui.SplashScreenActivity}" drawable="gag"/>

diff --git a/app/src/main/res/xml/theme_wallpapers.xml b/app/src/main/res/xml/theme_wallpapers.xml
@@ -4,11 +4,17 @@
 
     <version>1</version>
 
-    <item drawable="bush" />
-    <item drawable="clovers" />
-    <item drawable="daisy" />
-    <item drawable="ivy" />
-    <item drawable="rock" />
-    <item drawable="wall" />
+    <item drawable="wall_1" />
+    <item drawable="wall_2" />
+    <item drawable="wall_3" />
+    <item drawable="wall_4" />
+    <item drawable="wall_5" />
+    <item drawable="wall_6" />
+    <item drawable="wall_7" />
+    <item drawable="wall_8" />
+    <item drawable="wall_9" />
+    <item drawable="wall_10" />
+    <item drawable="wall_11" />
+    <item drawable="wall_12" />
 
 </resources>