diff --git a/VisualChallenge/VisualChallenge.Android/Resources/Resource.designer.cs b/VisualChallenge/VisualChallenge.Android/Resources/Resource.designer.cs index 98d6c47..9aa5c43 100644 --- a/VisualChallenge/VisualChallenge.Android/Resources/Resource.designer.cs +++ b/VisualChallenge/VisualChallenge.Android/Resources/Resource.designer.cs @@ -8184,26 +8184,26 @@ public partial class Drawable // aapt resource value: 0x7f020054 public const int avd_hide_password = 2130837588; - // aapt resource value: 0x7f020139 - public const int avd_hide_password_1 = 2130837817; + // aapt resource value: 0x7f02013e + public const int avd_hide_password_1 = 2130837822; - // aapt resource value: 0x7f02013a - public const int avd_hide_password_2 = 2130837818; + // aapt resource value: 0x7f02013f + public const int avd_hide_password_2 = 2130837823; - // aapt resource value: 0x7f02013b - public const int avd_hide_password_3 = 2130837819; + // aapt resource value: 0x7f020140 + public const int avd_hide_password_3 = 2130837824; // aapt resource value: 0x7f020055 public const int avd_show_password = 2130837589; - // aapt resource value: 0x7f02013c - public const int avd_show_password_1 = 2130837820; + // aapt resource value: 0x7f020141 + public const int avd_show_password_1 = 2130837825; - // aapt resource value: 0x7f02013d - public const int avd_show_password_2 = 2130837821; + // aapt resource value: 0x7f020142 + public const int avd_show_password_2 = 2130837826; - // aapt resource value: 0x7f02013e - public const int avd_show_password_3 = 2130837822; + // aapt resource value: 0x7f020143 + public const int avd_show_password_3 = 2130837827; // aapt resource value: 0x7f020056 public const int design_bottom_navigation_item_background = 2130837590; @@ -8746,145 +8746,160 @@ public partial class Drawable public const int ic_mtrl_chip_close_circle = 2130837769; // aapt resource value: 0x7f02010a - public const int ic_vol_type_speaker_dark = 2130837770; + public const int ic_question = 2130837770; // aapt resource value: 0x7f02010b - public const int ic_vol_type_speaker_group_dark = 2130837771; + public const int ic_ship = 2130837771; // aapt resource value: 0x7f02010c - public const int ic_vol_type_speaker_group_light = 2130837772; + public const int ic_train = 2130837772; // aapt resource value: 0x7f02010d - public const int ic_vol_type_speaker_light = 2130837773; + public const int ic_truck = 2130837773; // aapt resource value: 0x7f02010e - public const int ic_vol_type_tv_dark = 2130837774; + public const int ic_vol_type_speaker_dark = 2130837774; // aapt resource value: 0x7f02010f - public const int ic_vol_type_tv_light = 2130837775; + public const int ic_vol_type_speaker_group_dark = 2130837775; // aapt resource value: 0x7f020110 - public const int launch_screen = 2130837776; + public const int ic_vol_type_speaker_group_light = 2130837776; // aapt resource value: 0x7f020111 - public const int MaterialActivityIndicatorBackground = 2130837777; + public const int ic_vol_type_speaker_light = 2130837777; // aapt resource value: 0x7f020112 - public const int MaterialProgressBar = 2130837778; + public const int ic_vol_type_tv_dark = 2130837778; // aapt resource value: 0x7f020113 - public const int mr_button_connected_dark = 2130837779; + public const int ic_vol_type_tv_light = 2130837779; // aapt resource value: 0x7f020114 - public const int mr_button_connected_light = 2130837780; + public const int launch_screen = 2130837780; // aapt resource value: 0x7f020115 - public const int mr_button_connecting_dark = 2130837781; + public const int MaterialActivityIndicatorBackground = 2130837781; // aapt resource value: 0x7f020116 - public const int mr_button_connecting_light = 2130837782; + public const int MaterialProgressBar = 2130837782; // aapt resource value: 0x7f020117 - public const int mr_button_dark = 2130837783; + public const int mr_button_connected_dark = 2130837783; // aapt resource value: 0x7f020118 - public const int mr_button_light = 2130837784; + public const int mr_button_connected_light = 2130837784; // aapt resource value: 0x7f020119 - public const int mr_dialog_close_dark = 2130837785; + public const int mr_button_connecting_dark = 2130837785; // aapt resource value: 0x7f02011a - public const int mr_dialog_close_light = 2130837786; + public const int mr_button_connecting_light = 2130837786; // aapt resource value: 0x7f02011b - public const int mr_dialog_material_background_dark = 2130837787; + public const int mr_button_dark = 2130837787; // aapt resource value: 0x7f02011c - public const int mr_dialog_material_background_light = 2130837788; + public const int mr_button_light = 2130837788; // aapt resource value: 0x7f02011d - public const int mr_group_collapse = 2130837789; + public const int mr_dialog_close_dark = 2130837789; // aapt resource value: 0x7f02011e - public const int mr_group_expand = 2130837790; + public const int mr_dialog_close_light = 2130837790; // aapt resource value: 0x7f02011f - public const int mr_media_pause_dark = 2130837791; + public const int mr_dialog_material_background_dark = 2130837791; // aapt resource value: 0x7f020120 - public const int mr_media_pause_light = 2130837792; + public const int mr_dialog_material_background_light = 2130837792; // aapt resource value: 0x7f020121 - public const int mr_media_play_dark = 2130837793; + public const int mr_group_collapse = 2130837793; // aapt resource value: 0x7f020122 - public const int mr_media_play_light = 2130837794; + public const int mr_group_expand = 2130837794; // aapt resource value: 0x7f020123 - public const int mr_media_stop_dark = 2130837795; + public const int mr_media_pause_dark = 2130837795; // aapt resource value: 0x7f020124 - public const int mr_media_stop_light = 2130837796; + public const int mr_media_pause_light = 2130837796; // aapt resource value: 0x7f020125 - public const int mr_vol_type_audiotrack_dark = 2130837797; + public const int mr_media_play_dark = 2130837797; // aapt resource value: 0x7f020126 - public const int mr_vol_type_audiotrack_light = 2130837798; + public const int mr_media_play_light = 2130837798; // aapt resource value: 0x7f020127 - public const int mtrl_snackbar_background = 2130837799; + public const int mr_media_stop_dark = 2130837799; // aapt resource value: 0x7f020128 - public const int mtrl_tabs_default_indicator = 2130837800; + public const int mr_media_stop_light = 2130837800; // aapt resource value: 0x7f020129 - public const int navigation_empty_icon = 2130837801; + public const int mr_vol_type_audiotrack_dark = 2130837801; // aapt resource value: 0x7f02012a - public const int notification_action_background = 2130837802; + public const int mr_vol_type_audiotrack_light = 2130837802; // aapt resource value: 0x7f02012b - public const int notification_bg = 2130837803; + public const int mtrl_snackbar_background = 2130837803; // aapt resource value: 0x7f02012c - public const int notification_bg_low = 2130837804; + public const int mtrl_tabs_default_indicator = 2130837804; // aapt resource value: 0x7f02012d - public const int notification_bg_low_normal = 2130837805; + public const int navigation_empty_icon = 2130837805; // aapt resource value: 0x7f02012e - public const int notification_bg_low_pressed = 2130837806; + public const int notification_action_background = 2130837806; // aapt resource value: 0x7f02012f - public const int notification_bg_normal = 2130837807; + public const int notification_bg = 2130837807; // aapt resource value: 0x7f020130 - public const int notification_bg_normal_pressed = 2130837808; + public const int notification_bg_low = 2130837808; // aapt resource value: 0x7f020131 - public const int notification_icon_background = 2130837809; - - // aapt resource value: 0x7f020137 - public const int notification_template_icon_bg = 2130837815; - - // aapt resource value: 0x7f020138 - public const int notification_template_icon_low_bg = 2130837816; + public const int notification_bg_low_normal = 2130837809; // aapt resource value: 0x7f020132 - public const int notification_tile_bg = 2130837810; + public const int notification_bg_low_pressed = 2130837810; // aapt resource value: 0x7f020133 - public const int notify_panel_notification_icon_bg = 2130837811; + public const int notification_bg_normal = 2130837811; // aapt resource value: 0x7f020134 - public const int tooltip_frame_dark = 2130837812; + public const int notification_bg_normal_pressed = 2130837812; // aapt resource value: 0x7f020135 - public const int tooltip_frame_light = 2130837813; + public const int notification_icon_background = 2130837813; + + // aapt resource value: 0x7f02013c + public const int notification_template_icon_bg = 2130837820; + + // aapt resource value: 0x7f02013d + public const int notification_template_icon_low_bg = 2130837821; // aapt resource value: 0x7f020136 - public const int xamagon_preview = 2130837814; + public const int notification_tile_bg = 2130837814; + + // aapt resource value: 0x7f020137 + public const int notify_panel_notification_icon_bg = 2130837815; + + // aapt resource value: 0x7f020138 + public const int tooltip_frame_dark = 2130837816; + + // aapt resource value: 0x7f020139 + public const int tooltip_frame_light = 2130837817; + + // aapt resource value: 0x7f02013a + public const int weight = 2130837818; + + // aapt resource value: 0x7f02013b + public const int xamagon_preview = 2130837819; static Drawable() { diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/ic_question.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/ic_question.png new file mode 100644 index 0000000..768ca67 Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/ic_question.png differ diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/ic_ship.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/ic_ship.png new file mode 100644 index 0000000..a0e1d8a Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/ic_ship.png differ diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/ic_train.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/ic_train.png new file mode 100644 index 0000000..ef2a3f1 Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/ic_train.png differ diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/ic_truck.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/ic_truck.png new file mode 100644 index 0000000..805db5e Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/ic_truck.png differ diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/weight.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/weight.png new file mode 100644 index 0000000..bd79216 Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/weight.png differ diff --git a/VisualChallenge/VisualChallenge.Android/VisualChallenge.Android.csproj b/VisualChallenge/VisualChallenge.Android/VisualChallenge.Android.csproj index 051ffba..996d310 100644 --- a/VisualChallenge/VisualChallenge.Android/VisualChallenge.Android.csproj +++ b/VisualChallenge/VisualChallenge.Android/VisualChallenge.Android.csproj @@ -86,12 +86,26 @@ - + + + {DF343C5B-66F1-4EF5-B721-6246D8F1DC39} VisualChallenge + + + + + + + + + + + + \ No newline at end of file diff --git a/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/ic_question.imageset/Contents.json b/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/ic_question.imageset/Contents.json new file mode 100644 index 0000000..f841fc4 --- /dev/null +++ b/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/ic_question.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images": [ + { + "scale": "1x", + "idiom": "universal" + }, + { + "scale": "2x", + "idiom": "universal" + }, + { + "scale": "3x", + "idiom": "universal", + "filename": "ic_question.png" + } + ], + "properties": {}, + "info": { + "version": 1, + "author": "" + } +} \ No newline at end of file diff --git a/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/ic_question.imageset/ic_question.png b/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/ic_question.imageset/ic_question.png new file mode 100644 index 0000000..768ca67 Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/ic_question.imageset/ic_question.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/ic_ship.imageset/Contents.json b/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/ic_ship.imageset/Contents.json new file mode 100644 index 0000000..11fcc02 --- /dev/null +++ b/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/ic_ship.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images": [ + { + "scale": "1x", + "idiom": "universal" + }, + { + "scale": "2x", + "idiom": "universal" + }, + { + "scale": "3x", + "idiom": "universal", + "filename": "ic_ship.png" + } + ], + "properties": {}, + "info": { + "version": 1, + "author": "" + } +} \ No newline at end of file diff --git a/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/ic_ship.imageset/ic_ship.png b/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/ic_ship.imageset/ic_ship.png new file mode 100644 index 0000000..a0e1d8a Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/ic_ship.imageset/ic_ship.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/ic_train.imageset/Contents.json b/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/ic_train.imageset/Contents.json new file mode 100644 index 0000000..8d6f018 --- /dev/null +++ b/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/ic_train.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images": [ + { + "scale": "1x", + "idiom": "universal" + }, + { + "scale": "2x", + "idiom": "universal" + }, + { + "scale": "3x", + "idiom": "universal", + "filename": "ic_train.png" + } + ], + "properties": {}, + "info": { + "version": 1, + "author": "" + } +} \ No newline at end of file diff --git a/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/ic_train.imageset/ic_train.png b/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/ic_train.imageset/ic_train.png new file mode 100644 index 0000000..ef2a3f1 Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/ic_train.imageset/ic_train.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/ic_truck.imageset/Contents.json b/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/ic_truck.imageset/Contents.json new file mode 100644 index 0000000..d532b34 --- /dev/null +++ b/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/ic_truck.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images": [ + { + "scale": "1x", + "idiom": "universal" + }, + { + "scale": "2x", + "idiom": "universal" + }, + { + "scale": "3x", + "idiom": "universal", + "filename": "ic_truck.png" + } + ], + "properties": {}, + "info": { + "version": 1, + "author": "" + } +} \ No newline at end of file diff --git a/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/ic_truck.imageset/ic_truck.png b/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/ic_truck.imageset/ic_truck.png new file mode 100644 index 0000000..805db5e Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/ic_truck.imageset/ic_truck.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/weight.imageset/Contents.json b/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/weight.imageset/Contents.json new file mode 100644 index 0000000..a45a9e6 --- /dev/null +++ b/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/weight.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images": [ + { + "scale": "1x", + "idiom": "universal" + }, + { + "scale": "2x", + "idiom": "universal" + }, + { + "scale": "3x", + "idiom": "universal", + "filename": "weight.png" + } + ], + "properties": {}, + "info": { + "version": 1, + "author": "" + } +} \ No newline at end of file diff --git a/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/weight.imageset/weight.png b/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/weight.imageset/weight.png new file mode 100644 index 0000000..bd79216 Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Assets.xcassets/weight.imageset/weight.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/VisualChallenge.iOS.csproj b/VisualChallenge/VisualChallenge.iOS/VisualChallenge.iOS.csproj index f7d6432..3d37502 100644 --- a/VisualChallenge/VisualChallenge.iOS/VisualChallenge.iOS.csproj +++ b/VisualChallenge/VisualChallenge.iOS/VisualChallenge.iOS.csproj @@ -123,6 +123,36 @@ + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + diff --git a/VisualChallenge/VisualChallenge/VisualChallengePage.xaml b/VisualChallenge/VisualChallenge/VisualChallengePage.xaml index 305cee4..ddfd739 100644 --- a/VisualChallenge/VisualChallenge/VisualChallengePage.xaml +++ b/VisualChallenge/VisualChallenge/VisualChallengePage.xaml @@ -6,18 +6,315 @@ Shell.NavBarIsVisible="True" BackgroundColor="White" Title="Visual Challenge" + Visual="Material" > - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -