Merge pull request #107 from muak/development

Development

README-ja.md

@@ -179,12 +179,17 @@ SettingsViewのプロパティ設定はApp.xamlに記述した方が良いかも
 * HeaderPadding
 * HeaderTextColor
 * HeaderFontSize
+* HeaderFontFamily
+* HeaderFontAttributes
 * HeaderTextVerticalAlign
+  > HeaderHeightを設定した場合のみ有効です。
 * HeaderBackgroundColor
 * HeaderHeight
     * ヘッダーに関する設定
 * FooterTextColor
 * FooterFontSize
+* FooterFontFamily
+* FooterFontAttributes
 * FooterBackgroundColor
 * FooterPadding
     * フッターに関する設定
@@ -195,16 +200,24 @@ SettingsViewのプロパティ設定はApp.xamlに記述した方が良いかも
 	* 行の高さを固定にするかどうか。デフォルトはfalse。true推奨。
 * CellTitleColor
 * CellTitleFontSize
+* CellTitleFontFamily
+* CellTitleFontAttributes
 * CellValueTextColor
 * CellValueTextFontSize
+* CellValueTextFontFamily
+* CellValueTextFontAttributes
 * CellDescriptionColor
 * CellDescriptionFontSize
+* CellDescriptionFontFamily
+* CellDescriptionFontAttributes
 * CellBackgroundColor
 * CellIconSize
 * CellIconRadius
 * CellAccentColor
 * CellHintTextColor
 * CellHintFontSize
+* CellHintFontFamily
+* CellHintFontAttributes
     * 一括セル設定。どこがどのパーツかは後述のLayoutを参照。
 * UseDescriptionAsValue (Androidのみ有効)
 	* Description項目をValue項目として使用するかどうか。
@@ -407,19 +420,25 @@ public class Option
 * TitleColor
     * Title部分の文字色
 * TitleFontSize
-    * Title部分のフォントサイズ
+* TitleFontFamily
+* TitleFontAttributes
+    * Title部分のフォント設定
 * Description
     * Description部分の文字列
 * DescriptionColor
     * Description部分の文字色
 * DescriptionFontSize
-    * Description部分のフォントサイズ
+* DescriptionFontFamily
+* DescriptionFontAttributes
+    * Description部分のフォント設定
 * HintText
     * Hint部分の文字列（何らかの情報やバリデーションのエラーなど、右上に表示）
 * HintTextColor
     * Hint部分の文字色
 * HintFontSize
-    * Hint部分のフォントサイズ
+* HintFontFamily
+* HintFontAttributes
+    * Hint部分のフォント設定
 * BackgroundColor
     * セルの背景色
 * IconSource
@@ -453,7 +472,9 @@ Install-Package Xamain.Forms.Svg -pre
 * ValueTextColor
     * ValueText部分の文字色
 * ValueTextFontSize
-    * ValueText部分のフォントサイズ
+* ValueTextFontFamily
+* ValueTextFontAttributes
+    * ValueText部分のフォント設定
 * IgnoreUseDescriptionAsValue
 	* UseDescriptionAsValueの値がtrueだった場合、その設定を無視するかどうか。
 	* 例えば全体としてはValueは下に置きたいが、あるセルだけは通常のレイアウトで使用したい時などに使います。
@@ -624,6 +645,9 @@ NumberPickerCellをNumber以外に対応させたもので、データソース
 	* 選択したアイテム。 (two-way binding)
 * SelectedCommand
     * アイテム選択時に発火するコマンド。
+* IsCircularPicker
+    * ピッカーのアイテムを循環させるかどうか。(Android のみ)
+    * デフォルト true
 
 ValueTextは使用できません。
 
@@ -633,6 +657,8 @@ ValueTextは使用できません。
 iOSではタップ時にページ遷移し遷移先ページでピッカーが表示されます。
 Androidではタップ時にダイアログでピッカーが表示されます。
 
+> PickerCellは、iOSのShell上では動作しません。
+
 ### Properties
 
 * PageTitle
@@ -688,13 +714,17 @@ Xamarin.Forms.EntryCellとは別物です。
 * ValueTextColor
     * 入力文字色
 * ValueTextFontSize
-    * 入力文字列のフォントサイズ
+* ValueTextFontFamily
+* ValueTextFontAttributes
+    * 入力文字列のフォント設定
 * MaxLength
     * 最大文字列長
 * Keyboard
     * キーボードの種類
 * Placeholder
     * Placeholderの文字列
+* PlaceholderColor
+    * Placeholderの文字色
 * TextAlignment
     * 入力文字列の水平位置属性
 * AccentColor

README.md

@@ -180,12 +180,17 @@ Whereby any SettingsView in App will become the same property setttings.
 * HeaderPadding
 * HeaderTextColor
 * HeaderFontSize
+* HeaderFontFamily
+* HeaderFontAttributes
 * HeaderTextVerticalAlign
+  > Note that this property is enabled only when specifying HeaderHeight.
 * HeaderBackgroundColor
 * HeaderHeight
     * They are section header options.
 * FooterTextColor
 * FooterFontSize
