Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve Glide usage for Image Loading on Android #5198

Merged
merged 35 commits into from
Mar 24, 2022
Merged

Improve Glide usage for Image Loading on Android #5198

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
00f0cb8
Make Glide load into imageview directly
Redth Mar 10, 2022
c4e4654
Refactor glide usage and implement listener
Redth Mar 14, 2022
4997314
Allow image views to autosize
Redth Mar 14, 2022
fa5d222
New test image
Redth Mar 14, 2022
25e6e4d
Fix image size of Glide loaded font images
Redth Mar 14, 2022
e4d04f3
Add glide ImageLoader to android aar project
Redth Mar 16, 2022
d45b862
Use the helpers from the android aar
Redth Mar 16, 2022
450b0d4
Use autoscaling property from Font
Redth Mar 16, 2022
fea8794
Merge image callbacks into one
Redth Mar 16, 2022
a0aa7d8
Add some benchmark tests
Redth Mar 16, 2022
d51a391
More work on benchmark
Redth Mar 16, 2022
ed8a475
Remove unused helper methods
Redth Mar 16, 2022
793fa6d
Simplify callback
Redth Mar 16, 2022
a25bb65
Use custom glide targets instead of listeners
Redth Mar 16, 2022
87a7073
Benchmark uses non-resource/asset file
Redth Mar 16, 2022
81a45d0
Check if streams are empty
Redth Mar 16, 2022
98eaeee
Clean up tests
Redth Mar 16, 2022
c206387
Add glide model loader / factor for InputStream
Redth Mar 17, 2022
6e71547
Refactor android platform code project
Redth Mar 17, 2022
87a0bf6
Fix a couple tests
Redth Mar 17, 2022
e5d4e3b
Update interop project
Redth Mar 21, 2022
76b13de
Rework glide interop / image service
Redth Mar 21, 2022
fc99372
Fix more tests
Redth Mar 21, 2022
7c163ac
Clear pending operations for image view targets
Redth Mar 23, 2022
c1d1fd7
Only load if we are supposed to apply the source
Redth Mar 23, 2022
8d55dec
Merge branch 'main' into glidier
Redth Mar 23, 2022
fb5707a
Fix rebase
Redth Mar 23, 2022
7c720bf
More rebase fixes
Redth Mar 23, 2022
6cc0ad1
Fix solution filters
Redth Mar 23, 2022
e787af4
Throw if request is cancelled in test
Redth Mar 23, 2022
77e048b
Do not always clear first
Redth Mar 23, 2022
35f2851
Run callback clear on ui thread
Redth Mar 23, 2022
1450bda
Invoke clear on main thread in load calls too
Redth Mar 23, 2022
f43bfc1
Fix refactor
Redth Mar 23, 2022
6baaa73
Fix api call
Redth Mar 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 20 additions & 11 deletions Microsoft.Maui.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,18 +206,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharedSource", "SharedSourc
src\BlazorWebView\src\SharedSource\WebView2WebViewManager.cs = src\BlazorWebView\src\SharedSource\WebView2WebViewManager.cs
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmarks.Droid", "src\Core\tests\Benchmarks.Droid\Benchmarks.Droid.csproj", "{5B56A734-D53C-4635-A53E-F889FCFCDD66}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{0a39a74b-6f7a-4d41-84f2-b0ccdce899df}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.projitems*{0a39a74b-6f7a-4d41-84f2-b0ccdce899df}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{772e2531-2270-429a-9afb-4aa0104aef27}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{a34ebe01-25bf-4e69-a2dc-2288dc625541}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.projitems*{a34ebe01-25bf-4e69-a2dc-2288dc625541}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{ae2513cb-4e5e-4e5c-8237-88954d4c9433}*SharedItemsImports = 13
src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.projitems*{e175485b-3c8c-47d7-8dd5-f7fed627eb25}*SharedItemsImports = 13
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{eadd8100-b3ae-4a31-92c4-267a64a1c6eb}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.projitems*{eadd8100-b3ae-4a31-92c4-267a64a1c6eb}*SharedItemsImports = 5
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
Expand Down Expand Up @@ -509,6 +500,12 @@ Global
{5FEA7500-0ACE-4C26-9A7B-2EB3958CBBC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5FEA7500-0ACE-4C26-9A7B-2EB3958CBBC6}.Release|Any CPU.Build.0 = Release|Any CPU
{5FEA7500-0ACE-4C26-9A7B-2EB3958CBBC6}.Release|Any CPU.Deploy.0 = Release|Any CPU
{5B56A734-D53C-4635-A53E-F889FCFCDD66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5B56A734-D53C-4635-A53E-F889FCFCDD66}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5B56A734-D53C-4635-A53E-F889FCFCDD66}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{5B56A734-D53C-4635-A53E-F889FCFCDD66}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5B56A734-D53C-4635-A53E-F889FCFCDD66}.Release|Any CPU.Build.0 = Release|Any CPU
{5B56A734-D53C-4635-A53E-F889FCFCDD66}.Release|Any CPU.Deploy.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -604,8 +601,20 @@ Global
{A9C514B9-1EE2-4A12-8E8A-CE16D87545C3} = {1614D1A4-5C3D-4D5B-8C89-426E37A564EF}
{5FEA7500-0ACE-4C26-9A7B-2EB3958CBBC6} = {A9C514B9-1EE2-4A12-8E8A-CE16D87545C3}
{4F2926C8-43AB-4328-A735-D9EAD699F81D} = {ED7F28E0-D0AF-417D-983D-3D874EEE8554}
{5B56A734-D53C-4635-A53E-F889FCFCDD66} = {C564DDD6-DE79-45CD-88EA-3F690481572A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0B8ABEAD-D2B5-4370-A187-62B5ABE4EE50}
EndGlobalSection
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{0a39a74b-6f7a-4d41-84f2-b0ccdce899df}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.projitems*{0a39a74b-6f7a-4d41-84f2-b0ccdce899df}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{772e2531-2270-429a-9afb-4aa0104aef27}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{a34ebe01-25bf-4e69-a2dc-2288dc625541}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.projitems*{a34ebe01-25bf-4e69-a2dc-2288dc625541}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{ae2513cb-4e5e-4e5c-8237-88954d4c9433}*SharedItemsImports = 13
src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.projitems*{e175485b-3c8c-47d7-8dd5-f7fed627eb25}*SharedItemsImports = 13
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{eadd8100-b3ae-4a31-92c4-267a64a1c6eb}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\UITests.Shared\Compatibility.UITests.projitems*{eadd8100-b3ae-4a31-92c4-267a64a1c6eb}*SharedItemsImports = 5
EndGlobalSection
EndGlobal
4 changes: 4 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@
<MicrosoftMauiGraphicsVersion>6.0.200-preview.14.1092</MicrosoftMauiGraphicsVersion>
<SystemNumericsVectorsVersion>4.5.0</SystemNumericsVectorsVersion>
<_MicrosoftWebWebView2Version>1.0.1020.30</_MicrosoftWebWebView2Version>

<!-- GLIDE - the android maven artifact in /src/Core/AndroidNative/maui/build.gradle -->
<!-- must be kept in sync with the binding library version to it here: -->
<_XamarinAndroidGlideVersion>4.12.0.2</_XamarinAndroidGlideVersion>

<_XamarinAndroidXSecurityVersion>1.1.0-alpha03</_XamarinAndroidXSecurityVersion>
<_XamarinGoogleCryptoTinkAndroidVersion>1.6.1.2</_XamarinGoogleCryptoTinkAndroidVersion>
<_SkiaSharpVersion>2.88.0-preview.232</_SkiaSharpVersion>
Expand Down
16 changes: 8 additions & 8 deletions src/Controls/samples/Controls.Sample/Pages/Controls/ImageButtonPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<ImageButton
HorizontalOptions="Center"
WidthRequest="200"
HeightRequest="100"

Clicked="OnImageButtonClicked"
Aspect="AspectFit"
Background="Green"
Source="settings.png"
Source="cog.png"
Padding="16, 9, 16, 9" />
<Label
Text="AspectFill"
Expand All @@ -31,7 +31,7 @@
Clicked="OnImageButtonClicked"
Aspect="AspectFill"
Background="Green"
Source="settings.png"
Source="cog.png"
Padding="16, 9, 16, 9" />
<Label
Text="Fill"
Expand All @@ -43,7 +43,7 @@
Clicked="OnImageButtonClicked"
Aspect="Fill"
Background="Green"
Source="settings.png"
Source="cog.png"
Padding="16, 9, 16, 9" />
<Label
x:Name="InfoLabel"
Expand All @@ -56,15 +56,15 @@
Style="{StaticResource Headline}"/>
<ImageButton
Aspect="AspectFit"
Source="settings.png"
Source="cog.png"
BorderColor="Red"
BackgroundColor="Green"/>
<Label
Text="BorderWidth"
Style="{StaticResource Headline}"/>
<ImageButton
Aspect="AspectFit"
Source="settings.png"
Source="cog.png"
BorderColor="Red"
BorderWidth="4"
BackgroundColor="Green"/>
Expand All @@ -73,15 +73,15 @@
Style="{StaticResource Headline}"/>
<ImageButton
Aspect="AspectFit"
Source="settings.png"
Source="cog.png"
CornerRadius="0"
BackgroundColor="Purple"/>
<Label
Text="CornerRadius = 10"
Style="{StaticResource Headline}"/>
<ImageButton
Aspect="AspectFit"
Source="settings.png"
Source="cog.png"
CornerRadius="10"
BackgroundColor="Purple"/>
</VerticalStackLayout>
Expand Down
18 changes: 9 additions & 9 deletions src/Controls/samples/Controls.Sample/Pages/Controls/ImagePage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,24 @@
Style="{StaticResource Headline}"/>
<Image
Source="https://aka.ms/campus.jpg"
HeightRequest="200"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can make requests here, but if we just leave the default, Glide will try and make the imageview bigger which seems to play well with layouts so far...

WidthRequest="200"/>
/>
<Label
Text="FileSource"
Style="{StaticResource Headline}"/>
<Image
Background="Purple"
Source="dotnet_bot.png"
HeightRequest="200"
WidthRequest="200"/>
/>
<Label
Text="Font Image Source"
Style="{StaticResource Headline}"/>
<Image

Background="Green">
<Image.Source>
<FontImageSource
FontAutoScalingEnabled="True"
FontAutoScalingEnabled="False"
Size="20"
FontFamily = "Ionicons"
Glyph = "&#xf30c;">
</FontImageSource>
Expand All @@ -39,12 +39,12 @@
<Label
Text="Font Image Source Scaling Disabled"
Style="{StaticResource Headline}"/>
<Image
Background="Green">
<Image BackgroundColor="Green" HorizontalOptions="Center">
<Image.Source>
<FontImageSource
FontAutoScalingEnabled="False"
FontFamily = "Ionicons"
FontAutoScalingEnabled="True"
FontFamily = "Ionicons"
Size="90"
Glyph = "&#xf30c;">
</FontImageSource>
</Image.Source>
Expand Down
3 changes: 3 additions & 0 deletions src/Controls/samples/Controls.Sample/Resources/Images/cog.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 9 additions & 4 deletions src/Controls/src/Core/Platform/Android/BottomNavigationViewUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,15 @@ static async Task SetMenuItemIcon(IMenuItem menuItem, ImageSource source, IMauiC
var services = context.Services;
var provider = services.GetRequiredService<IImageSourceServiceProvider>();
var imageSourceService = provider.GetRequiredImageSourceService(source);
var drawableResult = await imageSourceService.GetDrawableAsync(source, context.Context);
var drawable = drawableResult.Value;
menuItem.SetIcon(drawable);
drawable?.Dispose();

await imageSourceService.LoadDrawableAsync(
context.Context,
source,
d =>
{
menuItem.SetIcon(d);
d.Dispose();
});
}


Expand Down
6 changes: 6 additions & 0 deletions src/Core/AndroidNative/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,9 @@ However, since this builds an `.aar` (instead of a `.jar`) the
top-level task is:

.\gradlew createAar


## Glide
NOTE: The binding nuget package version for glide specified in `eng/Version.props`
must be kept in sync with the maven artifact specified in this project
in the `maui/build.gradle`!
6 changes: 5 additions & 1 deletion src/Core/AndroidNative/maui/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ android {
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro', 'lib-proguard-rules.txt'
}
}
compileOptions {
Expand All @@ -26,5 +26,9 @@ android {
}

dependencies {
implementation 'com.github.bumptech.glide:glide:4.12.0'
implementation 'androidx.appcompat:appcompat:1.3.1'

implementation 'com.github.bumptech.glide:annotations:4.12.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
}
4 changes: 4 additions & 0 deletions src/Core/AndroidNative/maui/lib-proguard-rules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-keep public class * extends com.bumptech.glide.module.AppGlideModule
-keep public class * extends com.bumptech.glide.module.LibraryGlideModule
-keep class com.bumptech.glide.GeneratedAppGlideModuleImpl
-keep class com.microsoft.maui.MauiGlideModule
Loading