Merge pull request #10 from NuclleaR/master

Update to version 2.0.2

Author: wcoder

README.md

@@ -1,6 +1,6 @@
 # Xamarin.BlurView
 
-![version](https://img.shields.io/badge/original-v1.6.5-orange.svg?style=flat)
+![version](https://img.shields.io/badge/original-v2.0.2-orange.svg?style=flat)
 [![NuGet Badge](https://buildstats.info/nuget/Xamarin.BlurView)](https://www.nuget.org/packages/Xamarin.BlurView/)
 ![Build status](https://yauhenipakala.visualstudio.com/_apis/public/build/definitions/b0170656-dd62-445e-bbb7-d6a336f4a889/1/badge)
 

nuget/Xamarin.BlurView.nuspec

@@ -1,7 +1,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
   <metadata>
     <id>Xamarin.BlurView</id>
-    <version>1.6.5</version>
+    <version>2.0.2</version>
     <title>Dynamic blur for Xamarin Android</title>
     <authors>Dmitry Saviuk, Yauheni Pakala</authors>
     <owners>Yauheni Pakala</owners>

samples/SampleApp/ListFragment.cs

@@ -1,7 +1,7 @@
 using Android.Content;
 using Android.Views;
-using AndroidX.RecyclerView.Widget;
-
+using AndroidX.RecyclerView.Widget;
+
 namespace SampleApp
 {
     public class ListFragment : BaseFragment
@@ -19,19 +19,11 @@ public override void OnViewCreated(View view, Android.OS.Bundle savedInstanceSta
             Init();
         }
 
-        public override View OnCreateView(LayoutInflater inflater, ViewGroup container, Android.OS.Bundle savedInstanceState)
-        {
-            var view = base.OnCreateView(inflater, container, savedInstanceState);
-
-            recyclerView = view.FindViewById<RecyclerView>(Resource.Id.recyclerView);
-
-            return view;
-        }
-
-        void Init()
+        private void Init()
         {
-            recyclerView.SetAdapter(new ExampleListAdapter(Context));
-            recyclerView.SetLayoutManager(new LinearLayoutManager(Context));
+            recyclerView = View.FindViewById<RecyclerView>(Resource.Id.recyclerView);
+            recyclerView?.SetAdapter(new ExampleListAdapter(Context));
+            recyclerView?.SetLayoutManager(new LinearLayoutManager(Context));
         }
     }
 

samples/SampleApp/MainActivity.cs

@@ -1,20 +1,22 @@
 using System.Collections.Generic;
 using Android.App;
 using Android.Content.PM;
-using Android.Graphics.Drawables;
 using Android.OS;
 using Android.Views;
 using Android.Widget;
 using Java.Lang;
 using Com.EightbitLab.BlurViewBinding;
-using AndroidX.ViewPager.Widget;
-using AndroidX.AppCompat.App;
-using Google.Android.Material.Tabs;
-using AndroidX.Fragment.App;
-//using Com.EightbitLab.SupportRenderScriptBlurBinding;
-
-// Ported from:
-// https://github.com/Dimezis/BlurView/blob/b5f6f414ae16885acb709fe5a65d24df05c4c62a/app/src/main/java/com/eightbitlab/blurview_sample/MainActivity.java
+using AndroidX.ViewPager.Widget;
+using AndroidX.AppCompat.App;
+using Google.Android.Material.Tabs;
+using AndroidX.Fragment.App;
+using Math = Java.Lang.Math;
+using String = Java.Lang.String;
+
+//using Com.EightbitLab.SupportRenderScriptBlurBinding;
+
+// Ported from:
+// https://github.com/Dimezis/BlurView/blob/b5f6f414ae16885acb709fe5a65d24df05c4c62a/app/src/main/java/com/eightbitlab/blurview_sample/MainActivity.java
 namespace SampleApp
 {
     [Activity(
@@ -25,73 +27,88 @@ namespace SampleApp
         Theme = "@style/Theme.MyTheme")]
     public class MainActivity : AppCompatActivity
     {
-        ViewGroup root;
-        ViewPager viewPager;
-        SeekBar radiusSeekBar;
-        BlurView topBlurView;
-        BlurView bottomBlurView;
-        TabLayout tabLayout;
+        private ViewPager viewPager;
+        private TabLayout tabLayout;
+        private BlurView bottomBlurView;
+        private BlurView topBlurView;
+        private SeekBar radiusSeekBar;
+        private ViewGroup root;
 
         protected override void OnCreate(Bundle savedInstanceState)
         {
             base.OnCreate(savedInstanceState);
             SetContentView(Resource.Layout.activity_main);
+            InitView();
+            SetupBlurView();
+            SetupViewPager();
+        }
 
-            root = FindViewById<ViewGroup>(Resource.Id.root);
+        private void InitView()
+        {
             viewPager = FindViewById<ViewPager>(Resource.Id.viewPager);
-            radiusSeekBar = FindViewById<SeekBar>(Resource.Id.radiusSeekBar);
-            topBlurView = FindViewById<BlurView>(Resource.Id.topBlurView);
-            bottomBlurView = FindViewById<BlurView>(Resource.Id.bottomBlurView);
             tabLayout = FindViewById<TabLayout>(Resource.Id.tabLayout);
+            bottomBlurView = FindViewById<BlurView>(Resource.Id.bottomBlurView);
+            topBlurView = FindViewById<BlurView>(Resource.Id.topBlurView);
+            radiusSeekBar = FindViewById<SeekBar>(Resource.Id.radiusSeekBar);
+            root = FindViewById<ViewGroup>(Resource.Id.root);
+        }
+
+        private void SetupViewPager()
+        {
+            viewPager.OffscreenPageLimit = 2;
+            viewPager.Adapter = new ViewPagerAdapter(SupportFragmentManager);
+            tabLayout.SetupWithViewPager(viewPager);
+        }
 
-            SetupBlurView();
-            SetupViewPager();
-        }
-
         void SetupBlurView()
         {
-            float radius = 25f;
-            float minBlurRadius = 10f;
-            float step = 4f;
+            const float radius = 25f;
+            const float minBlurRadius = 4f;
+            const float step = 4f;
 
             //set background, if your root layout doesn't have one
-            Drawable windowBackground = Window.DecorView.Background;
-
-            var topViewSettings = topBlurView.SetupWith(root)
+            var windowBackground = Window?.DecorView.Background;
+            var algorithm = GetBlurAlgorithm();
+
+            var topViewSettings = topBlurView.SetupWith(root, algorithm)
                 .SetFrameClearDrawable(windowBackground)
-                .SetBlurAlgorithm(new RenderScriptBlur(this)) // SupportRenderScriptBlur
-                .SetBlurRadius(radius)
-                .SetHasFixedTransformationMatrix(true);
+                .SetBlurRadius(radius);
 
-            var bottomViewSettings = bottomBlurView.SetupWith(root)
+            var bottomViewSettings = bottomBlurView.SetupWith(root, algorithm)
                 .SetFrameClearDrawable(windowBackground)
-                .SetBlurAlgorithm(new RenderScriptBlur(this)) // SupportRenderScriptBlur
-                .SetBlurRadius(radius)
-                .SetHasFixedTransformationMatrix(true);
+                .SetBlurRadius(radius);
 
-            int initialProgress = (int)(radius * step);
+            var initialProgress = (int) (radius * step);
             radiusSeekBar.Progress = initialProgress;
 
             radiusSeekBar.ProgressChanged += (sender, args) =>
             {
-                float blurRadius = args.Progress / step;
+                var blurRadius = args.Progress / step;
                 blurRadius = Math.Max(blurRadius, minBlurRadius);
                 topViewSettings.SetBlurRadius(blurRadius);
                 bottomViewSettings.SetBlurRadius(blurRadius);
             };
         }
 
-        void SetupViewPager()
+        private IBlurAlgorithm GetBlurAlgorithm()
         {
-            viewPager.OffscreenPageLimit = 2;
-            viewPager.Adapter = new ViewPagerAdapter(SupportFragmentManager);
-            tabLayout.SetupWithViewPager(viewPager);
+            IBlurAlgorithm algorithm;
+            if (Build.VERSION.SdkInt > BuildVersionCodes.R)
+            {
+                algorithm = new RenderEffectBlur();
+            }
+            else
+            {
+                algorithm = new RenderScriptBlur(this);
+            }
+
+            return algorithm;
         }
     }
 
     class ViewPagerAdapter : FragmentPagerAdapter
     {
-        List<BaseFragment> pages;
+        private readonly List<BaseFragment> pages;
 
         public ViewPagerAdapter(AndroidX.Fragment.App.FragmentManager fragmentManager)
             : base(fragmentManager, BehaviorResumeOnlyCurrentFragment)
@@ -113,8 +130,7 @@ public override AndroidX.Fragment.App.Fragment GetItem(int position)
 
         public override ICharSequence GetPageTitleFormatted(int position)
         {
-            return new Java.Lang.String(pages[position].Title);
+            return new String(pages[position].Title);
         }
     }
 }
-

samples/SampleApp/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.company.BlurView.SampleApp" android:versionCode="1" android:versionName="1.0" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="29" />
+	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
 	<application android:label="@string/app_name" android:icon="@drawable/Icon" android:theme="@style/Theme.MyTheme"></application>
 </manifest>

samples/SampleApp/Resources/Resource.Designer.cs

@@ -18,7 +18,7 @@
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <DevInstrumentationEnabled>True</DevInstrumentationEnabled>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
@@ -97,10 +97,6 @@
       <Project>{f5dda6ed-ab87-4c6f-89a6-96aeeadeb8bb}</Project>
       <Name>Xamarin.BlurView</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\Xamarin.BlurView.SupportRenderScriptBlur\Xamarin.BlurView.SupportRenderScriptBlur.csproj">
-      <Project>{874CA305-2F23-4046-AA19-46955CCA7033}</Project>
-      <Name>Xamarin.BlurView.SupportRenderScriptBlur</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>