From d758c96aeffc22faa23fa46f39a16d37e1604b6c Mon Sep 17 00:00:00 2001 From: meiron03 Date: Sat, 31 Aug 2024 15:26:43 +0800 Subject: [PATCH] Fix issues with blurview (#621) The jitpack build kept failing so I just forked the repo and changed it to use the right version of the blurview library --- PennMobile/build.gradle | 4 ++-- .../com/pennapps/labs/pennmobile/adapters/HomeAdapter.kt | 5 +++-- .../pennmobile/components/dialog/CustomBlurDialogue.java | 2 -- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/PennMobile/build.gradle b/PennMobile/build.gradle index 50fa65a8..b0d2cecc 100644 --- a/PennMobile/build.gradle +++ b/PennMobile/build.gradle @@ -75,8 +75,8 @@ dependencies { implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' implementation 'com.github.ahorn:android-rss:master-SNAPSHOT' implementation 'com.github.bumptech.glide:glide:4.11.0' - implementation('com.github.searchy2:CustomAlertViewDialogue:2.6.0'){ - exclude group: 'com.eightbitlab', module: 'blurview' + implementation('com.github.meiron03:CustomAlertViewDialogue:a1fc69d54d'){ + exclude group: 'com.github.Dimezis.BlurView', module: 'blurview' } implementation 'com.google.android.gms:play-services-location:21.0.1' implementation 'com.google.android.gms:play-services-maps:18.2.0' diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/HomeAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/HomeAdapter.kt index d13d24c5..d3bf766f 100644 --- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/HomeAdapter.kt +++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/HomeAdapter.kt @@ -54,6 +54,7 @@ import com.pennapps.labs.pennmobile.classes.Post import com.pennapps.labs.pennmobile.classes.PostCell import com.pennapps.labs.pennmobile.components.sneaker.Utils.convertToDp import com.pennapps.labs.pennmobile.utils.Utils +import eightbitlab.com.blurview.RenderScriptBlur import kotlinx.android.synthetic.main.home_base_card.view.dining_prefs_btn import kotlinx.android.synthetic.main.home_base_card.view.home_card_rv import kotlinx.android.synthetic.main.home_base_card.view.home_card_subtitle @@ -354,7 +355,7 @@ class HomeAdapter( /** Sets up blur view on news card */ holder.itemView.blurView - .setupWith(holder.itemView.news_card_container) + .setupWith(holder.itemView.news_card_container, RenderScriptBlur(mContext)) .setFrameClearDrawable(ColorDrawable(getColor(mContext, R.color.white))) .setBlurRadius(25f) @@ -536,7 +537,7 @@ class HomeAdapter( } /** Sets up blur view on post card */ holder.itemView.postBlurView - .setupWith(holder.itemView.post_card_container) + .setupWith(holder.itemView.post_card_container, RenderScriptBlur(mContext)) .setFrameClearDrawable(ColorDrawable(getColor(mContext, R.color.white))) .setBlurRadius(25f) /** Post clicking logic if there exists a URL **/ diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/components/dialog/CustomBlurDialogue.java b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/components/dialog/CustomBlurDialogue.java index ab89608a..46d2b401 100644 --- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/components/dialog/CustomBlurDialogue.java +++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/components/dialog/CustomBlurDialogue.java @@ -3,14 +3,12 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.drawable.Drawable; -import android.os.Build; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; import android.view.ViewOutlineProvider; import eightbitlab.com.blurview.BlurView; -import eightbitlab.com.blurview.RenderScriptBlur; import stream.customalert.CustomAlertDialogue; import stream.customalert.ui.RoundedCornersDrawable;