diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj index 14db6ae42..109275383 100644 --- a/src/Android/Android.csproj +++ b/src/Android/Android.csproj @@ -401,15 +401,9 @@ - - - - - - @@ -419,24 +413,15 @@ - - - - - - - - - @@ -467,36 +452,21 @@ - - - - - - - - - - - - - - - @@ -931,5 +901,20 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Android/Resources/Resource.Designer.cs b/src/Android/Resources/Resource.Designer.cs index 2f4eda37a..4695cca6d 100644 --- a/src/Android/Resources/Resource.Designer.cs +++ b/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() { diff --git a/src/Android/Resources/drawable-hdpi/refresh.png b/src/Android/Resources/drawable-hdpi/refresh.png index dbc14d079..799c59138 100644 Binary files a/src/Android/Resources/drawable-hdpi/refresh.png and b/src/Android/Resources/drawable-hdpi/refresh.png differ diff --git a/src/Android/Resources/drawable-hdpi/refresh_selected.png b/src/Android/Resources/drawable-hdpi/refresh_selected.png new file mode 100644 index 000000000..e47b94593 Binary files /dev/null and b/src/Android/Resources/drawable-hdpi/refresh_selected.png differ diff --git a/src/Android/Resources/drawable-hdpi/star.png b/src/Android/Resources/drawable-hdpi/star.png deleted file mode 100644 index 2bf8f07f0..000000000 Binary files a/src/Android/Resources/drawable-hdpi/star.png and /dev/null differ diff --git a/src/Android/Resources/drawable-hdpi/star_selected.png b/src/Android/Resources/drawable-hdpi/star_selected.png deleted file mode 100644 index 8856e0828..000000000 Binary files a/src/Android/Resources/drawable-hdpi/star_selected.png and /dev/null differ diff --git a/src/Android/Resources/drawable-xhdpi/refresh.png b/src/Android/Resources/drawable-xhdpi/refresh.png index 687eabc3a..55045f2af 100644 Binary files a/src/Android/Resources/drawable-xhdpi/refresh.png and b/src/Android/Resources/drawable-xhdpi/refresh.png differ diff --git a/src/Android/Resources/drawable-xhdpi/refresh_selected.png b/src/Android/Resources/drawable-xhdpi/refresh_selected.png new file mode 100644 index 000000000..9f62258cc Binary files /dev/null and b/src/Android/Resources/drawable-xhdpi/refresh_selected.png differ diff --git a/src/Android/Resources/drawable-xhdpi/star.png b/src/Android/Resources/drawable-xhdpi/star.png deleted file mode 100644 index 546034ca0..000000000 Binary files a/src/Android/Resources/drawable-xhdpi/star.png and /dev/null differ diff --git a/src/Android/Resources/drawable-xhdpi/star_selected.png b/src/Android/Resources/drawable-xhdpi/star_selected.png deleted file mode 100644 index 34457819a..000000000 Binary files a/src/Android/Resources/drawable-xhdpi/star_selected.png and /dev/null differ diff --git a/src/Android/Resources/drawable-xxhdpi/refresh.png b/src/Android/Resources/drawable-xxhdpi/refresh.png index f492ee5c7..05af7189f 100644 Binary files a/src/Android/Resources/drawable-xxhdpi/refresh.png and b/src/Android/Resources/drawable-xxhdpi/refresh.png differ diff --git a/src/Android/Resources/drawable-xxhdpi/refresh_selected.png b/src/Android/Resources/drawable-xxhdpi/refresh_selected.png new file mode 100644 index 000000000..69ea35aa3 Binary files /dev/null and b/src/Android/Resources/drawable-xxhdpi/refresh_selected.png differ diff --git a/src/Android/Resources/drawable-xxhdpi/star.png b/src/Android/Resources/drawable-xxhdpi/star.png deleted file mode 100644 index c311d40d4..000000000 Binary files a/src/Android/Resources/drawable-xxhdpi/star.png and /dev/null differ diff --git a/src/Android/Resources/drawable-xxhdpi/star_selected.png b/src/Android/Resources/drawable-xxhdpi/star_selected.png deleted file mode 100644 index ffb60fd84..000000000 Binary files a/src/Android/Resources/drawable-xxhdpi/star_selected.png and /dev/null differ diff --git a/src/Android/Resources/drawable-xxxhdpi/refresh.png b/src/Android/Resources/drawable-xxxhdpi/refresh.png index ecad46609..578f36c07 100644 Binary files a/src/Android/Resources/drawable-xxxhdpi/refresh.png and b/src/Android/Resources/drawable-xxxhdpi/refresh.png differ diff --git a/src/Android/Resources/drawable-xxxhdpi/refresh_selected.png b/src/Android/Resources/drawable-xxxhdpi/refresh_selected.png new file mode 100644 index 000000000..47faceff2 Binary files /dev/null and b/src/Android/Resources/drawable-xxxhdpi/refresh_selected.png differ diff --git a/src/Android/Resources/drawable-xxxhdpi/star.png b/src/Android/Resources/drawable-xxxhdpi/star.png deleted file mode 100644 index 44da06e9e..000000000 Binary files a/src/Android/Resources/drawable-xxxhdpi/star.png and /dev/null differ diff --git a/src/Android/Resources/drawable-xxxhdpi/star_selected.png b/src/Android/Resources/drawable-xxxhdpi/star_selected.png deleted file mode 100644 index d24d5080a..000000000 Binary files a/src/Android/Resources/drawable-xxxhdpi/star_selected.png and /dev/null differ diff --git a/src/Android/Resources/drawable/refresh.png b/src/Android/Resources/drawable/refresh.png index 8a5833794..ad666bce0 100644 Binary files a/src/Android/Resources/drawable/refresh.png and b/src/Android/Resources/drawable/refresh.png differ diff --git a/src/Android/Resources/drawable/refresh_selected.png b/src/Android/Resources/drawable/refresh_selected.png new file mode 100644 index 000000000..b70611d15 Binary files /dev/null and b/src/Android/Resources/drawable/refresh_selected.png differ diff --git a/src/Android/Resources/drawable/star.png b/src/Android/Resources/drawable/star.png deleted file mode 100644 index 906b0abd4..000000000 Binary files a/src/Android/Resources/drawable/star.png and /dev/null differ diff --git a/src/Android/Resources/drawable/star_selected.png b/src/Android/Resources/drawable/star_selected.png deleted file mode 100644 index f1f6e7f38..000000000 Binary files a/src/Android/Resources/drawable/star_selected.png and /dev/null differ diff --git a/src/App/Pages/MainPage.cs b/src/App/Pages/MainPage.cs index afada596e..1d914f8e1 100644 --- a/src/App/Pages/MainPage.cs +++ b/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); diff --git a/src/App/Pages/Tools/ToolsPage.cs b/src/App/Pages/Tools/ToolsPage.cs index f73046593..441449237 100644 --- a/src/App/Pages/Tools/ToolsPage.cs +++ b/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"); diff --git a/src/App/Pages/Tools/ToolsPasswordGeneratorPage.cs b/src/App/Pages/Tools/ToolsPasswordGeneratorPage.cs index 24772f48f..bb384481a 100644 --- a/src/App/Pages/Tools/ToolsPasswordGeneratorPage.cs +++ b/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; } diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs index 17e1cf992..1d3d220d2 100644 --- a/src/App/Resources/AppResources.Designer.cs +++ b/src/App/Resources/AppResources.Designer.cs @@ -2310,15 +2310,6 @@ namespace Bit.App.Resources { } } - /// - /// Looks up a localized string similar to Automatically generate strong, unique passwords for your logins.. - /// - public static string PasswordGeneratorDescription { - get { - return ResourceManager.GetString("PasswordGeneratorDescription", resourceCulture); - } - } - /// /// Looks up a localized string similar to Password Hint. /// diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx index d16328959..160f5897d 100644 --- a/src/App/Resources/AppResources.resx +++ b/src/App/Resources/AppResources.resx @@ -630,9 +630,6 @@ Password Generator - - Automatically generate strong, unique passwords for your logins. - Password Hint diff --git a/src/UWP.Images/UWP.Images.projitems b/src/UWP.Images/UWP.Images.projitems index bcf657558..b7499790a 100644 --- a/src/UWP.Images/UWP.Images.projitems +++ b/src/UWP.Images/UWP.Images.projitems @@ -44,12 +44,11 @@ + - - diff --git a/src/UWP.Images/refresh.png b/src/UWP.Images/refresh.png index ecad46609..578f36c07 100644 Binary files a/src/UWP.Images/refresh.png and b/src/UWP.Images/refresh.png differ diff --git a/src/UWP.Images/refresh_selected.png b/src/UWP.Images/refresh_selected.png new file mode 100644 index 000000000..47faceff2 Binary files /dev/null and b/src/UWP.Images/refresh_selected.png differ diff --git a/src/UWP.Images/star.png b/src/UWP.Images/star.png deleted file mode 100644 index 44da06e9e..000000000 Binary files a/src/UWP.Images/star.png and /dev/null differ diff --git a/src/UWP.Images/star_selected.png b/src/UWP.Images/star_selected.png deleted file mode 100644 index d24d5080a..000000000 Binary files a/src/UWP.Images/star_selected.png and /dev/null differ diff --git a/src/iOS/Resources/refresh.png b/src/iOS/Resources/refresh.png index 8a5833794..14c4d0ec5 100644 Binary files a/src/iOS/Resources/refresh.png and b/src/iOS/Resources/refresh.png differ diff --git a/src/iOS/Resources/refresh@2x.png b/src/iOS/Resources/refresh@2x.png index 687eabc3a..0e93d70cc 100644 Binary files a/src/iOS/Resources/refresh@2x.png and b/src/iOS/Resources/refresh@2x.png differ diff --git a/src/iOS/Resources/refresh@3x.png b/src/iOS/Resources/refresh@3x.png index f492ee5c7..5650602b6 100644 Binary files a/src/iOS/Resources/refresh@3x.png and b/src/iOS/Resources/refresh@3x.png differ diff --git a/src/iOS/Resources/star.png b/src/iOS/Resources/star.png deleted file mode 100644 index 8cbc47a86..000000000 Binary files a/src/iOS/Resources/star.png and /dev/null differ diff --git a/src/iOS/Resources/star@2x.png b/src/iOS/Resources/star@2x.png deleted file mode 100644 index f72d278b7..000000000 Binary files a/src/iOS/Resources/star@2x.png and /dev/null differ diff --git a/src/iOS/Resources/star@3x.png b/src/iOS/Resources/star@3x.png deleted file mode 100644 index a979223f1..000000000 Binary files a/src/iOS/Resources/star@3x.png and /dev/null differ diff --git a/src/iOS/iOS.csproj b/src/iOS/iOS.csproj index 06a0e5c05..f3e61ad9f 100644 --- a/src/iOS/iOS.csproj +++ b/src/iOS/iOS.csproj @@ -286,15 +286,6 @@ - - - - - - - - -