fix tween issues and add more material samples

4 年前 · d5e4e6a0
--- a/Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/demo/material/backdrop_demo.cs
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/demo/material/backdrop_demo.cs
                title: "Accessories",
                assets: new List<string>
                {
-                    "products/belt.png",
-                    "products/earrings.png",
-                    "products/backpack.png",
-                    "products/hat.png",
-                    "products/scarf.png",
-                    "products/sunnies.png"
+                    "StreamingAssets/gallery/products/belt.png",
+                    "StreamingAssets/gallery/products/earrings.png",
+                    "StreamingAssets/gallery/products/backpack.png",
+                    "StreamingAssets/gallery/products/hat.png",
+                    "StreamingAssets/gallery/products/scarf.png",
+                    "StreamingAssets/gallery/products/sunnies.png"
                }
            ),
            new Category(
-                    "products/backpack.png",
-                    "products/cup.png",
-                    "products/napkins.png",
-                    "products/top.png"
+                    "StreamingAssets/gallery/products/backpack.png",
+                    "StreamingAssets/gallery/products/cup.png",
+                    "StreamingAssets/gallery/products/napkins.png",
+                    "StreamingAssets/gallery/products/top.png"
                }
            ),
            new Category(
-                    "products/jacket.png",
-                    "products/jumper.png",
-                    "products/scarf.png",
-                    "products/sweater.png",
-                    "products/sweats.png"
+                    "StreamingAssets/gallery/products/jacket.png",
+                    "StreamingAssets/gallery/products/jumper.png",
+                    "StreamingAssets/gallery/products/scarf.png",
+                    "StreamingAssets/gallery/products/sweater.png",
+                    "StreamingAssets/gallery/products/sweats.png"
                }
            ),
            new Category(
-                    "products/cup.png",
-                    "products/napkins.png",
-                    "products/planters.png",
-                    "products/table.png",
-                    "products/teaset.png"
+                    "StreamingAssets/gallery/products/cup.png",
+                    "StreamingAssets/gallery/products/napkins.png",
+                    "StreamingAssets/gallery/products/planters.png",
+                    "StreamingAssets/gallery/products/table.png",
+                    "StreamingAssets/gallery/products/teaset.png"
                }
            ),
            new Category(
-                    "products/jumper.png",
-                    "products/shirt.png",
-                    "products/sweater.png",
-                    "products/top.png"
+                    "StreamingAssets/gallery/products/jumper.png",
+                    "StreamingAssets/gallery/products/shirt.png",
+                    "StreamingAssets/gallery/products/sweater.png",
+                    "StreamingAssets/gallery/products/top.png"
                }
            ),
            new Category(
-                    "products/backpack.png",
-                    "products/belt.png",
-                    "products/cup.png",
-                    "products/dress.png",
-                    "products/earrings.png",
-                    "products/flatwear.png",
-                    "products/hat.png",
-                    "products/jacket.png",
-                    "products/jumper.png",
-                    "products/napkins.png",
-                    "products/planters.png",
-                    "products/scarf.png",
-                    "products/shirt.png",
-                    "products/sunnies.png",
-                    "products/sweater.png",
-                    "products/sweats.png",
-                    "products/table.png",
-                    "products/teaset.png",
-                    "products/top.png"
+                    "StreamingAssets/gallery/products/backpack.png",
+                    "StreamingAssets/gallery/products/belt.png",
+                    "StreamingAssets/gallery/products/cup.png",
+                    "StreamingAssets/gallery/products/dress.png",
+                    "StreamingAssets/gallery/products/earrings.png",
+                    "StreamingAssets/gallery/products/flatwear.png",
+                    "StreamingAssets/gallery/products/hat.png",
+                    "StreamingAssets/gallery/products/jacket.png",
+                    "StreamingAssets/gallery/products/jumper.png",
+                    "StreamingAssets/gallery/products/napkins.png",
+                    "StreamingAssets/gallery/products/planters.png",
+                    "StreamingAssets/gallery/products/scarf.png",
+                    "StreamingAssets/gallery/products/shirt.png",
+                    "StreamingAssets/gallery/products/sunnies.png",
+                    "StreamingAssets/gallery/products/sweater.png",
+                    "StreamingAssets/gallery/products/sweats.png",
+                    "StreamingAssets/gallery/products/table.png",
+                    "StreamingAssets/gallery/products/teaset.png",
+                    "StreamingAssets/gallery/products/top.png"
                }
            )
        };
                                        child: new Column(
                                            children: new List<Widget>
                                            {
-                                                Image.asset(
+                                                Image.file(
-                                                    package: "uiwidgets_gallery_assets",
                                                    fit: BoxFit.contain
                                                ),
                                                new Container(
--- a/Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/demo/material/bottom_navigation_demo.cs
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/demo/material/bottom_navigation_demo.cs
                opacity: this._animation,
                child: new SlideTransition(
                    position: this._animation.drive(
-                        new Tween<Offset>(
+                        new OffsetTween(
                            begin: new Offset(0.0f, 0.02f), // Slightly down.
                            end: Offset.zero
                        )
--- a/Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/demo/material/drawer_demo.cs
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/demo/material/drawer_demo.cs
            "A", "B", "C", "D", "E",
        };

-        private static readonly Animatable<Offset> _drawerDetailsTween = new Tween<Offset>(
+        private static readonly Animatable<Offset> _drawerDetailsTween = new OffsetTween(
            begin: new Offset(0.0f, -1.0f),
            end: Offset.zero
        ).chain(new CurveTween(
--- a/Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/gallery/backdrop.cs
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/gallery/backdrop.cs
        private AnimationController _controller;
        private Animation<float> _frontOpacity;

-        private static readonly Animatable<float> _frontOpacityTween = new Tween<float>(begin: 0.2f, end: 1.0f)
+        private static readonly Animatable<float> _frontOpacityTween = new FloatTween(begin: 0.2f, end: 1.0f)
            .chain(new CurveTween(curve: new Interval(0.0f, 0.4f, curve: Curves.easeInOut)));

        public override void initState()
--- a/Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/gallery/demos.cs
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/UIWidgetsGallery/gallery/demos.cs
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using UIWidgetsGallery.demo.material;
+using UnityEngine;

 namespace UIWidgetsGallery.gallery
 {
        {
            List<GalleryDemo> galleryDemos = new List<GalleryDemo>
            {
-                
+                new GalleryDemo(
+                    title: "Backdrop",
+                    subtitle: $"Select a front layer from back layer",
+                    icon: GalleryIcons.backdrop,
+                    category: GalleryDemoCategory._kMaterialComponents,
+                    routeName: BackdropDemo.routeName,
+                    buildRoute: (BuildContext context) => new BackdropDemo()
+                ),
+                new GalleryDemo(
+                    title: "Banner",
+                    subtitle: "Displaying a banner within a list",
+                    icon: GalleryIcons.lists_leave_behind,
+                    category: GalleryDemoCategory._kMaterialComponents,
+                    routeName: BannerDemo.routeName,
+                    documentationUrl: "https://api.flutter.dev/flutter/material/MaterialBanner-class.html",
+                    buildRoute: (BuildContext context) => new BannerDemo()
+                ),
+                new GalleryDemo(
+                    title: "Bottom app bar",
+                    subtitle: "Optional floating action button notch",
+                    icon: GalleryIcons.bottom_app_bar,
+                    category: GalleryDemoCategory._kMaterialComponents,
+                    routeName: BottomAppBarDemo.routeName,
+                    documentationUrl: "https://docs.flutter.io/flutter/material/BottomAppBar-class.html",
+                    buildRoute: (BuildContext context) => new BottomAppBarDemo()
+                ),
+                new GalleryDemo(
+                    title: "Bottom navigation",
+                    subtitle: "Bottom navigation with cross-fading views",
+                    icon: GalleryIcons.bottom_navigation,
+                    category: GalleryDemoCategory._kMaterialComponents,
+                    routeName: BottomNavigationDemo.routeName,
+                    documentationUrl: "https://docs.flutter.io/flutter/material/BottomNavigationBar-class.html",
+                    buildRoute: (BuildContext context) => new BottomNavigationDemo()
+                )
            };

            return galleryDemos;

-        public static readonly List<GalleryDemoCategory> kAllGalleryDemoCategories =
-        kAllGalleryDemos.Select<GalleryDemo, GalleryDemoCategory>((GalleryDemo demo) => demo.category).ToList();
+        public static readonly HashSet<GalleryDemoCategory> kAllGalleryDemoCategories =
+        new HashSet<GalleryDemoCategory>(kAllGalleryDemos.Select<GalleryDemo, GalleryDemoCategory>((GalleryDemo demo) => demo.category).ToList());


        static Dictionary<GalleryDemoCategory, List<GalleryDemo>> _generateCategoryToDemos()
--- a/com.unity.uiwidgets/Runtime/animation/tween.cs
+++ b/com.unity.uiwidgets/Runtime/animation/tween.cs
        readonly Animatable<T> _evaluatable;

        public override T value {
-            get { return _evaluatable.evaluate(parent); }
+            get {
+                return  _evaluatable.evaluate(parent);
+            }
        }

        public override string ToString() {
            return $"{_parent}\u27A9{_evaluatable}";
        }
    }
+    
+    /**
+     * We make Tween<T> a abstract class by design here (while it is not a abstract class in flutter
+     * The reason to do so is, in C# we cannot use arithmetic between generic types, therefore the
+     * lerp method cannot be implemented in Tween<T>
+     *
+     * To solve this problem, we make each Tween<T1>, Tween<T2> an explicit subclass T1Tween and T2Tween and
+     * implement the lerp method specifically
+     *
+     * See the implementations in "_OnOffAnimationColor" for some specific workarounds on this issue
+     * 
+     */
-    public class Tween<T> : Animatable<T>, IEquatable<Tween<T>> {
+    public abstract class Tween<T> : Animatable<T>, IEquatable<Tween<T>> {
        public Tween(T begin, T end) {
            this.begin = begin;
            this.end = end;

        public virtual T end { get; set; }

-        public virtual T lerp(float t) {
-            D.assert(begin != null);
-            D.assert(end != null);
-            return default; //begin + (end - begin) * t as T;
-        }
+        public abstract T lerp(float t);

        public override T transform(float t) {
            if (t == 0.0)
--- a/com.unity.uiwidgets/Runtime/cupertino/context_menu.cs
+++ b/com.unity.uiwidgets/Runtime/cupertino/context_menu.cs

        public override void initState() { 
            base.initState();
-            _mask = new _OnOffAnimation<Color>(
+            _mask = new _OnOffAnimationColor(
                controller: widget.controller,
                onValue: _lightModeMaskColor,
                offValue: _masklessColor,
    }
  }

-  public class _OnOffAnimation<T> : CompoundAnimation<T> { 
-    public _OnOffAnimation(
+  
+  /**
+   * We cannot use _OnOffAnimation<T> here directly since Tween<T> is an abstract class in UIWidgets (while it is not in flutter)
+   * Refer to "Twee<T>" for the detailed reasons why we do so
+   *
+   * Instead, we should explicitly define classes for each generic type here
+   * 
+   */
+  public class _OnOffAnimationColor : CompoundAnimation<Color> { 
+    public _OnOffAnimationColor(
-      T onValue = default,
-      T offValue = default,
+      Color onValue = default,
+      Color offValue = default,
-        first: new Tween<T>(begin: offValue, end: onValue).animate(
+        first: new ColorTween(begin: offValue, end: onValue).animate(
-        next: new Tween<T>(begin: onValue, end: offValue).animate(
+        next: new ColorTween(begin: onValue, end: offValue).animate(
            new CurvedAnimation(
                parent: controller,
                curve: new Interval(intervalOff == null ? 0.0f : (float)intervalOff, intervalOff == null ? 0.0f : (float)intervalOff)
      D.assert(intervalOff !=null && intervalOff >= 0.0 && intervalOff <= 1.0);
      D.assert(intervalOn <= intervalOff);
    }
-    public readonly T _offValue;
-    public override T value {
+    public readonly Color _offValue;
+    public override Color value {
      get {
        return next.value.Equals( _offValue) ? next.value : first.value; 
      }
--- a/com.unity.uiwidgets/Runtime/material/data_table.cs
+++ b/com.unity.uiwidgets/Runtime/material/data_table.cs
        bool _down;

        static readonly Animatable<float> _turnTween =
-            new Tween<float>(begin: 0.0f, end: Mathf.PI).chain(new CurveTween(curve: Curves.easeIn));
+            new FloatTween(begin: 0.0f, end: Mathf.PI).chain(new CurveTween(curve: Curves.easeIn));

        public override void initState() {
            base.initState();
--- a/com.unity.uiwidgets/Runtime/material/page_transitions_theme.cs
+++ b/com.unity.uiwidgets/Runtime/material/page_transitions_theme.cs
        }

        // The scrim obscures the old page by becoming increasingly opaque.
-        internal static readonly Tween<float> _scrimOpacityTween = new Tween<float>(
+        internal static readonly Tween<float> _scrimOpacityTween = new FloatTween(
            begin: 0.0f,
            end: 0.60f
        );
        public static readonly List<TweenSequenceItem<float>> fastOutExtraSlowInTweenSequenceItems =
            new List<TweenSequenceItem<float>> {
                new TweenSequenceItem<float>(
-                    tween: new Tween<float>(begin: 0.0f, end: 0.4f)
+                    tween: new FloatTween(begin: 0.0f, end: 0.4f)
-                    tween: new Tween<float>(begin: 0.4f, end: 1.0f)
+                    tween: new FloatTween(begin: 0.4f, end: 1.0f)
                        .chain(new CurveTween(curve: new Cubic(0.208333f, 0.82f, 0.25f, 1.0f))),
                    weight: 1.0f - 0.166666f
                )
                    .chain(new CurveTween(curve: new Interval(0.2075f, 0.4175f))));

            Animation<float> _forwardEndScreenScaleTransition = widget.animation.drive(
-                new Tween<float>(begin: 0.85f, end: 1.00f)
+                new FloatTween(begin: 0.85f, end: 1.00f)
-                new Tween<float>(begin: 1.00f, end: 1.05f)
+                new FloatTween(begin: 1.00f, end: 1.05f)
-                new Tween<float>(begin: 0.0f, end: 1.00f)
+                new FloatTween(begin: 0.0f, end: 1.00f)
-                new Tween<float>(begin: 1.00f, end: 1.10f)
+                new FloatTween(begin: 1.00f, end: 1.10f)
-                new Tween<float>(begin: 0.9f, end: 1.0f)
+                new FloatTween(begin: 0.9f, end: 1.0f)
-                new Tween<float>(begin: 0.0f, end: 1.00f)
+                new FloatTween(begin: 0.0f, end: 1.00f)
                    .chain(new CurveTween(curve: new Interval(1 - 0.2075f, 1 - 0.0825f))));

            return new AnimatedBuilder(
--- a/com.unity.uiwidgets/Runtime/material/slider_theme.cs
+++ b/com.unity.uiwidgets/Runtime/material/slider_theme.cs
            D.assert(sliderTheme.thumbColor != null);

            Canvas canvas = context.canvas;
-            Tween<float> radiusTween = new Tween<float>(
+            Tween<float> radiusTween = new FloatTween(
                begin: _disabledThumbRadius,
                end: enabledThumbRadius
            );
            D.assert(sliderTheme.overlappingShapeStrokeColor != null);
            D.assert(enableAnimation != null);
            Canvas canvas = context.canvas;
-            Tween<float> radiusTween = new Tween<float>(
+            Tween<float> radiusTween = new FloatTween(
                begin: _disabledThumbRadius,
                end: enabledThumbRadius
            );
--- a/com.unity.uiwidgets/Runtime/material/time_picker.cs
+++ b/com.unity.uiwidgets/Runtime/material/time_picker.cs
            );

            //the end will be set to be valid value later, we just make it 1f by default here
-            _thetaTween = new Tween<float>(begin: _getThetaForTime(widget.selectedTime), end: 1f);
+            _thetaTween = new FloatTween(begin: _getThetaForTime(widget.selectedTime), end: 1f);
            _theta = _thetaController
                .drive(new CurveTween(curve: Curves.fastOutSlowIn))
                .drive(_thetaTween);
--- a/com.unity.uiwidgets/Runtime/widgets/basic.cs
+++ b/com.unity.uiwidgets/Runtime/widgets/basic.cs
            Offset translation = null,
            bool transformHitTests = true,
            Widget child = null) : base(key: key, child: child) {
+            D.assert(translation != null);
            this.translation = translation;
            this.transformHitTests = transformHitTests;
        }
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery.meta
+fileFormatVersion: 2
+guid: 60b8580f456aaf44eaad07b0b57a21d7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/GalleryIcons.ttf
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/GalleryIcons.ttf
+�0DSIGUWU��(OS/2-v&48`cmapV�5P�glyf�F#�8�head1.�6hhea���$hmtx�����locaql�^maxp9� name��RC�post����A��9_<����0�T���������..�
+����fL�ff�    @�)���@�@ UUUUUUU�U�U���U�UUUVUU�UUUUU�U���UUUU����L0 �)�� �����:	"If����_�=V��Bj���*R{�-B\M��.j�		(	D	�	�	�
+
+fU�k!'!!!77���rr���V++k�U������&@@&U@�@3#3#'!#73!!+**�kU�`/��0`��f��V��@��U�������UU�k!!5!!UV����U�Vk��V�����VU���-2#!#"&'&&'&&546766766322654&#!+5KK5��X4)':		:')4XW��@K55K'.:'**':.'�U@�@
2#!"&54632654&##+5KK5��5KK5V�@K55KK55K�VU�k7!535!!5#���U�U���@�����a���@�k��o��@��|֖�����Q�U�k#GS_f2#"&'&&'&&5467667662676676654&'&&'&&#"#"&54632#"&54632!#"&,S'Nt!!tN'S,,T&Nt!!tN&T,$B>]



]>B$$B>]



]>B�%&&%��&%%&��sIIsk!tN'S,,S'Nt!!tN'S,,S'Nt!�

]>B$$B>]



]>B$$B>]

�%%&&%%&&�K``�kU@7!7&&#"32676676673#"&'&&'&&54676676632�d�։#\52.F
+
+
+
+F.2(&?YW68$B>\

\>B$G|�d�։#)
+
+F.22.F
+
+."3/E
+	

]>B$$B>]

6U�kA%"&'&&'&&54676676632#"32676676654632,S'Ns""sN'S,$B>]

]>B$$B>]
"sN'S"sN'S,,S'Ns"
]>B$$B>]

]>B$,S'Ns"����2#!"&5463!2654&#"�,??,��,??,k���&&%%�>,�*,>>,�,>�+U���&%%&Uk�#/;GS2#"&546!2#"&546!2#"&546!2#"&5464&#"32674&#"32674&#"326�#22#$22$12##22#22##22$22$#22����2##22##22##22##22##22##22##22##2U�kU#"&546322#"&5462#"&546#22##22##22##22##22##22k2##22##2V2##22##2�2##22##2����!!5!5!����U�VV�UU�@�@#'+2#!"&5463!!!!'3#!!'3#!!'3#Z�L���V����UU���UU���UU@�L�U��UUUUVVVUUUU
+U�k#'+/32#!"&54635#!5#!5#5#!5#!5#5#!5#!5#U$22$�V$22$��������������������k2$�V$22$�$2���������������������k''	77���<��<��</��<��#�<�<�@��332#!"&5463353!!#5�U+#22#��#22#+UV�����U2#��#22#V#2UU�U��*+��Uk�3#!"&546333'33'33�2$�V$21$*V�VVU�UUU���#22##2�����U�k!!!!!����V�����Vk��VV�V*�VU�k!!5!73#5!73#5!73#UV���V*VV��V*VV��V*VVk��V���V�֪��V�֪��VV�k	3!!!!'77%3#'##73'VV��*�+�~XX((XX(��H�Q)�(R��V@��VV�V-((XX((X}�ll��U@�k #"&'&477'!'0#"&5462���
+
+���q0���]7&'6]k�U;��
+	;�q�g���u.&77&.uU�k!!7!!!"&5463!2UV��V��V��%%�%%k��V��k%%%%�@�@2#!"&5463''+#22#��#22#��<���<@2#��#22#V#2���<���<U�k!!!!!!!!!!!����V�����B������B��k��VV�V�����.����U�k#GS2#"&'&&'&&5467667662676676654&'&&'&&#"3##5#535,S'Nt!!tN'S,,S'Nt!!tN'S,$B>]

]>B$$B>]

]>BO��V��k!tN'S,,S'Nt!!tN'S,,S'Nt!�
]>B$$B>]

]>B$$B>]
*�V��V�U�k!!!!UV��V��Vk���UU�k%!!!!5!���VV�V��VVV�+Հ�U�k;Sq��6632#"&'&&'&&5467667667667667666654&'&&'&&#"26654&'&&'&&#"326267"&'&&'&&5267"&'&&'&&5-):7Q*!B)	E():7Q*!B)	E&:'*$A:7Qb:'*%:'*%�$A:7Q:'*j$A:7Q:'*_Q7:)(E	)B!*Q7:)(E	)B!*�mA$*':Q6:h%*':%*':�Q6:A$*':�Q7:A$*':�@�@0463!2#!"&54&#"326!54&'&&'&&#"�2#V#22#��#2K55KK55K��P,&&,P�#22#��#22#�5KK55KK��++""U�k%!!!���VV�VV����+����,1O#&'&&'&&'!!3667667667332676676676&'&&'&&'!�">8P
+	Z<@""B>c"��[��
O37Gh�*-+B
3%)��?���"d>B""@;Z
P9>"�n�73O
pgH��:(+-+I
��&#2�@�@#53'7'7#53#53'7'7%#5+VVx;w�Z|<|�������^x<x�w;x��V���w;x�|<|�VVV�x<x�x;w���@�@
+"'33%'7'7#53#53'7'7%#5wwwLVx;w�Z|<|�������^x<x�w;x��V
��3�ͦw;x�|<|�VVV�x<x�x;w������%1?!2#!"&'&&'&&546766766"32654&2654&##UV)':		:')��)':	
+=&(6JJ67II6JJ6��9'**'99'*(&=
+UJ66JJ66J�J66JC##CU���!2#!"&546��$22$�V$22�2#�#22##2U�k
7!%!4&#!"UV��2#�#2V��V#22#U�k%7!23!3462654&#"!5##"&'#UV�U>W��V�W>%%%%����@&&@�V���W>��+>W�%%%%��##U�k7!!!!UV���V��VV����*�V*�@�@!!!!!!!'3#!5##5�����V���V���UU��UU@�U��UUVVVUUUUU�2'O)"&54632%7#5726323"&'#5'\**,,����;AL�	"
+%W3=j$LIP�+ -- +��4K&-}�Q;&3I2*oK���J�3Q5&&546754&''#&''76672546737y&&`IGa(!9&(5s�
�!
+�!!J+JbbJ+J�(88(�����""��E2w
+�	�	�	>�	�	�		(�	
+4�GalleryIconsRegular1.000;    ;GalleryIcons-RegularVersion 1.000;PS 1.0;hotconv 16.6.54;makeotf.lib2.5.65590 DEVELOPMENTGalleryIcons-RegularFont generated by IcoMoon.GalleryIconsRegular1.000;    ;GalleryIcons-RegularVersion 1.000;PS 1.0;hotconv 16.6.54;makeotf.lib2.5.65590 DEVELOPMENTGalleryIcons-RegularFont generated by IcoMoon..	
+
 !"#$%&'()*+,-uni0000uni0001uniE900uniE901uniE902uniE903uniE904uniE905uniE906uniE907uniE908uniE909uniE90AuniE90BuniE90CuniE90DuniE90EuniE90FuniE910uniE911uniE912uniE913uniE914uniE915uniE916uniE917uniE918uniE919uniE91AuniE91BuniE91CuniE91DuniE91EuniE91FuniE920uniE921uniE922uniE923uniE924uniE925uniE926uniE927uniE928uniE929�M4�M5�M4�M4
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/GalleryIcons.ttf.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/GalleryIcons.ttf.meta
+fileFormatVersion: 2
+guid: 33a4ff42b6cd70844855cf45925acc8f
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products.meta
+fileFormatVersion: 2
+guid: 4fb668afb0c93ea4b98276e3dea17ffa
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/backpack.png
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/backpack.png
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/backpack.png.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/backpack.png.meta
+fileFormatVersion: 2
+guid: d6729f200e288944a967a677e9c56898
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/belt.png
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/belt.png
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/belt.png.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/belt.png.meta
+fileFormatVersion: 2
+guid: 9eff4541269c91d4e96d8292599c0eec
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/cup.png
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/cup.png
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/cup.png.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/cup.png.meta
+fileFormatVersion: 2
+guid: 3a0325dda43334840ba4edb6df683baf
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/deskset.png
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/deskset.png
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/deskset.png.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/deskset.png.meta
+fileFormatVersion: 2
+guid: a6eae4e64a025bb4c91500af02625fda
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/dress.png
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/dress.png
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/dress.png.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/dress.png.meta
+fileFormatVersion: 2
+guid: 64b100d547d346d48995d4f64c480b0b
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/earrings.png
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/earrings.png
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/earrings.png.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/earrings.png.meta
+fileFormatVersion: 2
+guid: 6cdbab027690e8449b47d4b5dc44208a
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/flatwear.png
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/flatwear.png
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/flatwear.png.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/flatwear.png.meta
+fileFormatVersion: 2
+guid: 4f6758c2e7b01624db13c914e8779961
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/hat.png
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/hat.png
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/hat.png.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/hat.png.meta
+fileFormatVersion: 2
+guid: 01cef86a51d30fb438190ef8acef829f
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/jacket.png
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/jacket.png
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/jacket.png.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/jacket.png.meta
+fileFormatVersion: 2
+guid: b9e498ffc8bd0e04ea005f70864fea31
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/jumper.png
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/jumper.png
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/jumper.png.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/jumper.png.meta
+fileFormatVersion: 2
+guid: 649b6d9a26767eb42b59355740b11b84
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/kitchen_quattro.png
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/kitchen_quattro.png
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/kitchen_quattro.png.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/kitchen_quattro.png.meta
+fileFormatVersion: 2
+guid: e0f100212cbc71645acfd179f97225d9
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/napkins.png
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/napkins.png
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/napkins.png.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/napkins.png.meta
+fileFormatVersion: 2
+guid: 4e801739ec073e94098beab3ad842cc0
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/planters.png
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/planters.png
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/planters.png.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/planters.png.meta
+fileFormatVersion: 2
+guid: a72f4e34b69540f47ba32bd1da629c0e
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/platter.png
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/platter.png
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/platter.png.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/platter.png.meta
+fileFormatVersion: 2
+guid: 4ca9872bd3ef41844a828ad817e635b2
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/scarf.png
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/scarf.png
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/scarf.png.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/scarf.png.meta
+fileFormatVersion: 2
+guid: 29a3c18fe340d574fa6beee2251acc5d
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/shirt.png
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/shirt.png
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/shirt.png.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/shirt.png.meta
+fileFormatVersion: 2
+guid: 2b613d3bad0055243bb8b0f70d2e034a
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/sunnies.png
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/sunnies.png
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/sunnies.png.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/sunnies.png.meta
+fileFormatVersion: 2
+guid: cd761e57e3e967f4e867a2c766481b15
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/sweater.png
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/sweater.png
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/sweater.png.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/sweater.png.meta
+fileFormatVersion: 2
+guid: e1bc33cc6d39afd4791e38c1991ef508
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/sweats.png
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/sweats.png
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/sweats.png.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/sweats.png.meta
+fileFormatVersion: 2
+guid: 1d2e84aee75b46c4c8afc68361c5c384
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/table.png
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/table.png
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/table.png.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/table.png.meta
+fileFormatVersion: 2
+guid: 17ceba205b7b4704796d5ab80bf28768
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/teaset.png
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/teaset.png
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/teaset.png.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/teaset.png.meta
+fileFormatVersion: 2
+guid: 19a2d88f8e3c0d14e8a27776ec198fd4
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/top.png
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/top.png
--- a/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/top.png.meta
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/StreamingAssets/gallery/products/top.png.meta
+fileFormatVersion: 2
+guid: 1857217eb1d0a884899108edfd7a78b4
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: