Merge pull request #110 from muak/development

Development
muak · May 31, 2020 · 032280a · 032280a
2 parents 83f5ebe + 38339aa
commit 032280a
Show file tree

Hide file tree

Showing 17 changed files with 162 additions and 57 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 ## files generated by popular Visual Studio add-ons.
 
 .vs/
+mono_crash.*
 
 # User-specific files
 *.suo

diff --git a/README-ja.md b/README-ja.md
@@ -657,8 +657,6 @@ ValueTextは使用できません。
 iOSではタップ時にページ遷移し遷移先ページでピッカーが表示されます。
 Androidではタップ時にダイアログでピッカーが表示されます。
 
-> PickerCellは、iOSのShell上では動作しません。
-
 ### Properties
 
 * PageTitle

diff --git a/README.md b/README.md
@@ -649,8 +649,6 @@ This is a LabelCell calling a multiple select picker.
 When tapped on iOS, move next page and show picker there.
 When tapped on Android, show the picker on a dialog. 
 
-> Note that the PickerCell is not supported in Shell on iOS.
-
 ### Properties
 
 * PageTitle

diff --git a/Sample/Sample/App.xaml.cs b/Sample/Sample/App.xaml.cs
@@ -22,7 +22,7 @@ protected override void OnInitialized()
 
             NavigationService.NavigateAsync("MyNavigationPage/MainPage");
             //MainPage = new AppShell();
