diff --git a/Notify/Notify/Notify.Android/Notify.Android.csproj b/Notify/Notify/Notify.Android/Notify.Android.csproj index c096751..7df871d 100644 --- a/Notify/Notify/Notify.Android/Notify.Android.csproj +++ b/Notify/Notify/Notify.Android/Notify.Android.csproj @@ -106,6 +106,7 @@ + @@ -117,6 +118,7 @@ + @@ -134,6 +136,7 @@ + diff --git a/Notify/Notify/Notify.Android/Resources/Resource.designer.cs b/Notify/Notify/Notify.Android/Resources/Resource.designer.cs index 4a87ce4..a6956a5 100644 --- a/Notify/Notify/Notify.Android/Resources/Resource.designer.cs +++ b/Notify/Notify/Notify.Android/Resources/Resource.designer.cs @@ -2,6 +2,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -14,7 +15,7 @@ namespace Notify.Droid { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.99")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.93")] public partial class Resource { @@ -30249,256 +30250,265 @@ public partial class Drawable public const int bluetooth_icon = 2131165279; // aapt resource value: 0x7F070060 - public const int btn_checkbox_checked_mtrl = 2131165280; + public const int bluetooth_icon_white = 2131165280; // aapt resource value: 0x7F070061 - public const int btn_checkbox_checked_to_unchecked_mtrl_animation = 2131165281; + public const int btn_checkbox_checked_mtrl = 2131165281; // aapt resource value: 0x7F070062 - public const int btn_checkbox_unchecked_mtrl = 2131165282; + public const int btn_checkbox_checked_to_unchecked_mtrl_animation = 2131165282; // aapt resource value: 0x7F070063 - public const int btn_checkbox_unchecked_to_checked_mtrl_animation = 2131165283; + public const int btn_checkbox_unchecked_mtrl = 2131165283; // aapt resource value: 0x7F070064 - public const int btn_radio_off_mtrl = 2131165284; + public const int btn_checkbox_unchecked_to_checked_mtrl_animation = 2131165284; // aapt resource value: 0x7F070065 - public const int btn_radio_off_to_on_mtrl_animation = 2131165285; + public const int btn_radio_off_mtrl = 2131165285; // aapt resource value: 0x7F070066 - public const int btn_radio_on_mtrl = 2131165286; + public const int btn_radio_off_to_on_mtrl_animation = 2131165286; // aapt resource value: 0x7F070067 - public const int btn_radio_on_to_off_mtrl_animation = 2131165287; + public const int btn_radio_on_mtrl = 2131165287; // aapt resource value: 0x7F070068 - public const int delete_button = 2131165288; + public const int btn_radio_on_to_off_mtrl_animation = 2131165288; // aapt resource value: 0x7F070069 - public const int design_fab_background = 2131165289; + public const int delete_button = 2131165289; // aapt resource value: 0x7F07006A - public const int design_ic_visibility = 2131165290; + public const int design_fab_background = 2131165290; // aapt resource value: 0x7F07006B - public const int design_ic_visibility_off = 2131165291; + public const int design_ic_visibility = 2131165291; // aapt resource value: 0x7F07006C - public const int design_password_eye = 2131165292; + public const int design_ic_visibility_off = 2131165292; // aapt resource value: 0x7F07006D - public const int design_snackbar_background = 2131165293; + public const int design_password_eye = 2131165293; // aapt resource value: 0x7F07006E - public const int dynamic_location_colored_icon = 2131165294; + public const int design_snackbar_background = 2131165294; // aapt resource value: 0x7F07006F - public const int edit_button = 2131165295; + public const int dynamic_location_colored_icon = 2131165295; // aapt resource value: 0x7F070070 - public const int facebook = 2131165296; - - // aapt resource value: 0x7F070072 - public const int friends = 2131165298; + public const int edit_button = 2131165296; // aapt resource value: 0x7F070071 - public const int friend_request = 2131165297; + public const int facebook = 2131165297; // aapt resource value: 0x7F070073 - public const int google = 2131165299; + public const int friends = 2131165299; + + // aapt resource value: 0x7F070072 + public const int friend_request = 2131165298; // aapt resource value: 0x7F070074 - public const int google_maps_icon = 2131165300; + public const int google = 2131165300; // aapt resource value: 0x7F070075 - public const int groups = 2131165301; + public const int google_maps_icon = 2131165301; // aapt resource value: 0x7F070076 - public const int home = 2131165302; + public const int groups = 2131165302; // aapt resource value: 0x7F070077 - public const int ic_arrow_down_24dp = 2131165303; + public const int home = 2131165303; // aapt resource value: 0x7F070078 - public const int ic_clock_black_24dp = 2131165304; + public const int ic_arrow_down_24dp = 2131165304; // aapt resource value: 0x7F070079 - public const int ic_keyboard_black_24dp = 2131165305; + public const int ic_clock_black_24dp = 2131165305; // aapt resource value: 0x7F07007A - public const int ic_mtrl_checked_circle = 2131165306; + public const int ic_keyboard_black_24dp = 2131165306; // aapt resource value: 0x7F07007B - public const int ic_mtrl_chip_checked_black = 2131165307; + public const int ic_mtrl_checked_circle = 2131165307; // aapt resource value: 0x7F07007C - public const int ic_mtrl_chip_checked_circle = 2131165308; + public const int ic_mtrl_chip_checked_black = 2131165308; // aapt resource value: 0x7F07007D - public const int ic_mtrl_chip_close_circle = 2131165309; + public const int ic_mtrl_chip_checked_circle = 2131165309; // aapt resource value: 0x7F07007E - public const int location_colored_icon = 2131165310; + public const int ic_mtrl_chip_close_circle = 2131165310; // aapt resource value: 0x7F07007F - public const int location_icon = 2131165311; + public const int location_colored_icon = 2131165311; // aapt resource value: 0x7F070080 - public const int @lock = 2131165312; + public const int location_icon = 2131165312; // aapt resource value: 0x7F070081 - public const int LogOutButton = 2131165313; + public const int location_icon_white = 2131165313; // aapt resource value: 0x7F070082 - public const int material_cursor_drawable = 2131165314; + public const int @lock = 2131165314; // aapt resource value: 0x7F070083 - public const int material_ic_calendar_black_24dp = 2131165315; + public const int LogOutButton = 2131165315; // aapt resource value: 0x7F070084 - public const int material_ic_clear_black_24dp = 2131165316; + public const int material_cursor_drawable = 2131165316; // aapt resource value: 0x7F070085 - public const int material_ic_edit_black_24dp = 2131165317; + public const int material_ic_calendar_black_24dp = 2131165317; // aapt resource value: 0x7F070086 - public const int material_ic_keyboard_arrow_left_black_24dp = 2131165318; + public const int material_ic_clear_black_24dp = 2131165318; // aapt resource value: 0x7F070087 - public const int material_ic_keyboard_arrow_next_black_24dp = 2131165319; + public const int material_ic_edit_black_24dp = 2131165319; // aapt resource value: 0x7F070088 - public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165320; + public const int material_ic_keyboard_arrow_left_black_24dp = 2131165320; // aapt resource value: 0x7F070089 - public const int material_ic_keyboard_arrow_right_black_24dp = 2131165321; + public const int material_ic_keyboard_arrow_next_black_24dp = 2131165321; // aapt resource value: 0x7F07008A - public const int material_ic_menu_arrow_down_black_24dp = 2131165322; + public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165322; // aapt resource value: 0x7F07008B - public const int material_ic_menu_arrow_up_black_24dp = 2131165323; + public const int material_ic_keyboard_arrow_right_black_24dp = 2131165323; // aapt resource value: 0x7F07008C - public const int mtrl_dialog_background = 2131165324; + public const int material_ic_menu_arrow_down_black_24dp = 2131165324; // aapt resource value: 0x7F07008D - public const int mtrl_dropdown_arrow = 2131165325; + public const int material_ic_menu_arrow_up_black_24dp = 2131165325; // aapt resource value: 0x7F07008E - public const int mtrl_ic_arrow_drop_down = 2131165326; + public const int mtrl_dialog_background = 2131165326; // aapt resource value: 0x7F07008F - public const int mtrl_ic_arrow_drop_up = 2131165327; + public const int mtrl_dropdown_arrow = 2131165327; // aapt resource value: 0x7F070090 - public const int mtrl_ic_cancel = 2131165328; + public const int mtrl_ic_arrow_drop_down = 2131165328; // aapt resource value: 0x7F070091 - public const int mtrl_ic_error = 2131165329; + public const int mtrl_ic_arrow_drop_up = 2131165329; // aapt resource value: 0x7F070092 - public const int mtrl_navigation_bar_item_background = 2131165330; + public const int mtrl_ic_cancel = 2131165330; // aapt resource value: 0x7F070093 - public const int mtrl_popupmenu_background = 2131165331; + public const int mtrl_ic_error = 2131165331; // aapt resource value: 0x7F070094 - public const int mtrl_popupmenu_background_dark = 2131165332; + public const int mtrl_navigation_bar_item_background = 2131165332; // aapt resource value: 0x7F070095 - public const int mtrl_tabs_default_indicator = 2131165333; + public const int mtrl_popupmenu_background = 2131165333; // aapt resource value: 0x7F070096 - public const int navigation_empty_icon = 2131165334; + public const int mtrl_popupmenu_background_dark = 2131165334; // aapt resource value: 0x7F070097 - public const int notification = 2131165335; + public const int mtrl_tabs_default_indicator = 2131165335; // aapt resource value: 0x7F070098 - public const int notification_action_background = 2131165336; + public const int navigation_empty_icon = 2131165336; // aapt resource value: 0x7F070099 - public const int notification_bg = 2131165337; + public const int notification = 2131165337; // aapt resource value: 0x7F07009A - public const int notification_bg_low = 2131165338; + public const int notification_action_background = 2131165338; // aapt resource value: 0x7F07009B - public const int notification_bg_low_normal = 2131165339; + public const int notification_bg = 2131165339; // aapt resource value: 0x7F07009C - public const int notification_bg_low_pressed = 2131165340; + public const int notification_bg_low = 2131165340; // aapt resource value: 0x7F07009D - public const int notification_bg_normal = 2131165341; + public const int notification_bg_low_normal = 2131165341; // aapt resource value: 0x7F07009E - public const int notification_bg_normal_pressed = 2131165342; + public const int notification_bg_low_pressed = 2131165342; // aapt resource value: 0x7F07009F - public const int notification_icon_background = 2131165343; + public const int notification_bg_normal = 2131165343; // aapt resource value: 0x7F0700A0 - public const int notification_template_icon_bg = 2131165344; + public const int notification_bg_normal_pressed = 2131165344; // aapt resource value: 0x7F0700A1 - public const int notification_template_icon_low_bg = 2131165345; + public const int notification_icon_background = 2131165345; // aapt resource value: 0x7F0700A2 - public const int notification_tile_bg = 2131165346; + public const int notification_template_icon_bg = 2131165346; // aapt resource value: 0x7F0700A3 - public const int Notify = 2131165347; - - // aapt resource value: 0x7F0700A5 - public const int NotifyLanding = 2131165349; - - // aapt resource value: 0x7F0700A6 - public const int NotifyMainFade = 2131165350; + public const int notification_template_icon_low_bg = 2131165347; // aapt resource value: 0x7F0700A4 - public const int notify_panel_notification_icon_bg = 2131165348; + public const int notification_tile_bg = 2131165348; + + // aapt resource value: 0x7F0700A5 + public const int Notify = 2131165349; // aapt resource value: 0x7F0700A7 - public const int OldNotify = 2131165351; + public const int NotifyLanding = 2131165351; // aapt resource value: 0x7F0700A8 - public const int preference_list_divider_material = 2131165352; + public const int NotifyMainFade = 2131165352; + + // aapt resource value: 0x7F0700A6 + public const int notify_panel_notification_icon_bg = 2131165350; // aapt resource value: 0x7F0700A9 - public const int profile = 2131165353; + public const int OldNotify = 2131165353; // aapt resource value: 0x7F0700AA - public const int refresh_icon = 2131165354; + public const int preference_list_divider_material = 2131165354; // aapt resource value: 0x7F0700AB - public const int reject_button = 2131165355; + public const int profile = 2131165355; // aapt resource value: 0x7F0700AC - public const int renew_button = 2131165356; + public const int refresh_icon = 2131165356; // aapt resource value: 0x7F0700AD - public const int settings = 2131165357; + public const int reject_button = 2131165357; // aapt resource value: 0x7F0700AE - public const int test_custom_background = 2131165358; + public const int renew_button = 2131165358; // aapt resource value: 0x7F0700AF - public const int time_colored_icon = 2131165359; + public const int settings = 2131165359; // aapt resource value: 0x7F0700B0 - public const int tooltip_frame_dark = 2131165360; + public const int test_custom_background = 2131165360; // aapt resource value: 0x7F0700B1 - public const int tooltip_frame_light = 2131165361; + public const int time_colored_icon = 2131165361; // aapt resource value: 0x7F0700B2 - public const int wifi = 2131165362; + public const int tooltip_frame_dark = 2131165362; // aapt resource value: 0x7F0700B3 - public const int wifi_icon = 2131165363; + public const int tooltip_frame_light = 2131165363; + + // aapt resource value: 0x7F0700B4 + public const int wifi = 2131165364; + + // aapt resource value: 0x7F0700B5 + public const int wifi_icon = 2131165365; + + // aapt resource value: 0x7F0700B6 + public const int wifi_icon_white = 2131165366; static Drawable() { diff --git a/Notify/Notify/Notify.Android/Resources/drawable/bluetooth_icon_white.png b/Notify/Notify/Notify.Android/Resources/drawable/bluetooth_icon_white.png new file mode 100644 index 0000000..883fbb4 Binary files /dev/null and b/Notify/Notify/Notify.Android/Resources/drawable/bluetooth_icon_white.png differ diff --git a/Notify/Notify/Notify.Android/Resources/drawable/location_icon_white.png b/Notify/Notify/Notify.Android/Resources/drawable/location_icon_white.png new file mode 100644 index 0000000..6abfd54 Binary files /dev/null and b/Notify/Notify/Notify.Android/Resources/drawable/location_icon_white.png differ diff --git a/Notify/Notify/Notify.Android/Resources/drawable/wifi_icon_white.png b/Notify/Notify/Notify.Android/Resources/drawable/wifi_icon_white.png new file mode 100644 index 0000000..f5ed88d Binary files /dev/null and b/Notify/Notify/Notify.Android/Resources/drawable/wifi_icon_white.png differ diff --git a/Notify/Notify/Notify/Helpers/Converter.cs b/Notify/Notify/Notify/Helpers/Converter.cs index a472d50..16d79b1 100644 --- a/Notify/Notify/Notify/Helpers/Converter.cs +++ b/Notify/Notify/Notify/Helpers/Converter.cs @@ -22,7 +22,27 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu return null; } } + + public class BoolToIconConverter : IValueConverter + { + public string SelectedIcon { get; set; } + public string UnselectedIcon { get; set; } + + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + if (value is bool boolValue) + { + return boolValue ? SelectedIcon : UnselectedIcon; + } + return UnselectedIcon; + } + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + return null; + } + } + public class IdToIsExpandedConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) diff --git a/Notify/Notify/Notify/Views/DefinedDestinationsPage.xaml b/Notify/Notify/Notify/Views/DefinedDestinationsPage.xaml index 11165d5..fef887f 100644 --- a/Notify/Notify/Notify/Views/DefinedDestinationsPage.xaml +++ b/Notify/Notify/Notify/Views/DefinedDestinationsPage.xaml @@ -3,15 +3,27 @@ NavigationPage.HasNavigationBar="False" x:Class="Notify.Views.DefinedDestinationsPage" xmlns="http://xamarin.com/schemas/2014/forms" - xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" - xmlns:helpers="clr-namespace:Notify.Helpers;assembly=Notify"> - + xmlns:helpers="clr-namespace:Notify.Helpers;assembly=Notify" + xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"> + + + + - + @@ -25,39 +37,37 @@ - + - + Dark={StaticResource DarkPrimaryTextColor}}" + VerticalOptions="Start" /> + - + Dark={StaticResource DarkPrimaryTextColor}}" + VerticalTextAlignment="Center" /> + - - - - - - - - - + Source="{Binding IsLocationButtonSelected, Converter={StaticResource LocationIconConverter}}" + x:Name="LocationButton" /> - - - - - - - - - + Source="{Binding IsWifiButtonSelected, Converter={StaticResource WifiIconConverter}}" + x:Name="WifiButton" /> - - - - - - - - - + Source="{Binding IsBluetoothButtonSelected, Converter={StaticResource BluetoothIconConverter}}" + x:Name="BluetoothButton" /> - + - +