From f296c13aa2819dab25038d78c8ce02e10c060743 Mon Sep 17 00:00:00 2001 From: Michell Bak Date: Mon, 1 Feb 2016 20:49:04 +0100 Subject: [PATCH] Remove "Blur background in landscape" feature --- .../main/java/com/miz/functions/PreferenceKeys.java | 1 - .../com/miz/mizuu/fragments/MovieDetailsFragment.java | 8 +------- .../miz/mizuu/fragments/TvShowDetailsFragment.java | 11 ++--------- app/src/main/res/values/strings.xml | 2 -- app/src/main/res/xml/user_interface_prefs.xml | 7 ------- 5 files changed, 3 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/com/miz/functions/PreferenceKeys.java b/app/src/main/java/com/miz/functions/PreferenceKeys.java index 90216431..e7afbe59 100644 --- a/app/src/main/java/com/miz/functions/PreferenceKeys.java +++ b/app/src/main/java/com/miz/functions/PreferenceKeys.java @@ -57,7 +57,6 @@ private PreferenceKeys() {} // No instantiation public static final String IGNORE_FILESIZE_CHECK = "prefsIgnoreFilesizeCheck"; public static final String SHOW_FILE_LOCATION = "prefsShowFileLocation"; public static final String LANGUAGE_PREFERENCE = "prefsLanguagePreference"; - public static final String BLUR_BACKDROPS = "prefsBlurBackdrops"; public static final String CHROMECAST_BETA_SUPPORT = "prefsChromecastBeta"; public static final String USE_FAST_BLUR = "prefsUseFastBlur"; diff --git a/app/src/main/java/com/miz/mizuu/fragments/MovieDetailsFragment.java b/app/src/main/java/com/miz/mizuu/fragments/MovieDetailsFragment.java index 858fc049..fe45748a 100644 --- a/app/src/main/java/com/miz/mizuu/fragments/MovieDetailsFragment.java +++ b/app/src/main/java/com/miz/mizuu/fragments/MovieDetailsFragment.java @@ -61,14 +61,12 @@ import com.miz.base.MizActivity; import com.miz.db.DbAdapterMovies; import com.miz.functions.Actor; -import com.miz.functions.BlurTransformation; import com.miz.functions.FileSource; import com.miz.functions.Filepath; import com.miz.functions.IntentKeys; import com.miz.functions.MizLib; import com.miz.functions.Movie; import com.miz.functions.PaletteLoader; -import com.miz.functions.PreferenceKeys; import com.miz.functions.SimpleAnimatorListener; import com.miz.mizuu.EditMovie; import com.miz.mizuu.IdentifyMovie; @@ -459,11 +457,7 @@ public void onError() {} }); if (!MizLib.isPortrait(mContext)) { - if (PreferenceManager.getDefaultSharedPreferences(mContext).getBoolean(PreferenceKeys.BLUR_BACKDROPS, false)) { - mPicasso.load(mMovie.getBackdrop()).skipMemoryCache().error(R.drawable.bg).placeholder(R.drawable.bg).transform(new BlurTransformation(mContext, mMovie.getBackdrop().getAbsolutePath(), 8)).into(mBackground); - } else { - mPicasso.load(mMovie.getBackdrop()).skipMemoryCache().error(R.drawable.bg).placeholder(R.drawable.bg).into(mBackground); - } + mPicasso.load(mMovie.getBackdrop()).skipMemoryCache().error(R.drawable.bg).placeholder(R.drawable.bg).into(mBackground); } else { mPicasso.load(mMovie.getBackdrop()).skipMemoryCache().placeholder(R.drawable.bg).into(mBackground, new Callback() { @Override diff --git a/app/src/main/java/com/miz/mizuu/fragments/TvShowDetailsFragment.java b/app/src/main/java/com/miz/mizuu/fragments/TvShowDetailsFragment.java index 67db363d..5908eb00 100644 --- a/app/src/main/java/com/miz/mizuu/fragments/TvShowDetailsFragment.java +++ b/app/src/main/java/com/miz/mizuu/fragments/TvShowDetailsFragment.java @@ -30,7 +30,6 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; -import android.preference.PreferenceManager; import android.support.v4.app.Fragment; import android.support.v4.content.LocalBroadcastManager; import android.support.v7.app.ActionBarActivity; @@ -58,7 +57,6 @@ import com.miz.db.DbAdapterTvShowEpisodes; import com.miz.db.DbAdapterTvShows; import com.miz.functions.Actor; -import com.miz.functions.BlurTransformation; import com.miz.functions.EpisodeCounter; import com.miz.functions.FileSource; import com.miz.functions.Filepath; @@ -66,7 +64,6 @@ import com.miz.functions.IntentKeys; import com.miz.functions.MizLib; import com.miz.functions.PaletteLoader; -import com.miz.functions.PreferenceKeys; import com.miz.functions.SimpleAnimatorListener; import com.miz.mizuu.EditTvShow; import com.miz.mizuu.IdentifyTvShow; @@ -399,7 +396,7 @@ public void onSuccess() { @Override public void onPaletteLoaded(int swatchColor) { mToolbarColor = swatchColor; - ViewUtils.updateToolbarBackground(getActivity(), mToolbar, 0, thisShow.getTitle(), mToolbarColor); + ViewUtils.updateToolbarBackground(getActivity(), mToolbar, 0, thisShow.getTitle(), mToolbarColor); } }); @@ -430,11 +427,7 @@ public void onError() { }); if (!MizLib.isPortrait(getActivity())) { - if (PreferenceManager.getDefaultSharedPreferences(mContext).getBoolean(PreferenceKeys.BLUR_BACKDROPS, false)) { - mPicasso.load(thisShow.getBackdrop()).skipMemoryCache().error(R.drawable.bg).placeholder(R.drawable.bg).transform(new BlurTransformation(mContext, thisShow.getBackdrop(), 8)).into(background); - } else { - mPicasso.load(thisShow.getBackdrop()).skipMemoryCache().error(R.drawable.bg).placeholder(R.drawable.bg).into(background); - } + mPicasso.load(thisShow.getBackdrop()).skipMemoryCache().error(R.drawable.bg).placeholder(R.drawable.bg).into(background); } else { mPicasso.load(thisShow.getBackdrop()).skipMemoryCache().placeholder(R.drawable.bg).into(background, new Callback() { @Override diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 95829a1f..4347a333 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -407,8 +407,6 @@ See more Birthday Known credits - Background images for movies and TV shows will be blurry in landscape mode. - Blur background images Sign in with Trakt.tv Logged in as %s Early access testing diff --git a/app/src/main/res/xml/user_interface_prefs.xml b/app/src/main/res/xml/user_interface_prefs.xml index 9181321a..20be590d 100644 --- a/app/src/main/res/xml/user_interface_prefs.xml +++ b/app/src/main/res/xml/user_interface_prefs.xml @@ -17,13 +17,6 @@ android:summary="@string/overviewGridItemSizeDescription" android:title="@string/overviewGridItemSizeTitle" /> - -