diff --git a/.idea/workspace.xml b/.idea/workspace.xml index fdaa740..376c96c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -10,26 +10,28 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + - + @@ -60,8 +62,8 @@ - - + + @@ -71,47 +73,37 @@ - + - - + + - - + + - - + + - - + + - - - - - - - - - - - - + + - + @@ -1421,7 +1413,7 @@ @@ -1751,8 +1744,10 @@ - + + + @@ -1796,10 +1791,6 @@ @@ -1811,8 +1802,8 @@ - @@ -1828,6 +1819,10 @@ @@ -1841,8 +1836,6 @@ - - @@ -2203,7 +2196,7 @@ - + @@ -2453,13 +2446,6 @@ - - - - - - - @@ -2474,13 +2460,6 @@ - - - - - - - @@ -2539,69 +2518,87 @@ - + + + + + + - + + - + - + + - - - + + + + + + - + - - + + - + - + - + - - + + - + - - + + - + + + + + + + + + - + - + - - + + diff --git a/app/build.gradle b/app/build.gradle index 7ef9902..e78235f 100644 --- 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 index c2586c0..7deeb46 100644 --- 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"> diff --git a/app/src/main/java/ovh/ice/icecons/MainActivity.java b/app/src/main/java/ovh/ice/icecons/MainActivity.java index db9d0c9..4871d78 100644 --- 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 index a030d24..7d7d7a3 100644 --- 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 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 index ca9990f..a523621 100644 Binary files a/app/src/main/res/drawable-nodpi/wall_10.jpg and b/app/src/main/res/drawable-nodpi/wall_10.jpg differ diff --git a/app/src/main/res/drawable-nodpi/wall_11.jpg b/app/src/main/res/drawable-nodpi/wall_11.jpg index 0467c84..9ae0df5 100644 Binary files a/app/src/main/res/drawable-nodpi/wall_11.jpg and b/app/src/main/res/drawable-nodpi/wall_11.jpg differ diff --git a/app/src/main/res/drawable-nodpi/wall_12.jpg b/app/src/main/res/drawable-nodpi/wall_12.jpg index a523621..e3e17b6 100644 Binary files a/app/src/main/res/drawable-nodpi/wall_12.jpg and b/app/src/main/res/drawable-nodpi/wall_12.jpg differ diff --git a/app/src/main/res/drawable-nodpi/wall_13.jpg b/app/src/main/res/drawable-nodpi/wall_13.jpg deleted file mode 100644 index 9ae0df5..0000000 Binary files a/app/src/main/res/drawable-nodpi/wall_13.jpg and /dev/null differ diff --git a/app/src/main/res/drawable-nodpi/wall_14.jpg b/app/src/main/res/drawable-nodpi/wall_14.jpg deleted file mode 100644 index 7c52241..0000000 Binary files a/app/src/main/res/drawable-nodpi/wall_14.jpg and /dev/null differ diff --git a/app/src/main/res/drawable-nodpi/wall_15.jpg b/app/src/main/res/drawable-nodpi/wall_15.jpg deleted file mode 100644 index e3e17b6..0000000 Binary files a/app/src/main/res/drawable-nodpi/wall_15.jpg and /dev/null differ diff --git a/app/src/main/res/drawable-nodpi/wall_16.jpg b/app/src/main/res/drawable-nodpi/wall_16.jpg deleted file mode 100644 index 1522ee3..0000000 Binary files a/app/src/main/res/drawable-nodpi/wall_16.jpg and /dev/null differ diff --git a/app/src/main/res/drawable-nodpi/wall_2.jpg b/app/src/main/res/drawable-nodpi/wall_2.jpg index e84b972..b0af7dd 100644 Binary files a/app/src/main/res/drawable-nodpi/wall_2.jpg and b/app/src/main/res/drawable-nodpi/wall_2.jpg differ diff --git a/app/src/main/res/drawable-nodpi/wall_3.jpg b/app/src/main/res/drawable-nodpi/wall_3.jpg index b0af7dd..7f3d198 100644 Binary files a/app/src/main/res/drawable-nodpi/wall_3.jpg and b/app/src/main/res/drawable-nodpi/wall_3.jpg differ diff --git a/app/src/main/res/drawable-nodpi/wall_4.jpg b/app/src/main/res/drawable-nodpi/wall_4.jpg index 7f3d198..c8347b3 100644 Binary files a/app/src/main/res/drawable-nodpi/wall_4.jpg and b/app/src/main/res/drawable-nodpi/wall_4.jpg differ diff --git a/app/src/main/res/drawable-nodpi/wall_5.jpg b/app/src/main/res/drawable-nodpi/wall_5.jpg index c8347b3..374e2c7 100644 Binary files a/app/src/main/res/drawable-nodpi/wall_5.jpg and b/app/src/main/res/drawable-nodpi/wall_5.jpg differ diff --git a/app/src/main/res/drawable-nodpi/wall_6.jpg b/app/src/main/res/drawable-nodpi/wall_6.jpg index 374e2c7..ebdf57d 100644 Binary files a/app/src/main/res/drawable-nodpi/wall_6.jpg and b/app/src/main/res/drawable-nodpi/wall_6.jpg differ diff --git a/app/src/main/res/drawable-nodpi/wall_7.jpg b/app/src/main/res/drawable-nodpi/wall_7.jpg index ebdf57d..7428895 100644 Binary files a/app/src/main/res/drawable-nodpi/wall_7.jpg and b/app/src/main/res/drawable-nodpi/wall_7.jpg differ diff --git a/app/src/main/res/drawable-nodpi/wall_8.jpg b/app/src/main/res/drawable-nodpi/wall_8.jpg index 75b8f34..ca9990f 100644 Binary files a/app/src/main/res/drawable-nodpi/wall_8.jpg and b/app/src/main/res/drawable-nodpi/wall_8.jpg differ diff --git a/app/src/main/res/drawable-nodpi/wall_9.jpg b/app/src/main/res/drawable-nodpi/wall_9.jpg index 7428895..0467c84 100644 Binary files a/app/src/main/res/drawable-nodpi/wall_9.jpg and b/app/src/main/res/drawable-nodpi/wall_9.jpg differ diff --git a/app/src/main/res/xml/appfilter.xml b/app/src/main/res/xml/appfilter.xml index c74937b..9b3cd0e 100755 --- a/app/src/main/res/xml/appfilter.xml +++ b/app/src/main/res/xml/appfilter.xml @@ -149,7 +149,7 @@ - + @@ -684,7 +684,7 @@ - + diff --git a/app/src/main/res/xml/theme_wallpapers.xml b/app/src/main/res/xml/theme_wallpapers.xml index 91d10ba..4f21c48 100644 --- a/app/src/main/res/xml/theme_wallpapers.xml +++ b/app/src/main/res/xml/theme_wallpapers.xml @@ -4,11 +4,17 @@ 1 - - - - - - + + + + + + + + + + + +