diff --git a/src/Demo/Demo.Droid/Demo.Droid.csproj b/src/Demo/Demo.Droid/Demo.Droid.csproj index dee7fd8..921b63f 100644 --- a/src/Demo/Demo.Droid/Demo.Droid.csproj +++ b/src/Demo/Demo.Droid/Demo.Droid.csproj @@ -14,9 +14,9 @@ Resources\Resource.Designer.cs Off True - v5.0 + v5.1 Properties\AndroidManifest.xml - e08ce7ee + 7efdbe4c true @@ -50,7 +50,7 @@ - ..\..\packages\Xamarin.Forms.1.4.3.6376\lib\MonoAndroid10\FormsViewGroup.dll + ..\..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\FormsViewGroup.dll @@ -58,33 +58,29 @@ - - ..\..\packages\Xamarin.Android.Support.Design.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.Design.dll - True + + ..\..\packages\Xamarin.Android.Support.Design.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.Design.dll - - ..\..\packages\Xamarin.Android.Support.v4.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - True + + ..\..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - - ..\..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - True + + ..\..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - - ..\..\packages\Xamarin.Android.Support.v7.CardView.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll - True + + ..\..\packages\Xamarin.Android.Support.v7.CardView.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll - ..\..\packages\Xamarin.Forms.1.4.3.6376\lib\MonoAndroid10\Xamarin.Forms.Core.dll + ..\..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\Xamarin.Forms.Core.dll - ..\..\packages\Xamarin.Forms.1.4.3.6376\lib\MonoAndroid10\Xamarin.Forms.Platform.dll + ..\..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\Xamarin.Forms.Platform.dll - ..\..\packages\Xamarin.Forms.1.4.3.6376\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll + ..\..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll - ..\..\packages\Xamarin.Forms.1.4.3.6376\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll + ..\..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll @@ -131,11 +127,11 @@ - + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/src/Demo/Demo.Droid/MainActivity.cs b/src/Demo/Demo.Droid/MainActivity.cs index 62a91b5..aeb7fab 100644 --- a/src/Demo/Demo.Droid/MainActivity.cs +++ b/src/Demo/Demo.Droid/MainActivity.cs @@ -9,7 +9,7 @@ using Xamarin.Forms; - [Activity(ConfigurationChanges = AppConfig, MainLauncher = true, Theme = CompatThemeLightDarkActionBar)] + [Activity(ConfigurationChanges = AppConfig, MainLauncher = true, Theme = "@style/Theme.AppCompat.NoActionBar")] public class MainActivity : AppCompatFormsApplicationActivity { private const ConfigChanges AppConfig = ConfigChanges.Orientation | ConfigChanges.ScreenSize; @@ -21,7 +21,7 @@ protected override void OnCreate(Bundle savedInstanceState) base.OnCreate(savedInstanceState); Forms.Init(this, savedInstanceState); - FormsAppCompat.EnableAll(); + FormsAppCompat.Init(); this.LoadApplication(new App()); } diff --git a/src/Demo/Demo.Droid/Properties/AndroidManifest.xml b/src/Demo/Demo.Droid/Properties/AndroidManifest.xml index e3a4a60..89f23d4 100644 --- a/src/Demo/Demo.Droid/Properties/AndroidManifest.xml +++ b/src/Demo/Demo.Droid/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/Demo/Demo.Droid/Resources/Resource.Designer.cs b/src/Demo/Demo.Droid/Resources/Resource.Designer.cs index f5217a6..39a4d9b 100644 --- a/src/Demo/Demo.Droid/Resources/Resource.Designer.cs +++ b/src/Demo/Demo.Droid/Resources/Resource.Designer.cs @@ -692,6 +692,8 @@ public static void UpdateIdValues() global::NativeCode.Mobile.AppCompat.Resource.Layout.design_navigation_menu = global::Demo.Droid.Resource.Layout.design_navigation_menu; global::NativeCode.Mobile.AppCompat.Resource.Layout.layout_snackbar = global::Demo.Droid.Resource.Layout.layout_snackbar; global::NativeCode.Mobile.AppCompat.Resource.Layout.layout_snackbar_include = global::Demo.Droid.Resource.Layout.layout_snackbar_include; + global::NativeCode.Mobile.AppCompat.Resource.Layout.layout_tab_icon = global::Demo.Droid.Resource.Layout.layout_tab_icon; + global::NativeCode.Mobile.AppCompat.Resource.Layout.layout_tab_text = global::Demo.Droid.Resource.Layout.layout_tab_text; global::NativeCode.Mobile.AppCompat.Resource.Layout.notification_media_action = global::Demo.Droid.Resource.Layout.notification_media_action; global::NativeCode.Mobile.AppCompat.Resource.Layout.notification_media_cancel_action = global::Demo.Droid.Resource.Layout.notification_media_cancel_action; global::NativeCode.Mobile.AppCompat.Resource.Layout.notification_template_big_media = global::Demo.Droid.Resource.Layout.notification_template_big_media; @@ -935,6 +937,7 @@ public static void UpdateIdValues() global::NativeCode.Mobile.AppCompat.Resource.Style.TextAppearance_AppCompat_Widget_PopupMenu_Small = global::Demo.Droid.Resource.Style.TextAppearance_AppCompat_Widget_PopupMenu_Small; global::NativeCode.Mobile.AppCompat.Resource.Style.TextAppearance_AppCompat_Widget_Switch = global::Demo.Droid.Resource.Style.TextAppearance_AppCompat_Widget_Switch; global::NativeCode.Mobile.AppCompat.Resource.Style.TextAppearance_AppCompat_Widget_TextView_SpinnerItem = global::Demo.Droid.Resource.Style.TextAppearance_AppCompat_Widget_TextView_SpinnerItem; + global::NativeCode.Mobile.AppCompat.Resource.Style.TextAppearance_Design_CollapsingToolbar_Expanded = global::Demo.Droid.Resource.Style.TextAppearance_Design_CollapsingToolbar_Expanded; global::NativeCode.Mobile.AppCompat.Resource.Style.TextAppearance_Design_Error = global::Demo.Droid.Resource.Style.TextAppearance_Design_Error; global::NativeCode.Mobile.AppCompat.Resource.Style.TextAppearance_Design_Hint = global::Demo.Droid.Resource.Style.TextAppearance_Design_Hint; global::NativeCode.Mobile.AppCompat.Resource.Style.TextAppearance_Design_Snackbar_Action = global::Demo.Droid.Resource.Style.TextAppearance_Design_Snackbar_Action; @@ -2118,6 +2121,8 @@ public static void UpdateIdValues() global::NativeCode.Mobile.AppCompat.Renderers.Resource.Layout.fab_normal = global::Demo.Droid.Resource.Layout.fab_normal; global::NativeCode.Mobile.AppCompat.Renderers.Resource.Layout.layout_snackbar = global::Demo.Droid.Resource.Layout.layout_snackbar; global::NativeCode.Mobile.AppCompat.Renderers.Resource.Layout.layout_snackbar_include = global::Demo.Droid.Resource.Layout.layout_snackbar_include; + global::NativeCode.Mobile.AppCompat.Renderers.Resource.Layout.layout_tab_icon = global::Demo.Droid.Resource.Layout.layout_tab_icon; + global::NativeCode.Mobile.AppCompat.Renderers.Resource.Layout.layout_tab_text = global::Demo.Droid.Resource.Layout.layout_tab_text; global::NativeCode.Mobile.AppCompat.Renderers.Resource.Layout.notification_media_action = global::Demo.Droid.Resource.Layout.notification_media_action; global::NativeCode.Mobile.AppCompat.Renderers.Resource.Layout.notification_media_cancel_action = global::Demo.Droid.Resource.Layout.notification_media_cancel_action; global::NativeCode.Mobile.AppCompat.Renderers.Resource.Layout.notification_template_big_media = global::Demo.Droid.Resource.Layout.notification_template_big_media; @@ -2367,6 +2372,7 @@ public static void UpdateIdValues() global::NativeCode.Mobile.AppCompat.Renderers.Resource.Style.TextAppearance_AppCompat_Widget_PopupMenu_Small = global::Demo.Droid.Resource.Style.TextAppearance_AppCompat_Widget_PopupMenu_Small; global::NativeCode.Mobile.AppCompat.Renderers.Resource.Style.TextAppearance_AppCompat_Widget_Switch = global::Demo.Droid.Resource.Style.TextAppearance_AppCompat_Widget_Switch; global::NativeCode.Mobile.AppCompat.Renderers.Resource.Style.TextAppearance_AppCompat_Widget_TextView_SpinnerItem = global::Demo.Droid.Resource.Style.TextAppearance_AppCompat_Widget_TextView_SpinnerItem; + global::NativeCode.Mobile.AppCompat.Renderers.Resource.Style.TextAppearance_Design_CollapsingToolbar_Expanded = global::Demo.Droid.Resource.Style.TextAppearance_Design_CollapsingToolbar_Expanded; global::NativeCode.Mobile.AppCompat.Renderers.Resource.Style.TextAppearance_Design_Error = global::Demo.Droid.Resource.Style.TextAppearance_Design_Error; global::NativeCode.Mobile.AppCompat.Renderers.Resource.Style.TextAppearance_Design_Hint = global::Demo.Droid.Resource.Style.TextAppearance_Design_Hint; global::NativeCode.Mobile.AppCompat.Renderers.Resource.Style.TextAppearance_Design_Snackbar_Action = global::Demo.Droid.Resource.Style.TextAppearance_Design_Snackbar_Action; @@ -5065,43 +5071,49 @@ public partial class Layout public const int layout_snackbar_include = 2130903074; // aapt resource value: 0x7f030023 - public const int notification_media_action = 2130903075; + public const int layout_tab_icon = 2130903075; // aapt resource value: 0x7f030024 - public const int notification_media_cancel_action = 2130903076; + public const int layout_tab_text = 2130903076; // aapt resource value: 0x7f030025 - public const int notification_template_big_media = 2130903077; + public const int notification_media_action = 2130903077; // aapt resource value: 0x7f030026 - public const int notification_template_big_media_narrow = 2130903078; + public const int notification_media_cancel_action = 2130903078; // aapt resource value: 0x7f030027 - public const int notification_template_lines = 2130903079; + public const int notification_template_big_media = 2130903079; // aapt resource value: 0x7f030028 - public const int notification_template_media = 2130903080; + public const int notification_template_big_media_narrow = 2130903080; // aapt resource value: 0x7f030029 - public const int notification_template_part_chronometer = 2130903081; + public const int notification_template_lines = 2130903081; // aapt resource value: 0x7f03002a - public const int notification_template_part_time = 2130903082; + public const int notification_template_media = 2130903082; // aapt resource value: 0x7f03002b - public const int select_dialog_item_material = 2130903083; + public const int notification_template_part_chronometer = 2130903083; // aapt resource value: 0x7f03002c - public const int select_dialog_multichoice_material = 2130903084; + public const int notification_template_part_time = 2130903084; // aapt resource value: 0x7f03002d - public const int select_dialog_singlechoice_material = 2130903085; + public const int select_dialog_item_material = 2130903085; // aapt resource value: 0x7f03002e - public const int spinner = 2130903086; + public const int select_dialog_multichoice_material = 2130903086; // aapt resource value: 0x7f03002f - public const int support_simple_spinner_dropdown_item = 2130903087; + public const int select_dialog_singlechoice_material = 2130903087; + + // aapt resource value: 0x7f030030 + public const int spinner = 2130903088; + + // aapt resource value: 0x7f030031 + public const int support_simple_spinner_dropdown_item = 2130903089; static Layout() { @@ -5210,14 +5222,14 @@ public partial class Style // aapt resource value: 0x7f070079 public const int Animation_AppCompat_DropDownUp = 2131165305; - // aapt resource value: 0x7f070139 - public const int AppTheme = 2131165497; - // aapt resource value: 0x7f07013a - public const int AppTheme_Light = 2131165498; + public const int AppTheme = 2131165498; // aapt resource value: 0x7f07013b - public const int AppTheme_Light_DarkActionBar = 2131165499; + public const int AppTheme_Light = 2131165499; + + // aapt resource value: 0x7f07013c + public const int AppTheme_Light_DarkActionBar = 2131165500; // aapt resource value: 0x7f07007a public const int Base_AlertDialog_AppCompat = 2131165306; @@ -5231,20 +5243,20 @@ public partial class Style // aapt resource value: 0x7f07007d public const int Base_Animation_AppCompat_DropDownUp = 2131165309; - // aapt resource value: 0x7f070136 - public const int Base_AppTheme = 2131165494; - - // aapt resource value: 0x7f07013d - public const int Base_AppTheme_EditTextStyle = 2131165501; + // aapt resource value: 0x7f070137 + public const int Base_AppTheme = 2131165495; // aapt resource value: 0x7f07013e - public const int Base_AppTheme_EditTextStyle_Light = 2131165502; + public const int Base_AppTheme_EditTextStyle = 2131165502; - // aapt resource value: 0x7f070137 - public const int Base_AppTheme_Light = 2131165495; + // aapt resource value: 0x7f07013f + public const int Base_AppTheme_EditTextStyle_Light = 2131165503; // aapt resource value: 0x7f070138 - public const int Base_AppTheme_Light_DarkActionBar = 2131165496; + public const int Base_AppTheme_Light = 2131165496; + + // aapt resource value: 0x7f070139 + public const int Base_AppTheme_Light_DarkActionBar = 2131165497; // aapt resource value: 0x7f07007e public const int Base_DialogWindowTitle_AppCompat = 2131165310; @@ -5642,8 +5654,8 @@ public partial class Style // aapt resource value: 0x7f070002 public const int CardView_Light = 2131165186; - // aapt resource value: 0x7f07013c - public const int DrawerArrowStyle = 2131165500; + // aapt resource value: 0x7f07013d + public const int DrawerArrowStyle = 2131165501; // aapt resource value: 0x7f070013 public const int Platform_AppCompat = 2131165203; @@ -5838,19 +5850,22 @@ public partial class Style public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131165391; // aapt resource value: 0x7f070129 - public const int TextAppearance_Design_Error = 2131165481; + public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131165481; // aapt resource value: 0x7f07012a - public const int TextAppearance_Design_Hint = 2131165482; + public const int TextAppearance_Design_Error = 2131165482; // aapt resource value: 0x7f07012b - public const int TextAppearance_Design_Snackbar_Action = 2131165483; + public const int TextAppearance_Design_Hint = 2131165483; // aapt resource value: 0x7f07012c - public const int TextAppearance_Design_Snackbar_Message = 2131165484; + public const int TextAppearance_Design_Snackbar_Action = 2131165484; // aapt resource value: 0x7f07012d - public const int TextAppearance_Design_Tab = 2131165485; + public const int TextAppearance_Design_Snackbar_Message = 2131165485; + + // aapt resource value: 0x7f07012e + public const int TextAppearance_Design_Tab = 2131165486; // aapt resource value: 0x7f07001e public const int TextAppearance_StatusBar_EventContent = 2131165214; @@ -6128,32 +6143,32 @@ public partial class Style // aapt resource value: 0x7f070126 public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131165478; - // aapt resource value: 0x7f07012e - public const int Widget_Design_AppBarLayout = 2131165486; - // aapt resource value: 0x7f07012f - public const int Widget_Design_CollapsingToolbar = 2131165487; + public const int Widget_Design_AppBarLayout = 2131165487; // aapt resource value: 0x7f070130 - public const int Widget_Design_CoordinatorLayout = 2131165488; + public const int Widget_Design_CollapsingToolbar = 2131165488; // aapt resource value: 0x7f070131 - public const int Widget_Design_FloatingActionButton = 2131165489; + public const int Widget_Design_CoordinatorLayout = 2131165489; // aapt resource value: 0x7f070132 - public const int Widget_Design_NavigationView = 2131165490; + public const int Widget_Design_FloatingActionButton = 2131165490; // aapt resource value: 0x7f070133 - public const int Widget_Design_ScrimInsetsFrameLayout = 2131165491; + public const int Widget_Design_NavigationView = 2131165491; // aapt resource value: 0x7f070134 - public const int Widget_Design_Snackbar = 2131165492; + public const int Widget_Design_ScrimInsetsFrameLayout = 2131165492; + + // aapt resource value: 0x7f070135 + public const int Widget_Design_Snackbar = 2131165493; // aapt resource value: 0x7f070127 public const int Widget_Design_TabLayout = 2131165479; - // aapt resource value: 0x7f070135 - public const int Widget_Design_TextInputLayout = 2131165493; + // aapt resource value: 0x7f070136 + public const int Widget_Design_TextInputLayout = 2131165494; static Style() { diff --git a/src/Demo/Demo.Droid/packages.config b/src/Demo/Demo.Droid/packages.config index 2332755..ba7de1c 100644 --- a/src/Demo/Demo.Droid/packages.config +++ b/src/Demo/Demo.Droid/packages.config @@ -1,9 +1,9 @@  - - - - - + + + + + diff --git a/src/Demo/Demo/Demo.csproj b/src/Demo/Demo/Demo.csproj index d4e1584..eaf67de 100644 --- a/src/Demo/Demo/Demo.csproj +++ b/src/Demo/Demo/Demo.csproj @@ -15,7 +15,7 @@ {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Profile78 v4.5 - bf239a56 + f9abc86c true @@ -72,18 +72,17 @@ - - ..\..\packages\PropertyChanged.Fody.1.50.1\Lib\portable-net4+sl4+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\PropertyChanged.dll - False + + ..\..\packages\PropertyChanged.Fody.1.50.3\Lib\portable-net4+sl4+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\PropertyChanged.dll - ..\..\packages\Xamarin.Forms.1.4.3.6376\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll + ..\..\packages\Xamarin.Forms.1.5.0.6446\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll - ..\..\packages\Xamarin.Forms.1.4.3.6376\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll + ..\..\packages\Xamarin.Forms.1.5.0.6446\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll - ..\..\packages\Xamarin.Forms.1.4.3.6376\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll + ..\..\packages\Xamarin.Forms.1.5.0.6446\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll @@ -142,16 +141,9 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - - - - \ No newline at end of file + + + diff --git a/src/Demo/Demo/Views/MainView.xaml b/src/Demo/Demo/Views/MainView.xaml index 2d85fb9..5a86373 100644 --- a/src/Demo/Demo/Views/MainView.xaml +++ b/src/Demo/Demo/Views/MainView.xaml @@ -19,13 +19,17 @@ Item 9 +