diff --git a/src/App/Pages/Tools/ToolsExtensionPage.cs b/src/App/Pages/Tools/ToolsExtensionPage.cs index b58ece8fa..e8792b283 100644 --- a/src/App/Pages/Tools/ToolsExtensionPage.cs +++ b/src/App/Pages/Tools/ToolsExtensionPage.cs @@ -50,16 +50,17 @@ namespace Bit.App.Pages var notStartedImage = new Image { - Source = "", + Source = "ext-more", VerticalOptions = LayoutOptions.CenterAndExpand, - HorizontalOptions = LayoutOptions.Center + HorizontalOptions = LayoutOptions.Center, + Margin = new Thickness(0, -10, 0, 0) }; var notStartedButton = new Button { Text = "Enable App Extension", Command = new Command(() => ShowExtension()), - VerticalOptions = LayoutOptions.EndAndExpand, + VerticalOptions = LayoutOptions.End, HorizontalOptions = LayoutOptions.Fill, Style = (Style)Application.Current.Resources["btn-primary"] }; @@ -68,8 +69,9 @@ namespace Bit.App.Pages { Orientation = StackOrientation.Vertical, Spacing = 20, - Padding = new Thickness(30, 40), - Children = { notStartedLabel, notStartedSublabel, notStartedImage, notStartedButton } + Padding = new Thickness(20, 20, 20, 30), + Children = { notStartedLabel, notStartedSublabel, notStartedImage, notStartedButton }, + VerticalOptions = LayoutOptions.FillAndExpand }; notStartedStackLayout.SetBinding(IsVisibleProperty, m => m.NotStarted); @@ -97,16 +99,17 @@ namespace Bit.App.Pages var notActivatedImage = new Image { - Source = "", + Source = "ext-act", VerticalOptions = LayoutOptions.CenterAndExpand, - HorizontalOptions = LayoutOptions.Center + HorizontalOptions = LayoutOptions.Center, + Margin = new Thickness(0, -10, 0, 0) }; var notActivatedButton = new Button { Text = "Enable App Extension", Command = new Command(() => ShowExtension()), - VerticalOptions = LayoutOptions.EndAndExpand, + VerticalOptions = LayoutOptions.End, HorizontalOptions = LayoutOptions.Fill, Style = (Style)Application.Current.Resources["btn-primary"] }; @@ -115,8 +118,9 @@ namespace Bit.App.Pages { Orientation = StackOrientation.Vertical, Spacing = 20, - Padding = new Thickness(30, 40), - Children = { notActivatedLabel, notActivatedSublabel, notActivatedImage, notActivatedButton } + Padding = new Thickness(20, 20, 20, 30), + Children = { notActivatedLabel, notActivatedSublabel, notActivatedImage, notActivatedButton }, + VerticalOptions = LayoutOptions.FillAndExpand }; notActivatedStackLayout.SetBinding(IsVisibleProperty, m => m.StartedAndNotActivated); @@ -145,16 +149,17 @@ namespace Bit.App.Pages var activatedImage = new Image { - Source = "", + Source = "ext-use", VerticalOptions = LayoutOptions.CenterAndExpand, - HorizontalOptions = LayoutOptions.Center + HorizontalOptions = LayoutOptions.Center, + Margin = new Thickness(0, -10, 0, 0) }; var activatedButton = new Button { Text = "See Supported Apps", Command = new Command(() => Device.OpenUri(new Uri("https://bitwarden.com"))), - VerticalOptions = LayoutOptions.EndAndExpand, + VerticalOptions = LayoutOptions.End, HorizontalOptions = LayoutOptions.Fill, Style = (Style)Application.Current.Resources["btn-primary"] }; @@ -172,7 +177,8 @@ namespace Bit.App.Pages { Orientation = StackOrientation.Vertical, Spacing = 10, - Padding = new Thickness(30, 40), + Padding = new Thickness(20, 20, 20, 30), + VerticalOptions = LayoutOptions.FillAndExpand, Children = { activatedLabel, activatedSublabel, activatedImage, activatedButton, activatedButtonReenable } }; @@ -180,7 +186,8 @@ namespace Bit.App.Pages var stackLayout = new StackLayout { - Children = { notStartedStackLayout, notActivatedStackLayout, activatedStackLayout } + Children = { notStartedStackLayout, notActivatedStackLayout, activatedStackLayout }, + VerticalOptions = LayoutOptions.FillAndExpand }; if(Device.OS == TargetPlatform.iOS) @@ -189,7 +196,7 @@ namespace Bit.App.Pages } Title = "App Extension"; - Content = stackLayout; + Content = new ScrollView { Content = stackLayout }; BindingContext = Model; } diff --git a/src/iOS/Resources/bg.png b/src/iOS/Resources/bg.png deleted file mode 100644 index da898fc3c..000000000 Binary files a/src/iOS/Resources/bg.png and /dev/null differ diff --git a/src/iOS/Resources/bg@2x.png b/src/iOS/Resources/bg@2x.png deleted file mode 100644 index 2050e8aa0..000000000 Binary files a/src/iOS/Resources/bg@2x.png and /dev/null differ diff --git a/src/iOS/Resources/bg@3x.png b/src/iOS/Resources/bg@3x.png deleted file mode 100644 index 462f781a8..000000000 Binary files a/src/iOS/Resources/bg@3x.png and /dev/null differ diff --git a/src/iOS/Resources/ext-act.png b/src/iOS/Resources/ext-act.png new file mode 100644 index 000000000..be97e5b28 Binary files /dev/null and b/src/iOS/Resources/ext-act.png differ diff --git a/src/iOS/Resources/ext-act@2x.png b/src/iOS/Resources/ext-act@2x.png new file mode 100644 index 000000000..d8f294e54 Binary files /dev/null and b/src/iOS/Resources/ext-act@2x.png differ diff --git a/src/iOS/Resources/ext-act@3x.png b/src/iOS/Resources/ext-act@3x.png new file mode 100644 index 000000000..bd9a411a1 Binary files /dev/null and b/src/iOS/Resources/ext-act@3x.png differ diff --git a/src/iOS/Resources/ext-more.png b/src/iOS/Resources/ext-more.png new file mode 100644 index 000000000..64763ea3d Binary files /dev/null and b/src/iOS/Resources/ext-more.png differ diff --git a/src/iOS/Resources/ext-more@2x.png b/src/iOS/Resources/ext-more@2x.png new file mode 100644 index 000000000..67c326055 Binary files /dev/null and b/src/iOS/Resources/ext-more@2x.png differ diff --git a/src/iOS/Resources/ext-more@3x.png b/src/iOS/Resources/ext-more@3x.png new file mode 100644 index 000000000..2982b9cd0 Binary files /dev/null and b/src/iOS/Resources/ext-more@3x.png differ diff --git a/src/iOS/Resources/ext-use.png b/src/iOS/Resources/ext-use.png new file mode 100644 index 000000000..4b0a90f72 Binary files /dev/null and b/src/iOS/Resources/ext-use.png differ diff --git a/src/iOS/Resources/ext-use@2x.png b/src/iOS/Resources/ext-use@2x.png new file mode 100644 index 000000000..93ee7f492 Binary files /dev/null and b/src/iOS/Resources/ext-use@2x.png differ diff --git a/src/iOS/Resources/ext-use@3x.png b/src/iOS/Resources/ext-use@3x.png new file mode 100644 index 000000000..35869465e Binary files /dev/null and b/src/iOS/Resources/ext-use@3x.png differ diff --git a/src/iOS/Resources/more.png b/src/iOS/Resources/more.png index f7968b5da..6906eac17 100644 Binary files a/src/iOS/Resources/more.png and b/src/iOS/Resources/more.png differ diff --git a/src/iOS/Resources/more@3x.png b/src/iOS/Resources/more@3x.png index 6906eac17..f7968b5da 100644 Binary files a/src/iOS/Resources/more@3x.png and b/src/iOS/Resources/more@3x.png differ diff --git a/src/iOS/iOS.csproj b/src/iOS/iOS.csproj index 1130fe9fa..6c9a3f3a9 100644 --- a/src/iOS/iOS.csproj +++ b/src/iOS/iOS.csproj @@ -356,9 +356,6 @@ - - - @@ -368,12 +365,6 @@ - - - - - - @@ -518,6 +509,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +