diff --git a/VisualChallenge/VisualChallenge.Android/MainActivity.cs b/VisualChallenge/VisualChallenge.Android/MainActivity.cs index af10bc6..12de282 100644 --- a/VisualChallenge/VisualChallenge.Android/MainActivity.cs +++ b/VisualChallenge/VisualChallenge.Android/MainActivity.cs @@ -23,8 +23,9 @@ protected override void OnCreate(Bundle savedInstanceState) global::Xamarin.Forms.Forms.SetFlags("Shell_Experimental", "CollectionView_Experimental", "FastRenderers_Experimental"); global::Xamarin.Forms.Forms.Init(this, savedInstanceState); - global::Xamarin.Forms.FormsMaterial.Init(this, savedInstanceState); - LoadApplication(new App()); + global::Xamarin.Forms.FormsMaterial.Init(this, savedInstanceState); + + LoadApplication(new App()); } } } \ No newline at end of file diff --git a/VisualChallenge/VisualChallenge.Android/NoShiftEffect.cs b/VisualChallenge/VisualChallenge.Android/NoShiftEffect.cs new file mode 100644 index 0000000..59351fb --- /dev/null +++ b/VisualChallenge/VisualChallenge.Android/NoShiftEffect.cs @@ -0,0 +1,31 @@ +using Android.App; +using Android.Support.Design.BottomNavigation; +using Android.Support.Design.Widget; +using Android.Views; +using VisualChallenge.Droid; +using Xamarin.Forms; +using Xamarin.Forms.Platform.Android; + +[assembly: ResolutionGroupName("VisualChallenge")] +[assembly: ExportEffect(typeof(NoShiftEffect), "NoShiftEffect")] +namespace VisualChallenge.Droid +{ + public class NoShiftEffect : PlatformEffect + { + protected override void OnAttached() + { + if (!(Container.GetChildAt(0) is ViewGroup layout)) + return; + + if (!(layout.GetChildAt(1) is BottomNavigationView bottomNavigationView)) + return; + + // This is what we set to adjust if the shifting happens + bottomNavigationView.LabelVisibilityMode = LabelVisibilityMode.LabelVisibilityLabeled; + } + + protected override void OnDetached() + { + } + } +} \ No newline at end of file diff --git a/VisualChallenge/VisualChallenge.Android/Resources/Resource.designer.cs b/VisualChallenge/VisualChallenge.Android/Resources/Resource.designer.cs index 98d6c47..2aabfd8 100644 --- a/VisualChallenge/VisualChallenge.Android/Resources/Resource.designer.cs +++ b/VisualChallenge/VisualChallenge.Android/Resources/Resource.designer.cs @@ -8184,707 +8184,767 @@ 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: 0x7f02014d + public const int avd_hide_password_1 = 2130837837; - // aapt resource value: 0x7f02013a - public const int avd_hide_password_2 = 2130837818; + // aapt resource value: 0x7f02014e + public const int avd_hide_password_2 = 2130837838; - // aapt resource value: 0x7f02013b - public const int avd_hide_password_3 = 2130837819; + // aapt resource value: 0x7f02014f + public const int avd_hide_password_3 = 2130837839; // 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: 0x7f020150 + public const int avd_show_password_1 = 2130837840; - // aapt resource value: 0x7f02013d - public const int avd_show_password_2 = 2130837821; + // aapt resource value: 0x7f020151 + public const int avd_show_password_2 = 2130837841; - // aapt resource value: 0x7f02013e - public const int avd_show_password_3 = 2130837822; + // aapt resource value: 0x7f020152 + public const int avd_show_password_3 = 2130837842; // aapt resource value: 0x7f020056 - public const int design_bottom_navigation_item_background = 2130837590; + public const int bell = 2130837590; // aapt resource value: 0x7f020057 - public const int design_fab_background = 2130837591; + public const int bookmarks_menu = 2130837591; // aapt resource value: 0x7f020058 - public const int design_ic_visibility = 2130837592; + public const int comment = 2130837592; // aapt resource value: 0x7f020059 - public const int design_ic_visibility_off = 2130837593; + public const int dark_mode = 2130837593; // aapt resource value: 0x7f02005a - public const int design_password_eye = 2130837594; + public const int design_bottom_navigation_item_background = 2130837594; // aapt resource value: 0x7f02005b - public const int design_snackbar_background = 2130837595; + public const int design_fab_background = 2130837595; // aapt resource value: 0x7f02005c - public const int ic_audiotrack_dark = 2130837596; + public const int design_ic_visibility = 2130837596; // aapt resource value: 0x7f02005d - public const int ic_audiotrack_light = 2130837597; + public const int design_ic_visibility_off = 2130837597; // aapt resource value: 0x7f02005e - public const int ic_dialog_close_dark = 2130837598; + public const int design_password_eye = 2130837598; // aapt resource value: 0x7f02005f - public const int ic_dialog_close_light = 2130837599; + public const int design_snackbar_background = 2130837599; // aapt resource value: 0x7f020060 - public const int ic_group_collapse_00 = 2130837600; + public const int dunno_what_this_is = 2130837600; // aapt resource value: 0x7f020061 - public const int ic_group_collapse_01 = 2130837601; + public const int feather = 2130837601; // aapt resource value: 0x7f020062 - public const int ic_group_collapse_02 = 2130837602; + public const int heart = 2130837602; // aapt resource value: 0x7f020063 - public const int ic_group_collapse_03 = 2130837603; + public const int home = 2130837603; // aapt resource value: 0x7f020064 - public const int ic_group_collapse_04 = 2130837604; + public const int ic_audiotrack_dark = 2130837604; // aapt resource value: 0x7f020065 - public const int ic_group_collapse_05 = 2130837605; + public const int ic_audiotrack_light = 2130837605; // aapt resource value: 0x7f020066 - public const int ic_group_collapse_06 = 2130837606; + public const int ic_dialog_close_dark = 2130837606; // aapt resource value: 0x7f020067 - public const int ic_group_collapse_07 = 2130837607; + public const int ic_dialog_close_light = 2130837607; // aapt resource value: 0x7f020068 - public const int ic_group_collapse_08 = 2130837608; + public const int ic_group_collapse_00 = 2130837608; // aapt resource value: 0x7f020069 - public const int ic_group_collapse_09 = 2130837609; + public const int ic_group_collapse_01 = 2130837609; // aapt resource value: 0x7f02006a - public const int ic_group_collapse_10 = 2130837610; + public const int ic_group_collapse_02 = 2130837610; // aapt resource value: 0x7f02006b - public const int ic_group_collapse_11 = 2130837611; + public const int ic_group_collapse_03 = 2130837611; // aapt resource value: 0x7f02006c - public const int ic_group_collapse_12 = 2130837612; + public const int ic_group_collapse_04 = 2130837612; // aapt resource value: 0x7f02006d - public const int ic_group_collapse_13 = 2130837613; + public const int ic_group_collapse_05 = 2130837613; // aapt resource value: 0x7f02006e - public const int ic_group_collapse_14 = 2130837614; + public const int ic_group_collapse_06 = 2130837614; // aapt resource value: 0x7f02006f - public const int ic_group_collapse_15 = 2130837615; + public const int ic_group_collapse_07 = 2130837615; // aapt resource value: 0x7f020070 - public const int ic_group_expand_00 = 2130837616; + public const int ic_group_collapse_08 = 2130837616; // aapt resource value: 0x7f020071 - public const int ic_group_expand_01 = 2130837617; + public const int ic_group_collapse_09 = 2130837617; // aapt resource value: 0x7f020072 - public const int ic_group_expand_02 = 2130837618; + public const int ic_group_collapse_10 = 2130837618; // aapt resource value: 0x7f020073 - public const int ic_group_expand_03 = 2130837619; + public const int ic_group_collapse_11 = 2130837619; // aapt resource value: 0x7f020074 - public const int ic_group_expand_04 = 2130837620; + public const int ic_group_collapse_12 = 2130837620; // aapt resource value: 0x7f020075 - public const int ic_group_expand_05 = 2130837621; + public const int ic_group_collapse_13 = 2130837621; // aapt resource value: 0x7f020076 - public const int ic_group_expand_06 = 2130837622; + public const int ic_group_collapse_14 = 2130837622; // aapt resource value: 0x7f020077 - public const int ic_group_expand_07 = 2130837623; + public const int ic_group_collapse_15 = 2130837623; // aapt resource value: 0x7f020078 - public const int ic_group_expand_08 = 2130837624; + public const int ic_group_expand_00 = 2130837624; // aapt resource value: 0x7f020079 - public const int ic_group_expand_09 = 2130837625; + public const int ic_group_expand_01 = 2130837625; // aapt resource value: 0x7f02007a - public const int ic_group_expand_10 = 2130837626; + public const int ic_group_expand_02 = 2130837626; // aapt resource value: 0x7f02007b - public const int ic_group_expand_11 = 2130837627; + public const int ic_group_expand_03 = 2130837627; // aapt resource value: 0x7f02007c - public const int ic_group_expand_12 = 2130837628; + public const int ic_group_expand_04 = 2130837628; // aapt resource value: 0x7f02007d - public const int ic_group_expand_13 = 2130837629; + public const int ic_group_expand_05 = 2130837629; // aapt resource value: 0x7f02007e - public const int ic_group_expand_14 = 2130837630; + public const int ic_group_expand_06 = 2130837630; // aapt resource value: 0x7f02007f - public const int ic_group_expand_15 = 2130837631; + public const int ic_group_expand_07 = 2130837631; // aapt resource value: 0x7f020080 - public const int ic_media_pause_dark = 2130837632; + public const int ic_group_expand_08 = 2130837632; // aapt resource value: 0x7f020081 - public const int ic_media_pause_light = 2130837633; + public const int ic_group_expand_09 = 2130837633; // aapt resource value: 0x7f020082 - public const int ic_media_play_dark = 2130837634; + public const int ic_group_expand_10 = 2130837634; // aapt resource value: 0x7f020083 - public const int ic_media_play_light = 2130837635; + public const int ic_group_expand_11 = 2130837635; // aapt resource value: 0x7f020084 - public const int ic_media_stop_dark = 2130837636; + public const int ic_group_expand_12 = 2130837636; // aapt resource value: 0x7f020085 - public const int ic_media_stop_light = 2130837637; + public const int ic_group_expand_13 = 2130837637; // aapt resource value: 0x7f020086 - public const int ic_mr_button_connected_00_dark = 2130837638; + public const int ic_group_expand_14 = 2130837638; // aapt resource value: 0x7f020087 - public const int ic_mr_button_connected_00_light = 2130837639; + public const int ic_group_expand_15 = 2130837639; // aapt resource value: 0x7f020088 - public const int ic_mr_button_connected_01_dark = 2130837640; + public const int ic_media_pause_dark = 2130837640; // aapt resource value: 0x7f020089 - public const int ic_mr_button_connected_01_light = 2130837641; + public const int ic_media_pause_light = 2130837641; // aapt resource value: 0x7f02008a - public const int ic_mr_button_connected_02_dark = 2130837642; + public const int ic_media_play_dark = 2130837642; // aapt resource value: 0x7f02008b - public const int ic_mr_button_connected_02_light = 2130837643; + public const int ic_media_play_light = 2130837643; // aapt resource value: 0x7f02008c - public const int ic_mr_button_connected_03_dark = 2130837644; + public const int ic_media_stop_dark = 2130837644; // aapt resource value: 0x7f02008d - public const int ic_mr_button_connected_03_light = 2130837645; + public const int ic_media_stop_light = 2130837645; // aapt resource value: 0x7f02008e - public const int ic_mr_button_connected_04_dark = 2130837646; + public const int ic_mr_button_connected_00_dark = 2130837646; // aapt resource value: 0x7f02008f - public const int ic_mr_button_connected_04_light = 2130837647; + public const int ic_mr_button_connected_00_light = 2130837647; // aapt resource value: 0x7f020090 - public const int ic_mr_button_connected_05_dark = 2130837648; + public const int ic_mr_button_connected_01_dark = 2130837648; // aapt resource value: 0x7f020091 - public const int ic_mr_button_connected_05_light = 2130837649; + public const int ic_mr_button_connected_01_light = 2130837649; // aapt resource value: 0x7f020092 - public const int ic_mr_button_connected_06_dark = 2130837650; + public const int ic_mr_button_connected_02_dark = 2130837650; // aapt resource value: 0x7f020093 - public const int ic_mr_button_connected_06_light = 2130837651; + public const int ic_mr_button_connected_02_light = 2130837651; // aapt resource value: 0x7f020094 - public const int ic_mr_button_connected_07_dark = 2130837652; + public const int ic_mr_button_connected_03_dark = 2130837652; // aapt resource value: 0x7f020095 - public const int ic_mr_button_connected_07_light = 2130837653; + public const int ic_mr_button_connected_03_light = 2130837653; // aapt resource value: 0x7f020096 - public const int ic_mr_button_connected_08_dark = 2130837654; + public const int ic_mr_button_connected_04_dark = 2130837654; // aapt resource value: 0x7f020097 - public const int ic_mr_button_connected_08_light = 2130837655; + public const int ic_mr_button_connected_04_light = 2130837655; // aapt resource value: 0x7f020098 - public const int ic_mr_button_connected_09_dark = 2130837656; + public const int ic_mr_button_connected_05_dark = 2130837656; // aapt resource value: 0x7f020099 - public const int ic_mr_button_connected_09_light = 2130837657; + public const int ic_mr_button_connected_05_light = 2130837657; // aapt resource value: 0x7f02009a - public const int ic_mr_button_connected_10_dark = 2130837658; + public const int ic_mr_button_connected_06_dark = 2130837658; // aapt resource value: 0x7f02009b - public const int ic_mr_button_connected_10_light = 2130837659; + public const int ic_mr_button_connected_06_light = 2130837659; // aapt resource value: 0x7f02009c - public const int ic_mr_button_connected_11_dark = 2130837660; + public const int ic_mr_button_connected_07_dark = 2130837660; // aapt resource value: 0x7f02009d - public const int ic_mr_button_connected_11_light = 2130837661; + public const int ic_mr_button_connected_07_light = 2130837661; // aapt resource value: 0x7f02009e - public const int ic_mr_button_connected_12_dark = 2130837662; + public const int ic_mr_button_connected_08_dark = 2130837662; // aapt resource value: 0x7f02009f - public const int ic_mr_button_connected_12_light = 2130837663; + public const int ic_mr_button_connected_08_light = 2130837663; // aapt resource value: 0x7f0200a0 - public const int ic_mr_button_connected_13_dark = 2130837664; + public const int ic_mr_button_connected_09_dark = 2130837664; // aapt resource value: 0x7f0200a1 - public const int ic_mr_button_connected_13_light = 2130837665; + public const int ic_mr_button_connected_09_light = 2130837665; // aapt resource value: 0x7f0200a2 - public const int ic_mr_button_connected_14_dark = 2130837666; + public const int ic_mr_button_connected_10_dark = 2130837666; // aapt resource value: 0x7f0200a3 - public const int ic_mr_button_connected_14_light = 2130837667; + public const int ic_mr_button_connected_10_light = 2130837667; // aapt resource value: 0x7f0200a4 - public const int ic_mr_button_connected_15_dark = 2130837668; + public const int ic_mr_button_connected_11_dark = 2130837668; // aapt resource value: 0x7f0200a5 - public const int ic_mr_button_connected_15_light = 2130837669; + public const int ic_mr_button_connected_11_light = 2130837669; // aapt resource value: 0x7f0200a6 - public const int ic_mr_button_connected_16_dark = 2130837670; + public const int ic_mr_button_connected_12_dark = 2130837670; // aapt resource value: 0x7f0200a7 - public const int ic_mr_button_connected_16_light = 2130837671; + public const int ic_mr_button_connected_12_light = 2130837671; // aapt resource value: 0x7f0200a8 - public const int ic_mr_button_connected_17_dark = 2130837672; + public const int ic_mr_button_connected_13_dark = 2130837672; // aapt resource value: 0x7f0200a9 - public const int ic_mr_button_connected_17_light = 2130837673; + public const int ic_mr_button_connected_13_light = 2130837673; // aapt resource value: 0x7f0200aa - public const int ic_mr_button_connected_18_dark = 2130837674; + public const int ic_mr_button_connected_14_dark = 2130837674; // aapt resource value: 0x7f0200ab - public const int ic_mr_button_connected_18_light = 2130837675; + public const int ic_mr_button_connected_14_light = 2130837675; // aapt resource value: 0x7f0200ac - public const int ic_mr_button_connected_19_dark = 2130837676; + public const int ic_mr_button_connected_15_dark = 2130837676; // aapt resource value: 0x7f0200ad - public const int ic_mr_button_connected_19_light = 2130837677; + public const int ic_mr_button_connected_15_light = 2130837677; // aapt resource value: 0x7f0200ae - public const int ic_mr_button_connected_20_dark = 2130837678; + public const int ic_mr_button_connected_16_dark = 2130837678; // aapt resource value: 0x7f0200af - public const int ic_mr_button_connected_20_light = 2130837679; + public const int ic_mr_button_connected_16_light = 2130837679; // aapt resource value: 0x7f0200b0 - public const int ic_mr_button_connected_21_dark = 2130837680; + public const int ic_mr_button_connected_17_dark = 2130837680; // aapt resource value: 0x7f0200b1 - public const int ic_mr_button_connected_21_light = 2130837681; + public const int ic_mr_button_connected_17_light = 2130837681; // aapt resource value: 0x7f0200b2 - public const int ic_mr_button_connected_22_dark = 2130837682; + public const int ic_mr_button_connected_18_dark = 2130837682; // aapt resource value: 0x7f0200b3 - public const int ic_mr_button_connected_22_light = 2130837683; + public const int ic_mr_button_connected_18_light = 2130837683; // aapt resource value: 0x7f0200b4 - public const int ic_mr_button_connected_23_dark = 2130837684; + public const int ic_mr_button_connected_19_dark = 2130837684; // aapt resource value: 0x7f0200b5 - public const int ic_mr_button_connected_23_light = 2130837685; + public const int ic_mr_button_connected_19_light = 2130837685; // aapt resource value: 0x7f0200b6 - public const int ic_mr_button_connected_24_dark = 2130837686; + public const int ic_mr_button_connected_20_dark = 2130837686; // aapt resource value: 0x7f0200b7 - public const int ic_mr_button_connected_24_light = 2130837687; + public const int ic_mr_button_connected_20_light = 2130837687; // aapt resource value: 0x7f0200b8 - public const int ic_mr_button_connected_25_dark = 2130837688; + public const int ic_mr_button_connected_21_dark = 2130837688; // aapt resource value: 0x7f0200b9 - public const int ic_mr_button_connected_25_light = 2130837689; + public const int ic_mr_button_connected_21_light = 2130837689; // aapt resource value: 0x7f0200ba - public const int ic_mr_button_connected_26_dark = 2130837690; + public const int ic_mr_button_connected_22_dark = 2130837690; // aapt resource value: 0x7f0200bb - public const int ic_mr_button_connected_26_light = 2130837691; + public const int ic_mr_button_connected_22_light = 2130837691; // aapt resource value: 0x7f0200bc - public const int ic_mr_button_connected_27_dark = 2130837692; + public const int ic_mr_button_connected_23_dark = 2130837692; // aapt resource value: 0x7f0200bd - public const int ic_mr_button_connected_27_light = 2130837693; + public const int ic_mr_button_connected_23_light = 2130837693; // aapt resource value: 0x7f0200be - public const int ic_mr_button_connected_28_dark = 2130837694; + public const int ic_mr_button_connected_24_dark = 2130837694; // aapt resource value: 0x7f0200bf - public const int ic_mr_button_connected_28_light = 2130837695; + public const int ic_mr_button_connected_24_light = 2130837695; // aapt resource value: 0x7f0200c0 - public const int ic_mr_button_connected_29_dark = 2130837696; + public const int ic_mr_button_connected_25_dark = 2130837696; // aapt resource value: 0x7f0200c1 - public const int ic_mr_button_connected_29_light = 2130837697; + public const int ic_mr_button_connected_25_light = 2130837697; // aapt resource value: 0x7f0200c2 - public const int ic_mr_button_connected_30_dark = 2130837698; + public const int ic_mr_button_connected_26_dark = 2130837698; // aapt resource value: 0x7f0200c3 - public const int ic_mr_button_connected_30_light = 2130837699; + public const int ic_mr_button_connected_26_light = 2130837699; // aapt resource value: 0x7f0200c4 - public const int ic_mr_button_connecting_00_dark = 2130837700; + public const int ic_mr_button_connected_27_dark = 2130837700; // aapt resource value: 0x7f0200c5 - public const int ic_mr_button_connecting_00_light = 2130837701; + public const int ic_mr_button_connected_27_light = 2130837701; // aapt resource value: 0x7f0200c6 - public const int ic_mr_button_connecting_01_dark = 2130837702; + public const int ic_mr_button_connected_28_dark = 2130837702; // aapt resource value: 0x7f0200c7 - public const int ic_mr_button_connecting_01_light = 2130837703; + public const int ic_mr_button_connected_28_light = 2130837703; // aapt resource value: 0x7f0200c8 - public const int ic_mr_button_connecting_02_dark = 2130837704; + public const int ic_mr_button_connected_29_dark = 2130837704; // aapt resource value: 0x7f0200c9 - public const int ic_mr_button_connecting_02_light = 2130837705; + public const int ic_mr_button_connected_29_light = 2130837705; // aapt resource value: 0x7f0200ca - public const int ic_mr_button_connecting_03_dark = 2130837706; + public const int ic_mr_button_connected_30_dark = 2130837706; // aapt resource value: 0x7f0200cb - public const int ic_mr_button_connecting_03_light = 2130837707; + public const int ic_mr_button_connected_30_light = 2130837707; // aapt resource value: 0x7f0200cc - public const int ic_mr_button_connecting_04_dark = 2130837708; + public const int ic_mr_button_connecting_00_dark = 2130837708; // aapt resource value: 0x7f0200cd - public const int ic_mr_button_connecting_04_light = 2130837709; + public const int ic_mr_button_connecting_00_light = 2130837709; // aapt resource value: 0x7f0200ce - public const int ic_mr_button_connecting_05_dark = 2130837710; + public const int ic_mr_button_connecting_01_dark = 2130837710; // aapt resource value: 0x7f0200cf - public const int ic_mr_button_connecting_05_light = 2130837711; + public const int ic_mr_button_connecting_01_light = 2130837711; // aapt resource value: 0x7f0200d0 - public const int ic_mr_button_connecting_06_dark = 2130837712; + public const int ic_mr_button_connecting_02_dark = 2130837712; // aapt resource value: 0x7f0200d1 - public const int ic_mr_button_connecting_06_light = 2130837713; + public const int ic_mr_button_connecting_02_light = 2130837713; // aapt resource value: 0x7f0200d2 - public const int ic_mr_button_connecting_07_dark = 2130837714; + public const int ic_mr_button_connecting_03_dark = 2130837714; // aapt resource value: 0x7f0200d3 - public const int ic_mr_button_connecting_07_light = 2130837715; + public const int ic_mr_button_connecting_03_light = 2130837715; // aapt resource value: 0x7f0200d4 - public const int ic_mr_button_connecting_08_dark = 2130837716; + public const int ic_mr_button_connecting_04_dark = 2130837716; // aapt resource value: 0x7f0200d5 - public const int ic_mr_button_connecting_08_light = 2130837717; + public const int ic_mr_button_connecting_04_light = 2130837717; // aapt resource value: 0x7f0200d6 - public const int ic_mr_button_connecting_09_dark = 2130837718; + public const int ic_mr_button_connecting_05_dark = 2130837718; // aapt resource value: 0x7f0200d7 - public const int ic_mr_button_connecting_09_light = 2130837719; + public const int ic_mr_button_connecting_05_light = 2130837719; // aapt resource value: 0x7f0200d8 - public const int ic_mr_button_connecting_10_dark = 2130837720; + public const int ic_mr_button_connecting_06_dark = 2130837720; // aapt resource value: 0x7f0200d9 - public const int ic_mr_button_connecting_10_light = 2130837721; + public const int ic_mr_button_connecting_06_light = 2130837721; // aapt resource value: 0x7f0200da - public const int ic_mr_button_connecting_11_dark = 2130837722; + public const int ic_mr_button_connecting_07_dark = 2130837722; // aapt resource value: 0x7f0200db - public const int ic_mr_button_connecting_11_light = 2130837723; + public const int ic_mr_button_connecting_07_light = 2130837723; // aapt resource value: 0x7f0200dc - public const int ic_mr_button_connecting_12_dark = 2130837724; + public const int ic_mr_button_connecting_08_dark = 2130837724; // aapt resource value: 0x7f0200dd - public const int ic_mr_button_connecting_12_light = 2130837725; + public const int ic_mr_button_connecting_08_light = 2130837725; // aapt resource value: 0x7f0200de - public const int ic_mr_button_connecting_13_dark = 2130837726; + public const int ic_mr_button_connecting_09_dark = 2130837726; // aapt resource value: 0x7f0200df - public const int ic_mr_button_connecting_13_light = 2130837727; + public const int ic_mr_button_connecting_09_light = 2130837727; // aapt resource value: 0x7f0200e0 - public const int ic_mr_button_connecting_14_dark = 2130837728; + public const int ic_mr_button_connecting_10_dark = 2130837728; // aapt resource value: 0x7f0200e1 - public const int ic_mr_button_connecting_14_light = 2130837729; + public const int ic_mr_button_connecting_10_light = 2130837729; // aapt resource value: 0x7f0200e2 - public const int ic_mr_button_connecting_15_dark = 2130837730; + public const int ic_mr_button_connecting_11_dark = 2130837730; // aapt resource value: 0x7f0200e3 - public const int ic_mr_button_connecting_15_light = 2130837731; + public const int ic_mr_button_connecting_11_light = 2130837731; // aapt resource value: 0x7f0200e4 - public const int ic_mr_button_connecting_16_dark = 2130837732; + public const int ic_mr_button_connecting_12_dark = 2130837732; // aapt resource value: 0x7f0200e5 - public const int ic_mr_button_connecting_16_light = 2130837733; + public const int ic_mr_button_connecting_12_light = 2130837733; // aapt resource value: 0x7f0200e6 - public const int ic_mr_button_connecting_17_dark = 2130837734; + public const int ic_mr_button_connecting_13_dark = 2130837734; // aapt resource value: 0x7f0200e7 - public const int ic_mr_button_connecting_17_light = 2130837735; + public const int ic_mr_button_connecting_13_light = 2130837735; // aapt resource value: 0x7f0200e8 - public const int ic_mr_button_connecting_18_dark = 2130837736; + public const int ic_mr_button_connecting_14_dark = 2130837736; // aapt resource value: 0x7f0200e9 - public const int ic_mr_button_connecting_18_light = 2130837737; + public const int ic_mr_button_connecting_14_light = 2130837737; // aapt resource value: 0x7f0200ea - public const int ic_mr_button_connecting_19_dark = 2130837738; + public const int ic_mr_button_connecting_15_dark = 2130837738; // aapt resource value: 0x7f0200eb - public const int ic_mr_button_connecting_19_light = 2130837739; + public const int ic_mr_button_connecting_15_light = 2130837739; // aapt resource value: 0x7f0200ec - public const int ic_mr_button_connecting_20_dark = 2130837740; + public const int ic_mr_button_connecting_16_dark = 2130837740; // aapt resource value: 0x7f0200ed - public const int ic_mr_button_connecting_20_light = 2130837741; + public const int ic_mr_button_connecting_16_light = 2130837741; // aapt resource value: 0x7f0200ee - public const int ic_mr_button_connecting_21_dark = 2130837742; + public const int ic_mr_button_connecting_17_dark = 2130837742; // aapt resource value: 0x7f0200ef - public const int ic_mr_button_connecting_21_light = 2130837743; + public const int ic_mr_button_connecting_17_light = 2130837743; // aapt resource value: 0x7f0200f0 - public const int ic_mr_button_connecting_22_dark = 2130837744; + public const int ic_mr_button_connecting_18_dark = 2130837744; // aapt resource value: 0x7f0200f1 - public const int ic_mr_button_connecting_22_light = 2130837745; + public const int ic_mr_button_connecting_18_light = 2130837745; // aapt resource value: 0x7f0200f2 - public const int ic_mr_button_connecting_23_dark = 2130837746; + public const int ic_mr_button_connecting_19_dark = 2130837746; // aapt resource value: 0x7f0200f3 - public const int ic_mr_button_connecting_23_light = 2130837747; + public const int ic_mr_button_connecting_19_light = 2130837747; // aapt resource value: 0x7f0200f4 - public const int ic_mr_button_connecting_24_dark = 2130837748; + public const int ic_mr_button_connecting_20_dark = 2130837748; // aapt resource value: 0x7f0200f5 - public const int ic_mr_button_connecting_24_light = 2130837749; + public const int ic_mr_button_connecting_20_light = 2130837749; // aapt resource value: 0x7f0200f6 - public const int ic_mr_button_connecting_25_dark = 2130837750; + public const int ic_mr_button_connecting_21_dark = 2130837750; // aapt resource value: 0x7f0200f7 - public const int ic_mr_button_connecting_25_light = 2130837751; + public const int ic_mr_button_connecting_21_light = 2130837751; // aapt resource value: 0x7f0200f8 - public const int ic_mr_button_connecting_26_dark = 2130837752; + public const int ic_mr_button_connecting_22_dark = 2130837752; // aapt resource value: 0x7f0200f9 - public const int ic_mr_button_connecting_26_light = 2130837753; + public const int ic_mr_button_connecting_22_light = 2130837753; // aapt resource value: 0x7f0200fa - public const int ic_mr_button_connecting_27_dark = 2130837754; + public const int ic_mr_button_connecting_23_dark = 2130837754; // aapt resource value: 0x7f0200fb - public const int ic_mr_button_connecting_27_light = 2130837755; + public const int ic_mr_button_connecting_23_light = 2130837755; // aapt resource value: 0x7f0200fc - public const int ic_mr_button_connecting_28_dark = 2130837756; + public const int ic_mr_button_connecting_24_dark = 2130837756; // aapt resource value: 0x7f0200fd - public const int ic_mr_button_connecting_28_light = 2130837757; + public const int ic_mr_button_connecting_24_light = 2130837757; // aapt resource value: 0x7f0200fe - public const int ic_mr_button_connecting_29_dark = 2130837758; + public const int ic_mr_button_connecting_25_dark = 2130837758; // aapt resource value: 0x7f0200ff - public const int ic_mr_button_connecting_29_light = 2130837759; + public const int ic_mr_button_connecting_25_light = 2130837759; // aapt resource value: 0x7f020100 - public const int ic_mr_button_connecting_30_dark = 2130837760; + public const int ic_mr_button_connecting_26_dark = 2130837760; // aapt resource value: 0x7f020101 - public const int ic_mr_button_connecting_30_light = 2130837761; + public const int ic_mr_button_connecting_26_light = 2130837761; // aapt resource value: 0x7f020102 - public const int ic_mr_button_disabled_dark = 2130837762; + public const int ic_mr_button_connecting_27_dark = 2130837762; // aapt resource value: 0x7f020103 - public const int ic_mr_button_disabled_light = 2130837763; + public const int ic_mr_button_connecting_27_light = 2130837763; // aapt resource value: 0x7f020104 - public const int ic_mr_button_disconnected_dark = 2130837764; + public const int ic_mr_button_connecting_28_dark = 2130837764; // aapt resource value: 0x7f020105 - public const int ic_mr_button_disconnected_light = 2130837765; + public const int ic_mr_button_connecting_28_light = 2130837765; // aapt resource value: 0x7f020106 - public const int ic_mr_button_grey = 2130837766; + public const int ic_mr_button_connecting_29_dark = 2130837766; // aapt resource value: 0x7f020107 - public const int ic_mtrl_chip_checked_black = 2130837767; + public const int ic_mr_button_connecting_29_light = 2130837767; // aapt resource value: 0x7f020108 - public const int ic_mtrl_chip_checked_circle = 2130837768; + public const int ic_mr_button_connecting_30_dark = 2130837768; // aapt resource value: 0x7f020109 - public const int ic_mtrl_chip_close_circle = 2130837769; + public const int ic_mr_button_connecting_30_light = 2130837769; // aapt resource value: 0x7f02010a - public const int ic_vol_type_speaker_dark = 2130837770; + public const int ic_mr_button_disabled_dark = 2130837770; // aapt resource value: 0x7f02010b - public const int ic_vol_type_speaker_group_dark = 2130837771; + public const int ic_mr_button_disabled_light = 2130837771; // aapt resource value: 0x7f02010c - public const int ic_vol_type_speaker_group_light = 2130837772; + public const int ic_mr_button_disconnected_dark = 2130837772; // aapt resource value: 0x7f02010d - public const int ic_vol_type_speaker_light = 2130837773; + public const int ic_mr_button_disconnected_light = 2130837773; // aapt resource value: 0x7f02010e - public const int ic_vol_type_tv_dark = 2130837774; + public const int ic_mr_button_grey = 2130837774; // aapt resource value: 0x7f02010f - public const int ic_vol_type_tv_light = 2130837775; + public const int ic_mtrl_chip_checked_black = 2130837775; // aapt resource value: 0x7f020110 - public const int launch_screen = 2130837776; + public const int ic_mtrl_chip_checked_circle = 2130837776; // aapt resource value: 0x7f020111 - public const int MaterialActivityIndicatorBackground = 2130837777; + public const int ic_mtrl_chip_close_circle = 2130837777; // aapt resource value: 0x7f020112 - public const int MaterialProgressBar = 2130837778; + public const int ic_vol_type_speaker_dark = 2130837778; // aapt resource value: 0x7f020113 - public const int mr_button_connected_dark = 2130837779; + public const int ic_vol_type_speaker_group_dark = 2130837779; // aapt resource value: 0x7f020114 - public const int mr_button_connected_light = 2130837780; + public const int ic_vol_type_speaker_group_light = 2130837780; // aapt resource value: 0x7f020115 - public const int mr_button_connecting_dark = 2130837781; + public const int ic_vol_type_speaker_light = 2130837781; // aapt resource value: 0x7f020116 - public const int mr_button_connecting_light = 2130837782; + public const int ic_vol_type_tv_dark = 2130837782; // aapt resource value: 0x7f020117 - public const int mr_button_dark = 2130837783; + public const int ic_vol_type_tv_light = 2130837783; // aapt resource value: 0x7f020118 - public const int mr_button_light = 2130837784; + public const int image = 2130837784; // aapt resource value: 0x7f020119 - public const int mr_dialog_close_dark = 2130837785; + public const int launch_screen = 2130837785; // aapt resource value: 0x7f02011a - public const int mr_dialog_close_light = 2130837786; + public const int lists_menu = 2130837786; // aapt resource value: 0x7f02011b - public const int mr_dialog_material_background_dark = 2130837787; + public const int MaterialActivityIndicatorBackground = 2130837787; // aapt resource value: 0x7f02011c - public const int mr_dialog_material_background_light = 2130837788; + public const int MaterialProgressBar = 2130837788; // aapt resource value: 0x7f02011d - public const int mr_group_collapse = 2130837789; + public const int message = 2130837789; // aapt resource value: 0x7f02011e - public const int mr_group_expand = 2130837790; + public const int moments_menu = 2130837790; // aapt resource value: 0x7f02011f - public const int mr_media_pause_dark = 2130837791; + public const int more = 2130837791; // aapt resource value: 0x7f020120 - public const int mr_media_pause_light = 2130837792; + public const int more_blue = 2130837792; // aapt resource value: 0x7f020121 - public const int mr_media_play_dark = 2130837793; + public const int mr_button_connected_dark = 2130837793; // aapt resource value: 0x7f020122 - public const int mr_media_play_light = 2130837794; + public const int mr_button_connected_light = 2130837794; // aapt resource value: 0x7f020123 - public const int mr_media_stop_dark = 2130837795; + public const int mr_button_connecting_dark = 2130837795; // aapt resource value: 0x7f020124 - public const int mr_media_stop_light = 2130837796; + public const int mr_button_connecting_light = 2130837796; // aapt resource value: 0x7f020125 - public const int mr_vol_type_audiotrack_dark = 2130837797; + public const int mr_button_dark = 2130837797; // aapt resource value: 0x7f020126 - public const int mr_vol_type_audiotrack_light = 2130837798; + public const int mr_button_light = 2130837798; // aapt resource value: 0x7f020127 - public const int mtrl_snackbar_background = 2130837799; + public const int mr_dialog_close_dark = 2130837799; // aapt resource value: 0x7f020128 - public const int mtrl_tabs_default_indicator = 2130837800; + public const int mr_dialog_close_light = 2130837800; // aapt resource value: 0x7f020129 - public const int navigation_empty_icon = 2130837801; + public const int mr_dialog_material_background_dark = 2130837801; // aapt resource value: 0x7f02012a - public const int notification_action_background = 2130837802; + public const int mr_dialog_material_background_light = 2130837802; // aapt resource value: 0x7f02012b - public const int notification_bg = 2130837803; + public const int mr_group_collapse = 2130837803; // aapt resource value: 0x7f02012c - public const int notification_bg_low = 2130837804; + public const int mr_group_expand = 2130837804; // aapt resource value: 0x7f02012d - public const int notification_bg_low_normal = 2130837805; + public const int mr_media_pause_dark = 2130837805; // aapt resource value: 0x7f02012e - public const int notification_bg_low_pressed = 2130837806; + public const int mr_media_pause_light = 2130837806; // aapt resource value: 0x7f02012f - public const int notification_bg_normal = 2130837807; + public const int mr_media_play_dark = 2130837807; // aapt resource value: 0x7f020130 - public const int notification_bg_normal_pressed = 2130837808; + public const int mr_media_play_light = 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 mr_media_stop_dark = 2130837809; // aapt resource value: 0x7f020132 - public const int notification_tile_bg = 2130837810; + public const int mr_media_stop_light = 2130837810; // aapt resource value: 0x7f020133 - public const int notify_panel_notification_icon_bg = 2130837811; + public const int mr_vol_type_audiotrack_dark = 2130837811; // aapt resource value: 0x7f020134 - public const int tooltip_frame_dark = 2130837812; + public const int mr_vol_type_audiotrack_light = 2130837812; // aapt resource value: 0x7f020135 - public const int tooltip_frame_light = 2130837813; + public const int mtrl_snackbar_background = 2130837813; // aapt resource value: 0x7f020136 - public const int xamagon_preview = 2130837814; + public const int mtrl_tabs_default_indicator = 2130837814; + + // aapt resource value: 0x7f020137 + public const int navigation_empty_icon = 2130837815; + + // aapt resource value: 0x7f020138 + public const int notification_action_background = 2130837816; + + // aapt resource value: 0x7f020139 + public const int notification_bg = 2130837817; + + // aapt resource value: 0x7f02013a + public const int notification_bg_low = 2130837818; + + // aapt resource value: 0x7f02013b + public const int notification_bg_low_normal = 2130837819; + + // aapt resource value: 0x7f02013c + public const int notification_bg_low_pressed = 2130837820; + + // aapt resource value: 0x7f02013d + public const int notification_bg_normal = 2130837821; + + // aapt resource value: 0x7f02013e + public const int notification_bg_normal_pressed = 2130837822; + + // aapt resource value: 0x7f02013f + public const int notification_icon_background = 2130837823; + + // aapt resource value: 0x7f02014b + public const int notification_template_icon_bg = 2130837835; + + // aapt resource value: 0x7f02014c + public const int notification_template_icon_low_bg = 2130837836; + + // aapt resource value: 0x7f020140 + public const int notification_tile_bg = 2130837824; + + // aapt resource value: 0x7f020141 + public const int notify_panel_notification_icon_bg = 2130837825; + + // aapt resource value: 0x7f020142 + public const int profile = 2130837826; + + // aapt resource value: 0x7f020143 + public const int profile_menu = 2130837827; + + // aapt resource value: 0x7f020144 + public const int retweet = 2130837828; + + // aapt resource value: 0x7f020145 + public const int search = 2130837829; + + // aapt resource value: 0x7f020146 + public const int share = 2130837830; + + // aapt resource value: 0x7f020147 + public const int stars = 2130837831; + + // aapt resource value: 0x7f020148 + public const int tooltip_frame_dark = 2130837832; + + // aapt resource value: 0x7f020149 + public const int tooltip_frame_light = 2130837833; + + // aapt resource value: 0x7f02014a + public const int xamagon_preview = 2130837834; static Drawable() { diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/bell.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/bell.png new file mode 100644 index 0000000..ad14f09 Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/bell.png differ diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/bookmarks_menu.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/bookmarks_menu.png new file mode 100644 index 0000000..da45fec Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/bookmarks_menu.png differ diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/comment.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/comment.png new file mode 100644 index 0000000..8e263bc Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/comment.png differ diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/dark_mode.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/dark_mode.png new file mode 100644 index 0000000..c849473 Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/dark_mode.png differ diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/dunno_what_this_is.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/dunno_what_this_is.png new file mode 100644 index 0000000..c3b61ad Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/dunno_what_this_is.png differ diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/feather.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/feather.png new file mode 100644 index 0000000..b04fac5 Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/feather.png differ diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/heart.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/heart.png new file mode 100644 index 0000000..644d394 Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/heart.png differ diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/home.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/home.png new file mode 100644 index 0000000..88144c7 Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/home.png differ diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/image.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/image.png new file mode 100644 index 0000000..256d2e4 Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/image.png differ diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/lists_menu.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/lists_menu.png new file mode 100644 index 0000000..e459c0b Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/lists_menu.png differ diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/message.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/message.png new file mode 100644 index 0000000..26b6d21 Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/message.png differ diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/moments_menu.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/moments_menu.png new file mode 100644 index 0000000..5e3760a Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/moments_menu.png differ diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/more.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/more.png new file mode 100644 index 0000000..fef3129 Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/more.png differ diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/more_blue.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/more_blue.png new file mode 100644 index 0000000..dbee927 Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/more_blue.png differ diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/profile.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/profile.png new file mode 100644 index 0000000..6c35547 Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/profile.png differ diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/profile_menu.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/profile_menu.png new file mode 100644 index 0000000..0104109 Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/profile_menu.png differ diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/retweet.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/retweet.png new file mode 100644 index 0000000..a16ca1b Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/retweet.png differ diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/search.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/search.png new file mode 100644 index 0000000..77c2691 Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/search.png differ diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/share.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/share.png new file mode 100644 index 0000000..38f563a Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/share.png differ diff --git a/VisualChallenge/VisualChallenge.Android/Resources/drawable/stars.png b/VisualChallenge/VisualChallenge.Android/Resources/drawable/stars.png new file mode 100644 index 0000000..764582c Binary files /dev/null and b/VisualChallenge/VisualChallenge.Android/Resources/drawable/stars.png differ diff --git a/VisualChallenge/VisualChallenge.Android/Resources/layout/Toolbar.axml b/VisualChallenge/VisualChallenge.Android/Resources/layout/Toolbar.axml index aabd0a3..3bb606a 100644 --- a/VisualChallenge/VisualChallenge.Android/Resources/layout/Toolbar.axml +++ b/VisualChallenge/VisualChallenge.Android/Resources/layout/Toolbar.axml @@ -2,7 +2,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/toolbar" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="wrap_content" android:background="?attr/colorPrimary" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" android:popupTheme="@style/ThemeOverlay.AppCompat.Light" /> diff --git a/VisualChallenge/VisualChallenge.Android/Resources/values/dimens.xml b/VisualChallenge/VisualChallenge.Android/Resources/values/dimens.xml new file mode 100644 index 0000000..b8b8a4c --- /dev/null +++ b/VisualChallenge/VisualChallenge.Android/Resources/values/dimens.xml @@ -0,0 +1,4 @@ + + 12sp + 12sp + \ No newline at end of file diff --git a/VisualChallenge/VisualChallenge.Android/VisualChallenge.Android.csproj b/VisualChallenge/VisualChallenge.Android/VisualChallenge.Android.csproj index 051ffba..da090ec 100644 --- a/VisualChallenge/VisualChallenge.Android/VisualChallenge.Android.csproj +++ b/VisualChallenge/VisualChallenge.Android/VisualChallenge.Android.csproj @@ -55,6 +55,7 @@ + @@ -86,12 +87,74 @@ - + + + {DF343C5B-66F1-4EF5-B721-6246D8F1DC39} VisualChallenge + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/VisualChallenge/VisualChallenge.iOS/Resources/bell.png b/VisualChallenge/VisualChallenge.iOS/Resources/bell.png new file mode 100644 index 0000000..0e55046 Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Resources/bell.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/Resources/bookmarks_menu.png b/VisualChallenge/VisualChallenge.iOS/Resources/bookmarks_menu.png new file mode 100644 index 0000000..da45fec Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Resources/bookmarks_menu.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/Resources/comment.png b/VisualChallenge/VisualChallenge.iOS/Resources/comment.png new file mode 100644 index 0000000..8e263bc Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Resources/comment.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/Resources/dark_mode.png b/VisualChallenge/VisualChallenge.iOS/Resources/dark_mode.png new file mode 100644 index 0000000..c849473 Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Resources/dark_mode.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/Resources/dunno_what_this_is.png b/VisualChallenge/VisualChallenge.iOS/Resources/dunno_what_this_is.png new file mode 100644 index 0000000..c3b61ad Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Resources/dunno_what_this_is.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/Resources/feather.png b/VisualChallenge/VisualChallenge.iOS/Resources/feather.png new file mode 100644 index 0000000..b04fac5 Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Resources/feather.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/Resources/heart.png b/VisualChallenge/VisualChallenge.iOS/Resources/heart.png new file mode 100644 index 0000000..644d394 Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Resources/heart.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/Resources/home.png b/VisualChallenge/VisualChallenge.iOS/Resources/home.png new file mode 100644 index 0000000..b274a46 Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Resources/home.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/Resources/image.png b/VisualChallenge/VisualChallenge.iOS/Resources/image.png new file mode 100644 index 0000000..256d2e4 Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Resources/image.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/Resources/lists_menu.png b/VisualChallenge/VisualChallenge.iOS/Resources/lists_menu.png new file mode 100644 index 0000000..e459c0b Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Resources/lists_menu.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/Resources/message.png b/VisualChallenge/VisualChallenge.iOS/Resources/message.png new file mode 100644 index 0000000..a23bcbc Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Resources/message.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/Resources/moments_menu.png b/VisualChallenge/VisualChallenge.iOS/Resources/moments_menu.png new file mode 100644 index 0000000..5e3760a Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Resources/moments_menu.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/Resources/more.png b/VisualChallenge/VisualChallenge.iOS/Resources/more.png new file mode 100644 index 0000000..fef3129 Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Resources/more.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/Resources/more_blue.png b/VisualChallenge/VisualChallenge.iOS/Resources/more_blue.png new file mode 100644 index 0000000..dbee927 Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Resources/more_blue.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/Resources/profile.png b/VisualChallenge/VisualChallenge.iOS/Resources/profile.png new file mode 100644 index 0000000..6c35547 Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Resources/profile.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/Resources/profile_menu.png b/VisualChallenge/VisualChallenge.iOS/Resources/profile_menu.png new file mode 100644 index 0000000..0104109 Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Resources/profile_menu.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/Resources/retweet.png b/VisualChallenge/VisualChallenge.iOS/Resources/retweet.png new file mode 100644 index 0000000..a16ca1b Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Resources/retweet.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/Resources/search.png b/VisualChallenge/VisualChallenge.iOS/Resources/search.png new file mode 100644 index 0000000..9d0eab1 Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Resources/search.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/Resources/share.png b/VisualChallenge/VisualChallenge.iOS/Resources/share.png new file mode 100644 index 0000000..38f563a Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Resources/share.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/Resources/stars.png b/VisualChallenge/VisualChallenge.iOS/Resources/stars.png new file mode 100644 index 0000000..764582c Binary files /dev/null and b/VisualChallenge/VisualChallenge.iOS/Resources/stars.png differ diff --git a/VisualChallenge/VisualChallenge.iOS/VisualChallenge.iOS.csproj b/VisualChallenge/VisualChallenge.iOS/VisualChallenge.iOS.csproj index f7d6432..2ca096c 100644 --- a/VisualChallenge/VisualChallenge.iOS/VisualChallenge.iOS.csproj +++ b/VisualChallenge/VisualChallenge.iOS/VisualChallenge.iOS.csproj @@ -144,4 +144,64 @@ VisualChallenge + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/VisualChallenge/VisualChallenge/App.xaml b/VisualChallenge/VisualChallenge/App.xaml index 2508a6a..f10efed 100644 --- a/VisualChallenge/VisualChallenge/App.xaml +++ b/VisualChallenge/VisualChallenge/App.xaml @@ -3,6 +3,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="VisualChallenge.App"> - + #1da1f2 \ No newline at end of file diff --git a/VisualChallenge/VisualChallenge/App.xaml.cs b/VisualChallenge/VisualChallenge/App.xaml.cs index 2ab3c58..2558da8 100644 --- a/VisualChallenge/VisualChallenge/App.xaml.cs +++ b/VisualChallenge/VisualChallenge/App.xaml.cs @@ -1,15 +1,44 @@ using Xamarin.Forms; +using Xamarin.Forms.PlatformConfiguration.AndroidSpecific; namespace VisualChallenge { - public partial class App : Application + public partial class App : Xamarin.Forms.Application { public App() { InitializeComponent(); - - MainPage = new AppShell(); + var visualChallengePage = new VisualChallengePage() + { + Icon = "home.png" + }; + var tabbedPage = new Xamarin.Forms.TabbedPage + { + Visual = VisualMarker.Material + }; + tabbedPage.Effects.Add(Effect.Resolve("VisualChallenge.NoShiftEffect")); + tabbedPage.On().SetToolbarPlacement(ToolbarPlacement.Bottom); + tabbedPage.Children.Add(visualChallengePage); + NavigationPage.SetHasBackButton(visualChallengePage, false); + tabbedPage.Children.Add(new ContentPage + { + Icon = "search.png" + }); + tabbedPage.Children.Add(new ContentPage + { + Icon = "bell.png" + }); + tabbedPage.Children.Add(new ContentPage + { + Icon = "message.png" + }); + MainPage = new MasterDetailPage() + { + Master = new MasterPage(), + Detail = tabbedPage + }; + NavigationPage.SetHasNavigationBar(tabbedPage, false); } protected override void OnStart() diff --git a/VisualChallenge/VisualChallenge/AppShell.xaml b/VisualChallenge/VisualChallenge/AppShell.xaml deleted file mode 100644 index 0f654c7..0000000 --- a/VisualChallenge/VisualChallenge/AppShell.xaml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - #2196F3 - - + + + + + + + + + + + + + + + + +