+* FooterFontFamily
+* FooterFontAttributes
 * FooterBackgroundColor
 * FooterPadding
     * They are section footer options.
@@ -196,16 +201,24 @@ Whereby any SettingsView in App will become the same property setttings.
 	* Whether row height is fixed. Default false.(recomend true)
 * CellTitleColor
 * CellTitleFontSize
+* CellTitleFontFamily
+* CellTitleFontAttributes
 * CellValueTextColor
 * CellValueTextFontSize
+* CellValueTextFontFamily
+* CellValueTextFontAttributes
 * CellDescriptionColor
 * CellDescriptionFontSize
+* CellDescriptionFontFamily
+* CellDescriptionFontAttributes
 * CellBackgroundColor
 * CellIconSize
 * CellIconRadius
 * CellAccentColor
 * CellHintTextColor
 * CellHintFontSize
+* CellHintFontFamily
+* CellHintFontAttributes
     * They are bulk cell options.
 * UseDescriptionAsValue (for Android)
 	* Whether description field  is used as value field. (like general android app)
@@ -404,19 +417,25 @@ public class Option
 * TitleColor
     * Title text color.
 * TitleFontSize
-    * Title text font size.
+* TitleFontFamily
+* TitleFontAttributes
+    * Title text font size, family, attributes.
 * Description
     * Description text.
 * DescriptionColor
     * Description text color.
 * DescriptionFontSize
-    * Description text font size.
+* DescriptionFontSize
+* DescriptionFontFamily
+    * Description text font size, family, attributes.
 * HintText
     * Hint text.(for some information, validation error and so on)
 * HintTextColor
     * Hint text color.
 * HintFontSize
-    * Hint text font size.
+* HintFontFamily
+* HintFontAttributes
+    * Hint text font size, family, attributes.
 * BackgroundColor
     * Cell background color.
 * IconSource
@@ -451,7 +470,9 @@ This is a cell showing read only text.
 * ValueTextColor
     * Value text color.
 * ValueTextFontSize
-    * Value text font size.
+* ValueTextFontFamily
+* ValueTextFontAttributes
+    * Value text font size, family, attributes.
 * IgnoreUseDescriptionAsValue
     * Whether ignore the setting that SettingsView property of UseDescriptionAsValue.
 
@@ -616,6 +637,9 @@ This is a LabelCell calling a text picker.
 	* Selected item is set. (two-way binding)
 * SelectedCommand
     * A command invoked when an item is selected.
+* IsCircularPicker
+    * Whether the picker items are circulated. (for Android) 
+    * Default true
 
 This cell can't use ValueText property.
 
@@ -625,6 +649,8 @@ 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
@@ -675,13 +701,17 @@ This is a cell inputing some text.
 * ValueTextColor
     * Input text color.
 * ValueTextFontSize
-    * Input text font size.
+* ValueTextFontFamily
+* ValueTextFontAttributes
+    * Input text font size, family, attributes.
 * MaxLength
     * Input text maximum length.
 * Keyboard
     * Keyboard type.
 * Placeholder
     * Placeholder text.
+* PlaceholderColor
+    * Placeholder color.
 * TextAlignment
     * Input text horizontal alignment.
 * AccentColor

Sample/Sample.Droid/Sample.Droid.csproj

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Xamarin.Forms.4.4.0.991477\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.4.4.0.991477\build\Xamarin.Forms.props')" />
+  <Import Project="..\packages\Xamarin.Forms.4.6.0.800\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.4.6.0.800\build\Xamarin.Forms.props')" />
   <PropertyGroup>
     <AndroidEnablePreloadAssemblies>false</AndroidEnablePreloadAssemblies>
+    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -157,19 +158,19 @@
       <HintPath>..\packages\ReactiveProperty.4.2.2\lib\MonoAndroid\ReactiveProperty.dll</HintPath>
     </Reference>
     <Reference Include="FormsViewGroup">
-      <HintPath>..\packages\Xamarin.Forms.4.4.0.991477\lib\MonoAndroid90\FormsViewGroup.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Forms.4.6.0.800\lib\MonoAndroid90\FormsViewGroup.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\packages\Xamarin.Forms.4.4.0.991477\lib\MonoAndroid90\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Forms.4.6.0.800\lib\MonoAndroid90\Xamarin.Forms.Core.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform.Android">
-      <HintPath>..\packages\Xamarin.Forms.4.4.0.991477\lib\MonoAndroid90\Xamarin.Forms.Platform.Android.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Forms.4.6.0.800\lib\MonoAndroid90\Xamarin.Forms.Platform.Android.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform">
-      <HintPath>..\packages\Xamarin.Forms.4.4.0.991477\lib\MonoAndroid90\Xamarin.Forms.Platform.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Forms.4.6.0.800\lib\MonoAndroid90\Xamarin.Forms.Platform.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\packages\Xamarin.Forms.4.4.0.991477\lib\MonoAndroid90\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Forms.4.6.0.800\lib\MonoAndroid90\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
     <Reference Include="AiForms.Effects">
       <HintPath>..\packages\AiForms.Effects.1.5.5\lib\MonoAndroid\AiForms.Effects.dll</HintPath>
@@ -329,5 +330,5 @@
   <Import Project="..\packages\Xamarin.Android.Support.v7.RecyclerView.28.0.0.3\build\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.RecyclerView.28.0.0.3\build\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.targets')" />
   <Import Project="..\packages\Xamarin.Android.Support.Design.28.0.0.3\build\monoandroid90\Xamarin.Android.Support.Design.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Design.28.0.0.3\build\monoandroid90\Xamarin.Android.Support.Design.targets')" />
   <Import Project="..\packages\Xamarin.Android.Support.v7.MediaRouter.28.0.0.3\build\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.MediaRouter.28.0.0.3\build\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.targets')" />
-  <Import Project="..\packages\Xamarin.Forms.4.4.0.991477\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.4.4.0.991477\build\Xamarin.Forms.targets')" />
+  <Import Project="..\packages\Xamarin.Forms.4.6.0.800\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.4.6.0.800\build\Xamarin.Forms.targets')" />
 </Project>

Sample/Sample.Droid/packages.config

@@ -102,6 +102,6 @@
   <package id="Xamarin.Android.Support.Vector.Drawable" version="28.0.0.3" targetFramework="monoandroid90" />
   <package id="Xamarin.Android.Support.VersionedParcelable" version="28.0.0.3" targetFramework="monoandroid90" />
   <package id="Xamarin.Android.Support.ViewPager" version="28.0.0.3" targetFramework="monoandroid90" />
-  <package id="Xamarin.Forms" version="4.4.0.991477" targetFramework="monoandroid90" />
+  <package id="Xamarin.Forms" version="4.6.0.800" targetFramework="monoandroid90" />
   <package id="Xamarin.Forms.Svg" version="0.0.1-pre" targetFramework="monoandroid71" />
 </packages>

Sample/Sample.iOS/Sample.iOS.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Xamarin.Forms.4.4.0.991477\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.4.4.0.991477\build\Xamarin.Forms.props')" />
+  <Import Project="..\packages\Xamarin.Forms.4.6.0.800\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.4.6.0.800\build\Xamarin.Forms.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
@@ -144,16 +144,13 @@
       <HintPath>..\packages\ReactiveProperty.4.2.2\lib\Xamarin.iOS10\ReactiveProperty.iOS.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\packages\Xamarin.Forms.4.4.0.991477\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Forms.4.6.0.800\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform">
-      <HintPath>..\packages\Xamarin.Forms.4.4.0.991477\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Platform.iOS">
-      <HintPath>..\packages\Xamarin.Forms.4.4.0.991477\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Forms.4.6.0.800\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\packages\Xamarin.Forms.4.4.0.991477\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Forms.4.6.0.800\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
     <Reference Include="AiForms.Effects">
       <HintPath>..\packages\AiForms.Effects.1.5.5\lib\Xamarin.iOS10\AiForms.Effects.dll</HintPath>
@@ -197,5 +194,5 @@
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <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')" />
-  <Import Project="..\packages\Xamarin.Forms.4.4.0.991477\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.4.4.0.991477\build\Xamarin.Forms.targets')" />
+  <Import Project="..\packages\Xamarin.Forms.4.6.0.800\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.4.6.0.800\build\Xamarin.Forms.targets')" />
 </Project>

Sample/Sample.iOS/packages.config

@@ -66,6 +66,6 @@
   <package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="xamarinios10" />
   <package id="System.Xml.XDocument" version="4.0.11" targetFramework="xamarinios10" />
   <package id="Unity" version="5.5.5" targetFramework="xamarinios10" />
-  <package id="Xamarin.Forms" version="4.4.0.991477" targetFramework="xamarinios10" />
+  <package id="Xamarin.Forms" version="4.6.0.800" targetFramework="xamarinios10" />
   <package id="Xamarin.Forms.Svg" version="0.0.1-pre" targetFramework="xamarinios10" />
 </packages>

Sample/Sample/Properties/AssemblyInfo.cs

@@ -1,3 +1,5 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using Xamarin.Forms;
 
+[assembly: ExportFont("APJapanesefont.ttf", Alias = "Anzu")]

Sample/Sample/Sample.csproj

@@ -11,7 +11,7 @@
     <PackageReference Include="Prism.Unity.Forms" Version="7.0.0.396" />
     <PackageReference Include="ReactiveProperty" Version="4.2.2" />
 
-    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991477" />
+    <PackageReference Include="Xamarin.Forms" Version="4.6.0.800" />
     <PackageReference Include="AiForms.Effects" Version="1.5.5" />
   </ItemGroup>
   <ItemGroup>
@@ -20,5 +20,11 @@
   <ItemGroup>
     <ProjectReference Include="..\..\SettingsView\SettingsView.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <None Remove="Resources\APJapanesefont.ttf" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\APJapanesefont.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>