Revert "Rebase develnui (#4853)"
authorSeoyeon2Kim <34738918+Seoyeon2Kim@users.noreply.github.com>
Tue, 20 Dec 2022 05:32:04 +0000 (14:32 +0900)
committerdongsug-song <35130733+dongsug-song@users.noreply.github.com>
Tue, 20 Dec 2022 05:42:04 +0000 (14:42 +0900)
This reverts commit 2ae464cf2e05bd2821e43c09c941df484dbae620.

44 files changed:
packaging/csapi-tizenfx.spec
packaging/version.txt
src/Tizen.NUI.Components/Controls/AlertDialog.cs
src/Tizen.NUI.Components/Controls/AlertDialogBindableProperty.cs
src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultGridItem.cs
src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultGridItemBindableProperty.cs
src/Tizen.NUI/Tizen.NUI.csproj
src/Tizen.NUI/src/internal/Layouting/RelativeLayout.cs
test/NUITizenGallery/Examples/AlertDialogTest/AlertDialogTestDialogPage.xaml [deleted file]
test/NUITizenGallery/Examples/AlertDialogTest/AlertDialogTestDialogPage.xaml.cs [deleted file]
test/NUITizenGallery/Examples/AlertDialogTest/AlertDialogTestPage.xaml
test/NUITizenGallery/Examples/AlertDialogTest/AlertDialogTestPage.xaml.cs
test/NUITizenGallery/Examples/CollectionViewTest/AnimalGrid.cs [deleted file]
test/NUITizenGallery/Examples/CollectionViewTest/AnimalGridPage.cs [deleted file]
test/NUITizenGallery/Examples/CollectionViewTest/AnimalGridPage.xaml [deleted file]
test/NUITizenGallery/Examples/CollectionViewTest/AnimalList.cs [deleted file]
test/NUITizenGallery/Examples/CollectionViewTest/AnimalListPage.cs [deleted file]
test/NUITizenGallery/Examples/CollectionViewTest/AnimalListPage.xaml [deleted file]
test/NUITizenGallery/Examples/CollectionViewTest/Animals.cs [deleted file]
test/NUITizenGallery/NUITizenGallery.csproj
test/NUITizenGallery/res/images/animals/baldeagle.jpg [deleted file]
test/NUITizenGallery/res/images/animals/bear.jpg [deleted file]
test/NUITizenGallery/res/images/animals/cat.jpg [deleted file]
test/NUITizenGallery/res/images/animals/chicken.jpg [deleted file]
test/NUITizenGallery/res/images/animals/cow.jpg [deleted file]
test/NUITizenGallery/res/images/animals/deer.jpg [deleted file]
test/NUITizenGallery/res/images/animals/dog.jpg [deleted file]
test/NUITizenGallery/res/images/animals/duck.jpg [deleted file]
test/NUITizenGallery/res/images/animals/elephant.jpg [deleted file]
test/NUITizenGallery/res/images/animals/emperorpenguin.jpg [deleted file]
test/NUITizenGallery/res/images/animals/giraffe.jpg [deleted file]
test/NUITizenGallery/res/images/animals/horse.jpg [deleted file]
test/NUITizenGallery/res/images/animals/leopard.jpg [deleted file]
test/NUITizenGallery/res/images/animals/lion.jpg [deleted file]
test/NUITizenGallery/res/images/animals/panda.jpg [deleted file]
test/NUITizenGallery/res/images/animals/peacock.jpg [deleted file]
test/NUITizenGallery/res/images/animals/pig.jpg [deleted file]
test/NUITizenGallery/res/images/animals/pigeon.jpg [deleted file]
test/NUITizenGallery/res/images/animals/redfox.jpg [deleted file]
test/NUITizenGallery/res/images/animals/seagull.jpg [deleted file]
test/NUITizenGallery/res/images/animals/squirrel.jpg [deleted file]
test/NUITizenGallery/res/images/animals/tiger.jpg [deleted file]
test/NUITizenGallery/res/images/animals/wolf.jpg [deleted file]
test/NUITizenGallery/res/images/animals/zebra.jpg [deleted file]

index 4b3be45..084472a 100644 (file)
@@ -1,7 +1,7 @@
 # Auto-generated from csapi-tizenfx.spec.in by makespec.sh
 
 %define TIZEN_NET_API_VERSION 11
-%define TIZEN_NET_RPM_VERSION 11.0.0.999+nui22206
+%define TIZEN_NET_RPM_VERSION 11.0.0.999+nui22205
 %define TIZEN_NET_NUGET_VERSION 11.0.0.99999
 
 %define DOTNET_ASSEMBLY_PATH /usr/share/dotnet.tizen/framework
index d6968b1..9e893c8 100755 (executable)
@@ -6,4 +6,4 @@ RPM_VERSION=11.0.0.999
 NUGET_VERSION=11.0.0.99999
 
 # RPM Version Suffix
-RPM_VERSION_SUFFIX=nui22206
+RPM_VERSION_SUFFIX=nui22205
index 5a4334d..642bfaf 100755 (executable)
@@ -346,19 +346,6 @@ namespace Tizen.NUI.Components
         {
             get
             {
-                return GetValue(ActionsProperty) as IEnumerable<View>;
-            }
-            set
-            {
-                SetValue(ActionsProperty, value);
-                NotifyPropertyChanged();
-            }
-        }
-
-        private IEnumerable<View> InternalActions
-        {
-            get
-            {
                 return actionContentViews;
             }
             set
index 21dc5c1..d25c68d 100755 (executable)
@@ -1,5 +1,4 @@
 using System.ComponentModel;
-using System.Collections.Generic;
 using Tizen.NUI.BaseComponents;
 using Tizen.NUI.Binding;
 
@@ -80,24 +79,6 @@ namespace Tizen.NUI.Components
         });
 
         /// <summary>
-        /// ActionsProperty
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public static readonly BindableProperty ActionsProperty = BindableProperty.Create(nameof(Actions), typeof(IEnumerable<View>), typeof(AlertDialog), null, propertyChanged: (bindable, oldValue, newValue) =>
-        {
-            var instance = (AlertDialog)bindable;
-            if (newValue != null)
-            {
-                instance.InternalActions = newValue as IEnumerable<View>;
-            }
-        },
-        defaultValueCreator: (bindable) =>
-        {
-            var instance = (AlertDialog)bindable;
-            return instance.InternalActions;
-        });
-
-        /// <summary>
         /// ActionContentProperty
         /// </summary>
         [EditorBrowsable(EditorBrowsableState.Never)]
index 72c9221..499f1e9 100755 (executable)
@@ -164,32 +164,23 @@ namespace Tizen.NUI.Components
             }
         }
 
-        /// <summary>
-        /// Image resource url in DefaultGridItem.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public string ResourceUrl
-        {
-            get => GetValue(ResourceUrlProperty) as string;
-            set
-            {
-                SetValue(ResourceUrlProperty, value);
-                NotifyPropertyChanged();
-            }
-        }
-
-        internal string InternalResourceUrl
-        {
-            get
-            {
-                return Image.ResourceUrl;
-            }
-            set
-            {
-                Image.ResourceUrl = value;
-            }
-        }
-
+        /* open when ImageView using Uri not string
+                /// <summary>
+                /// Image image's resource url in DefaultGridItem.
+                /// </summary>
+                [EditorBrowsable(EditorBrowsableState.Never)]
+                public string ImageUrl
+                {
+                    get
+                    {
+                        return Image.ResourceUrl;
+                    }
+                    set
+                    {
+                        Image.ResourceUrl = value;
+                    }
+                }
+        */
 
         /// <summary>
         /// DefaultGridItem's text part.
@@ -345,8 +336,6 @@ namespace Tizen.NUI.Components
             RelativeLayout.SetRightTarget(itemImage, this);
             RelativeLayout.SetRightRelativeOffset(itemImage, 1.0F);
             RelativeLayout.SetHorizontalAlignment(itemImage, RelativeLayout.Alignment.Center);
-            RelativeLayout.SetFillHorizontal(itemImage, true);
-            RelativeLayout.SetFillVertical(itemImage, true);
 
             if (itemLabel != null)
             {
index 977d95c..4a62d0f 100755 (executable)
@@ -42,25 +42,6 @@ namespace Tizen.NUI.Components
             return instance.InternalText;
         });
 
-
-        /// <summary>
-        /// ResourceUrlProperty
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public static readonly BindableProperty ResourceUrlProperty = BindableProperty.Create(nameof(ResourceUrl), typeof(string), typeof(DefaultGridItem), default(string), propertyChanged: (bindable, oldValue, newValue) =>
-        {
-            var instance = (DefaultGridItem)bindable;
-            if (newValue != null)
-            {
-                instance.InternalResourceUrl = newValue as string;
-            }
-        },
-        defaultValueCreator: (bindable) =>
-        {
-            var instance = (DefaultGridItem)bindable;
-            return instance.InternalResourceUrl;
-        });
-
         /// <summary>
         /// LabelOrientationTypeProperty
         /// </summary>
index 8f6d799..d9c7ab5 100755 (executable)
@@ -9,11 +9,18 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <TizenPreloadFile Include="Tizen.NUI.preload" Sequence="30" />
+        <TizenPreloadFile Include="Tizen.NUI.preload"
+                          Sequence="30" />
     </ItemGroup>
     <ItemGroup>
-      <PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
-      <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
+        <PackageReference Include="Microsoft.CSharp"
+                          Version="4.3.0" />
+        <PackageReference Include="System.Reflection"
+                          Version="4.3.0" />
+        <PackageReference Include="System.Reflection.TypeExtensions"
+                          Version="4.3.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection"
+                          Version="1.1.0" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Tizen.Applications.Common\Tizen.Applications.Common.csproj" />
@@ -23,7 +30,8 @@
         <ProjectReference Include="..\Tizen.Applications.ThemeManager\Tizen.Applications.ThemeManager.csproj" />
         <ProjectReference Include="..\Tizen.Tracer\Tizen.Tracer.csproj" />
     </ItemGroup>
-    <Target Name="ChangeAliasesOfStrongNameAssemblies" BeforeTargets="FindReferenceAssembliesForReferences;ResolveReferences">
+    <Target Name="ChangeAliasesOfStrongNameAssemblies"
+            BeforeTargets="FindReferenceAssembliesForReferences;ResolveReferences">
         <ItemGroup>
             <ReferencePath Condition="'%(FileName)' == 'Tizen.System.SystemSettings'">
                 <Aliases>TizenSystemSettings</Aliases>
index 07d24b2..52c9a95 100755 (executable)
@@ -175,7 +175,7 @@ namespace Tizen.NUI
 
             Geometry viewGeometry = new Geometry(startPosition + ((endPosition - startPosition - viewSize) * alignment), viewSize);
             Geometry spaceGeometry = new Geometry(startPosition, Math.Abs(endPosition - startPosition));
-            if (fill)
+            if (fill && spaceGeometry.Size > viewGeometry.Size)
             {
                 viewGeometry = spaceGeometry;
             }
diff --git a/test/NUITizenGallery/Examples/AlertDialogTest/AlertDialogTestDialogPage.xaml b/test/NUITizenGallery/Examples/AlertDialogTest/AlertDialogTestDialogPage.xaml
deleted file mode 100755 (executable)
index f64f702..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<DialogPage x:Class="NUITizenGallery.AlertDialogTestDialogPage"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  xmlns:sys="clr-namespace:System.Collections.Generic;assembly=netstandard">
-
-    <!-- Content is main placeholder of DialogPage. Add your dialog into this view. -->
-    <DialogPage.Content>
-        <AlertDialog x:Name="alertDialog" Title="Title" Message="Message">
-            <AlertDialog.Actions>
-                <sys:List x:TypeArguments="View">
-                    <Button x:Name="cancelButton" Text="Cancel"/>
-                    <Button x:Name="okButton" Text="OK"/>
-                </sys:List>
-            </AlertDialog.Actions>
-        </AlertDialog>
-    </DialogPage.Content>
-
-</DialogPage>
diff --git a/test/NUITizenGallery/Examples/AlertDialogTest/AlertDialogTestDialogPage.xaml.cs b/test/NUITizenGallery/Examples/AlertDialogTest/AlertDialogTestDialogPage.xaml.cs
deleted file mode 100644 (file)
index 6869d24..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright(c) 2022 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-//using Tizen.NUI;
-//using Tizen.NUI.BaseComponents;
-using Tizen.NUI.Components;
-
-namespace NUITizenGallery
-{
-    public partial class AlertDialogTestDialogPage : DialogPage
-    {
-        public AlertDialogTestDialogPage()
-        {
-            InitializeComponent();
-
-            cancelButton.Clicked += CancelButtonClicked;
-            okButton.Clicked += OkButtonClicked;
-        }
-
-        private void CancelButtonClicked(object sender, ClickedEventArgs args)
-        {
-            Navigator?.Pop();
-        }
-
-        private void OkButtonClicked(object sender, ClickedEventArgs args)
-        {
-            Navigator?.Pop();
-        }
-    }
-}
index 40e6715..b9a07d7 100755 (executable)
                 <LinearLayout LinearOrientation="Vertical" CellPadding="0,20"/>
             </View.Layout>
 
