Skip to content
This repository was archived by the owner on May 4, 2023. It is now read-only.

Commit e4d7b93

Browse files
committed
Update BlurView library
1 parent a5a4860 commit e4d7b93

File tree

4 files changed

+32
-15
lines changed

4 files changed

+32
-15
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ dependencies {
156156
implementation "com.mikepenz:aboutlibraries:${latestAboutLibsRelease}"
157157
implementation "dev.rikka.rikkax.layoutinflater:layoutinflater:1.2.0"
158158
implementation "dev.rikka.rikkax.insets:insets:1.3.0"
159-
implementation 'com.github.Dimezis:BlurView:version-1.6.6'
159+
implementation 'com.github.Dimezis:BlurView:version-2.0.2'
160160
implementation 'com.github.KieronQuinn:MonetCompat:0.4.1'
161161
implementation 'com.github.Fox2Code:FoxCompat:0.1.5'
162162

app/src/main/java/com/fox2code/mmm/MainActivity.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import com.fox2code.mmm.module.ModuleViewListBuilder;
3535
import com.fox2code.mmm.repo.RepoManager;
3636
import com.fox2code.mmm.settings.SettingsActivity;
37+
import com.fox2code.mmm.utils.BlurUtils;
3738
import com.fox2code.mmm.utils.ExternalHelper;
3839
import com.fox2code.mmm.utils.Http;
3940
import com.fox2code.mmm.utils.IntentHelper;
@@ -42,6 +43,7 @@
4243
import com.topjohnwu.superuser.Shell;
4344

4445
import eightbitlab.com.blurview.BlurView;
46+
import eightbitlab.com.blurview.RenderEffectBlur;
4547
import eightbitlab.com.blurview.RenderScriptBlur;
4648

4749
public class MainActivity extends FoxActivity implements SwipeRefreshLayout.OnRefreshListener,
@@ -121,10 +123,7 @@ protected void onCreate(Bundle savedInstanceState) {
121123
this.moduleList.setItemViewCacheSize(4); // Default is 2
122124
this.swipeRefreshLayout.setOnRefreshListener(this);
123125
this.actionBarBlur.setBackground(this.actionBarBackground);
124-
this.actionBarBlur.setupWith(findViewById(R.id.blur_frame))
125-
.setFrameClearDrawable(this.getWindow().getDecorView().getBackground())
126-
.setBlurAlgorithm(new RenderScriptBlur(this)).setBlurRadius(4F)
127-
.setBlurAutoUpdate(true).setHasFixedTransformationMatrix(true);
126+
BlurUtils.setupBlur(this.actionBarBlur, this, R.id.blur_frame);
128127
this.updateBlurState();
129128
this.moduleList.addOnScrollListener(new RecyclerView.OnScrollListener() {
130129
@Override

app/src/main/java/com/fox2code/mmm/markdown/MarkdownActivity.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.fox2code.mmm.MainApplication;
2424
import com.fox2code.mmm.R;
2525
import com.fox2code.mmm.XHooks;
26+
import com.fox2code.mmm.utils.BlurUtils;
2627
import com.fox2code.mmm.utils.Http;
2728
import com.fox2code.mmm.utils.IntentHelper;
2829
import com.google.android.material.chip.Chip;
@@ -131,7 +132,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
131132
this.header = findViewById(R.id.markdownHeader);
132133
this.footer = findViewById(R.id.markdownFooter);
133134
this.actionBarBlur.setBackground(this.actionBarBackground);
134-
this.setupBlurView(this.actionBarBlur, markdownBackground);
135+
BlurUtils.setupBlur(this.actionBarBlur, this, markdownBackground);
136+
this.updateBlurState();
135137
UiThreadHandler.handler.post(() -> // Fix header/footer height
136138
this.updateScreenInsets(this.getResources().getConfiguration()));
137139

@@ -171,15 +173,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
171173
}, "Markdown load thread").start();
172174
}
173175

174-
private void setupBlurView(BlurView view, ViewGroup setupWith) {
175-
view.setupWith(setupWith).setFrameClearDrawable(
176-
this.getWindow().getDecorView().getBackground())
177-
.setBlurAlgorithm(new RenderScriptBlur(this))
178-
.setBlurRadius(4F).setBlurAutoUpdate(true)
179-
.setHasFixedTransformationMatrix(true);
180-
this.updateBlurState();
181-
}
182-
183176
private void updateBlurState() {
184177
boolean isLightMode = this.isLightTheme();
185178
int colorBackground;
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package com.fox2code.mmm.utils;
2+
3+
import android.app.Activity;
4+
import android.os.Build;
5+
import android.view.ViewGroup;
6+
7+
import androidx.annotation.IdRes;
8+
9+
import eightbitlab.com.blurview.BlurView;
10+
import eightbitlab.com.blurview.RenderEffectBlur;
11+
import eightbitlab.com.blurview.RenderScriptBlur;
12+
13+
public class BlurUtils {
14+
public static void setupBlur(BlurView blurView, Activity activity, @IdRes int viewId) {
15+
setupBlur(blurView, activity, activity.findViewById(viewId));
16+
}
17+
18+
@SuppressWarnings("deprecation")
19+
public static void setupBlur(BlurView blurView, Activity activity, ViewGroup rootView) {
20+
blurView.setupWith(rootView, Build.VERSION.SDK_INT < Build.VERSION_CODES.S ?
21+
new RenderScriptBlur(blurView.getContext()) : new RenderEffectBlur())
22+
.setFrameClearDrawable(activity.getWindow().getDecorView().getBackground())
23+
.setBlurRadius(4F).setBlurAutoUpdate(true);
24+
}
25+
}

0 commit comments

Comments
 (0)