move password generator to main nav

src/Android/Android.csproj

@@ -401,15 +401,9 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\fa_lock_selected.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\star_selected.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-hdpi\fa_lock_selected.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\star_selected.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-hdpi\cogs_selected.png" />
   </ItemGroup>
@@ -419,24 +413,15 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xhdpi\fa_lock_selected.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\star_selected.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xxxhdpi\cogs_selected.png" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xxxhdpi\fa_lock_selected.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\star_selected.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xxhdpi\fa_lock_selected.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\star_selected.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xxhdpi\cogs_selected.png" />
   </ItemGroup>
@@ -467,36 +452,21 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xxxhdpi\cogs.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\star.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\fa_lock.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\star.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-hdpi\fa_lock.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\star.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xhdpi\fa_lock.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\star.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xxhdpi\fa_lock.png" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xxxhdpi\fa_lock.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\star.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xxxhdpi\tools.png" />
   </ItemGroup>
@@ -931,5 +901,20 @@
     <PackageReference Include="Portable.BouncyCastle" Version="1.8.1.3" />
     <PackageReference Include="Plugin.CurrentActivity" Version="1.0.1" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\refresh_selected.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-hdpi\refresh_selected.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\refresh_selected.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xxhdpi\refresh_selected.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xxxhdpi\refresh_selected.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>

src/Android/Resources/Resource.Designer.cs

@@ -2812,8 +2812,8 @@ namespace Bit.Android
 			// aapt resource value: 0x7f0200f3
 			public const int notification_sm = 2130837747;
 			
-			// aapt resource value: 0x7f020106
-			public const int notification_template_icon_bg = 2130837766;
+			// aapt resource value: 0x7f020105
+			public const int notification_template_icon_bg = 2130837765;
 			
 			// aapt resource value: 0x7f0200f4
 			public const int paperclip = 2130837748;
@@ -2825,49 +2825,46 @@ namespace Bit.Android
 			public const int refresh = 2130837750;
 			
 			// aapt resource value: 0x7f0200f7
-			public const int roundedbg = 2130837751;
+			public const int refresh_selected = 2130837751;
 			
 			// aapt resource value: 0x7f0200f8
-			public const int roundedbgdark = 2130837752;
+			public const int roundedbg = 2130837752;
 			
 			// aapt resource value: 0x7f0200f9
-			public const int search = 2130837753;
+			public const int roundedbgdark = 2130837753;
 			
 			// aapt resource value: 0x7f0200fa
-			public const int share = 2130837754;
+			public const int search = 2130837754;
 			
 			// aapt resource value: 0x7f0200fb
-			public const int share_tools = 2130837755;
+			public const int share = 2130837755;
 			
 			// aapt resource value: 0x7f0200fc
-			public const int shield = 2130837756;
+			public const int share_tools = 2130837756;
 			
 			// aapt resource value: 0x7f0200fd
-			public const int splash_screen = 2130837757;
+			public const int shield = 2130837757;
 			
 			// aapt resource value: 0x7f0200fe
-			public const int star = 2130837758;
+			public const int splash_screen = 2130837758;
 			
 			// aapt resource value: 0x7f0200ff
-			public const int star_selected = 2130837759;
+			public const int tools = 2130837759;
 			
 			// aapt resource value: 0x7f020100
-			public const int tools = 2130837760;
+			public const int tools_selected = 2130837760;
 			
 			// aapt resource value: 0x7f020101
-			public const int tools_selected = 2130837761;
+			public const int trash = 2130837761;
 			
 			// aapt resource value: 0x7f020102
-			public const int trash = 2130837762;
+			public const int upload = 2130837762;
 			
 			// aapt resource value: 0x7f020103
-			public const int upload = 2130837763;
+			public const int user = 2130837763;
 			
 			// aapt resource value: 0x7f020104
-			public const int user = 2130837764;
-			
-			// aapt resource value: 0x7f020105
-			public const int yubikey = 2130837765;
+			public const int yubikey = 2130837764;
 			
 			static Drawable()
 			{

src/App/Pages/MainPage.cs

@@ -12,15 +12,18 @@ namespace Bit.App.Pages
         {
             TintColor = Color.FromHex("3c8dbc");
 
-            var settingsNavigation = new ExtendedNavigationPage(new SettingsPage());
             var vaultNavigation = new ExtendedNavigationPage(new VaultListGroupingsPage());
+            var passwordGeneratorNavigation = new ExtendedNavigationPage(new ToolsPasswordGeneratorPage());
             var toolsNavigation = new ExtendedNavigationPage(new ToolsPage());
+            var settingsNavigation = new ExtendedNavigationPage(new SettingsPage());
 
             vaultNavigation.Icon = "fa_lock.png";
+            passwordGeneratorNavigation.Icon = "refresh.png";
             toolsNavigation.Icon = "tools.png";
             settingsNavigation.Icon = "cogs.png";
 
             Children.Add(vaultNavigation);
+            Children.Add(passwordGeneratorNavigation);
             Children.Add(toolsNavigation);
             Children.Add(settingsNavigation);
 

src/App/Pages/Tools/ToolsPage.cs

@@ -26,7 +26,6 @@ namespace Bit.App.Pages
             Init();
         }
 
-        public ToolsViewCell GeneratorCell { get; set; }
         public ToolsViewCell WebCell { get; set; }
         public ToolsViewCell ShareCell { get; set; }
         public ToolsViewCell ImportCell { get; set; }
@@ -35,13 +34,11 @@ namespace Bit.App.Pages
 
         public void Init()
         {
-            GeneratorCell = new ToolsViewCell(AppResources.PasswordGenerator, AppResources.PasswordGeneratorDescription,
-                "refresh.png");
             WebCell = new ToolsViewCell(AppResources.WebVault, AppResources.WebVaultDescription, "globe.png");
             ShareCell = new ToolsViewCell(AppResources.ShareVault, AppResources.ShareVaultDescription, "share_tools.png");
             ImportCell = new ToolsViewCell(AppResources.ImportItems, AppResources.ImportItemsDescription, "cloudup.png");
 
-            var section = new TableSection(Helpers.GetEmptyTableSectionTitle()) { GeneratorCell };
+            var section = new TableSection(Helpers.GetEmptyTableSectionTitle());
 
             if(Device.RuntimePlatform == Device.iOS)
             {
@@ -86,7 +83,6 @@ namespace Bit.App.Pages
         protected override void OnAppearing()
         {
             base.OnAppearing();
-            GeneratorCell.Tapped += GeneratorCell_Tapped;
             WebCell.Tapped += WebCell_Tapped;
             ShareCell.Tapped += ShareCell_Tapped;
             ImportCell.Tapped += ImportCell_Tapped;
@@ -103,7 +99,6 @@ namespace Bit.App.Pages
         protected override void OnDisappearing()
         {
             base.OnDisappearing();
-            GeneratorCell.Tapped -= GeneratorCell_Tapped;
             WebCell.Tapped -= WebCell_Tapped;
             ShareCell.Tapped -= ShareCell_Tapped;
             ImportCell.Tapped -= ImportCell_Tapped;
@@ -135,11 +130,6 @@ namespace Bit.App.Pages
             Navigation.PushModalAsync(new ExtendedNavigationPage(new ToolsExtensionPage()));
         }
 
-        private async void GeneratorCell_Tapped(object sender, EventArgs e)
-        {
-            await Navigation.PushForDeviceAsync(new ToolsPasswordGeneratorPage());
-        }
-
         private void WebCell_Tapped(object sender, EventArgs e)
         {
             _googleAnalyticsService.TrackAppEvent("OpenedTool", "Web");

src/App/Pages/Tools/ToolsPasswordGeneratorPage.cs

@@ -130,7 +130,7 @@ namespace Bit.App.Pages
                 ToolbarItems.Add(selectToolBarItem);
             }
 
-            Title = AppResources.GeneratePassword;
+            Title = AppResources.PasswordGenerator;
             Content = scrollView;
             BindingContext = Model;
         }

src/App/Resources/AppResources.Designer.cs

@@ -2310,15 +2310,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Automatically generate strong, unique passwords for your logins..
-        /// </summary>
-        public static string PasswordGeneratorDescription {
-            get {
-                return ResourceManager.GetString("PasswordGeneratorDescription", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Password Hint.
         /// </summary>

src/App/Resources/AppResources.resx

@@ -630,9 +630,6 @@
   <data name="PasswordGenerator" xml:space="preserve">
     <value>Password Generator</value>
   </data>
-  <data name="PasswordGeneratorDescription" xml:space="preserve">
-    <value>Automatically generate strong, unique passwords for your logins.</value>
-  </data>
   <data name="PasswordHint" xml:space="preserve">
     <value>Password Hint</value>
   </data>

src/UWP.Images/UWP.Images.projitems

@@ -44,12 +44,11 @@
     <Content Include="$(MSBuildThisFileDirectory)photo.png" />
     <Content Include="$(MSBuildThisFileDirectory)plus.png" />
     <Content Include="$(MSBuildThisFileDirectory)refresh.png" />
+    <Content Include="$(MSBuildThisFileDirectory)refresh_selected.png" />
     <Content Include="$(MSBuildThisFileDirectory)search.png" />
     <Content Include="$(MSBuildThisFileDirectory)share.png" />
     <Content Include="$(MSBuildThisFileDirectory)share_tools.png" />
     <Content Include="$(MSBuildThisFileDirectory)smile.png" />
-    <Content Include="$(MSBuildThisFileDirectory)star.png" />
-    <Content Include="$(MSBuildThisFileDirectory)star_selected.png" />
     <Content Include="$(MSBuildThisFileDirectory)tools.png" />
     <Content Include="$(MSBuildThisFileDirectory)tools_selected.png" />
     <Content Include="$(MSBuildThisFileDirectory)trash.png" />

src/iOS/iOS.csproj

@@ -286,15 +286,6 @@
   <ItemGroup>
     <BundleResource Include="Resources\logo%403x.png" />
   </ItemGroup>
-  <ItemGroup>
-    <BundleResource Include="Resources\star.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <BundleResource Include="Resources\star%402x.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <BundleResource Include="Resources\star%403x.png" />
-  </ItemGroup>
   <ItemGroup>
     <BundleResource Include="Resources\plus.png" />
   </ItemGroup>