-            <Button x:Name="buttonWithXaml"
-                        Text="Show AlertDialog with xaml"
-                        WidthSpecification="{Static LayoutParamPolicies.MatchParent}" />
-
             <Button x:Name="buttonOneAction"
                         Text="Show AlertDialog with one button"
                         WidthSpecification="{Static LayoutParamPolicies.MatchParent}" />
index af1b9ea..b5a07e3 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@ namespace NUITizenGallery
         {
             InitializeComponent();
 
-            buttonWithXaml.Clicked += ButtonWithXamlClicked;
             buttonOneAction.Clicked += ButtonOneActionClicked;
             buttonTwoActions.Clicked += ButtonTwoActionsClicked;
             buttonNoTitle.Clicked += ButtonNoTitleClicked;
@@ -38,11 +37,6 @@ namespace NUITizenGallery
 
         private int count;
 
-        private void ButtonWithXamlClicked(object sender, ClickedEventArgs args)
-        {
-            NUIApplication.GetDefaultWindow().GetDefaultNavigator().Push(new AlertDialogTestDialogPage());
-        }
-
         private void ButtonOneActionClicked(object sender, ClickedEventArgs args)
         {
             var button = new Button()
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/AnimalGrid.cs b/test/NUITizenGallery/Examples/CollectionViewTest/AnimalGrid.cs
deleted file mode 100644 (file)
index 3074613..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright(c) 2022 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-using System;
-using Tizen.NUI;
-using Tizen.NUI.Components;
-
-namespace NUITizenGallery
-{
-    internal class AnimalGrid : IExample
-    {
-        private Window window;
-
-        public void Activate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
-
-            window = NUIApplication.GetDefaultWindow();
-            window.GetDefaultNavigator().Push(new AnimalGridPage());
-        }
-        public void Deactivate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            window.GetDefaultNavigator().Pop();
-        }
-    }
-}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/AnimalGridPage.cs b/test/NUITizenGallery/Examples/CollectionViewTest/AnimalGridPage.cs
deleted file mode 100644 (file)
index 39a92fd..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright(c) 2022 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-using System;
-using System.ComponentModel;
-using Tizen.NUI;
-using Tizen.NUI.Binding;
-using Tizen.NUI.BaseComponents;
-using Tizen.NUI.Components;
-using Tizen.NUI.Components.Extension;
-
-namespace NUITizenGallery
-{
-    public partial class AnimalGridPage : ContentPage
-    {
-        public AnimalGridPage()
-        {
-            InitializeComponent();
-            BindingContext = new Animals();
-        }
-
-        protected override void Dispose(DisposeTypes type)
-        {
-            if (Disposed)
-            {
-                return;
-            }
-
-            if (type == DisposeTypes.Explicit)
-            {
-                RemoveAllChildren(true);
-            }
-
-            base.Dispose(type);
-        }
-
-        private void RemoveAllChildren(bool dispose = false)
-        {
-            RecursiveRemoveChildren(this, dispose);
-        }
-
-        private void RecursiveRemoveChildren(View parent, bool dispose)
-        {
-            if (parent == null)
-            {
-                return;
-            }
-
-            int maxChild = (int)parent.ChildCount;
-            for (int i = maxChild - 1; i >= 0; --i)
-            {
-                View child = parent.GetChildAt((uint)i);
-                if (child == null)
-                {
-                    continue;
-                }
-
-                RecursiveRemoveChildren(child, dispose);
-                parent.Remove(child);
-                if (dispose)
-                {
-                    child.Dispose();
-                }
-            }
-        }
-    }
-}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/AnimalGridPage.xaml b/test/NUITizenGallery/Examples/CollectionViewTest/AnimalGridPage.xaml
deleted file mode 100755 (executable)
index 3a065f7..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ContentPage x:Class="NUITizenGallery.AnimalGridPage"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
-  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
-
-    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
-    <ContentPage.AppBar>
-        <AppBar x:Name="appBar" Title="AnimalGridPage"/>
-    </ContentPage.AppBar>
-
-    <!-- Content is main placeholder of ContentPage. Add your content into this view. -->
-    <ContentPage.Content>
-        <View x:Name="ContentView"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
-          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
-
-            <View.Layout>
-                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
-            </View.Layout>
-
-            <CollectionView x:Name="ColView"
-              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
-              HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
-              ScrollingDirection="Vertical"
-              ItemsSource="{Binding Source}"
-              HideScrollbar="true"
-              SelectionMode="None">
-
-                <CollectionView.ItemsLayouter>
-                      <GridLayouter />
-                </CollectionView.ItemsLayouter>
-                <CollectionView.ItemTemplate>
-                      <DataTemplate>
-                            <DefaultGridItem
-                                WidthSpecification="230"
-                                HeightSpecification="200"
-                                Text="{Binding Path=Name}"
-                                ResourceUrl="{Binding Path=ImagePath}">
-                                <DefaultGridItem.Badge>
-                                    <CheckBox />
-                                </DefaultGridItem.Badge>
-                            </DefaultGridItem>
-                      </DataTemplate>
-                </CollectionView.ItemTemplate>
-
-
-            </CollectionView>
-        </View>
-    </ContentPage.Content>
-</ContentPage>
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/AnimalList.cs b/test/NUITizenGallery/Examples/CollectionViewTest/AnimalList.cs
deleted file mode 100644 (file)
index c61e87f..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright(c) 2022 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-using System;
-using Tizen.NUI;
-using Tizen.NUI.Components;
-
-namespace NUITizenGallery
-{
-    internal class AnimalList : IExample
-    {
-        private Window window;
-
-        public void Activate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
-
-            window = NUIApplication.GetDefaultWindow();
-            window.GetDefaultNavigator().Push(new AnimalListPage());
-        }
-        public void Deactivate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            window.GetDefaultNavigator().Pop();
-        }
-    }
-}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/AnimalListPage.cs b/test/NUITizenGallery/Examples/CollectionViewTest/AnimalListPage.cs
deleted file mode 100644 (file)
index cc79d84..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright(c) 2022 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-using System;
-using System.ComponentModel;
-using Tizen.NUI;
-using Tizen.NUI.Binding;
-using Tizen.NUI.BaseComponents;
-using Tizen.NUI.Components;
-using Tizen.NUI.Components.Extension;
-
-namespace NUITizenGallery
-{
-    public partial class AnimalListPage : ContentPage
-    {
-        public AnimalListPage()
-        {
-            InitializeComponent();
-            BindingContext = new Animals();
-        }
-
-        protected override void Dispose(DisposeTypes type)
-        {
-            if (Disposed)
-            {
-                return;
-            }
-
-            if (type == DisposeTypes.Explicit)
-            {
-                RemoveAllChildren(true);
-            }
-
-            base.Dispose(type);
-        }
-
-        private void RemoveAllChildren(bool dispose = false)
-        {
-            RecursiveRemoveChildren(this, dispose);
-        }
-
-        private void RecursiveRemoveChildren(View parent, bool dispose)
-        {
-            if (parent == null)
-            {
-                return;
-            }
-
-            int maxChild = (int)parent.ChildCount;
-            for (int i = maxChild - 1; i >= 0; --i)
-            {
-                View child = parent.GetChildAt((uint)i);
-                if (child == null)
-                {
-                    continue;
-                }
-
-                RecursiveRemoveChildren(child, dispose);
-                parent.Remove(child);
-                if (dispose)
-                {
-                    child.Dispose();
-                }
-            }
-        }
-    }
-}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/AnimalListPage.xaml b/test/NUITizenGallery/Examples/CollectionViewTest/AnimalListPage.xaml
deleted file mode 100755 (executable)
index b8b0160..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ContentPage x:Class="NUITizenGallery.AnimalListPage"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
-  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
-
-    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
-    <ContentPage.AppBar>
-        <AppBar x:Name="appBar" Title="AnimalListPage"/>
-    </ContentPage.AppBar>
-
-    <!-- Content is main placeholder of ContentPage. Add your content into this view. -->
-    <ContentPage.Content>
-        <View x:Name="ContentView"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
-          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
-
-            <View.Layout>
-                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
-            </View.Layout>
-
-            <CollectionView x:Name="ColView"
-              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
-              HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
-              ScrollingDirection="Vertical"
-              ItemsSource="{Binding Source}"
-              HideScrollbar="true"
-              SelectionMode="None">
-
-                <CollectionView.ItemsLayouter>
-                      <LinearLayouter />
-                </CollectionView.ItemsLayouter>
-                <CollectionView.ItemTemplate>
-                      <DataTemplate>
-                            <DefaultLinearItem
-                                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
-                                Text="{Binding Path=Name}"
-                                SubText="{Binding Path=ScientificName}">
-                                <DefaultLinearItem.Icon>
-                                    <ImageView
-                                        WidthSpecification="70"
-                                        HeightSpecification="50"
-                                        ResourceUrl="{Binding Path=ImagePath}" />
-                                </DefaultLinearItem.Icon>
-                                <DefaultLinearItem.Extra>
-                                    <CheckBox />
-                                </DefaultLinearItem.Extra>
-                            </DefaultLinearItem>
-                      </DataTemplate>
-                </CollectionView.ItemTemplate>
-
-
-            </CollectionView>
-        </View>
-    </ContentPage.Content>
-</ContentPage>
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/Animals.cs b/test/NUITizenGallery/Examples/CollectionViewTest/Animals.cs
deleted file mode 100644 (file)
index 14e553a..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright(c) 2022 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using Tizen.NUI;
-using Tizen.NUI.Binding;
-
-public class Animal : INotifyPropertyChanged
-{
-    private string _name;
-    private string _scientificName;
-    private string _imageUrl = Tizen.Applications.Application.Current.DirectoryInfo.Resource + "/images/animals/";
-
-    public event PropertyChangedEventHandler PropertyChanged;
-    private void OnPropertyChanged(string propertyName) { PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); }
-
-
-    public Animal(string name, string scientificName)
-    {
-        _name = name;
-        _scientificName = scientificName;
-    }
-
-    public string Name
-    {
-        get => _name;
-        set
-        {
-            _name = value;
-            OnPropertyChanged("Name");
-        }
-    }
-
-    public string ScientificName
-    {
-        get => _scientificName;
-        set
-        {
-            _scientificName = value;
-            OnPropertyChanged("ScientificName");
-        }
-    }
-
-    public string ImagePath
-    {
-        get
-        {
-            string filename = _name.Replace(" ", "");
-            filename = filename.ToLower() + ".jpg";
-            return _imageUrl + filename;
-        }
-    }
-}
-
-
-public class Animals
-{
-    (string Name,string ScientificName)[] namePool = {
-    ("Bald Eagle", "Haliaeetus leucocephalus"),
-    ("Bear", "Ursidae"),
-    ("Cat", "Felis catus"),
-    ("Chicken", "Gallus gallus domesticus"),
-    ("Cow", "Bos taurus"),
-    ("Deer", "Cervidae"),
-    ("Dog", "Canis lupus familiaris"),
-    ("Duck", "Anatidae"),
-    ("Elephant", "Elephantidae"),
-    ("Emperor Penguin", "Aptenodytes forsteri"),
-    ("Giraffe", "Giraffa"),
-    ("Horse", "Equus ferus"),
-    ("Leopard", "Panthera pardus"),
-    ("Lion", "Panthera leo"),
-    ("Panda", "Ailuropoda melanoleuca"),
-    ("Peacock", "Pavo cristatus"),
-    ("Pig", "Sus scrofa domesticus"),
-    ("Pigeon", "Columba livia"),
-    ("Red Fox", "Vulpes vulpes"),
-    ("Seagull", "Larus canus"),
-    ("Squirrel", "Sciurus vulgaris"),
-    ("Tiger", "Panthera tigris"),
-    ("Wolf", "Canis lupus"),
-    ("Zebra", "Hippotigris"),
-};
-    public ObservableCollection<Animal> Source {get; private set; } = new ObservableCollection<Animal>();
-
-    public Animals()
-    {
-        for (int i = 0; i < namePool.Length; i++)
-            Source.Add(new Animal(namePool[i].Name, namePool[i].ScientificName));
-    }
-}
index fbb4f22..764c965 100755 (executable)
@@ -29,7 +29,7 @@
     </ItemGroup>
 
     <PropertyGroup>
-        <XamlOptimization>1</XamlOptimization>
+        <XamlOptimization>2</XamlOptimization>
     </PropertyGroup>
 
     <ImportGroup>
diff --git a/test/NUITizenGallery/res/images/animals/baldeagle.jpg b/test/NUITizenGallery/res/images/animals/baldeagle.jpg
deleted file mode 100644 (file)
index 5441f72..0000000
Binary files a/test/NUITizenGallery/res/images/animals/baldeagle.jpg and /dev/null differ
diff --git a/test/NUITizenGallery/res/images/animals/bear.jpg b/test/NUITizenGallery/res/images/animals/bear.jpg
deleted file mode 100644 (file)
index d448f8b..0000000
Binary files a/test/NUITizenGallery/res/images/animals/bear.jpg and /dev/null differ
diff --git a/test/NUITizenGallery/res/images/animals/cat.jpg b/test/NUITizenGallery/res/images/animals/cat.jpg
deleted file mode 100644 (file)
index 60b7e2b..0000000
Binary files a/test/NUITizenGallery/res/images/animals/cat.jpg and /dev/null differ
diff --git a/test/NUITizenGallery/res/images/animals/chicken.jpg b/test/NUITizenGallery/res/images/animals/chicken.jpg
deleted file mode 100644 (file)
index 834df28..0000000
Binary files a/test/NUITizenGallery/res/images/animals/chicken.jpg and /dev/null differ
diff --git a/test/NUITizenGallery/res/images/animals/cow.jpg b/test/NUITizenGallery/res/images/animals/cow.jpg
deleted file mode 100644 (file)
index 65a01e6..0000000
Binary files a/test/NUITizenGallery/res/images/animals/cow.jpg and /dev/null differ
diff --git a/test/NUITizenGallery/res/images/animals/deer.jpg b/test/NUITizenGallery/res/images/animals/deer.jpg
deleted file mode 100644 (file)
index d1949b7..0000000
Binary files a/test/NUITizenGallery/res/images/animals/deer.jpg and /dev/null differ
diff --git a/test/NUITizenGallery/res/images/animals/dog.jpg b/test/NUITizenGallery/res/images/animals/dog.jpg
deleted file mode 100644 (file)
index 215212c..0000000
Binary files a/test/NUITizenGallery/res/images/animals/dog.jpg and /dev/null differ
diff --git a/test/NUITizenGallery/res/images/animals/duck.jpg b/test/NUITizenGallery/res/images/animals/duck.jpg
deleted file mode 100644 (file)
index e1bcddc..0000000
Binary files a/test/NUITizenGallery/res/images/animals/duck.jpg and /dev/null differ
diff --git a/test/NUITizenGallery/res/images/animals/elephant.jpg b/test/NUITizenGallery/res/images/animals/elephant.jpg
deleted file mode 100644 (file)
index c3a4af2..0000000
Binary files a/test/NUITizenGallery/res/images/animals/elephant.jpg and /dev/null differ
diff --git a/test/NUITizenGallery/res/images/animals/emperorpenguin.jpg b/test/NUITizenGallery/res/images/animals/emperorpenguin.jpg
deleted file mode 100644 (file)
index c9424df..0000000
Binary files a/test/NUITizenGallery/res/images/animals/emperorpenguin.jpg and /dev/null differ
diff --git a/test/NUITizenGallery/res/images/animals/giraffe.jpg b/test/NUITizenGallery/res/images/animals/giraffe.jpg
deleted file mode 100644 (file)
index ecb1c4d..0000000
Binary files a/test/NUITizenGallery/res/images/animals/giraffe.jpg and /dev/null differ
diff --git a/test/NUITizenGallery/res/images/animals/horse.jpg b/test/NUITizenGallery/res/images/animals/horse.jpg
deleted file mode 100644 (file)
index 5a1ff53..0000000
Binary files a/test/NUITizenGallery/res/images/animals/horse.jpg and /dev/null differ
diff --git a/test/NUITizenGallery/res/images/animals/leopard.jpg b/test/NUITizenGallery/res/images/animals/leopard.jpg
deleted file mode 100644 (file)
index 7d6541b..0000000
Binary files a/test/NUITizenGallery/res/images/animals/leopard.jpg and /dev/null differ
diff --git a/test/NUITizenGallery/res/images/animals/lion.jpg b/test/NUITizenGallery/res/images/animals/lion.jpg
deleted file mode 100644 (file)
index 4225ecc..0000000
Binary files a/test/NUITizenGallery/res/images/animals/lion.jpg and /dev/null differ
diff --git a/test/NUITizenGallery/res/images/animals/panda.jpg b/test/NUITizenGallery/res/images/animals/panda.jpg
deleted file mode 100644 (file)
index 2db190a..0000000
Binary files a/test/NUITizenGallery/res/images/animals/panda.jpg and /dev/null differ
diff --git a/test/NUITizenGallery/res/images/animals/peacock.jpg b/test/NUITizenGallery/res/images/animals/peacock.jpg
deleted file mode 100644 (file)
index 3aac5b2..0000000
Binary files a/test/NUITizenGallery/res/images/animals/peacock.jpg and /dev/null differ
diff --git a/test/NUITizenGallery/res/images/animals/pig.jpg b/test/NUITizenGallery/res/images/animals/pig.jpg
deleted file mode 100644 (file)
index f31bb18..0000000
Binary files a/test/NUITizenGallery/res/images/animals/pig.jpg and /dev/null differ
diff --git a/test/NUITizenGallery/res/images/animals/pigeon.jpg b/test/NUITizenGallery/res/images/animals/pigeon.jpg
deleted file mode 100644 (file)
index 40777bd..0000000
Binary files a/test/NUITizenGallery/res/images/animals/pigeon.jpg and /dev/null differ
diff --git a/test/NUITizenGallery/res/images/animals/redfox.jpg b/test/NUITizenGallery/res/images/animals/redfox.jpg
deleted file mode 100644 (file)
index c58e6ea..0000000
Binary files a/test/NUITizenGallery/res/images/animals/redfox.jpg and /dev/null differ
diff --git a/test/NUITizenGallery/res/images/animals/seagull.jpg b/test/NUITizenGallery/res/images/animals/seagull.jpg
deleted file mode 100644 (file)
index 1dd6385..0000000
Binary files a/test/NUITizenGallery/res/images/animals/seagull.jpg and /dev/null differ
diff --git a/test/NUITizenGallery/res/images/animals/squirrel.jpg b/test/NUITizenGallery/res/images/animals/squirrel.jpg
deleted file mode 100644 (file)
index 4a5c1e7..0000000
Binary files a/test/NUITizenGallery/res/images/animals/squirrel.jpg and /dev/null differ
diff --git a/test/NUITizenGallery/res/images/animals/tiger.jpg b/test/NUITizenGallery/res/images/animals/tiger.jpg
deleted file mode 100644 (file)
index 963c912..0000000
Binary files a/test/NUITizenGallery/res/images/animals/tiger.jpg and /dev/null differ
diff --git a/test/NUITizenGallery/res/images/animals/wolf.jpg b/test/NUITizenGallery/res/images/animals/wolf.jpg
deleted file mode 100644 (file)
index 3a010de..0000000
Binary files a/test/NUITizenGallery/res/images/animals/wolf.jpg and /dev/null differ
diff --git a/test/NUITizenGallery/res/images/animals/zebra.jpg b/test/NUITizenGallery/res/images/animals/zebra.jpg
deleted file mode 100644 (file)
index b787d53..0000000
Binary files a/test/NUITizenGallery/res/images/animals/zebra.jpg and /dev/null differ