Merge pull request #240 from OdetteP/lottie_animation

Adding lottie animation
Baseflow · Nov 27, 2019 · 034621c · 034621c
2 parents ee28073 + 3a2f09e
commit 034621c
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 3 deletions.
diff --git a/Samples/MaterialMvvmSample.iOS/LottieLogo1.json b/Samples/MaterialMvvmSample.iOS/LottieLogo1.json
diff --git a/Samples/MaterialMvvmSample.iOS/MaterialMvvmSample.iOS.csproj b/Samples/MaterialMvvmSample.iOS/MaterialMvvmSample.iOS.csproj
@@ -109,6 +109,7 @@
     <BundleResource Include="Resources\Fonts\Roboto-Regular.ttf" />
     <BundleResource Include="Resources\Fonts\Roboto-Bold.ttf" />
     <BundleResource Include="Resources\Fonts\Roboto-Medium.ttf" />
+    <BundleResource Include="LottieLogo1.json" />
   </ItemGroup>
   <ItemGroup>
     <InterfaceDefinition Include="Resources\LaunchScreen.storyboard" />

diff --git a/Samples/MaterialMvvmSample/Views/MaterialCircularView.xaml.cs b/Samples/MaterialMvvmSample/Views/MaterialCircularView.xaml.cs
@@ -18,7 +18,7 @@ public MaterialCircularView()
 
         public async Task RunLoadingDialog()
         {
-            var loadingDialog = await MaterialDialog.Instance.LoadingDialogAsync(message: "Something is running");
+            var loadingDialog = await MaterialDialog.Instance.LoadingDialogAsync(message: "Something is running", lottieAnimation: "LottieLogo1.json");
             await Task.Delay(5000); // Represents a task that is running.
             await loadingDialog.DismissAsync();
         }

diff --git a/Samples/MaterialMvvmSample/Views/MaterialTextFieldView.xaml b/Samples/MaterialMvvmSample/Views/MaterialTextFieldView.xaml
@@ -6,7 +6,8 @@
     xmlns:material="clr-namespace:XF.Material.Forms.UI;assembly=XF.Material"
     x:Class="MaterialMvvmSample.Views.MaterialTextFieldView">
     <ContentPage.Content>
-        <StackLayout Orientation="Vertical">
+        <StackLayout Orientation="Vertical"
+                     Padding="20">
             <material:MaterialTextField Placeholder="Auto Capitalization"
                                         IsAutoCapitalizationEnabled="True" />
 

diff --git a/XF.Material/Platforms/Ios/Renderers/MaterialCircularLoadingViewRenderer.cs b/XF.Material/Platforms/Ios/Renderers/MaterialCircularLoadingViewRenderer.cs
@@ -24,7 +24,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<AnimationView>
             }
 
             _materialElement = e?.NewElement as MaterialCircularLoadingView;
-            if (_materialElement != null)
+            if (_materialElement != null && string.IsNullOrEmpty(_materialElement.Animation))
             {
                 _materialElement.Animation = "loading_animation.json";
             }

diff --git a/XF.Material/UI/Dialogs/IMaterialDialog.cs b/XF.Material/UI/Dialogs/IMaterialDialog.cs
@@ -64,6 +64,13 @@ public interface IMaterialDialog
         /// <param name="configuration">The style of the loading dialog.</param>
         Task<IMaterialModalPage> LoadingDialogAsync(string message, MaterialLoadingDialogConfiguration configuration = null);
 
+        /// <summary>
+        /// Shows a dialog indicating a running task.
+        /// </summary>
+        /// <param name="message">The message of the dialog.</param>
+        /// <param name="configuration">The style of the loading dialog.</param>
+        Task<IMaterialModalPage> LoadingDialogAsync(string message, string lottieAnimation, MaterialLoadingDialogConfiguration configuration = null);
+
         /// <summary>
         /// Shows a snackbar indicating a running task.
         /// </summary>

diff --git a/XF.Material/UI/Dialogs/MaterialDialog.cs b/XF.Material/UI/Dialogs/MaterialDialog.cs
@@ -72,6 +72,11 @@ internal MaterialDialog()
             return MaterialLoadingDialog.Loading(message, configuration);
         }
 
+        public Task<IMaterialModalPage> LoadingDialogAsync(string message, string lottieAnimation, MaterialLoadingDialogConfiguration configuration = null)
+        {
+            return MaterialLoadingDialog.Loading(message, lottieAnimation, configuration);
+        }
+
         public Task<IMaterialModalPage> LoadingSnackbarAsync(
             string message,
             MaterialSnackbarConfiguration configuration = null)

diff --git a/XF.Material/UI/Dialogs/MaterialLoadingDialog.xaml.cs b/XF.Material/UI/Dialogs/MaterialLoadingDialog.xaml.cs
@@ -16,6 +16,14 @@ internal MaterialLoadingDialog(string message, MaterialLoadingDialogConfiguratio
             Message.Text = message;
         }
 
+        internal MaterialLoadingDialog(string message, string lottieAnimation, MaterialLoadingDialogConfiguration configuration)
+        {
+            InitializeComponent();
+            Configure(configuration);
+            Message.Text = message;
+            LoadingImage.Animation = lottieAnimation;
+        }
+
         public override bool Dismissable => false;
 
         public override string MessageText
@@ -34,6 +42,14 @@ internal static async Task<IMaterialModalPage> Loading(string message, MaterialL
             return dialog;
         }
 
+        internal static async Task<IMaterialModalPage> Loading(string message, string lottieAnimation, MaterialLoadingDialogConfiguration configuration = null)
+        {
+            var dialog = new MaterialLoadingDialog(message, lottieAnimation, configuration);
+            await dialog.ShowAsync();
+
+            return dialog;
+        }
+
         protected override void OnAppearing()
         {
             base.OnAppearing();