mirror of
https://github.com/bitwarden/android.git
synced 2024-12-23 01:20:31 +03:00
Tools share cell
This commit is contained in:
parent
0684dfe869
commit
15a9f80430
14 changed files with 71 additions and 9 deletions
src
Android
Android.csproj
Resources
App
iOS
|
@ -840,6 +840,21 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<AndroidResource Include="Resources\drawable-xxxhdpi\share.png" />
|
<AndroidResource Include="Resources\drawable-xxxhdpi\share.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<AndroidResource Include="Resources\drawable\share_tools.png" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<AndroidResource Include="Resources\drawable-hdpi\share_tools.png" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<AndroidResource Include="Resources\drawable-xhdpi\share_tools.png" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<AndroidResource Include="Resources\drawable-xxhdpi\share_tools.png" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<AndroidResource Include="Resources\drawable-xxxhdpi\share_tools.png" />
|
||||||
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
|
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
|
||||||
<Import Project="..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
|
<Import Project="..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
|
||||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||||
|
|
21
src/Android/Resources/Resource.Designer.cs
generated
21
src/Android/Resources/Resource.Designer.cs
generated
|
@ -2742,8 +2742,8 @@ namespace Bit.Android
|
||||||
// aapt resource value: 0x7f0200e4
|
// aapt resource value: 0x7f0200e4
|
||||||
public const int notification_sm = 2130837732;
|
public const int notification_sm = 2130837732;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0200f2
|
// aapt resource value: 0x7f0200f3
|
||||||
public const int notification_template_icon_bg = 2130837746;
|
public const int notification_template_icon_bg = 2130837747;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0200e5
|
// aapt resource value: 0x7f0200e5
|
||||||
public const int plus = 2130837733;
|
public const int plus = 2130837733;
|
||||||
|
@ -2764,25 +2764,28 @@ namespace Bit.Android
|
||||||
public const int share = 2130837738;
|
public const int share = 2130837738;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0200eb
|
// aapt resource value: 0x7f0200eb
|
||||||
public const int splash_screen = 2130837739;
|
public const int share_tools = 2130837739;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0200ec
|
// aapt resource value: 0x7f0200ec
|
||||||
public const int star = 2130837740;
|
public const int splash_screen = 2130837740;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0200ed
|
// aapt resource value: 0x7f0200ed
|
||||||
public const int star_selected = 2130837741;
|
public const int star = 2130837741;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0200ee
|
// aapt resource value: 0x7f0200ee
|
||||||
public const int tools = 2130837742;
|
public const int star_selected = 2130837742;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0200ef
|
// aapt resource value: 0x7f0200ef
|
||||||
public const int tools_selected = 2130837743;
|
public const int tools = 2130837743;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0200f0
|
// aapt resource value: 0x7f0200f0
|
||||||
public const int upload = 2130837744;
|
public const int tools_selected = 2130837744;
|
||||||
|
|
||||||
// aapt resource value: 0x7f0200f1
|
// aapt resource value: 0x7f0200f1
|
||||||
public const int user = 2130837745;
|
public const int upload = 2130837745;
|
||||||
|
|
||||||
|
// aapt resource value: 0x7f0200f2
|
||||||
|
public const int user = 2130837746;
|
||||||
|
|
||||||
static Drawable()
|
static Drawable()
|
||||||
{
|
{
|
||||||
|
|
BIN
src/Android/Resources/drawable-hdpi/share_tools.png
Normal file
BIN
src/Android/Resources/drawable-hdpi/share_tools.png
Normal file
Binary file not shown.
After (image error) Size: 1,009 B |
BIN
src/Android/Resources/drawable-xhdpi/share_tools.png
Normal file
BIN
src/Android/Resources/drawable-xhdpi/share_tools.png
Normal file
Binary file not shown.
After (image error) Size: 1.3 KiB |
BIN
src/Android/Resources/drawable-xxhdpi/share_tools.png
Normal file
BIN
src/Android/Resources/drawable-xxhdpi/share_tools.png
Normal file
Binary file not shown.
After (image error) Size: 1.5 KiB |
BIN
src/Android/Resources/drawable-xxxhdpi/share_tools.png
Normal file
BIN
src/Android/Resources/drawable-xxxhdpi/share_tools.png
Normal file
Binary file not shown.
After (image error) Size: 2.3 KiB |
BIN
src/Android/Resources/drawable/share_tools.png
Normal file
BIN
src/Android/Resources/drawable/share_tools.png
Normal file
Binary file not shown.
After (image error) Size: 817 B |
|
@ -25,6 +25,7 @@ namespace Bit.App.Pages
|
||||||
|
|
||||||
public ToolsViewCell GeneratorCell { get; set; }
|
public ToolsViewCell GeneratorCell { get; set; }
|
||||||
public ToolsViewCell WebCell { get; set; }
|
public ToolsViewCell WebCell { get; set; }
|
||||||
|
public ToolsViewCell ShareCell { get; set; }
|
||||||
public ToolsViewCell ImportCell { get; set; }
|
public ToolsViewCell ImportCell { get; set; }
|
||||||
public ToolsViewCell ExtensionCell { get; set; }
|
public ToolsViewCell ExtensionCell { get; set; }
|
||||||
public ToolsViewCell AutofillCell { get; set; }
|
public ToolsViewCell AutofillCell { get; set; }
|
||||||
|
@ -34,6 +35,7 @@ namespace Bit.App.Pages
|
||||||
GeneratorCell = new ToolsViewCell(AppResources.PasswordGenerator, AppResources.PasswordGeneratorDescription,
|
GeneratorCell = new ToolsViewCell(AppResources.PasswordGenerator, AppResources.PasswordGeneratorDescription,
|
||||||
"refresh");
|
"refresh");
|
||||||
WebCell = new ToolsViewCell(AppResources.WebVault, AppResources.WebVaultDescription, "globe");
|
WebCell = new ToolsViewCell(AppResources.WebVault, AppResources.WebVaultDescription, "globe");
|
||||||
|
ShareCell = new ToolsViewCell(AppResources.ShareVault, AppResources.ShareVaultDescription, "share_tools");
|
||||||
ImportCell = new ToolsViewCell(AppResources.ImportLogins, AppResources.ImportLoginsDescription, "cloudup");
|
ImportCell = new ToolsViewCell(AppResources.ImportLogins, AppResources.ImportLoginsDescription, "cloudup");
|
||||||
|
|
||||||
var section = new TableSection(" ") { GeneratorCell };
|
var section = new TableSection(" ") { GeneratorCell };
|
||||||
|
@ -53,6 +55,7 @@ namespace Bit.App.Pages
|
||||||
}
|
}
|
||||||
|
|
||||||
section.Add(WebCell);
|
section.Add(WebCell);
|
||||||
|
section.Add(ShareCell);
|
||||||
section.Add(ImportCell);
|
section.Add(ImportCell);
|
||||||
|
|
||||||
var table = new ExtendedTableView
|
var table = new ExtendedTableView
|
||||||
|
@ -81,6 +84,7 @@ namespace Bit.App.Pages
|
||||||
base.OnAppearing();
|
base.OnAppearing();
|
||||||
GeneratorCell.Tapped += GeneratorCell_Tapped;
|
GeneratorCell.Tapped += GeneratorCell_Tapped;
|
||||||
WebCell.Tapped += WebCell_Tapped;
|
WebCell.Tapped += WebCell_Tapped;
|
||||||
|
ShareCell.Tapped += ShareCell_Tapped;
|
||||||
ImportCell.Tapped += ImportCell_Tapped;
|
ImportCell.Tapped += ImportCell_Tapped;
|
||||||
if(ExtensionCell != null)
|
if(ExtensionCell != null)
|
||||||
{
|
{
|
||||||
|
@ -97,6 +101,7 @@ namespace Bit.App.Pages
|
||||||
base.OnDisappearing();
|
base.OnDisappearing();
|
||||||
GeneratorCell.Tapped -= GeneratorCell_Tapped;
|
GeneratorCell.Tapped -= GeneratorCell_Tapped;
|
||||||
WebCell.Tapped -= WebCell_Tapped;
|
WebCell.Tapped -= WebCell_Tapped;
|
||||||
|
ShareCell.Tapped -= ShareCell_Tapped;
|
||||||
ImportCell.Tapped -= ImportCell_Tapped;
|
ImportCell.Tapped -= ImportCell_Tapped;
|
||||||
if(ExtensionCell != null)
|
if(ExtensionCell != null)
|
||||||
{
|
{
|
||||||
|
@ -130,6 +135,12 @@ namespace Bit.App.Pages
|
||||||
Device.OpenUri(new Uri("https://vault.bitwarden.com"));
|
Device.OpenUri(new Uri("https://vault.bitwarden.com"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void ShareCell_Tapped(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
_googleAnalyticsService.TrackAppEvent("OpenedTool", "Share");
|
||||||
|
Device.OpenUri(new Uri("https://vault.bitwarden.com/#/?org=free"));
|
||||||
|
}
|
||||||
|
|
||||||
private async void ImportCell_Tapped(object sender, EventArgs e)
|
private async void ImportCell_Tapped(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
if(!await _userDialogs.ConfirmAsync(AppResources.ImportLoginsConfirmation, null, AppResources.Yes,
|
if(!await _userDialogs.ConfirmAsync(AppResources.ImportLoginsConfirmation, null, AppResources.Yes,
|
||||||
|
|
18
src/App/Resources/AppResources.Designer.cs
generated
18
src/App/Resources/AppResources.Designer.cs
generated
|
@ -1663,6 +1663,24 @@ namespace Bit.App.Resources {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized string similar to Share Your Vault.
|
||||||
|
/// </summary>
|
||||||
|
public static string ShareVault {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("ShareVault", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized string similar to Create an organization to securely share your logins with other users..
|
||||||
|
/// </summary>
|
||||||
|
public static string ShareVaultDescription {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("ShareVaultDescription", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized string similar to Show.
|
/// Looks up a localized string similar to Show.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -819,4 +819,10 @@
|
||||||
<data name="BitwardenAutofillServiceSearch" xml:space="preserve">
|
<data name="BitwardenAutofillServiceSearch" xml:space="preserve">
|
||||||
<value>You are searching for an auto-fill login for "{0}".</value>
|
<value>You are searching for an auto-fill login for "{0}".</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="ShareVault" xml:space="preserve">
|
||||||
|
<value>Share Your Vault</value>
|
||||||
|
</data>
|
||||||
|
<data name="ShareVaultDescription" xml:space="preserve">
|
||||||
|
<value>Create an organization to securely share your logins with other users.</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
BIN
src/iOS/Resources/share_tools.png
Normal file
BIN
src/iOS/Resources/share_tools.png
Normal file
Binary file not shown.
After (image error) Size: 817 B |
BIN
src/iOS/Resources/share_tools@2x.png
Normal file
BIN
src/iOS/Resources/share_tools@2x.png
Normal file
Binary file not shown.
After (image error) Size: 1.3 KiB |
BIN
src/iOS/Resources/share_tools@3x.png
Normal file
BIN
src/iOS/Resources/share_tools@3x.png
Normal file
Binary file not shown.
After (image error) Size: 1.5 KiB |
|
@ -702,6 +702,15 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<BundleResource Include="Resources\share.png" />
|
<BundleResource Include="Resources\share.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<BundleResource Include="Resources\share_tools.png" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<BundleResource Include="Resources\share_tools%402x.png" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<BundleResource Include="Resources\share_tools%403x.png" />
|
||||||
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
|
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
|
||||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|
Loading…
Reference in a new issue