extension tutorial images

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),
+                Padding = new Thickness(20, 20, 20, 30),
-                Children = { notStartedLabel, notStartedSublabel, notStartedImage, notStartedButton }
+                Children = { notStartedLabel, notStartedSublabel, notStartedImage, notStartedButton },
+                VerticalOptions = LayoutOptions.FillAndExpand
             };
 
             notStartedStackLayout.SetBinding<AppExtensionPageModel>(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),
+                Padding = new Thickness(20, 20, 20, 30),
-                Children = { notActivatedLabel, notActivatedSublabel, notActivatedImage, notActivatedButton }
+                Children = { notActivatedLabel, notActivatedSublabel, notActivatedImage, notActivatedButton },
+                VerticalOptions = LayoutOptions.FillAndExpand
             };
 
             notActivatedStackLayout.SetBinding<AppExtensionPageModel>(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;
         }
 

src/iOS/iOS.csproj

@@ -356,9 +356,6 @@
   <ItemGroup>
     <BundleResource Include="Resources\fa_folder_open%403x.png" />
   </ItemGroup>
-  <ItemGroup>
-    <BundleResource Include="Resources\bg.png" />
-  </ItemGroup>
   <ItemGroup>
     <BundleResource Include="Resources\logo.png" />
   </ItemGroup>
@@ -368,12 +365,6 @@
   <ItemGroup>
     <BundleResource Include="Resources\logo%403x.png" />
   </ItemGroup>
-  <ItemGroup>
-    <BundleResource Include="Resources\bg%402x.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <BundleResource Include="Resources\bg%403x.png" />
-  </ItemGroup>
   <ItemGroup>
     <BundleResource Include="Resources\star.png" />
   </ItemGroup>
@@ -518,6 +509,33 @@
   <ItemGroup>
     <BundleResource Include="Resources\tools%403x.png" />
   </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\ext-more.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\ext-more%402x.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\ext-more%403x.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\ext-act.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\ext-act%403x.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\ext-act%402x.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\ext-use.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\ext-use%402x.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\ext-use%403x.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <Import Project="..\..\packages\Xamarin.Forms.2.3.0.107\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.0.107\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">