diff options
| -rw-r--r--[-rwxr-xr-x] | Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.project.json | 2 | ||||
| -rw-r--r-- | Xamarin.Forms.Platform.Tizen/Cells/ImageCellRenderer.cs | 2 | ||||
| -rw-r--r-- | Xamarin.Forms.Platform.Tizen/Native/ListView.cs | 22 | ||||
| -rw-r--r-- | Xamarin.Forms.Platform.Tizen/Renderers/ButtonRenderer.cs | 2 | ||||
| -rw-r--r-- | Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs | 2 | ||||
| -rw-r--r-- | packaging/xamarin-forms-tizen.spec | 7 |
6 files changed, 19 insertions, 18 deletions
diff --git a/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.project.json b/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.project.json index c381ec60..b69f7307 100755..100644 --- a/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.project.json +++ b/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.project.json @@ -4,7 +4,7 @@ "NETStandard.Library": "1.6.0", "Tizen.Applications": "1.0.2", "Tizen.Location": "1.0.3", - "Tizen.Maps": "1.0.1" + "Tizen.Maps": "1.0.5" }, "frameworks": { "netstandard1.6": { diff --git a/Xamarin.Forms.Platform.Tizen/Cells/ImageCellRenderer.cs b/Xamarin.Forms.Platform.Tizen/Cells/ImageCellRenderer.cs index 9492e7c6..7bee5c8a 100644 --- a/Xamarin.Forms.Platform.Tizen/Cells/ImageCellRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Cells/ImageCellRenderer.cs @@ -35,7 +35,7 @@ namespace Xamarin.Forms.Platform.Tizen image.SetAlignment(-1.0, -1.0); // fill image.SetWeight(1.0, 1.0); // expand - image.LoadFromImageSourceAsync(imgCell.ImageSource); + var task = image.LoadFromImageSourceAsync(imgCell.ImageSource); return image; } else diff --git a/Xamarin.Forms.Platform.Tizen/Native/ListView.cs b/Xamarin.Forms.Platform.Tizen/Native/ListView.cs index fbee7d48..f8b09fa0 100644 --- a/Xamarin.Forms.Platform.Tizen/Native/ListView.cs +++ b/Xamarin.Forms.Platform.Tizen/Native/ListView.cs @@ -37,7 +37,7 @@ namespace Xamarin.Forms.Platform.Tizen.Native ListOfSubItems = null; } - public GenListItem Item; + public GenItem Item; public Cell Cell; public bool IsGroupItem; public CellRenderer Renderer; @@ -222,7 +222,7 @@ namespace Xamarin.Forms.Platform.Tizen.Native /// <param name="animated">If <c>true</c>, scrolling will be animated. Otherwise the cell will be moved instantaneously.</param> public void ApplyScrollTo(Cell cell, ScrollToPosition position, bool animated) { - GenListItem item = GetItemContext(cell)?.Item; + GenListItem item = GetItemContext(cell)?.Item as GenListItem; if (item != null) this.ScrollTo(item, position.ToNative(), animated); } @@ -233,7 +233,7 @@ namespace Xamarin.Forms.Platform.Tizen.Native /// <param name="cell">Cell to be selected.</param> public void ApplySelectedItem(Cell cell) { - GenListItem item = GetItemContext(cell)?.Item; + GenListItem item = GetItemContext(cell)?.Item as GenListItem; if (item != null) item.IsSelected = true; } @@ -265,7 +265,7 @@ namespace Xamarin.Forms.Platform.Tizen.Native { _headerContext = new ItemContext(); _headerContext.Item = _itemContextList.Count > 0 ? InsertBefore(headerTemplate, header, FirstItem) : Append(headerTemplate, header); - _headerContext.Item.SelectionMode = GenListSelectionMode.None; + (_headerContext.Item as GenListItem).SelectionMode = GenListSelectionMode.None; _headerContext.Item.Deleted += HeaderDeletedHandler; _itemContextList.Insert(0, _headerContext); } @@ -291,13 +291,13 @@ namespace Xamarin.Forms.Platform.Tizen.Native _footerElement = footer; if (HasFooter()) { - _footerContext.Item.UpdateItemClass(footerTemplate, footer); + (_footerContext.Item as GenListItem).UpdateItemClass(footerTemplate, footer); } else { _footerContext = new ItemContext(); _footerContext.Item = Append(footerTemplate, footer); - _footerContext.Item.SelectionMode = GenListSelectionMode.None; + (_footerContext.Item as GenListItem).SelectionMode = GenListSelectionMode.None; _footerContext.Item.Deleted += FooterDeletedHandler; _itemContextList.Add(_footerContext); } @@ -469,7 +469,7 @@ namespace Xamarin.Forms.Platform.Tizen.Native if (beforeCell != null) { - GenListItem beforeItem = GetItemContext(beforeCell)?.Item; + GenListItem beforeItem = GetItemContext(beforeCell)?.Item as GenListItem; groupItemContext.Item = InsertBefore(groupRenderer.Class, groupItemContext, beforeItem, GenListItemType.Group); } else @@ -477,7 +477,7 @@ namespace Xamarin.Forms.Platform.Tizen.Native groupItemContext.Item = Append(groupRenderer.Class, groupItemContext, GenListItemType.Group); } - groupItemContext.Item.SelectionMode = GenListSelectionMode.None; + (groupItemContext.Item as GenListItem).SelectionMode = GenListSelectionMode.None; groupItemContext.Item.IsEnabled = groupCell.IsEnabled; groupItemContext.IsGroupItem = true; @@ -507,12 +507,12 @@ namespace Xamarin.Forms.Platform.Tizen.Native { var groupContext = GetItemContext(groupCell); itemContext.ListOfSubItems = groupContext.ListOfSubItems; - parentItem = groupContext.Item; + parentItem = groupContext.Item as GenListItem; } if (beforeCell != null) { - GenListItem beforeItem = GetItemContext(beforeCell)?.Item; + GenListItem beforeItem = GetItemContext(beforeCell)?.Item as GenListItem; itemContext.Item = InsertBefore(renderer.Class, itemContext, beforeItem, GenListItemType.Normal, parentItem); } else @@ -520,7 +520,7 @@ namespace Xamarin.Forms.Platform.Tizen.Native itemContext.Item = Append(renderer.Class, itemContext, GenListItemType.Normal, parentItem); } - itemContext.Item.SelectionMode = GenListSelectionMode.Always; + (itemContext.Item as GenListItem).SelectionMode = GenListSelectionMode.Always; itemContext.Item.IsEnabled = cell.IsEnabled; cell.PropertyChanged += OnCellPropertyChanged; diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/ButtonRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/ButtonRenderer.cs index 8af7bb69..def27a99 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/ButtonRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/ButtonRenderer.cs @@ -90,7 +90,7 @@ namespace Xamarin.Forms.Platform.Tizen if (!string.IsNullOrEmpty(Element.Image)) { Control.Image = new Native.Image(Control); - Control.Image.LoadFromImageSourceAsync(Element.Image); + var task = Control.Image.LoadFromImageSourceAsync(Element.Image); } else { diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs index 361f0912..42ca0744 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs @@ -294,7 +294,7 @@ namespace Xamarin.Forms.Platform.Tizen else { Native.Image iconImage = new Native.Image(Forms.Context.MainWindow); - iconImage.LoadFromImageSourceAsync(item.Icon); + var task = iconImage.LoadFromImageSourceAsync(item.Icon); button.Image = iconImage; } diff --git a/packaging/xamarin-forms-tizen.spec b/packaging/xamarin-forms-tizen.spec index 0d457845..52784df9 100644 --- a/packaging/xamarin-forms-tizen.spec +++ b/packaging/xamarin-forms-tizen.spec @@ -38,7 +38,8 @@ BuildRequires: elm-sharp-nuget Allows one to use portable controls subsets that are mapped to native controls of Android, iOS, Windows Phone, and Tizen. -%dotnet_import_sub_packages +# make -nuget sub package +%_nuget_package %prep %setup -q @@ -59,8 +60,8 @@ cp %{SOURCE1} . %install function install_asm() { - mkdir -p %{buildroot}%{dotnet_assembly_path} - install -p -m 644 $1/bin/%{_dotnet_build_conf}/$1.dll %{buildroot}%{dotnet_assembly_path} + mkdir -p %{buildroot}%{_dotnet_assembly_path} + install -p -m 644 $1/bin/%{_dotnet_build_conf}/$1.dll %{buildroot}%{_dotnet_assembly_path} } install_asm Xamarin.Forms.Core |