Android renderers + maui sample ok!

roubachof · Oct 7, 2022 · 7e1eb5f · 7e1eb5f
1 parent 2a5d8e6
commit 7e1eb5f
Show file tree

Hide file tree

Showing 60 changed files with 397 additions and 221 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+Docs/** filter=lfs diff=lfs merge=lfs -text
diff --git a/Docs/DragAndDropEnabled.mp4 b/Docs/DragAndDropEnabled.mp4
diff --git a/Docs/MAUI/footer_android.png b/Docs/MAUI/footer_android.png
diff --git a/Docs/MAUI/grid_android.png b/Docs/MAUI/grid_android.png
diff --git a/Docs/MAUI/header_android.png b/Docs/MAUI/header_android.png
diff --git a/Docs/MAUI/horizontal_android.png b/Docs/MAUI/horizontal_android.png
diff --git a/Docs/MAUI/main_android.png b/Docs/MAUI/main_android.png
diff --git a/Docs/MAUI/vertical_android.png b/Docs/MAUI/vertical_android.png
diff --git a/Docs/demo.mp4 b/Docs/demo.mp4
diff --git a/Docs/drag_enabled_animation.gif b/Docs/drag_enabled_animation.gif
diff --git a/Docs/drag_grid.gif b/Docs/drag_grid.gif
diff --git a/Docs/drag_vertical.gif b/Docs/drag_vertical.gif
diff --git a/Docs/footer_android.png b/Docs/footer_android.png
diff --git a/Docs/github_banner.jpg b/Docs/github_banner.jpg
diff --git a/Docs/github_banner.pdn b/Docs/github_banner.pdn
diff --git a/Docs/github_banner.png b/Docs/github_banner.png
diff --git a/Docs/group_ios.png b/Docs/group_ios.png
diff --git a/Docs/header_android.png b/Docs/header_android.png
diff --git a/Docs/header_demo.mp4 b/Docs/header_demo.mp4
diff --git a/Docs/header_demo_320.mp4 b/Docs/header_demo_320.mp4
diff --git a/Docs/hlv_carousel_iphone.gif b/Docs/hlv_carousel_iphone.gif
diff --git a/Docs/hlv_drag_android.png b/Docs/hlv_drag_android.png
diff --git a/Docs/hlv_drag_iphone.png b/Docs/hlv_drag_iphone.png
diff --git a/Docs/hlv_grid_android.png b/Docs/hlv_grid_android.png
diff --git a/Docs/hlv_grid_iphone.png b/Docs/hlv_grid_iphone.png
diff --git a/Docs/hlv_horizontal_android.png b/Docs/hlv_horizontal_android.png
diff --git a/Docs/hlv_horizontal_android_col2.png b/Docs/hlv_horizontal_android_col2.png
diff --git a/Docs/hlv_horizontal_iphone.png b/Docs/hlv_horizontal_iphone.png
diff --git a/Docs/hlv_vertical_android.png b/Docs/hlv_vertical_android.png
diff --git a/Docs/hlv_vertical_iphone.png b/Docs/hlv_vertical_iphone.png
diff --git a/Docs/logo.png b/Docs/logo.png
diff --git a/Docs/logo_big.png b/Docs/logo_big.png
diff --git a/Docs/logo_maui.png b/Docs/logo_maui.png
diff --git a/Docs/logo_maui_big.png b/Docs/logo_maui_big.png
diff --git a/Docs/reveal.gif b/Docs/reveal.gif
diff --git a/Docs/scv_grid_android.png b/Docs/scv_grid_android.png
diff --git a/Docs/scv_horizontal_ios.jpg b/Docs/scv_horizontal_ios.jpg
diff --git a/Docs/video.mp4 b/Docs/video.mp4
diff --git a/Maui/MauiSample/MauiProgram.cs b/Maui/MauiSample/MauiProgram.cs
@@ -5,6 +5,7 @@
 
 using Sharpnado.CollectionView;
 using Sharpnado.Tabs;
+using SkiaSharp.Views.Maui.Controls.Hosting;
 
 namespace MauiSample;
 
@@ -15,13 +16,16 @@ public static MauiApp CreateMauiApp()
 		var builder = MauiApp.CreateBuilder();
 		builder
 			.UseMauiApp<App>()
+			.UseSkiaSharp()
 			.UseSharpnadoTabs(loggerEnable: false)
 			.UseSharpnadoCollectionView(loggerEnable: false)
 			.ConfigureFonts(fonts =>
 			{
 				fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
 				fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
-				fonts.AddFont("ka1.ttf", "KarmaticFont");
+                fonts.AddFont("Road_Rage.otf", "RoadRage");
+
+                fonts.AddFont("ka1.ttf", "KarmaticFont");
 			});
 
         return builder.Build();

diff --git a/Maui/MauiSample/MauiSample.csproj b/Maui/MauiSample/MauiSample.csproj
@@ -39,6 +39,8 @@
 
 		<!-- Images -->
 		<MauiImage Include="Resources\Images\*" />
+		<MauiImage Update="Resources\Images\cocktail.png" BaseSize="80,80" TintColor="#FF0266" />
+		<MauiImage Update="Resources\Images\island.png" BaseSize="80,80" TintColor="#FF0266" />
 		<MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />
 
 		<!-- Custom Fonts -->

diff --git a/Maui/MauiSample/Platforms/Android/Resources/values/colors.xml b/Maui/MauiSample/Platforms/Android/Resources/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#512BD4</color>
-    <color name="colorPrimaryDark">#2B0B98</color>
-    <color name="colorAccent">#2B0B98</color>
+    <color name="colorPrimary">#FF0266</color>
+    <color name="colorPrimaryDark">#323232</color>
+    <color name="colorAccent">#FF0266</color>
 </resources>
diff --git a/Maui/MauiSample/Presentation/Converters/IsNullConverter.cs b/Maui/MauiSample/Presentation/Converters/IsNullConverter.cs
@@ -2,7 +2,7 @@
 
 namespace MauiSample.Presentation.Converters
 {
-    public class IsNullConverter : IValueConverter
+    public class IsNullConverter : IValueConverter, IMarkupExtension
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
@@ -13,5 +13,7 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
         {
             throw new NotImplementedException();
         }
+
+        public object ProvideValue(IServiceProvider serviceProvider) => this;
     }
 }
diff --git a/Maui/MauiSample/Presentation/Converters/NotConverter.cs b/Maui/MauiSample/Presentation/Converters/NotConverter.cs
@@ -0,0 +1,24 @@
+using System.Globalization;
+
+namespace MauiSample.Presentation.Converters
+{
+    public class NotConverter : IValueConverter, IMarkupExtension
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is bool boolValue)
+            {
+                return !boolValue;
+            }
+
+            return false;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+
+        public object ProvideValue(IServiceProvider serviceProvider) => this;
+    }
+}
diff --git a/Maui/MauiSample/Presentation/ViewModels/ChoosePageViewModel.cs b/Maui/MauiSample/Presentation/ViewModels/ChoosePageViewModel.cs
@@ -1,21 +1,23 @@
-namespace MauiSample.Presentation.ViewModels
+using System.Collections.ObjectModel;
+
+namespace MauiSample.Presentation.ViewModels
 {
     public class ChoosePageViewModel
     {
         public ChoosePageViewModel()
         {
         }
 
-        public LogoLetterVmo[] Logo { get; } =
-        {
+        public ObservableCollection<LogoLetterVmo> Logo { get; } = new()
+            {
             new LogoLetterVmo("S", Color.FromHex("#FF0266"), "ShadowAccentBottom"),
             new LogoLetterVmo("H", Colors.White, "ShadowNeumorphismBottom"),
             new LogoLetterVmo("V", Colors.White, "ShadowNeumorphismBottom"),
             new LogoLetterVmo("L", Colors.White, "ShadowNeumorphismBottom"),
             new LogoLetterVmo("G", Colors.White, "ShadowNeumorphismBottom"),
-            new LogoLetterVmo("", Colors.White, "ShadowNeumorphismBottom"),
+            new LogoLetterVmo("", Color.FromHex("#FF0266"), "ShadowNeumorphismBottom", 32, "island.png"),
             new LogoLetterVmo("V", Colors.White, "ShadowNeumorphismBottom"),
-            new LogoLetterVmo("", Colors.White, "ShadowNeumorphismBottom"),
+            new LogoLetterVmo("", Color.FromHex("#FF0266"), "ShadowNeumorphismBottom", 32, "cocktail.png"),
             new LogoLetterVmo("V", Colors.White, "ShadowNeumorphismBottom"),
         };
     }

diff --git a/Maui/MauiSample/Presentation/ViewModels/LogoLetterVmo.cs b/Maui/MauiSample/Presentation/ViewModels/LogoLetterVmo.cs
@@ -2,17 +2,30 @@
 {
     public class LogoLetterVmo
     {
-        public LogoLetterVmo(string text, Color color, string shadowResourceName)
+        public LogoLetterVmo(
+            string text,
+            Color color,
+            string shadowResourceName,
+            double fontSize = 90,
+            string imageSource = null)
         {
             Text = text;
             TextColor = color;
             ShadowResourceName = shadowResourceName;
+            FontSize = fontSize;
+            ImageSource = imageSource;
         }
 
         public string Text { get; }
 
         public Color TextColor { get; }
 
         public string ShadowResourceName { get; }
+
+        public double FontSize { get; }
+
+        public string ImageSource { get; }
+
+        public bool HasImage => ImageSource != null;
     }
 }
diff --git a/Maui/MauiSample/Presentation/Views/ChoosePage.xaml b/Maui/MauiSample/Presentation/Views/ChoosePage.xaml
@@ -38,6 +38,16 @@
                     FontSize="30"
                     Text="CollectionView"
                     TextColor="White" />
+
+                <Label
+                    Grid.Row="0"
+                    Grid.RowSpan="2"
+                    Margin="205,12,0,0"
+                    FontFamily="RoadRage"
+                    FontSize="30"
+                    Rotation="-10"
+                    Text="MAUI"
+                    TextColor="{StaticResource Accent}" />
             </Grid>
         </StackLayout>
 
@@ -50,35 +60,51 @@
             HeightRequest="360"
             ItemHeight="110"
             ItemsSource="{Binding Logo, Mode=OneTime}"
-            VerticalOptions="Fill">
+            VerticalOptions="Fill"
+            ZIndex="100">
             <sho:GridView.ItemTemplate>
                 <DataTemplate x:DataType="viewModels:LogoLetterVmo">
                     <sho:DraggableViewCell x:Name="DraggableViewCell">
                         <ContentView>
-                            <Border Shadow="{StaticResource ShadowNeumorphismTop}" StrokeShape="RoundRectangle 10">
-                                <Border
-                                    Margin="8"
-                                    Padding="0"
-                                    Shadow="{Binding ShadowResourceName, Converter={converters:StringToResource}}"
-                                    StrokeShape="RoundRectangle 10">
-                                    <Border.Triggers>
-                                        <DataTrigger
-                                            Binding="{Binding Source={x:Reference DraggableViewCell}, Path=IsDragAndDropping}"
-                                            TargetType="Border"
-                                            Value="True">
-                                            <Setter Property="BackgroundColor" Value="{StaticResource DarkSurface}" />
-                                        </DataTrigger>
-                                    </Border.Triggers>
-                                    <Border.Background>
-                                        <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-                                            <GradientStop Offset="0.1" Color="#3a3a3a" />
-                                            <GradientStop Offset="0.9" Color="#2b2b2b" />
-                                        </LinearGradientBrush>
-                                    </Border.Background>
+                            <Border
+                                Margin="8"
+                                Padding="0"
+                                Shadow="{Binding ShadowResourceName, Converter={converters:StringToResource}}"
+                                StrokeShape="RoundRectangle 10"
+                                StrokeThickness="0">
+                                <Border.Triggers>
+                                    <DataTrigger
+                                        Binding="{Binding Source={x:Reference DraggableViewCell}, Path=IsDragAndDropping}"
+                                        TargetType="Border"
+                                        Value="True">
+                                        <Setter Property="BackgroundColor" Value="{StaticResource DarkSurface}" />
+                                    </DataTrigger>
+                                </Border.Triggers>
+                                <Border.Background>
+                                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                        <GradientStop Offset="0.1" Color="#3a3a3a" />
+                                        <GradientStop Offset="0.9" Color="#2b2b2b" />
+                                    </LinearGradientBrush>
+                                </Border.Background>
+                                <Grid>
+                                    <Image
+                                        HorizontalOptions="Center"
+                                        IsVisible="{Binding HasImage}"
+                                        Source="{Binding ImageSource}"
+                                        VerticalOptions="Center">
+                                        <Image.Shadow>
+                                            <Shadow
+                                                Brush="{StaticResource Primary}"
+                                                Opacity="1"
+                                                Radius="15" />
+                                        </Image.Shadow>
+                                    </Image>
                                     <Label
                                         FontAttributes="Bold"
-                                        FontSize="90"
+                                        FontSize="{Binding FontSize}"
                                         HorizontalOptions="Center"
+                                        HorizontalTextAlignment="Center"
+                                        IsVisible="{Binding ImageSource, Converter={converters:IsNullConverter}}"
                                         Style="{StaticResource TextHeadline}"
                                         Text="{Binding Text}"
                                         TextColor="{Binding TextColor}"
@@ -91,40 +117,40 @@
                                             </OnPlatform>
                                         </Label.Margin>
                                     </Label>
-                                </Border>
+                                </Grid>
                             </Border>
                         </ContentView>
                     </sho:DraggableViewCell>
                 </DataTemplate>
             </sho:GridView.ItemTemplate>
         </sho:GridView>
 
-        <StackLayout Margin="0,30" Spacing="20">
-            <Border Shadow="{StaticResource ShadowNeumorphismTop}" StrokeShape="RoundRectangle 10">
-                <Button
-                    x:Name="LayoutButton"
-                    BackgroundColor="{StaticResource DarkSurface}"
-                    Clicked="LayoutButton_OnClicked"
-                    CornerRadius="10"
-                    HorizontalOptions="Center"
-                    Shadow="{StaticResource ShadowNeumorphismBottom}"
-                    Text="Layout Examples"
-                    TextColor="White"
-                    WidthRequest="260" />
-            </Border>
+        <StackLayout
+            Margin="0,30"
+            Spacing="20"
+            ZIndex="10">
+            <Button
+                x:Name="LayoutButton"
+                BackgroundColor="{StaticResource DarkSurface}"
+                Clicked="LayoutButton_OnClicked"
+                CornerRadius="10"
+                HorizontalOptions="Center"
+                Shadow="{StaticResource ShadowNeumorphismBottom}"
+                Text="Layout Examples"
+                TextColor="White"
+                WidthRequest="260" />
+
+            <Button
+                x:Name="HeaderButton"
+                BackgroundColor="{StaticResource DarkSurface}"
+                Clicked="HeaderButton_OnClicked"
+                CornerRadius="10"
+                HorizontalOptions="Center"
+                Shadow="{StaticResource ShadowNeumorphismBottom}"
+                Text="Header and Grouping Example"
+                TextColor="White"
+                WidthRequest="260" />
 
-            <Border Shadow="{StaticResource ShadowNeumorphismTop}" StrokeShape="RoundRectangle 10">
-                <Button
-                    x:Name="HeaderButton"
-                    BackgroundColor="{StaticResource DarkSurface}"
-                    Clicked="HeaderButton_OnClicked"
-                    CornerRadius="10"
-                    HorizontalOptions="Center"
-                    Shadow="{StaticResource ShadowNeumorphismBottom}"
-                    Text="Header and Grouping Example"
-                    TextColor="White"
-                    WidthRequest="260" />
-            </Border>
         </StackLayout>
 
     </StackLayout>