diff --git a/src/GeoContacts.SharedModels/GeoContacts.SharedModels.csproj b/src/GeoContacts.SharedModels/GeoContacts.SharedModels.csproj index 0599586..1619dc9 100644 --- a/src/GeoContacts.SharedModels/GeoContacts.SharedModels.csproj +++ b/src/GeoContacts.SharedModels/GeoContacts.SharedModels.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/GeoContacts/GeoContacts.Android/GeoContacts.Android.csproj b/src/GeoContacts/GeoContacts.Android/GeoContacts.Android.csproj index 575d0d3..5333183 100644 --- a/src/GeoContacts/GeoContacts.Android/GeoContacts.Android.csproj +++ b/src/GeoContacts/GeoContacts.Android/GeoContacts.Android.csproj @@ -58,9 +58,6 @@ 1.0.2-preview - - 1.1.2-preview0008 - 0.1.0.10-beta @@ -84,7 +81,7 @@ - 1.8.1 + 1.9.1 1.7.0 @@ -110,6 +107,9 @@ 2.0.1 + + 1.1.4-preview0002 + diff --git a/src/GeoContacts/GeoContacts.Android/Properties/AndroidManifest.xml b/src/GeoContacts/GeoContacts.Android/Properties/AndroidManifest.xml index 237b863..f350f41 100644 --- a/src/GeoContacts/GeoContacts.Android/Properties/AndroidManifest.xml +++ b/src/GeoContacts/GeoContacts.Android/Properties/AndroidManifest.xml @@ -6,6 +6,14 @@ + + + + + + + + diff --git a/src/GeoContacts/GeoContacts.Android/Resources/Resource.designer.cs b/src/GeoContacts/GeoContacts.Android/Resources/Resource.designer.cs index 57a59b9..5d42112 100644 --- a/src/GeoContacts/GeoContacts.Android/Resources/Resource.designer.cs +++ b/src/GeoContacts/GeoContacts.Android/Resources/Resource.designer.cs @@ -55,6 +55,8 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Animation.abc_slide_in_top = global::GeoContacts.Droid.Resource.Animation.abc_slide_in_top; global::Microsoft.Identity.Client.Resource.Animation.abc_slide_out_bottom = global::GeoContacts.Droid.Resource.Animation.abc_slide_out_bottom; global::Microsoft.Identity.Client.Resource.Animation.abc_slide_out_top = global::GeoContacts.Droid.Resource.Animation.abc_slide_out_top; + global::Microsoft.Identity.Client.Resource.Animation.tooltip_enter = global::GeoContacts.Droid.Resource.Animation.tooltip_enter; + global::Microsoft.Identity.Client.Resource.Animation.tooltip_exit = global::GeoContacts.Droid.Resource.Animation.tooltip_exit; global::Microsoft.Identity.Client.Resource.Attribute.actionBarDivider = global::GeoContacts.Droid.Resource.Attribute.actionBarDivider; global::Microsoft.Identity.Client.Resource.Attribute.actionBarItemBackground = global::GeoContacts.Droid.Resource.Attribute.actionBarItemBackground; global::Microsoft.Identity.Client.Resource.Attribute.actionBarPopupTheme = global::GeoContacts.Droid.Resource.Attribute.actionBarPopupTheme; @@ -95,9 +97,15 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Attribute.alertDialogTheme = global::GeoContacts.Droid.Resource.Attribute.alertDialogTheme; global::Microsoft.Identity.Client.Resource.Attribute.allowStacking = global::GeoContacts.Droid.Resource.Attribute.allowStacking; global::Microsoft.Identity.Client.Resource.Attribute.alpha = global::GeoContacts.Droid.Resource.Attribute.alpha; + global::Microsoft.Identity.Client.Resource.Attribute.alphabeticModifiers = global::GeoContacts.Droid.Resource.Attribute.alphabeticModifiers; global::Microsoft.Identity.Client.Resource.Attribute.arrowHeadLength = global::GeoContacts.Droid.Resource.Attribute.arrowHeadLength; global::Microsoft.Identity.Client.Resource.Attribute.arrowShaftLength = global::GeoContacts.Droid.Resource.Attribute.arrowShaftLength; global::Microsoft.Identity.Client.Resource.Attribute.autoCompleteTextViewStyle = global::GeoContacts.Droid.Resource.Attribute.autoCompleteTextViewStyle; + global::Microsoft.Identity.Client.Resource.Attribute.autoSizeMaxTextSize = global::GeoContacts.Droid.Resource.Attribute.autoSizeMaxTextSize; + global::Microsoft.Identity.Client.Resource.Attribute.autoSizeMinTextSize = global::GeoContacts.Droid.Resource.Attribute.autoSizeMinTextSize; + global::Microsoft.Identity.Client.Resource.Attribute.autoSizePresetSizes = global::GeoContacts.Droid.Resource.Attribute.autoSizePresetSizes; + global::Microsoft.Identity.Client.Resource.Attribute.autoSizeStepGranularity = global::GeoContacts.Droid.Resource.Attribute.autoSizeStepGranularity; + global::Microsoft.Identity.Client.Resource.Attribute.autoSizeTextType = global::GeoContacts.Droid.Resource.Attribute.autoSizeTextType; global::Microsoft.Identity.Client.Resource.Attribute.background = global::GeoContacts.Droid.Resource.Attribute.background; global::Microsoft.Identity.Client.Resource.Attribute.backgroundSplit = global::GeoContacts.Droid.Resource.Attribute.backgroundSplit; global::Microsoft.Identity.Client.Resource.Attribute.backgroundStacked = global::GeoContacts.Droid.Resource.Attribute.backgroundStacked; @@ -129,10 +137,12 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Attribute.colorControlActivated = global::GeoContacts.Droid.Resource.Attribute.colorControlActivated; global::Microsoft.Identity.Client.Resource.Attribute.colorControlHighlight = global::GeoContacts.Droid.Resource.Attribute.colorControlHighlight; global::Microsoft.Identity.Client.Resource.Attribute.colorControlNormal = global::GeoContacts.Droid.Resource.Attribute.colorControlNormal; + global::Microsoft.Identity.Client.Resource.Attribute.colorError = global::GeoContacts.Droid.Resource.Attribute.colorError; global::Microsoft.Identity.Client.Resource.Attribute.colorPrimary = global::GeoContacts.Droid.Resource.Attribute.colorPrimary; global::Microsoft.Identity.Client.Resource.Attribute.colorPrimaryDark = global::GeoContacts.Droid.Resource.Attribute.colorPrimaryDark; global::Microsoft.Identity.Client.Resource.Attribute.colorSwitchThumbNormal = global::GeoContacts.Droid.Resource.Attribute.colorSwitchThumbNormal; global::Microsoft.Identity.Client.Resource.Attribute.commitIcon = global::GeoContacts.Droid.Resource.Attribute.commitIcon; + global::Microsoft.Identity.Client.Resource.Attribute.contentDescription = global::GeoContacts.Droid.Resource.Attribute.contentDescription; global::Microsoft.Identity.Client.Resource.Attribute.contentInsetEnd = global::GeoContacts.Droid.Resource.Attribute.contentInsetEnd; global::Microsoft.Identity.Client.Resource.Attribute.contentInsetEndWithActions = global::GeoContacts.Droid.Resource.Attribute.contentInsetEndWithActions; global::Microsoft.Identity.Client.Resource.Attribute.contentInsetLeft = global::GeoContacts.Droid.Resource.Attribute.contentInsetLeft; @@ -158,6 +168,16 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Attribute.editTextStyle = global::GeoContacts.Droid.Resource.Attribute.editTextStyle; global::Microsoft.Identity.Client.Resource.Attribute.elevation = global::GeoContacts.Droid.Resource.Attribute.elevation; global::Microsoft.Identity.Client.Resource.Attribute.expandActivityOverflowButtonDrawable = global::GeoContacts.Droid.Resource.Attribute.expandActivityOverflowButtonDrawable; + global::Microsoft.Identity.Client.Resource.Attribute.font = global::GeoContacts.Droid.Resource.Attribute.font; + global::Microsoft.Identity.Client.Resource.Attribute.fontFamily = global::GeoContacts.Droid.Resource.Attribute.fontFamily; + global::Microsoft.Identity.Client.Resource.Attribute.fontProviderAuthority = global::GeoContacts.Droid.Resource.Attribute.fontProviderAuthority; + global::Microsoft.Identity.Client.Resource.Attribute.fontProviderCerts = global::GeoContacts.Droid.Resource.Attribute.fontProviderCerts; + global::Microsoft.Identity.Client.Resource.Attribute.fontProviderFetchStrategy = global::GeoContacts.Droid.Resource.Attribute.fontProviderFetchStrategy; + global::Microsoft.Identity.Client.Resource.Attribute.fontProviderFetchTimeout = global::GeoContacts.Droid.Resource.Attribute.fontProviderFetchTimeout; + global::Microsoft.Identity.Client.Resource.Attribute.fontProviderPackage = global::GeoContacts.Droid.Resource.Attribute.fontProviderPackage; + global::Microsoft.Identity.Client.Resource.Attribute.fontProviderQuery = global::GeoContacts.Droid.Resource.Attribute.fontProviderQuery; + global::Microsoft.Identity.Client.Resource.Attribute.fontStyle = global::GeoContacts.Droid.Resource.Attribute.fontStyle; + global::Microsoft.Identity.Client.Resource.Attribute.fontWeight = global::GeoContacts.Droid.Resource.Attribute.fontWeight; global::Microsoft.Identity.Client.Resource.Attribute.gapBetweenBars = global::GeoContacts.Droid.Resource.Attribute.gapBetweenBars; global::Microsoft.Identity.Client.Resource.Attribute.goIcon = global::GeoContacts.Droid.Resource.Attribute.goIcon; global::Microsoft.Identity.Client.Resource.Attribute.height = global::GeoContacts.Droid.Resource.Attribute.height; @@ -165,6 +185,8 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Attribute.homeAsUpIndicator = global::GeoContacts.Droid.Resource.Attribute.homeAsUpIndicator; global::Microsoft.Identity.Client.Resource.Attribute.homeLayout = global::GeoContacts.Droid.Resource.Attribute.homeLayout; global::Microsoft.Identity.Client.Resource.Attribute.icon = global::GeoContacts.Droid.Resource.Attribute.icon; + global::Microsoft.Identity.Client.Resource.Attribute.iconTint = global::GeoContacts.Droid.Resource.Attribute.iconTint; + global::Microsoft.Identity.Client.Resource.Attribute.iconTintMode = global::GeoContacts.Droid.Resource.Attribute.iconTintMode; global::Microsoft.Identity.Client.Resource.Attribute.iconifiedByDefault = global::GeoContacts.Droid.Resource.Attribute.iconifiedByDefault; global::Microsoft.Identity.Client.Resource.Attribute.imageButtonStyle = global::GeoContacts.Droid.Resource.Attribute.imageButtonStyle; global::Microsoft.Identity.Client.Resource.Attribute.indeterminateProgressStyle = global::GeoContacts.Droid.Resource.Attribute.indeterminateProgressStyle; @@ -191,6 +213,7 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Attribute.navigationContentDescription = global::GeoContacts.Droid.Resource.Attribute.navigationContentDescription; global::Microsoft.Identity.Client.Resource.Attribute.navigationIcon = global::GeoContacts.Droid.Resource.Attribute.navigationIcon; global::Microsoft.Identity.Client.Resource.Attribute.navigationMode = global::GeoContacts.Droid.Resource.Attribute.navigationMode; + global::Microsoft.Identity.Client.Resource.Attribute.numericModifiers = global::GeoContacts.Droid.Resource.Attribute.numericModifiers; global::Microsoft.Identity.Client.Resource.Attribute.overlapAnchor = global::GeoContacts.Droid.Resource.Attribute.overlapAnchor; global::Microsoft.Identity.Client.Resource.Attribute.paddingBottomNoButtons = global::GeoContacts.Droid.Resource.Attribute.paddingBottomNoButtons; global::Microsoft.Identity.Client.Resource.Attribute.paddingEnd = global::GeoContacts.Droid.Resource.Attribute.paddingEnd; @@ -272,6 +295,9 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Attribute.titleTextStyle = global::GeoContacts.Droid.Resource.Attribute.titleTextStyle; global::Microsoft.Identity.Client.Resource.Attribute.toolbarNavigationButtonStyle = global::GeoContacts.Droid.Resource.Attribute.toolbarNavigationButtonStyle; global::Microsoft.Identity.Client.Resource.Attribute.toolbarStyle = global::GeoContacts.Droid.Resource.Attribute.toolbarStyle; + global::Microsoft.Identity.Client.Resource.Attribute.tooltipForegroundColor = global::GeoContacts.Droid.Resource.Attribute.tooltipForegroundColor; + global::Microsoft.Identity.Client.Resource.Attribute.tooltipFrameBackground = global::GeoContacts.Droid.Resource.Attribute.tooltipFrameBackground; + global::Microsoft.Identity.Client.Resource.Attribute.tooltipText = global::GeoContacts.Droid.Resource.Attribute.tooltipText; global::Microsoft.Identity.Client.Resource.Attribute.track = global::GeoContacts.Droid.Resource.Attribute.track; global::Microsoft.Identity.Client.Resource.Attribute.trackTint = global::GeoContacts.Droid.Resource.Attribute.trackTint; global::Microsoft.Identity.Client.Resource.Attribute.trackTintMode = global::GeoContacts.Droid.Resource.Attribute.trackTintMode; @@ -333,6 +359,7 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Color.dim_foreground_disabled_material_light = global::GeoContacts.Droid.Resource.Color.dim_foreground_disabled_material_light; global::Microsoft.Identity.Client.Resource.Color.dim_foreground_material_dark = global::GeoContacts.Droid.Resource.Color.dim_foreground_material_dark; global::Microsoft.Identity.Client.Resource.Color.dim_foreground_material_light = global::GeoContacts.Droid.Resource.Color.dim_foreground_material_light; + global::Microsoft.Identity.Client.Resource.Color.error_color_material = global::GeoContacts.Droid.Resource.Color.error_color_material; global::Microsoft.Identity.Client.Resource.Color.foreground_material_dark = global::GeoContacts.Droid.Resource.Color.foreground_material_dark; global::Microsoft.Identity.Client.Resource.Color.foreground_material_light = global::GeoContacts.Droid.Resource.Color.foreground_material_light; global::Microsoft.Identity.Client.Resource.Color.highlighted_text_material_dark = global::GeoContacts.Droid.Resource.Color.highlighted_text_material_dark; @@ -372,6 +399,8 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Color.switch_thumb_material_light = global::GeoContacts.Droid.Resource.Color.switch_thumb_material_light; global::Microsoft.Identity.Client.Resource.Color.switch_thumb_normal_material_dark = global::GeoContacts.Droid.Resource.Color.switch_thumb_normal_material_dark; global::Microsoft.Identity.Client.Resource.Color.switch_thumb_normal_material_light = global::GeoContacts.Droid.Resource.Color.switch_thumb_normal_material_light; + global::Microsoft.Identity.Client.Resource.Color.tooltip_background_dark = global::GeoContacts.Droid.Resource.Color.tooltip_background_dark; + global::Microsoft.Identity.Client.Resource.Color.tooltip_background_light = global::GeoContacts.Droid.Resource.Color.tooltip_background_light; global::Microsoft.Identity.Client.Resource.Dimension.abc_action_bar_content_inset_material = global::GeoContacts.Droid.Resource.Dimension.abc_action_bar_content_inset_material; global::Microsoft.Identity.Client.Resource.Dimension.abc_action_bar_content_inset_with_nav = global::GeoContacts.Droid.Resource.Dimension.abc_action_bar_content_inset_with_nav; global::Microsoft.Identity.Client.Resource.Dimension.abc_action_bar_default_height_material = global::GeoContacts.Droid.Resource.Dimension.abc_action_bar_default_height_material; @@ -446,6 +475,11 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Dimension.abc_text_size_subtitle_material_toolbar = global::GeoContacts.Droid.Resource.Dimension.abc_text_size_subtitle_material_toolbar; global::Microsoft.Identity.Client.Resource.Dimension.abc_text_size_title_material = global::GeoContacts.Droid.Resource.Dimension.abc_text_size_title_material; global::Microsoft.Identity.Client.Resource.Dimension.abc_text_size_title_material_toolbar = global::GeoContacts.Droid.Resource.Dimension.abc_text_size_title_material_toolbar; + global::Microsoft.Identity.Client.Resource.Dimension.compat_button_inset_horizontal_material = global::GeoContacts.Droid.Resource.Dimension.compat_button_inset_horizontal_material; + global::Microsoft.Identity.Client.Resource.Dimension.compat_button_inset_vertical_material = global::GeoContacts.Droid.Resource.Dimension.compat_button_inset_vertical_material; + global::Microsoft.Identity.Client.Resource.Dimension.compat_button_padding_horizontal_material = global::GeoContacts.Droid.Resource.Dimension.compat_button_padding_horizontal_material; + global::Microsoft.Identity.Client.Resource.Dimension.compat_button_padding_vertical_material = global::GeoContacts.Droid.Resource.Dimension.compat_button_padding_vertical_material; + global::Microsoft.Identity.Client.Resource.Dimension.compat_control_corner_material = global::GeoContacts.Droid.Resource.Dimension.compat_control_corner_material; global::Microsoft.Identity.Client.Resource.Dimension.disabled_alpha_material_dark = global::GeoContacts.Droid.Resource.Dimension.disabled_alpha_material_dark; global::Microsoft.Identity.Client.Resource.Dimension.disabled_alpha_material_light = global::GeoContacts.Droid.Resource.Dimension.disabled_alpha_material_light; global::Microsoft.Identity.Client.Resource.Dimension.highlight_alpha_material_colored = global::GeoContacts.Droid.Resource.Dimension.highlight_alpha_material_colored; @@ -470,6 +504,14 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Dimension.notification_subtext_size = global::GeoContacts.Droid.Resource.Dimension.notification_subtext_size; global::Microsoft.Identity.Client.Resource.Dimension.notification_top_pad = global::GeoContacts.Droid.Resource.Dimension.notification_top_pad; global::Microsoft.Identity.Client.Resource.Dimension.notification_top_pad_large_text = global::GeoContacts.Droid.Resource.Dimension.notification_top_pad_large_text; + global::Microsoft.Identity.Client.Resource.Dimension.tooltip_corner_radius = global::GeoContacts.Droid.Resource.Dimension.tooltip_corner_radius; + global::Microsoft.Identity.Client.Resource.Dimension.tooltip_horizontal_padding = global::GeoContacts.Droid.Resource.Dimension.tooltip_horizontal_padding; + global::Microsoft.Identity.Client.Resource.Dimension.tooltip_margin = global::GeoContacts.Droid.Resource.Dimension.tooltip_margin; + global::Microsoft.Identity.Client.Resource.Dimension.tooltip_precise_anchor_extra_offset = global::GeoContacts.Droid.Resource.Dimension.tooltip_precise_anchor_extra_offset; + global::Microsoft.Identity.Client.Resource.Dimension.tooltip_precise_anchor_threshold = global::GeoContacts.Droid.Resource.Dimension.tooltip_precise_anchor_threshold; + global::Microsoft.Identity.Client.Resource.Dimension.tooltip_vertical_padding = global::GeoContacts.Droid.Resource.Dimension.tooltip_vertical_padding; + global::Microsoft.Identity.Client.Resource.Dimension.tooltip_y_offset_non_touch = global::GeoContacts.Droid.Resource.Dimension.tooltip_y_offset_non_touch; + global::Microsoft.Identity.Client.Resource.Dimension.tooltip_y_offset_touch = global::GeoContacts.Droid.Resource.Dimension.tooltip_y_offset_touch; global::Microsoft.Identity.Client.Resource.Drawable.abc_ab_share_pack_mtrl_alpha = global::GeoContacts.Droid.Resource.Drawable.abc_ab_share_pack_mtrl_alpha; global::Microsoft.Identity.Client.Resource.Drawable.abc_action_bar_item_background_material = global::GeoContacts.Droid.Resource.Drawable.abc_action_bar_item_background_material; global::Microsoft.Identity.Client.Resource.Drawable.abc_btn_borderless_material = global::GeoContacts.Droid.Resource.Drawable.abc_btn_borderless_material; @@ -565,6 +607,14 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Drawable.notification_template_icon_low_bg = global::GeoContacts.Droid.Resource.Drawable.notification_template_icon_low_bg; global::Microsoft.Identity.Client.Resource.Drawable.notification_tile_bg = global::GeoContacts.Droid.Resource.Drawable.notification_tile_bg; global::Microsoft.Identity.Client.Resource.Drawable.notify_panel_notification_icon_bg = global::GeoContacts.Droid.Resource.Drawable.notify_panel_notification_icon_bg; + global::Microsoft.Identity.Client.Resource.Drawable.tooltip_frame_dark = global::GeoContacts.Droid.Resource.Drawable.tooltip_frame_dark; + global::Microsoft.Identity.Client.Resource.Drawable.tooltip_frame_light = global::GeoContacts.Droid.Resource.Drawable.tooltip_frame_light; + global::Microsoft.Identity.Client.Resource.Id.ALT = global::GeoContacts.Droid.Resource.Id.ALT; + global::Microsoft.Identity.Client.Resource.Id.CTRL = global::GeoContacts.Droid.Resource.Id.CTRL; + global::Microsoft.Identity.Client.Resource.Id.FUNCTION = global::GeoContacts.Droid.Resource.Id.FUNCTION; + global::Microsoft.Identity.Client.Resource.Id.META = global::GeoContacts.Droid.Resource.Id.META; + global::Microsoft.Identity.Client.Resource.Id.SHIFT = global::GeoContacts.Droid.Resource.Id.SHIFT; + global::Microsoft.Identity.Client.Resource.Id.SYM = global::GeoContacts.Droid.Resource.Id.SYM; global::Microsoft.Identity.Client.Resource.Id.action0 = global::GeoContacts.Droid.Resource.Id.action0; global::Microsoft.Identity.Client.Resource.Id.action_bar = global::GeoContacts.Droid.Resource.Id.action_bar; global::Microsoft.Identity.Client.Resource.Id.action_bar_activity_content = global::GeoContacts.Droid.Resource.Id.action_bar_activity_content; @@ -589,7 +639,9 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Id.agentWebView = global::GeoContacts.Droid.Resource.Id.agentWebView; global::Microsoft.Identity.Client.Resource.Id.alertTitle = global::GeoContacts.Droid.Resource.Id.alertTitle; global::Microsoft.Identity.Client.Resource.Id.always = global::GeoContacts.Droid.Resource.Id.always; + global::Microsoft.Identity.Client.Resource.Id.async = global::GeoContacts.Droid.Resource.Id.async; global::Microsoft.Identity.Client.Resource.Id.beginning = global::GeoContacts.Droid.Resource.Id.beginning; + global::Microsoft.Identity.Client.Resource.Id.blocking = global::GeoContacts.Droid.Resource.Id.blocking; global::Microsoft.Identity.Client.Resource.Id.bottom = global::GeoContacts.Droid.Resource.Id.bottom; global::Microsoft.Identity.Client.Resource.Id.buttonPanel = global::GeoContacts.Droid.Resource.Id.buttonPanel; global::Microsoft.Identity.Client.Resource.Id.cancel_action = global::GeoContacts.Droid.Resource.Id.cancel_action; @@ -607,6 +659,7 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Id.end_padder = global::GeoContacts.Droid.Resource.Id.end_padder; global::Microsoft.Identity.Client.Resource.Id.expand_activities_button = global::GeoContacts.Droid.Resource.Id.expand_activities_button; global::Microsoft.Identity.Client.Resource.Id.expanded_menu = global::GeoContacts.Droid.Resource.Id.expanded_menu; + global::Microsoft.Identity.Client.Resource.Id.forever = global::GeoContacts.Droid.Resource.Id.forever; global::Microsoft.Identity.Client.Resource.Id.home = global::GeoContacts.Droid.Resource.Id.home; global::Microsoft.Identity.Client.Resource.Id.homeAsUp = global::GeoContacts.Droid.Resource.Id.homeAsUp; global::Microsoft.Identity.Client.Resource.Id.icon = global::GeoContacts.Droid.Resource.Id.icon; @@ -614,11 +667,13 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Id.ifRoom = global::GeoContacts.Droid.Resource.Id.ifRoom; global::Microsoft.Identity.Client.Resource.Id.image = global::GeoContacts.Droid.Resource.Id.image; global::Microsoft.Identity.Client.Resource.Id.info = global::GeoContacts.Droid.Resource.Id.info; + global::Microsoft.Identity.Client.Resource.Id.italic = global::GeoContacts.Droid.Resource.Id.italic; global::Microsoft.Identity.Client.Resource.Id.line1 = global::GeoContacts.Droid.Resource.Id.line1; global::Microsoft.Identity.Client.Resource.Id.line3 = global::GeoContacts.Droid.Resource.Id.line3; global::Microsoft.Identity.Client.Resource.Id.listMode = global::GeoContacts.Droid.Resource.Id.listMode; global::Microsoft.Identity.Client.Resource.Id.list_item = global::GeoContacts.Droid.Resource.Id.list_item; global::Microsoft.Identity.Client.Resource.Id.media_actions = global::GeoContacts.Droid.Resource.Id.media_actions; + global::Microsoft.Identity.Client.Resource.Id.message = global::GeoContacts.Droid.Resource.Id.message; global::Microsoft.Identity.Client.Resource.Id.middle = global::GeoContacts.Droid.Resource.Id.middle; global::Microsoft.Identity.Client.Resource.Id.multiply = global::GeoContacts.Droid.Resource.Id.multiply; global::Microsoft.Identity.Client.Resource.Id.never = global::GeoContacts.Droid.Resource.Id.never; @@ -661,6 +716,7 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Id.submenuarrow = global::GeoContacts.Droid.Resource.Id.submenuarrow; global::Microsoft.Identity.Client.Resource.Id.submit_area = global::GeoContacts.Droid.Resource.Id.submit_area; global::Microsoft.Identity.Client.Resource.Id.tabMode = global::GeoContacts.Droid.Resource.Id.tabMode; + global::Microsoft.Identity.Client.Resource.Id.tag_transition_group = global::GeoContacts.Droid.Resource.Id.tag_transition_group; global::Microsoft.Identity.Client.Resource.Id.text = global::GeoContacts.Droid.Resource.Id.text; global::Microsoft.Identity.Client.Resource.Id.text2 = global::GeoContacts.Droid.Resource.Id.text2; global::Microsoft.Identity.Client.Resource.Id.textSpacerNoButtons = global::GeoContacts.Droid.Resource.Id.textSpacerNoButtons; @@ -671,6 +727,7 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Id.title_template = global::GeoContacts.Droid.Resource.Id.title_template; global::Microsoft.Identity.Client.Resource.Id.top = global::GeoContacts.Droid.Resource.Id.top; global::Microsoft.Identity.Client.Resource.Id.topPanel = global::GeoContacts.Droid.Resource.Id.topPanel; + global::Microsoft.Identity.Client.Resource.Id.uniform = global::GeoContacts.Droid.Resource.Id.uniform; global::Microsoft.Identity.Client.Resource.Id.up = global::GeoContacts.Droid.Resource.Id.up; global::Microsoft.Identity.Client.Resource.Id.useLogo = global::GeoContacts.Droid.Resource.Id.useLogo; global::Microsoft.Identity.Client.Resource.Id.withText = global::GeoContacts.Droid.Resource.Id.withText; @@ -678,6 +735,7 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Integer.abc_config_activityDefaultDur = global::GeoContacts.Droid.Resource.Integer.abc_config_activityDefaultDur; global::Microsoft.Identity.Client.Resource.Integer.abc_config_activityShortDur = global::GeoContacts.Droid.Resource.Integer.abc_config_activityShortDur; global::Microsoft.Identity.Client.Resource.Integer.cancel_button_image_alpha = global::GeoContacts.Droid.Resource.Integer.cancel_button_image_alpha; + global::Microsoft.Identity.Client.Resource.Integer.config_tooltipAnimTime = global::GeoContacts.Droid.Resource.Integer.config_tooltipAnimTime; global::Microsoft.Identity.Client.Resource.Integer.status_bar_notification_info_maxnum = global::GeoContacts.Droid.Resource.Integer.status_bar_notification_info_maxnum; global::Microsoft.Identity.Client.Resource.Layout.abc_action_bar_title_item = global::GeoContacts.Droid.Resource.Layout.abc_action_bar_title_item; global::Microsoft.Identity.Client.Resource.Layout.abc_action_bar_up_container = global::GeoContacts.Droid.Resource.Layout.abc_action_bar_up_container; @@ -724,6 +782,7 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Layout.select_dialog_multichoice_material = global::GeoContacts.Droid.Resource.Layout.select_dialog_multichoice_material; global::Microsoft.Identity.Client.Resource.Layout.select_dialog_singlechoice_material = global::GeoContacts.Droid.Resource.Layout.select_dialog_singlechoice_material; global::Microsoft.Identity.Client.Resource.Layout.support_simple_spinner_dropdown_item = global::GeoContacts.Droid.Resource.Layout.support_simple_spinner_dropdown_item; + global::Microsoft.Identity.Client.Resource.Layout.tooltip = global::GeoContacts.Droid.Resource.Layout.tooltip; global::Microsoft.Identity.Client.Resource.Layout.WebAuthenticationBroker = global::GeoContacts.Droid.Resource.Layout.WebAuthenticationBroker; global::Microsoft.Identity.Client.Resource.String.ApplicationName = global::GeoContacts.Droid.Resource.String.ApplicationName; global::Microsoft.Identity.Client.Resource.String.abc_action_bar_home_description = global::GeoContacts.Droid.Resource.String.abc_action_bar_home_description; @@ -761,10 +820,12 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Style.AlertDialog_AppCompat_Light = global::GeoContacts.Droid.Resource.Style.AlertDialog_AppCompat_Light; global::Microsoft.Identity.Client.Resource.Style.Animation_AppCompat_Dialog = global::GeoContacts.Droid.Resource.Style.Animation_AppCompat_Dialog; global::Microsoft.Identity.Client.Resource.Style.Animation_AppCompat_DropDownUp = global::GeoContacts.Droid.Resource.Style.Animation_AppCompat_DropDownUp; + global::Microsoft.Identity.Client.Resource.Style.Animation_AppCompat_Tooltip = global::GeoContacts.Droid.Resource.Style.Animation_AppCompat_Tooltip; global::Microsoft.Identity.Client.Resource.Style.Base_AlertDialog_AppCompat = global::GeoContacts.Droid.Resource.Style.Base_AlertDialog_AppCompat; global::Microsoft.Identity.Client.Resource.Style.Base_AlertDialog_AppCompat_Light = global::GeoContacts.Droid.Resource.Style.Base_AlertDialog_AppCompat_Light; global::Microsoft.Identity.Client.Resource.Style.Base_Animation_AppCompat_Dialog = global::GeoContacts.Droid.Resource.Style.Base_Animation_AppCompat_Dialog; global::Microsoft.Identity.Client.Resource.Style.Base_Animation_AppCompat_DropDownUp = global::GeoContacts.Droid.Resource.Style.Base_Animation_AppCompat_DropDownUp; + global::Microsoft.Identity.Client.Resource.Style.Base_Animation_AppCompat_Tooltip = global::GeoContacts.Droid.Resource.Style.Base_Animation_AppCompat_Tooltip; global::Microsoft.Identity.Client.Resource.Style.Base_DialogWindowTitle_AppCompat = global::GeoContacts.Droid.Resource.Style.Base_DialogWindowTitle_AppCompat; global::Microsoft.Identity.Client.Resource.Style.Base_DialogWindowTitleBackground_AppCompat = global::GeoContacts.Droid.Resource.Style.Base_DialogWindowTitleBackground_AppCompat; global::Microsoft.Identity.Client.Resource.Style.Base_TextAppearance_AppCompat = global::GeoContacts.Droid.Resource.Style.Base_TextAppearance_AppCompat; @@ -794,6 +855,7 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Style.Base_TextAppearance_AppCompat_Subhead_Inverse = global::GeoContacts.Droid.Resource.Style.Base_TextAppearance_AppCompat_Subhead_Inverse; global::Microsoft.Identity.Client.Resource.Style.Base_TextAppearance_AppCompat_Title = global::GeoContacts.Droid.Resource.Style.Base_TextAppearance_AppCompat_Title; global::Microsoft.Identity.Client.Resource.Style.Base_TextAppearance_AppCompat_Title_Inverse = global::GeoContacts.Droid.Resource.Style.Base_TextAppearance_AppCompat_Title_Inverse; + global::Microsoft.Identity.Client.Resource.Style.Base_TextAppearance_AppCompat_Tooltip = global::GeoContacts.Droid.Resource.Style.Base_TextAppearance_AppCompat_Tooltip; global::Microsoft.Identity.Client.Resource.Style.Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = global::GeoContacts.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_ActionBar_Menu; global::Microsoft.Identity.Client.Resource.Style.Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = global::GeoContacts.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle; global::Microsoft.Identity.Client.Resource.Style.Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = global::GeoContacts.Droid.Resource.Style.Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse; @@ -849,6 +911,9 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Style.Base_V22_Theme_AppCompat_Light = global::GeoContacts.Droid.Resource.Style.Base_V22_Theme_AppCompat_Light; global::Microsoft.Identity.Client.Resource.Style.Base_V23_Theme_AppCompat = global::GeoContacts.Droid.Resource.Style.Base_V23_Theme_AppCompat; global::Microsoft.Identity.Client.Resource.Style.Base_V23_Theme_AppCompat_Light = global::GeoContacts.Droid.Resource.Style.Base_V23_Theme_AppCompat_Light; + global::Microsoft.Identity.Client.Resource.Style.Base_V26_Theme_AppCompat = global::GeoContacts.Droid.Resource.Style.Base_V26_Theme_AppCompat; + global::Microsoft.Identity.Client.Resource.Style.Base_V26_Theme_AppCompat_Light = global::GeoContacts.Droid.Resource.Style.Base_V26_Theme_AppCompat_Light; + global::Microsoft.Identity.Client.Resource.Style.Base_V26_Widget_AppCompat_Toolbar = global::GeoContacts.Droid.Resource.Style.Base_V26_Widget_AppCompat_Toolbar; global::Microsoft.Identity.Client.Resource.Style.Base_V7_Theme_AppCompat = global::GeoContacts.Droid.Resource.Style.Base_V7_Theme_AppCompat; global::Microsoft.Identity.Client.Resource.Style.Base_V7_Theme_AppCompat_Dialog = global::GeoContacts.Droid.Resource.Style.Base_V7_Theme_AppCompat_Dialog; global::Microsoft.Identity.Client.Resource.Style.Base_V7_Theme_AppCompat_Light = global::GeoContacts.Droid.Resource.Style.Base_V7_Theme_AppCompat_Light; @@ -856,6 +921,7 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Style.Base_V7_ThemeOverlay_AppCompat_Dialog = global::GeoContacts.Droid.Resource.Style.Base_V7_ThemeOverlay_AppCompat_Dialog; global::Microsoft.Identity.Client.Resource.Style.Base_V7_Widget_AppCompat_AutoCompleteTextView = global::GeoContacts.Droid.Resource.Style.Base_V7_Widget_AppCompat_AutoCompleteTextView; global::Microsoft.Identity.Client.Resource.Style.Base_V7_Widget_AppCompat_EditText = global::GeoContacts.Droid.Resource.Style.Base_V7_Widget_AppCompat_EditText; + global::Microsoft.Identity.Client.Resource.Style.Base_V7_Widget_AppCompat_Toolbar = global::GeoContacts.Droid.Resource.Style.Base_V7_Widget_AppCompat_Toolbar; global::Microsoft.Identity.Client.Resource.Style.Base_Widget_AppCompat_ActionBar = global::GeoContacts.Droid.Resource.Style.Base_Widget_AppCompat_ActionBar; global::Microsoft.Identity.Client.Resource.Style.Base_Widget_AppCompat_ActionBar_Solid = global::GeoContacts.Droid.Resource.Style.Base_Widget_AppCompat_ActionBar_Solid; global::Microsoft.Identity.Client.Resource.Style.Base_Widget_AppCompat_ActionBar_TabBar = global::GeoContacts.Droid.Resource.Style.Base_Widget_AppCompat_ActionBar_TabBar; @@ -924,6 +990,8 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Style.Platform_V14_AppCompat_Light = global::GeoContacts.Droid.Resource.Style.Platform_V14_AppCompat_Light; global::Microsoft.Identity.Client.Resource.Style.Platform_V21_AppCompat = global::GeoContacts.Droid.Resource.Style.Platform_V21_AppCompat; global::Microsoft.Identity.Client.Resource.Style.Platform_V21_AppCompat_Light = global::GeoContacts.Droid.Resource.Style.Platform_V21_AppCompat_Light; + global::Microsoft.Identity.Client.Resource.Style.Platform_V25_AppCompat = global::GeoContacts.Droid.Resource.Style.Platform_V25_AppCompat; + global::Microsoft.Identity.Client.Resource.Style.Platform_V25_AppCompat_Light = global::GeoContacts.Droid.Resource.Style.Platform_V25_AppCompat_Light; global::Microsoft.Identity.Client.Resource.Style.Platform_Widget_AppCompat_Spinner = global::GeoContacts.Droid.Resource.Style.Platform_Widget_AppCompat_Spinner; global::Microsoft.Identity.Client.Resource.Style.RtlOverlay_DialogWindowTitle_AppCompat = global::GeoContacts.Droid.Resource.Style.RtlOverlay_DialogWindowTitle_AppCompat; global::Microsoft.Identity.Client.Resource.Style.RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = global::GeoContacts.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_ActionBar_TitleItem; @@ -967,6 +1035,7 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Style.TextAppearance_AppCompat_Subhead_Inverse = global::GeoContacts.Droid.Resource.Style.TextAppearance_AppCompat_Subhead_Inverse; global::Microsoft.Identity.Client.Resource.Style.TextAppearance_AppCompat_Title = global::GeoContacts.Droid.Resource.Style.TextAppearance_AppCompat_Title; global::Microsoft.Identity.Client.Resource.Style.TextAppearance_AppCompat_Title_Inverse = global::GeoContacts.Droid.Resource.Style.TextAppearance_AppCompat_Title_Inverse; + global::Microsoft.Identity.Client.Resource.Style.TextAppearance_AppCompat_Tooltip = global::GeoContacts.Droid.Resource.Style.TextAppearance_AppCompat_Tooltip; global::Microsoft.Identity.Client.Resource.Style.TextAppearance_AppCompat_Widget_ActionBar_Menu = global::GeoContacts.Droid.Resource.Style.TextAppearance_AppCompat_Widget_ActionBar_Menu; global::Microsoft.Identity.Client.Resource.Style.TextAppearance_AppCompat_Widget_ActionBar_Subtitle = global::GeoContacts.Droid.Resource.Style.TextAppearance_AppCompat_Widget_ActionBar_Subtitle; global::Microsoft.Identity.Client.Resource.Style.TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = global::GeoContacts.Droid.Resource.Style.TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse; @@ -986,6 +1055,16 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Style.TextAppearance_AppCompat_Widget_PopupMenu_Small = global::GeoContacts.Droid.Resource.Style.TextAppearance_AppCompat_Widget_PopupMenu_Small; global::Microsoft.Identity.Client.Resource.Style.TextAppearance_AppCompat_Widget_Switch = global::GeoContacts.Droid.Resource.Style.TextAppearance_AppCompat_Widget_Switch; global::Microsoft.Identity.Client.Resource.Style.TextAppearance_AppCompat_Widget_TextView_SpinnerItem = global::GeoContacts.Droid.Resource.Style.TextAppearance_AppCompat_Widget_TextView_SpinnerItem; + global::Microsoft.Identity.Client.Resource.Style.TextAppearance_Compat_Notification = global::GeoContacts.Droid.Resource.Style.TextAppearance_Compat_Notification; + global::Microsoft.Identity.Client.Resource.Style.TextAppearance_Compat_Notification_Info = global::GeoContacts.Droid.Resource.Style.TextAppearance_Compat_Notification_Info; + global::Microsoft.Identity.Client.Resource.Style.TextAppearance_Compat_Notification_Info_Media = global::GeoContacts.Droid.Resource.Style.TextAppearance_Compat_Notification_Info_Media; + global::Microsoft.Identity.Client.Resource.Style.TextAppearance_Compat_Notification_Line2 = global::GeoContacts.Droid.Resource.Style.TextAppearance_Compat_Notification_Line2; + global::Microsoft.Identity.Client.Resource.Style.TextAppearance_Compat_Notification_Line2_Media = global::GeoContacts.Droid.Resource.Style.TextAppearance_Compat_Notification_Line2_Media; + global::Microsoft.Identity.Client.Resource.Style.TextAppearance_Compat_Notification_Media = global::GeoContacts.Droid.Resource.Style.TextAppearance_Compat_Notification_Media; + global::Microsoft.Identity.Client.Resource.Style.TextAppearance_Compat_Notification_Time = global::GeoContacts.Droid.Resource.Style.TextAppearance_Compat_Notification_Time; + global::Microsoft.Identity.Client.Resource.Style.TextAppearance_Compat_Notification_Time_Media = global::GeoContacts.Droid.Resource.Style.TextAppearance_Compat_Notification_Time_Media; + global::Microsoft.Identity.Client.Resource.Style.TextAppearance_Compat_Notification_Title = global::GeoContacts.Droid.Resource.Style.TextAppearance_Compat_Notification_Title; + global::Microsoft.Identity.Client.Resource.Style.TextAppearance_Compat_Notification_Title_Media = global::GeoContacts.Droid.Resource.Style.TextAppearance_Compat_Notification_Title_Media; global::Microsoft.Identity.Client.Resource.Style.TextAppearance_Widget_AppCompat_ExpandedMenu_Item = global::GeoContacts.Droid.Resource.Style.TextAppearance_Widget_AppCompat_ExpandedMenu_Item; global::Microsoft.Identity.Client.Resource.Style.TextAppearance_Widget_AppCompat_Toolbar_Subtitle = global::GeoContacts.Droid.Resource.Style.TextAppearance_Widget_AppCompat_Toolbar_Subtitle; global::Microsoft.Identity.Client.Resource.Style.TextAppearance_Widget_AppCompat_Toolbar_Title = global::GeoContacts.Droid.Resource.Style.TextAppearance_Widget_AppCompat_Toolbar_Title; @@ -1089,6 +1168,8 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Style.Widget_AppCompat_TextView_SpinnerItem = global::GeoContacts.Droid.Resource.Style.Widget_AppCompat_TextView_SpinnerItem; global::Microsoft.Identity.Client.Resource.Style.Widget_AppCompat_Toolbar = global::GeoContacts.Droid.Resource.Style.Widget_AppCompat_Toolbar; global::Microsoft.Identity.Client.Resource.Style.Widget_AppCompat_Toolbar_Button_Navigation = global::GeoContacts.Droid.Resource.Style.Widget_AppCompat_Toolbar_Button_Navigation; + global::Microsoft.Identity.Client.Resource.Style.Widget_Compat_NotificationActionContainer = global::GeoContacts.Droid.Resource.Style.Widget_Compat_NotificationActionContainer; + global::Microsoft.Identity.Client.Resource.Style.Widget_Compat_NotificationActionText = global::GeoContacts.Droid.Resource.Style.Widget_Compat_NotificationActionText; global::Microsoft.Identity.Client.Resource.Styleable.ActionBar = global::GeoContacts.Droid.Resource.Styleable.ActionBar; global::Microsoft.Identity.Client.Resource.Styleable.ActionBar_background = global::GeoContacts.Droid.Resource.Styleable.ActionBar_background; global::Microsoft.Identity.Client.Resource.Styleable.ActionBar_backgroundSplit = global::GeoContacts.Droid.Resource.Styleable.ActionBar_backgroundSplit; @@ -1162,6 +1243,12 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTextHelper_android_textAppearance = global::GeoContacts.Droid.Resource.Styleable.AppCompatTextHelper_android_textAppearance; global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTextView = global::GeoContacts.Droid.Resource.Styleable.AppCompatTextView; global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTextView_android_textAppearance = global::GeoContacts.Droid.Resource.Styleable.AppCompatTextView_android_textAppearance; + global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTextView_autoSizeMaxTextSize = global::GeoContacts.Droid.Resource.Styleable.AppCompatTextView_autoSizeMaxTextSize; + global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTextView_autoSizeMinTextSize = global::GeoContacts.Droid.Resource.Styleable.AppCompatTextView_autoSizeMinTextSize; + global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTextView_autoSizePresetSizes = global::GeoContacts.Droid.Resource.Styleable.AppCompatTextView_autoSizePresetSizes; + global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTextView_autoSizeStepGranularity = global::GeoContacts.Droid.Resource.Styleable.AppCompatTextView_autoSizeStepGranularity; + global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTextView_autoSizeTextType = global::GeoContacts.Droid.Resource.Styleable.AppCompatTextView_autoSizeTextType; + global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTextView_fontFamily = global::GeoContacts.Droid.Resource.Styleable.AppCompatTextView_fontFamily; global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTextView_textAllCaps = global::GeoContacts.Droid.Resource.Styleable.AppCompatTextView_textAllCaps; global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTheme = global::GeoContacts.Droid.Resource.Styleable.AppCompatTheme; global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTheme_actionBarDivider = global::GeoContacts.Droid.Resource.Styleable.AppCompatTheme_actionBarDivider; @@ -1218,6 +1305,7 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTheme_colorControlActivated = global::GeoContacts.Droid.Resource.Styleable.AppCompatTheme_colorControlActivated; global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTheme_colorControlHighlight = global::GeoContacts.Droid.Resource.Styleable.AppCompatTheme_colorControlHighlight; global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTheme_colorControlNormal = global::GeoContacts.Droid.Resource.Styleable.AppCompatTheme_colorControlNormal; + global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTheme_colorError = global::GeoContacts.Droid.Resource.Styleable.AppCompatTheme_colorError; global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTheme_colorPrimary = global::GeoContacts.Droid.Resource.Styleable.AppCompatTheme_colorPrimary; global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTheme_colorPrimaryDark = global::GeoContacts.Droid.Resource.Styleable.AppCompatTheme_colorPrimaryDark; global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTheme_colorSwitchThumbNormal = global::GeoContacts.Droid.Resource.Styleable.AppCompatTheme_colorSwitchThumbNormal; @@ -1270,6 +1358,8 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTheme_textColorSearchUrl = global::GeoContacts.Droid.Resource.Styleable.AppCompatTheme_textColorSearchUrl; global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTheme_toolbarNavigationButtonStyle = global::GeoContacts.Droid.Resource.Styleable.AppCompatTheme_toolbarNavigationButtonStyle; global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTheme_toolbarStyle = global::GeoContacts.Droid.Resource.Styleable.AppCompatTheme_toolbarStyle; + global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTheme_tooltipForegroundColor = global::GeoContacts.Droid.Resource.Styleable.AppCompatTheme_tooltipForegroundColor; + global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTheme_tooltipFrameBackground = global::GeoContacts.Droid.Resource.Styleable.AppCompatTheme_tooltipFrameBackground; global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTheme_windowActionBar = global::GeoContacts.Droid.Resource.Styleable.AppCompatTheme_windowActionBar; global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTheme_windowActionBarOverlay = global::GeoContacts.Droid.Resource.Styleable.AppCompatTheme_windowActionBarOverlay; global::Microsoft.Identity.Client.Resource.Styleable.AppCompatTheme_windowActionModeOverlay = global::GeoContacts.Droid.Resource.Styleable.AppCompatTheme_windowActionModeOverlay; @@ -1299,6 +1389,20 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Styleable.DrawerArrowToggle_gapBetweenBars = global::GeoContacts.Droid.Resource.Styleable.DrawerArrowToggle_gapBetweenBars; global::Microsoft.Identity.Client.Resource.Styleable.DrawerArrowToggle_spinBars = global::GeoContacts.Droid.Resource.Styleable.DrawerArrowToggle_spinBars; global::Microsoft.Identity.Client.Resource.Styleable.DrawerArrowToggle_thickness = global::GeoContacts.Droid.Resource.Styleable.DrawerArrowToggle_thickness; + global::Microsoft.Identity.Client.Resource.Styleable.FontFamily = global::GeoContacts.Droid.Resource.Styleable.FontFamily; + global::Microsoft.Identity.Client.Resource.Styleable.FontFamily_fontProviderAuthority = global::GeoContacts.Droid.Resource.Styleable.FontFamily_fontProviderAuthority; + global::Microsoft.Identity.Client.Resource.Styleable.FontFamily_fontProviderCerts = global::GeoContacts.Droid.Resource.Styleable.FontFamily_fontProviderCerts; + global::Microsoft.Identity.Client.Resource.Styleable.FontFamily_fontProviderFetchStrategy = global::GeoContacts.Droid.Resource.Styleable.FontFamily_fontProviderFetchStrategy; + global::Microsoft.Identity.Client.Resource.Styleable.FontFamily_fontProviderFetchTimeout = global::GeoContacts.Droid.Resource.Styleable.FontFamily_fontProviderFetchTimeout; + global::Microsoft.Identity.Client.Resource.Styleable.FontFamily_fontProviderPackage = global::GeoContacts.Droid.Resource.Styleable.FontFamily_fontProviderPackage; + global::Microsoft.Identity.Client.Resource.Styleable.FontFamily_fontProviderQuery = global::GeoContacts.Droid.Resource.Styleable.FontFamily_fontProviderQuery; + global::Microsoft.Identity.Client.Resource.Styleable.FontFamilyFont = global::GeoContacts.Droid.Resource.Styleable.FontFamilyFont; + global::Microsoft.Identity.Client.Resource.Styleable.FontFamilyFont_android_font = global::GeoContacts.Droid.Resource.Styleable.FontFamilyFont_android_font; + global::Microsoft.Identity.Client.Resource.Styleable.FontFamilyFont_android_fontStyle = global::GeoContacts.Droid.Resource.Styleable.FontFamilyFont_android_fontStyle; + global::Microsoft.Identity.Client.Resource.Styleable.FontFamilyFont_android_fontWeight = global::GeoContacts.Droid.Resource.Styleable.FontFamilyFont_android_fontWeight; + global::Microsoft.Identity.Client.Resource.Styleable.FontFamilyFont_font = global::GeoContacts.Droid.Resource.Styleable.FontFamilyFont_font; + global::Microsoft.Identity.Client.Resource.Styleable.FontFamilyFont_fontStyle = global::GeoContacts.Droid.Resource.Styleable.FontFamilyFont_fontStyle; + global::Microsoft.Identity.Client.Resource.Styleable.FontFamilyFont_fontWeight = global::GeoContacts.Droid.Resource.Styleable.FontFamilyFont_fontWeight; global::Microsoft.Identity.Client.Resource.Styleable.LinearLayoutCompat = global::GeoContacts.Droid.Resource.Styleable.LinearLayoutCompat; global::Microsoft.Identity.Client.Resource.Styleable.LinearLayoutCompat_android_baselineAligned = global::GeoContacts.Droid.Resource.Styleable.LinearLayoutCompat_android_baselineAligned; global::Microsoft.Identity.Client.Resource.Styleable.LinearLayoutCompat_android_baselineAlignedChildIndex = global::GeoContacts.Droid.Resource.Styleable.LinearLayoutCompat_android_baselineAlignedChildIndex; @@ -1328,6 +1432,7 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Styleable.MenuItem_actionLayout = global::GeoContacts.Droid.Resource.Styleable.MenuItem_actionLayout; global::Microsoft.Identity.Client.Resource.Styleable.MenuItem_actionProviderClass = global::GeoContacts.Droid.Resource.Styleable.MenuItem_actionProviderClass; global::Microsoft.Identity.Client.Resource.Styleable.MenuItem_actionViewClass = global::GeoContacts.Droid.Resource.Styleable.MenuItem_actionViewClass; + global::Microsoft.Identity.Client.Resource.Styleable.MenuItem_alphabeticModifiers = global::GeoContacts.Droid.Resource.Styleable.MenuItem_alphabeticModifiers; global::Microsoft.Identity.Client.Resource.Styleable.MenuItem_android_alphabeticShortcut = global::GeoContacts.Droid.Resource.Styleable.MenuItem_android_alphabeticShortcut; global::Microsoft.Identity.Client.Resource.Styleable.MenuItem_android_checkable = global::GeoContacts.Droid.Resource.Styleable.MenuItem_android_checkable; global::Microsoft.Identity.Client.Resource.Styleable.MenuItem_android_checked = global::GeoContacts.Droid.Resource.Styleable.MenuItem_android_checked; @@ -1341,7 +1446,12 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Styleable.MenuItem_android_title = global::GeoContacts.Droid.Resource.Styleable.MenuItem_android_title; global::Microsoft.Identity.Client.Resource.Styleable.MenuItem_android_titleCondensed = global::GeoContacts.Droid.Resource.Styleable.MenuItem_android_titleCondensed; global::Microsoft.Identity.Client.Resource.Styleable.MenuItem_android_visible = global::GeoContacts.Droid.Resource.Styleable.MenuItem_android_visible; + global::Microsoft.Identity.Client.Resource.Styleable.MenuItem_contentDescription = global::GeoContacts.Droid.Resource.Styleable.MenuItem_contentDescription; + global::Microsoft.Identity.Client.Resource.Styleable.MenuItem_iconTint = global::GeoContacts.Droid.Resource.Styleable.MenuItem_iconTint; + global::Microsoft.Identity.Client.Resource.Styleable.MenuItem_iconTintMode = global::GeoContacts.Droid.Resource.Styleable.MenuItem_iconTintMode; + global::Microsoft.Identity.Client.Resource.Styleable.MenuItem_numericModifiers = global::GeoContacts.Droid.Resource.Styleable.MenuItem_numericModifiers; global::Microsoft.Identity.Client.Resource.Styleable.MenuItem_showAsAction = global::GeoContacts.Droid.Resource.Styleable.MenuItem_showAsAction; + global::Microsoft.Identity.Client.Resource.Styleable.MenuItem_tooltipText = global::GeoContacts.Droid.Resource.Styleable.MenuItem_tooltipText; global::Microsoft.Identity.Client.Resource.Styleable.MenuView = global::GeoContacts.Droid.Resource.Styleable.MenuView; global::Microsoft.Identity.Client.Resource.Styleable.MenuView_android_headerBackground = global::GeoContacts.Droid.Resource.Styleable.MenuView_android_headerBackground; global::Microsoft.Identity.Client.Resource.Styleable.MenuView_android_horizontalDivider = global::GeoContacts.Droid.Resource.Styleable.MenuView_android_horizontalDivider; @@ -1401,15 +1511,18 @@ public static void UpdateIdValues() global::Microsoft.Identity.Client.Resource.Styleable.SwitchCompat_trackTint = global::GeoContacts.Droid.Resource.Styleable.SwitchCompat_trackTint; global::Microsoft.Identity.Client.Resource.Styleable.SwitchCompat_trackTintMode = global::GeoContacts.Droid.Resource.Styleable.SwitchCompat_trackTintMode; global::Microsoft.Identity.Client.Resource.Styleable.TextAppearance = global::GeoContacts.Droid.Resource.Styleable.TextAppearance; + global::Microsoft.Identity.Client.Resource.Styleable.TextAppearance_android_fontFamily = global::GeoContacts.Droid.Resource.Styleable.TextAppearance_android_fontFamily; global::Microsoft.Identity.Client.Resource.Styleable.TextAppearance_android_shadowColor = global::GeoContacts.Droid.Resource.Styleable.TextAppearance_android_shadowColor; global::Microsoft.Identity.Client.Resource.Styleable.TextAppearance_android_shadowDx = global::GeoContacts.Droid.Resource.Styleable.TextAppearance_android_shadowDx; global::Microsoft.Identity.Client.Resource.Styleable.TextAppearance_android_shadowDy = global::GeoContacts.Droid.Resource.Styleable.TextAppearance_android_shadowDy; global::Microsoft.Identity.Client.Resource.Styleable.TextAppearance_android_shadowRadius = global::GeoContacts.Droid.Resource.Styleable.TextAppearance_android_shadowRadius; global::Microsoft.Identity.Client.Resource.Styleable.TextAppearance_android_textColor = global::GeoContacts.Droid.Resource.Styleable.TextAppearance_android_textColor; global::Microsoft.Identity.Client.Resource.Styleable.TextAppearance_android_textColorHint = global::GeoContacts.Droid.Resource.Styleable.TextAppearance_android_textColorHint; + global::Microsoft.Identity.Client.Resource.Styleable.TextAppearance_android_textColorLink = global::GeoContacts.Droid.Resource.Styleable.TextAppearance_android_textColorLink; global::Microsoft.Identity.Client.Resource.Styleable.TextAppearance_android_textSize = global::GeoContacts.Droid.Resource.Styleable.TextAppearance_android_textSize; global::Microsoft.Identity.Client.Resource.Styleable.TextAppearance_android_textStyle = global::GeoContacts.Droid.Resource.Styleable.TextAppearance_android_textStyle; global::Microsoft.Identity.Client.Resource.Styleable.TextAppearance_android_typeface = global::GeoContacts.Droid.Resource.Styleable.TextAppearance_android_typeface; + global::Microsoft.Identity.Client.Resource.Styleable.TextAppearance_fontFamily = global::GeoContacts.Droid.Resource.Styleable.TextAppearance_fontFamily; global::Microsoft.Identity.Client.Resource.Styleable.TextAppearance_textAllCaps = global::GeoContacts.Droid.Resource.Styleable.TextAppearance_textAllCaps; global::Microsoft.Identity.Client.Resource.Styleable.Toolbar = global::GeoContacts.Droid.Resource.Styleable.Toolbar; global::Microsoft.Identity.Client.Resource.Styleable.Toolbar_android_gravity = global::GeoContacts.Droid.Resource.Styleable.Toolbar_android_gravity; diff --git a/src/GeoContacts/GeoContacts.Android/mobile-center-post-clone.sh b/src/GeoContacts/GeoContacts.Android/mobile-center-post-clone.sh index 64cb17e..fec9657 100644 --- a/src/GeoContacts/GeoContacts.Android/mobile-center-post-clone.sh +++ b/src/GeoContacts/GeoContacts.Android/mobile-center-post-clone.sh @@ -7,12 +7,14 @@ echo "Arguments for updating:" echo " - ACID: $AC_ANDROID" echo " - ACLogin: $AC_SHOWLOGIN" echo " - ACFace: $AC_FACE" +echo " - ACUseMSFT: $AC_USEMSFT" # Updating manifest sed -i '' "s/AC_ANDROID/$AC_ANDROID/g" $BUILD_REPOSITORY_LOCALPATH/src/GeoContacts/GeoContacts/Helpers/CommonConstants.cs sed -i '' "s/AC_FACE/$AC_FACE/g" $BUILD_REPOSITORY_LOCALPATH/src/GeoContacts/GeoContacts/Helpers/CommonConstants.cs +sed -i '' "s/AC_USEMSFT_NO/$AC_USEMSFT/g" $BUILD_REPOSITORY_LOCALPATH/src/GeoContacts/GeoContacts/Helpers/CommonConstants.cs if [ "$APPCENTER_BRANCH" == "appstore" ]; then sed -i '' "s/AC_SHOWLOGIN/$AC_SHOWLOGIN/g" $BUILD_REPOSITORY_LOCALPATH/src/GeoContacts/GeoContacts/Helpers/CommonConstants.cs diff --git a/src/GeoContacts/GeoContacts.iOS/GeoContacts.iOS.csproj b/src/GeoContacts/GeoContacts.iOS/GeoContacts.iOS.csproj index d9f9c4f..e8defd2 100644 --- a/src/GeoContacts/GeoContacts.iOS/GeoContacts.iOS.csproj +++ b/src/GeoContacts/GeoContacts.iOS/GeoContacts.iOS.csproj @@ -31,6 +31,8 @@ false true true + iPhone Developer + Entitlements.plist none @@ -151,9 +153,6 @@ 1.0.2-preview - - 1.1.2-preview0008 - 0.1.0.10-beta @@ -170,7 +169,7 @@ 3.0.0.5 - 1.8.1 + 1.9.1 1.7.0 @@ -193,6 +192,9 @@ 2.0.1 + + 1.1.4-preview0002 + diff --git a/src/GeoContacts/GeoContacts.iOS/Info.plist b/src/GeoContacts/GeoContacts.iOS/Info.plist index 85be860..321cd26 100644 --- a/src/GeoContacts/GeoContacts.iOS/Info.plist +++ b/src/GeoContacts/GeoContacts.iOS/Info.plist @@ -49,8 +49,9 @@ com.microsoft.advocates CFBundleURLSchemes - msal8f999c10-2a7f-403c-b20b-cbe07b319cf3 + msal8aea67fd-38da-49a1-8f68-ca0c9e9e2501 appcenter-APP_SECRET + msal8f999c10-2a7f-403c-b20b-cbe07b319cf3 diff --git a/src/GeoContacts/GeoContacts/GeoContacts.csproj b/src/GeoContacts/GeoContacts/GeoContacts.csproj index fcb80d8..dd81c89 100644 --- a/src/GeoContacts/GeoContacts/GeoContacts.csproj +++ b/src/GeoContacts/GeoContacts/GeoContacts.csproj @@ -8,14 +8,13 @@ - - + @@ -23,6 +22,7 @@ + diff --git a/src/GeoContacts/GeoContacts/Helpers/CommonConstants.cs b/src/GeoContacts/GeoContacts/Helpers/CommonConstants.cs index c615549..9aa70f9 100644 --- a/src/GeoContacts/GeoContacts/Helpers/CommonConstants.cs +++ b/src/GeoContacts/GeoContacts/Helpers/CommonConstants.cs @@ -12,13 +12,27 @@ public class CommonConstants public const string AppCenterUWP = "AC_UWP"; public const string ShowLogin = "AC_SHOWLOGIN"; public const string FaceApiKey = "AC_FACE"; + public const string AppCenterUseMsft = "AC_USEMSFT_NO"; #endregion #region AD + public const bool USE_MSFT = "AC_USE_MSFT" == AppCenterUseMsft; + public const string ADApplicationID = "8f999c10-2a7f-403c-b20b-cbe07b319cf3"; public const string ADRedirectID = "msal" + ADApplicationID + "://auth"; public static readonly string[] ADScopes = new string[] { "user.read" }; public const string ADAuthority = "https://login.microsoftonline.com/organizations/"; + + public const string B2CTenant = "geocontacts.onmicrosoft.com"; + public const string B2CClientID = "8aea67fd-38da-49a1-8f68-ca0c9e9e2501"; + public const string B2CPolicy = "B2C_1_SignInUp"; + + public const string B2CAuthorityBase = "https://login.microsoftonline.com/tfp/" + B2CTenant + "/"; + public const string B2CAuthority = B2CAuthorityBase + B2CPolicy; + + public const string B2CRedirectUrl = "msal" + B2CClientID + "://auth"; + public static readonly string[] B2CScopes = new string[] { "https://geocontacts.onmicrosoft.com/geocontacts/login" }; + #endregion #region LocationFunction diff --git a/src/GeoContacts/GeoContacts/Resources/AppResources.Designer.cs b/src/GeoContacts/GeoContacts/Resources/AppResources.Designer.cs index 02361da..dcc81a8 100644 --- a/src/GeoContacts/GeoContacts/Resources/AppResources.Designer.cs +++ b/src/GeoContacts/GeoContacts/Resources/AppResources.Designer.cs @@ -10,48 +10,35 @@ namespace GeoContacts.Resources { using System; + using System.Reflection; - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class AppResources { - private static global::System.Resources.ResourceManager resourceMan; + private static System.Resources.ResourceManager resourceMan; - private static global::System.Globalization.CultureInfo resourceCulture; + private static System.Globalization.CultureInfo resourceCulture; - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal AppResources() { } - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + internal static System.Resources.ResourceManager ResourceManager { get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GeoContacts.Resources.AppResources", typeof(AppResources).Assembly); + if (object.Equals(null, resourceMan)) { + System.Resources.ResourceManager temp = new System.Resources.ResourceManager("GeoContacts.Resources.AppResources", typeof(AppResources).Assembly); resourceMan = temp; } return resourceMan; } } - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + internal static System.Globalization.CultureInfo Culture { get { return resourceCulture; } @@ -60,243 +47,162 @@ internal AppResources() { } } - /// - /// Looks up a localized string similar to Cloud Developer Advocates. - /// internal static string AppName { get { return ResourceManager.GetString("AppName", resourceCulture); } } - /// - /// Looks up a localized string similar to Follow. - /// internal static string ButtonFollow { get { return ResourceManager.GetString("ButtonFollow", resourceCulture); } } - /// - /// Looks up a localized string similar to Add Mood. - /// internal static string ButtonMood { get { return ResourceManager.GetString("ButtonMood", resourceCulture); } } - /// - /// Looks up a localized string similar to Sync with Cloud. - /// internal static string ButtonSync { get { return ResourceManager.GetString("ButtonSync", resourceCulture); } } - /// - /// Looks up a localized string similar to Get Location. - /// internal static string ButtonSyncLocation { get { return ResourceManager.GetString("ButtonSyncLocation", resourceCulture); } } - /// - /// Looks up a localized string similar to Cancel. - /// internal static string Cancel { get { return ResourceManager.GetString("Cancel", resourceCulture); } } - /// - /// Looks up a localized string similar to Please add your current location before syncing.. - /// internal static string ErrorNeedLocation { get { return ResourceManager.GetString("ErrorNeedLocation", resourceCulture); } } - /// - /// Looks up a localized string similar to Find Neaby CDAs. - /// internal static string FindCloseCDAs { get { return ResourceManager.GetString("FindCloseCDAs", resourceCulture); } } - /// - /// Looks up a localized string similar to Hometown. - /// internal static string Hometown { get { return ResourceManager.GetString("Hometown", resourceCulture); } } - /// - /// Looks up a localized string similar to Continue as Guest. - /// internal static string LoginPageGuest { get { return ResourceManager.GetString("LoginPageGuest", resourceCulture); } } - /// - /// Looks up a localized string similar to CDA Login. - /// internal static string LoginPageLoginWithMicrosoft { get { return ResourceManager.GetString("LoginPageLoginWithMicrosoft", resourceCulture); } } - /// - /// Looks up a localized string similar to Welcome to the Microsoft Cloud Developer Advocate contacts application. This app enables you to browse and find CDAs near you.. - /// internal static string LoginPageWelcome { get { return ResourceManager.GetString("LoginPageWelcome", resourceCulture); } } - /// - /// Looks up a localized string similar to It appears that no CDAs are nearby :(. - /// internal static string NoCDAsNearby { get { return ResourceManager.GetString("NoCDAsNearby", resourceCulture); } } - /// - /// Looks up a localized string similar to Un oh, looks like your device is offline. Check your connection and try again.. - /// internal static string NoInternet { get { return ResourceManager.GetString("NoInternet", resourceCulture); } } - /// - /// Looks up a localized string similar to OK. - /// internal static string OK { get { return ResourceManager.GetString("OK", resourceCulture); } } - /// - /// Looks up a localized string similar to Recently Checked-In. - /// internal static string RecentCheckin { get { return ResourceManager.GetString("RecentCheckin", resourceCulture); } } - /// - /// Looks up a localized string similar to Contacts. - /// internal static string TitleAllContacts { get { return ResourceManager.GetString("TitleAllContacts", resourceCulture); } } - /// - /// Looks up a localized string similar to Nearby. - /// internal static string TitleNearby { get { return ResourceManager.GetString("TitleNearby", resourceCulture); } } - /// - /// Looks up a localized string similar to Update Current Town. - /// internal static string TitleUpdateLocation { get { return ResourceManager.GetString("TitleUpdateLocation", resourceCulture); } } - /// - /// Looks up a localized string similar to Settings. - /// internal static string ToolbarSettings { get { return ResourceManager.GetString("ToolbarSettings", resourceCulture); } } - /// - /// Looks up a localized string similar to Update Location. - /// internal static string ToolbarUpdateLocation { get { return ResourceManager.GetString("ToolbarUpdateLocation", resourceCulture); } } - /// - /// Looks up a localized string similar to Syncing with the cloud.... - /// internal static string UpdateLocationBackend { get { return ResourceManager.GetString("UpdateLocationBackend", resourceCulture); } } - /// - /// Looks up a localized string similar to Uh oh, looks like we weren't able to update your location.. - /// internal static string UpdateLocationError { get { return ResourceManager.GetString("UpdateLocationError", resourceCulture); } } - /// - /// Looks up a localized string similar to Being smart and doing some geocoding.... - /// internal static string UpdateLocationGeocoding { get { return ResourceManager.GetString("UpdateLocationGeocoding", resourceCulture); } } - /// - /// Looks up a localized string similar to When updating your current location the town that you are currently in will be updated for everyone to see and to help find CDAs nearby.. - /// internal static string UpdateLocationMessage { get { return ResourceManager.GetString("UpdateLocationMessage", resourceCulture); } } - /// - /// Looks up a localized string similar to Getting your location.... - /// internal static string UpdatingLocation { get { return ResourceManager.GetString("UpdatingLocation", resourceCulture); } } - /// - /// Looks up a localized string similar to Location has been updated and synced!. - /// internal static string UpdatingLocationUpdated { get { return ResourceManager.GetString("UpdatingLocationUpdated", resourceCulture); diff --git a/src/GeoContacts/GeoContacts/Resources/AppResources.resx b/src/GeoContacts/GeoContacts/Resources/AppResources.resx index c1a1460..283357b 100644 --- a/src/GeoContacts/GeoContacts/Resources/AppResources.resx +++ b/src/GeoContacts/GeoContacts/Resources/AppResources.resx @@ -1,6 +1,6 @@  - - - - - - - + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Cloud Developer Advocates - + Follow - + Add Mood - + Sync with Cloud - + Get Location - + Cancel - + Please add your current location before syncing. - - Find Neaby CDAs + + Find Nearby CDAs - + Hometown - + Continue as Guest - + CDA Login - + Welcome to the Microsoft Cloud Developer Advocate contacts application. This app enables you to browse and find CDAs near you. - + It appears that no CDAs are nearby :( - + Un oh, looks like your device is offline. Check your connection and try again. - + OK - + Recently Checked-In - + Contacts - + Nearby - + Update Current Town - + Settings - + Update Location - + Syncing with the cloud... - + Uh oh, looks like we weren't able to update your location. - + Being smart and doing some geocoding... - + When updating your current location the town that you are currently in will be updated for everyone to see and to help find CDAs nearby. - + Getting your location... - + Location has been updated and synced! \ No newline at end of file diff --git a/src/GeoContacts/GeoContacts/Services/AuthenticationService.cs b/src/GeoContacts/GeoContacts/Services/AuthenticationService.cs index b1f69e5..7a16f3d 100644 --- a/src/GeoContacts/GeoContacts/Services/AuthenticationService.cs +++ b/src/GeoContacts/GeoContacts/Services/AuthenticationService.cs @@ -5,6 +5,8 @@ using System.Threading.Tasks; using System.Linq; using Microsoft.AppCenter.Crashes; +using System.Collections.Generic; +using System.Text; namespace GeoContacts { @@ -13,16 +15,31 @@ public class AuthenticationService : IAuthenticationService public static UIParent UIParent = null; PublicClientApplication authClient; + string[] scopes; void Init() { if (authClient != null) return; - authClient = new PublicClientApplication(CommonConstants.ADApplicationID, - CommonConstants.ADAuthority); - authClient.ValidateAuthority = false; - authClient.RedirectUri = CommonConstants.ADRedirectID; + if (CommonConstants.USE_MSFT) + { + authClient = new PublicClientApplication(CommonConstants.ADApplicationID, + CommonConstants.ADAuthority); + authClient.ValidateAuthority = false; + authClient.RedirectUri = CommonConstants.ADRedirectID; + + scopes = CommonConstants.ADScopes; + } + else + { + authClient = new PublicClientApplication(CommonConstants.B2CClientID); + + authClient.ValidateAuthority = false; + authClient.RedirectUri = CommonConstants.B2CRedirectUrl; + + scopes = CommonConstants.B2CScopes; + } } public async Task Login() @@ -38,8 +55,22 @@ public async Task Login() if (result != null) return result; - result = await authClient.AcquireTokenAsync(CommonConstants.ADScopes, UIParent); - var scope = result.Scopes.FirstOrDefault(); + if (CommonConstants.USE_MSFT) + { + result = await authClient.AcquireTokenAsync(scopes, UIParent); + } + else + { + result = await authClient.AcquireTokenAsync(scopes, + GetUserByPolicy(authClient.Users, + CommonConstants.B2CPolicy), + UIBehavior.ForceLogin, + null, + null, + CommonConstants.B2CAuthority, + UIParent); + + } } catch (MsalServiceException ex) { @@ -63,7 +94,17 @@ public async Task SilentLogin() try { - result = await authClient.AcquireTokenSilentAsync(CommonConstants.ADScopes, authClient.Users.FirstOrDefault()); + if (CommonConstants.USE_MSFT) + { + result = await authClient.AcquireTokenSilentAsync(scopes, authClient.Users.FirstOrDefault()); + } + else + { + result = await authClient.AcquireTokenSilentAsync(scopes, + GetUserByPolicy(authClient.Users, CommonConstants.B2CPolicy), + CommonConstants.B2CAuthority, + false); + } } catch (Exception ex) { @@ -92,5 +133,27 @@ public void Logout() authClient.Remove(user); } } + + IUser GetUserByPolicy(IEnumerable users, string policy) + { + foreach (var user in users) + { + string userIdentifier = Base64UrlDecode(user.Identifier.Split('.')[0]); + + if (userIdentifier.EndsWith(policy.ToLower(), StringComparison.OrdinalIgnoreCase)) return user; + } + + return null; + } + + string Base64UrlDecode(string s) + { + s = s.Replace('-', '+').Replace('_', '/'); + s = s.PadRight(s.Length + (4 - s.Length % 4) % 4, '='); + var byteArray = Convert.FromBase64String(s); + var decoded = Encoding.UTF8.GetString(byteArray, 0, byteArray.Count()); + return decoded; + } + } } diff --git a/src/GeoContacts/GeoContacts/ViewModel/LoginViewModel.cs b/src/GeoContacts/GeoContacts/ViewModel/LoginViewModel.cs index 6af9e15..be793b7 100644 --- a/src/GeoContacts/GeoContacts/ViewModel/LoginViewModel.cs +++ b/src/GeoContacts/GeoContacts/ViewModel/LoginViewModel.cs @@ -20,12 +20,12 @@ public class LoginViewModel : ViewModelBase public LoginViewModel() { LoginCommand = new Command(async () => await ExecuteLoginCommand()); - GuestCommand = new Command(() => + GuestCommand = new Command(() => { Settings.InGuestMode = true; Settings.LoggedInMSFT = false; App.GoHome(); - }); + }); } async Task ExecuteLoginCommand() @@ -40,6 +40,10 @@ async Task ExecuteLoginCommand() { IsBusy = true; Analytics.TrackEvent("CDA-Login"); + + // Force a logout first - just to be sure the silent login fails during this portion + AuthenticationService.Logout(); + authenticationResult = await AuthenticationService.Login(); diff --git a/src/GeoContactsFunctions/GeoContacts.Functions.csproj b/src/GeoContactsFunctions/GeoContacts.Functions.csproj index 10309c0..87e84fa 100644 --- a/src/GeoContactsFunctions/GeoContacts.Functions.csproj +++ b/src/GeoContactsFunctions/GeoContacts.Functions.csproj @@ -4,8 +4,8 @@ - - + + diff --git a/src/GeoContactsFunctions/UpdateGeolocation.cs b/src/GeoContactsFunctions/UpdateGeolocation.cs index 797419b..bbc6391 100644 --- a/src/GeoContactsFunctions/UpdateGeolocation.cs +++ b/src/GeoContactsFunctions/UpdateGeolocation.cs @@ -34,7 +34,7 @@ public static async Task RunUpdateGeolocation([HttpTrigger(WebHookType = GraphInfo cdaInfo = null; -#if DEBUG +#if RELEASE cdaInfo = new GraphInfo { UserPrincipalName = "testuser@microsoft.com" }; #else cdaInfo = await GetCDAGraphInfo(req, log); @@ -50,7 +50,7 @@ public static async Task RunUpdateGeolocation([HttpTrigger(WebHookType = if (!string.IsNullOrWhiteSpace(jsonContent)) data = JsonConvert.DeserializeObject(jsonContent); -#if DEBUG +#if RELEASE else data = new LocationUpdate { @@ -138,14 +138,15 @@ static async Task GetCDAGraphInfo(HttpRequestMessage req, TraceWriter cdaInfo = GraphInfo.FromJson(await graphResponse.Content.ReadAsStringAsync()); if (string.IsNullOrWhiteSpace(cdaInfo.UserPrincipalName)) - return null; + return new GraphInfo() { UserPrincipalName = "testuser@microsoft.com" }; log.Info(cdaInfo.ToString()); } catch (Exception ex) { + // Most likely due to using B2C log.Error("Graph HTTP call", ex); - return null; + return new GraphInfo() { UserPrincipalName = "testuser@microsoft.com" }; } return cdaInfo; @@ -180,7 +181,8 @@ public async static Task RunDeleteTimer([TimerTrigger("0 0 0 * * *")]TimerInfo m { var requestOptions = new RequestOptions { PartitionKey = new Microsoft.Azure.Documents.PartitionKey(loc.UserPrincipalName) }; await docClient.DeleteDocumentAsync(locationUri, requestOptions); - } catch (Exception ex) + } + catch (Exception ex) { log.Error($"Error while deleting location for {loc.UserPrincipalName} on {loc.InsertTime} with id {loc.Id}: {ex.Message}"); } diff --git a/src/mobile-center-post-clone.sh b/src/mobile-center-post-clone.sh index 2cc17a3..961b5f2 100644 --- a/src/mobile-center-post-clone.sh +++ b/src/mobile-center-post-clone.sh @@ -8,12 +8,15 @@ echo " - ACID: $AC_IOS" echo " - ACSECRET: $APP_SECRET" echo " - ACLogin: $AC_SHOWLOGIN" echo " - ACFace: $AC_FACE" +echo " - ACUseMSFT: $AC_USEMSFT" # Updating manifest sed -i '' "s/AC_IOS/$AC_IOS/g" $BUILD_REPOSITORY_LOCALPATH/src/GeoContacts/GeoContacts/Helpers/CommonConstants.cs sed -i '' "s/AC_FACE/$AC_FACE/g" $BUILD_REPOSITORY_LOCALPATH/src/GeoContacts/GeoContacts/Helpers/CommonConstants.cs sed -i '' "s/APP_SECRET/$APP_SECRET/g" $BUILD_REPOSITORY_LOCALPATH/src/GeoContacts/GeoContacts.iOS/Info.plist +sed -i '' "s/AC_USEMSFT_NO/$AC_USEMSFT/g" $BUILD_REPOSITORY_LOCALPATH/src/GeoContacts/GeoContacts/Helpers/CommonConstants.cs + if [ "$APPCENTER_BRANCH" == "appstore" ]; then /usr/libexec/PlistBuddy -c "Set :CFBundleIdentifier com.microsoft.advocates" "$BUILD_REPOSITORY_LOCALPATH/src/GeoContacts/GeoContacts.iOS/Info.plist" sed -i '' "s/AC_SHOWLOGIN/$AC_SHOWLOGIN/g" $BUILD_REPOSITORY_LOCALPATH/src/GeoContacts/GeoContacts/Helpers/CommonConstants.cs