-		}
+        }
 
         protected override void RegisterTypes(IContainerRegistry containerRegistry)
         {

diff --git a/Sample/Sample/Properties/AssemblyInfo.cs b/Sample/Sample/Properties/AssemblyInfo.cs
@@ -3,3 +3,4 @@
 using Xamarin.Forms;
 
 [assembly: ExportFont("APJapanesefont.ttf", Alias = "Anzu")]
+[assembly: ExportFont("icomoon.ttf", Alias = "Moon")]
diff --git a/Sample/Sample/Resources/icomoon.ttf b/Sample/Sample/Resources/icomoon.ttf
diff --git a/Sample/Sample/Resources/ionicons.ttf b/Sample/Sample/Resources/ionicons.ttf
diff --git a/Sample/Sample/Sample.csproj b/Sample/Sample/Sample.csproj
@@ -1,10 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>SettingsSample</AssemblyName>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <LangVersion>8.0</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <LangVersion>8.0</LangVersion>
+  </PropertyGroup>
   <ItemGroup>
 	<PackageReference Include="AiForms.Layouts" Version="1.0.4" />
 	<PackageReference Include="Xamarin.Forms.Svg" Version="1.0.0-pre4" />
@@ -22,9 +28,13 @@
   </ItemGroup>
   <ItemGroup>
     <None Remove="Resources\APJapanesefont.ttf" />
+    <None Remove="Resources\ionicons.ttf" />
+    <None Remove="Resources\icomoon.ttf" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\APJapanesefont.ttf" />
+    <EmbeddedResource Include="Resources\ionicons.ttf" />
+    <EmbeddedResource Include="Resources\icomoon.ttf" />
   </ItemGroup>
   <Import Project="..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.28.0.0.3\build\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.28.0.0.3\build\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" />
 </Project>
diff --git a/Sample/Sample/Views/SettingsViewPage.xaml b/Sample/Sample/Views/SettingsViewPage.xaml
@@ -61,7 +61,7 @@
     </ContentPage.Resources>
 
 	<sv:SettingsView HasUnevenRows="true" HeaderHeight="36" HeaderPadding="14,0,0,6" HeaderTextVerticalAlign="End" FooterPadding="14,4,4,6"
-                  ShowArrowIndicatorForAndroid="True" CellTitleFontFamily="Anzu"
+                  ShowArrowIndicatorForAndroid="True" 
         >
 
 		<sv:Section FooterText="This is a footer. optionaly you can write here.">
@@ -72,7 +72,14 @@
 		</sv:Section>
 
         <sv:Section Title="LabelCell">
-            <sv:LabelCell Title="Storage" ValueText="3,065MB" TitleFontFamily="" />
+            <sv:LabelCell Title="Storage" ValueText="3,065MB">
+                <sv:LabelCell.IconSource>
+                    <FontImageSource Glyph="&#xe901;"
+                                     Color="Blue"
+                                     FontFamily="Moon"
+                                     Size="30" />
+                </sv:LabelCell.IconSource>
+            </sv:LabelCell>
         </sv:Section>
 
         <sv:Section Title="CheckableCell">

diff --git a/Sample/Sample/Views/ShellTestPage.xaml b/Sample/Sample/Views/ShellTestPage.xaml
@@ -3,11 +3,14 @@
     xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:ai="clr-namespace:AiForms.Renderers;assembly=SettingsView"
-    x:Class="Sample.Views.ShellTestPage">
-    <ai:SettingsView BackgroundColor="White" >
+    x:Class="Sample.Views.ShellTestPage"
+    NavigationPage.BackButtonTitle=""
+    Title="ShellTest"
+    >
+    <ai:SettingsView BackgroundColor="AliceBlue" SeparatorColor="Brown" >
         <ai:Section Title="Section1" FooterText="Footer1"   >                
 
-            <ai:PickerCell ItemsSource="{Binding ItemsSource}" BackgroundColor="White"  />
+            <ai:PickerCell PageTitle="Hoge" ItemsSource="{Binding ItemsSource}" BackgroundColor="Beige" DisplayMember="Name" SubDisplayMember="Age" UsePickToClose="True" SelectionMode="Single" AccentColor="Red" TitleColor="Chocolate" DescriptionColor="BlueViolet" ValueTextColor="MediumSeaGreen"  />
         </ai:Section>
     </ai:SettingsView>
 </ContentPage>
diff --git a/Sample/Sample/Views/SurveyPage.xaml b/Sample/Sample/Views/SurveyPage.xaml
@@ -5,15 +5,7 @@
     xmlns:sv="clr-namespace:AiForms.Renderers;assembly=SettingsView"
     x:Class="Sample.Views.SurveyPage">
 
-
-    <sv:SettingsView  HeaderPadding="14" HeaderFontSize="30" HeaderTextVerticalAlign="End">
-        <!--<sv:SettingsView.ItemTemplate>
-            <DataTemplate>
-                <sv:Section>
-                    <sv:LabelCell Title="{Binding Name}" ValueText="{Binding Value}"/>
-                </sv:Section>
-            </DataTemplate>
-        </sv:SettingsView.ItemTemplate>-->
+    <sv:SettingsView  HeaderPadding="10" HeaderFontSize="16" HeaderTextVerticalAlign="Center">
         <sv:Section ItemsSource="{Binding ItemsSource}" Title="headerd fsdfjslkdfjlさkjdflさjflさkjfafsadfsadfjs;dlfjslakdfj;sadjf;lsadjfkasdfjeiofjaw" FooterText="footer">
             <sv:Section.ItemTemplate>
                 <DataTemplate>

diff --git a/SettingsView.Droid/SettingsViewRecyclerAdapter.cs b/SettingsView.Droid/SettingsViewRecyclerAdapter.cs
@@ -325,9 +325,16 @@ void BindHeaderView(HeaderViewHolder holder)
             {
                 cellHeight = (int)_context.ToPixels(_settingsView.HeaderHeight);
             }
+            else
+            {
+                cellHeight = -1; // Height Auto
+            }
 
-            view.SetMinimumHeight(cellHeight);
-            view.LayoutParameters.Height = cellHeight;
+            if (cellHeight >= 0)
+            {
+                view.SetMinimumHeight(cellHeight);
+                view.LayoutParameters.Height = cellHeight;
+            }
 
             //textview setting
             holder.TextView.SetPadding(
@@ -342,9 +349,11 @@ void BindHeaderView(HeaderViewHolder holder)
             holder.TextView.Typeface = FontUtility.CreateTypeface(_settingsView.HeaderFontFamily, _settingsView.HeaderFontAttributes);
             holder.TextView.SetTextSize(Android.Util.ComplexUnitType.Sp, (float)_settingsView.HeaderFontSize);
             holder.TextView.SetBackgroundColor(_settingsView.HeaderBackgroundColor.ToAndroid());
-            holder.TextView.SetMaxLines(1);
-            holder.TextView.SetMinLines(1);
-            holder.TextView.Ellipsize = TextUtils.TruncateAt.End;
+
+            // Single line was done away with.
+            //holder.TextView.SetMaxLines(1);
+            //holder.TextView.SetMinLines(1);
+            //holder.TextView.Ellipsize = TextUtils.TruncateAt.End;
 
             if (_settingsView.HeaderTextColor != Xamarin.Forms.Color.Default)
             {

diff --git a/SettingsView.iOS/Cells/CellBaseView.cs b/SettingsView.iOS/Cells/CellBaseView.cs
@@ -7,6 +7,7 @@
 using Xamarin.Forms.Platform.iOS;
 using Foundation;
 using CoreGraphics;
+using CoreFoundation;
 
 namespace AiForms.Renderers.iOS
 {
@@ -514,7 +515,16 @@ void LoadIconImage(IImageSourceHandler handler, ImageSource source)
             var scale = (float)UIScreen.MainScreen.Scale;
             Task.Run(async () =>
             {
-                image = await handler.LoadImageAsync(source, token, scale: scale);
+                if(source is FontImageSource)
+                {
+                    DispatchQueue.MainQueue.DispatchSync(async () => {
+                        image = await handler.LoadImageAsync(source, token, scale: scale);
+                    });
+                }
+                else
+                {
+                    image = await handler.LoadImageAsync(source, token, scale: scale);
+                }                
                 token.ThrowIfCancellationRequested();
             }, token).ContinueWith(t =>
             {

diff --git a/SettingsView.iOS/Cells/PickerCellRenderer.cs b/SettingsView.iOS/Cells/PickerCellRenderer.cs
@@ -1,12 +1,12 @@
-using AiForms.Renderers;
+using System.Collections.Specialized;
+using System.Linq;
+using AiForms.Renderers;
 using AiForms.Renderers.iOS;
+using Foundation;
+using ObjCRuntime;
 using UIKit;
 using Xamarin.Forms;
-using System.Collections.Specialized;
-using System;
-using Foundation;
-using System.Linq;
-using System.ComponentModel;
+using Xamarin.Forms.Platform.iOS;
 
 [assembly: ExportRenderer(typeof(PickerCell), typeof(PickerCellRenderer))]
 namespace AiForms.Renderers.iOS
@@ -82,17 +82,60 @@ public override void RowSelected(UITableView tableView, NSIndexPath indexPath)
                 return;
             }
 
-            var naviCtrl = GetUINavigationController(UIApplication.SharedApplication.KeyWindow.RootViewController);
             _pickerVC?.Dispose();
-            _pickerVC = new PickerTableViewController(this, tableView);
-            BeginInvokeOnMainThread(() => naviCtrl.PushViewController(_pickerVC, true));
+
+            var naviCtrl = GetUINavigationController(UIApplication.SharedApplication.KeyWindow.RootViewController);
+            if(naviCtrl is ShellSectionRenderer shell)
+            {
+                // When use Shell, the NativeView is wrapped in a Forms.ContentPage.
+                _pickerVC = new PickerTableViewController(this, tableView, shell.ShellSection.Navigation);
+                // Fix height broken. For some reason, TableView ContentSize is broken.
+                _pickerVC.TableView.ContentInset = new UIEdgeInsets(44, 0, 44, 0);
+                var page = new ContentPage();               
+                page.Content = _pickerVC.TableView.ToView(); ;
+                page.Title = _PickerCell.PageTitle;
+
+                // Fire manually because INavigation.PushAsync does not work ViewDidAppear and ViewWillAppear.
+                _pickerVC.ViewDidAppear(false);
+                _pickerVC.InitializeView();
+                BeginInvokeOnMainThread(async () => {
+                    await shell.ShellSection.Navigation.PushAsync(page, true);
+                    _pickerVC.InitializeScroll();
+                });
+            }
+            else
+            {
+                // When use traditional navigation.
+                _pickerVC = new PickerTableViewController(this, tableView);
+                BeginInvokeOnMainThread(() => naviCtrl.PushViewController(_pickerVC, true));
+            }
+
 
             if (!_PickerCell.KeepSelectedUntilBack) 
             {
                 tableView.DeselectRow(indexPath, true);
             }
         }
 
+        class NavDelegate : UINavigationControllerDelegate
+        {
+            readonly ShellSectionRenderer _self;
+
+            public NavDelegate(ShellSectionRenderer renderer)
+            {
+                _self = renderer;
+            }
+
+            public override void DidShowViewController(UINavigationController navigationController, [Transient] UIViewController viewController, bool animated)
+            {
+            }
+
+            public override void WillShowViewController(UINavigationController navigationController, [Transient] UIViewController viewController, bool animated)
+            {
+                navigationController.SetNavigationBarHidden(false, true);
+            }
+        }
+
         /// <summary>
         /// Updates the cell.
         /// </summary>