diff --git a/XamarinStudy/Resource/Image/droid.png b/XamarinStudy/Resource/Image/droid.png new file mode 100644 index 0000000..bfeb292 Binary files /dev/null and b/XamarinStudy/Resource/Image/droid.png differ diff --git a/XamarinStudy/XamarinStudy/XamarinStudy.Android/Resources/Resource.designer.cs b/XamarinStudy/XamarinStudy/XamarinStudy.Android/Resources/Resource.designer.cs index 500ce02..94e18fe 100644 --- a/XamarinStudy/XamarinStudy/XamarinStudy.Android/Resources/Resource.designer.cs +++ b/XamarinStudy/XamarinStudy/XamarinStudy.Android/Resources/Resource.designer.cs @@ -16531,146 +16531,149 @@ namespace XamarinStudy.Droid // aapt resource value: 0x7F070063 public const int design_snackbar_background = 2131165283; - // aapt resource value: 0x7F07006B - public const int icon_about = 2131165291; + // aapt resource value: 0x7F070064 + public const int droid = 2131165284; // aapt resource value: 0x7F07006C - public const int icon_feed = 2131165292; + public const int icon_about = 2131165292; - // aapt resource value: 0x7F070064 - public const int ic_arrow_down_24dp = 2131165284; + // aapt resource value: 0x7F07006D + public const int icon_feed = 2131165293; // aapt resource value: 0x7F070065 - public const int ic_clock_black_24dp = 2131165285; + public const int ic_arrow_down_24dp = 2131165285; // aapt resource value: 0x7F070066 - public const int ic_keyboard_black_24dp = 2131165286; + public const int ic_clock_black_24dp = 2131165286; // aapt resource value: 0x7F070067 - public const int ic_mtrl_checked_circle = 2131165287; + public const int ic_keyboard_black_24dp = 2131165287; // aapt resource value: 0x7F070068 - public const int ic_mtrl_chip_checked_black = 2131165288; + public const int ic_mtrl_checked_circle = 2131165288; // aapt resource value: 0x7F070069 - public const int ic_mtrl_chip_checked_circle = 2131165289; + public const int ic_mtrl_chip_checked_black = 2131165289; // aapt resource value: 0x7F07006A - public const int ic_mtrl_chip_close_circle = 2131165290; + public const int ic_mtrl_chip_checked_circle = 2131165290; - // aapt resource value: 0x7F07006D - public const int material_cursor_drawable = 2131165293; + // aapt resource value: 0x7F07006B + public const int ic_mtrl_chip_close_circle = 2131165291; // aapt resource value: 0x7F07006E - public const int material_ic_calendar_black_24dp = 2131165294; + public const int material_cursor_drawable = 2131165294; // aapt resource value: 0x7F07006F - public const int material_ic_clear_black_24dp = 2131165295; + public const int material_ic_calendar_black_24dp = 2131165295; // aapt resource value: 0x7F070070 - public const int material_ic_edit_black_24dp = 2131165296; + public const int material_ic_clear_black_24dp = 2131165296; // aapt resource value: 0x7F070071 - public const int material_ic_keyboard_arrow_left_black_24dp = 2131165297; + public const int material_ic_edit_black_24dp = 2131165297; // aapt resource value: 0x7F070072 - public const int material_ic_keyboard_arrow_next_black_24dp = 2131165298; + public const int material_ic_keyboard_arrow_left_black_24dp = 2131165298; // aapt resource value: 0x7F070073 - public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165299; + public const int material_ic_keyboard_arrow_next_black_24dp = 2131165299; // aapt resource value: 0x7F070074 - public const int material_ic_keyboard_arrow_right_black_24dp = 2131165300; + public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165300; // aapt resource value: 0x7F070075 - public const int material_ic_menu_arrow_down_black_24dp = 2131165301; + public const int material_ic_keyboard_arrow_right_black_24dp = 2131165301; // aapt resource value: 0x7F070076 - public const int material_ic_menu_arrow_up_black_24dp = 2131165302; + public const int material_ic_menu_arrow_down_black_24dp = 2131165302; // aapt resource value: 0x7F070077 - public const int mtrl_dialog_background = 2131165303; + public const int material_ic_menu_arrow_up_black_24dp = 2131165303; // aapt resource value: 0x7F070078 - public const int mtrl_dropdown_arrow = 2131165304; + public const int mtrl_dialog_background = 2131165304; // aapt resource value: 0x7F070079 - public const int mtrl_ic_arrow_drop_down = 2131165305; + public const int mtrl_dropdown_arrow = 2131165305; // aapt resource value: 0x7F07007A - public const int mtrl_ic_arrow_drop_up = 2131165306; + public const int mtrl_ic_arrow_drop_down = 2131165306; // aapt resource value: 0x7F07007B - public const int mtrl_ic_cancel = 2131165307; + public const int mtrl_ic_arrow_drop_up = 2131165307; // aapt resource value: 0x7F07007C - public const int mtrl_ic_error = 2131165308; + public const int mtrl_ic_cancel = 2131165308; // aapt resource value: 0x7F07007D - public const int mtrl_navigation_bar_item_background = 2131165309; + public const int mtrl_ic_error = 2131165309; // aapt resource value: 0x7F07007E - public const int mtrl_popupmenu_background = 2131165310; + public const int mtrl_navigation_bar_item_background = 2131165310; // aapt resource value: 0x7F07007F - public const int mtrl_popupmenu_background_dark = 2131165311; + public const int mtrl_popupmenu_background = 2131165311; // aapt resource value: 0x7F070080 - public const int mtrl_tabs_default_indicator = 2131165312; + public const int mtrl_popupmenu_background_dark = 2131165312; // aapt resource value: 0x7F070081 - public const int navigation_empty_icon = 2131165313; + public const int mtrl_tabs_default_indicator = 2131165313; // aapt resource value: 0x7F070082 - public const int notification_action_background = 2131165314; + public const int navigation_empty_icon = 2131165314; // aapt resource value: 0x7F070083 - public const int notification_bg = 2131165315; + public const int notification_action_background = 2131165315; // aapt resource value: 0x7F070084 - public const int notification_bg_low = 2131165316; + public const int notification_bg = 2131165316; // aapt resource value: 0x7F070085 - public const int notification_bg_low_normal = 2131165317; + public const int notification_bg_low = 2131165317; // aapt resource value: 0x7F070086 - public const int notification_bg_low_pressed = 2131165318; + public const int notification_bg_low_normal = 2131165318; // aapt resource value: 0x7F070087 - public const int notification_bg_normal = 2131165319; + public const int notification_bg_low_pressed = 2131165319; // aapt resource value: 0x7F070088 - public const int notification_bg_normal_pressed = 2131165320; + public const int notification_bg_normal = 2131165320; // aapt resource value: 0x7F070089 - public const int notification_icon_background = 2131165321; + public const int notification_bg_normal_pressed = 2131165321; // aapt resource value: 0x7F07008A - public const int notification_template_icon_bg = 2131165322; + public const int notification_icon_background = 2131165322; // aapt resource value: 0x7F07008B - public const int notification_template_icon_low_bg = 2131165323; + public const int notification_template_icon_bg = 2131165323; // aapt resource value: 0x7F07008C - public const int notification_tile_bg = 2131165324; + public const int notification_template_icon_low_bg = 2131165324; // aapt resource value: 0x7F07008D - public const int notify_panel_notification_icon_bg = 2131165325; + public const int notification_tile_bg = 2131165325; // aapt resource value: 0x7F07008E - public const int preference_list_divider_material = 2131165326; + public const int notify_panel_notification_icon_bg = 2131165326; // aapt resource value: 0x7F07008F - public const int test_custom_background = 2131165327; + public const int preference_list_divider_material = 2131165327; // aapt resource value: 0x7F070090 - public const int tooltip_frame_dark = 2131165328; + public const int test_custom_background = 2131165328; // aapt resource value: 0x7F070091 - public const int tooltip_frame_light = 2131165329; + public const int tooltip_frame_dark = 2131165329; // aapt resource value: 0x7F070092 - public const int xamarin_logo = 2131165330; + public const int tooltip_frame_light = 2131165330; + + // aapt resource value: 0x7F070093 + public const int xamarin_logo = 2131165331; static Drawable() { diff --git a/XamarinStudy/XamarinStudy/XamarinStudy.Android/Resources/drawable/droid.png b/XamarinStudy/XamarinStudy/XamarinStudy.Android/Resources/drawable/droid.png new file mode 100644 index 0000000..bfeb292 Binary files /dev/null and b/XamarinStudy/XamarinStudy/XamarinStudy.Android/Resources/drawable/droid.png differ diff --git a/XamarinStudy/XamarinStudy/XamarinStudy.Android/XamarinStudy.Android.csproj b/XamarinStudy/XamarinStudy/XamarinStudy.Android/XamarinStudy.Android.csproj index 3df0030..a5fc71b 100644 --- a/XamarinStudy/XamarinStudy/XamarinStudy.Android/XamarinStudy.Android.csproj +++ b/XamarinStudy/XamarinStudy/XamarinStudy.Android/XamarinStudy.Android.csproj @@ -1,4 +1,4 @@ - + Debug @@ -92,5 +92,8 @@ XamarinStudy - - + + + + + \ No newline at end of file diff --git a/XamarinStudy/XamarinStudy/XamarinStudy.UWP/Assets/droid.png b/XamarinStudy/XamarinStudy/XamarinStudy.UWP/Assets/droid.png new file mode 100644 index 0000000..bfeb292 Binary files /dev/null and b/XamarinStudy/XamarinStudy/XamarinStudy.UWP/Assets/droid.png differ diff --git a/XamarinStudy/XamarinStudy/XamarinStudy.UWP/XamarinStudy.UWP.csproj b/XamarinStudy/XamarinStudy/XamarinStudy.UWP/XamarinStudy.UWP.csproj index 9caff9a..9f7a358 100644 --- a/XamarinStudy/XamarinStudy/XamarinStudy.UWP/XamarinStudy.UWP.csproj +++ b/XamarinStudy/XamarinStudy/XamarinStudy.UWP/XamarinStudy.UWP.csproj @@ -104,6 +104,7 @@ + @@ -148,7 +149,7 @@ - + @@ -161,4 +162,4 @@ 14.0 - + \ No newline at end of file diff --git a/XamarinStudy/XamarinStudy/XamarinStudy/App.xaml.cs b/XamarinStudy/XamarinStudy/XamarinStudy/App.xaml.cs index 3dccbac..1418d82 100644 --- a/XamarinStudy/XamarinStudy/XamarinStudy/App.xaml.cs +++ b/XamarinStudy/XamarinStudy/XamarinStudy/App.xaml.cs @@ -36,6 +36,7 @@ namespace XamarinStudy //MainPage = new NavigationPage(new SampleNavigationPage()); TabbedPage tabbed = new TabbedPage(); + tabbed.Children.Add(new SampleElementPage3() { Title = "XAML_NEW" }); tabbed.Children.Add(new SampleElementPage1() { Title = "XAML" }); tabbed.Children.Add(new SampleElementPage2() { Title = "CS" }); MainPage = tabbed; diff --git a/XamarinStudy/XamarinStudy/XamarinStudy/Views/SampleElementPage3.xaml b/XamarinStudy/XamarinStudy/XamarinStudy/Views/SampleElementPage3.xaml new file mode 100644 index 0000000..4dc3643 --- /dev/null +++ b/XamarinStudy/XamarinStudy/XamarinStudy/Views/SampleElementPage3.xaml @@ -0,0 +1,11 @@ + + + + + + + + + \ No newline at end of file diff --git a/XamarinStudy/XamarinStudy/XamarinStudy/Views/SampleElementPage3.xaml.cs b/XamarinStudy/XamarinStudy/XamarinStudy/Views/SampleElementPage3.xaml.cs new file mode 100644 index 0000000..489dc9b --- /dev/null +++ b/XamarinStudy/XamarinStudy/XamarinStudy/Views/SampleElementPage3.xaml.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +using Xamarin.Forms; +using Xamarin.Forms.Xaml; + +namespace XamarinStudy.Views +{ + [XamlCompilation(XamlCompilationOptions.Compile)] + public partial class SampleElementPage3 : ContentPage + { + public SampleElementPage3() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/XamarinStudy/XamarinStudy/XamarinStudy/XamarinStudy.csproj b/XamarinStudy/XamarinStudy/XamarinStudy/XamarinStudy.csproj index ff7a85a..fc46044 100644 --- a/XamarinStudy/XamarinStudy/XamarinStudy/XamarinStudy.csproj +++ b/XamarinStudy/XamarinStudy/XamarinStudy/XamarinStudy.csproj @@ -23,6 +23,9 @@ MSBuild:UpdateDesignTimeXaml + + MSBuild:UpdateDesignTimeXaml + MSBuild:UpdateDesignTimeXaml