cog alt buttons

This commit is contained in:
Kyle Spearrin 2018-03-14 18:26:07 -04:00
parent fcb072c37d
commit e08a0a0938
12 changed files with 301 additions and 295 deletions

View File

@ -921,5 +921,20 @@
<ItemGroup> <ItemGroup>
<AndroidResource Include="Resources\drawable-xxxhdpi\refresh_alt.png" /> <AndroidResource Include="Resources\drawable-xxxhdpi\refresh_alt.png" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\cog_alt.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-hdpi\cog_alt.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xhdpi\cog_alt.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxhdpi\cog_alt.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxxhdpi\cog_alt.png" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
</Project> </Project>

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 738 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1005 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 590 B

View File

@ -259,20 +259,20 @@ namespace Bit.App.Utilities
case FieldType.Hidden: case FieldType.Hidden:
var hidden = type == FieldType.Hidden; var hidden = type == FieldType.Hidden;
var textFieldCell = new FormEntryCell(label, isPassword: hidden, var textFieldCell = new FormEntryCell(label, isPassword: hidden,
button1: hidden ? "eye.png" : "cog.png", button2: hidden ? "cog.png" : null); button1: hidden ? "eye.png" : "cog_alt.png", button2: hidden ? "cog_alt.png" : null);
textFieldCell.Entry.Text = value; textFieldCell.Entry.Text = value;
textFieldCell.Entry.DisableAutocapitalize = true; textFieldCell.Entry.DisableAutocapitalize = true;
textFieldCell.Entry.Autocorrect = false; textFieldCell.Entry.Autocorrect = false;
if(hidden) if(hidden)
{ {
textFieldCell.Entry.FontFamily = Helpers.OnPlatform( textFieldCell.Entry.FontFamily = OnPlatform(iOS: "Menlo-Regular", Android: "monospace",
iOS: "Menlo-Regular", Android: "monospace", Windows: "Courier"); Windows: "Courier");
textFieldCell.Button1.Command = new Command(() => textFieldCell.Button1.Command = new Command(() =>
{ {
textFieldCell.Entry.InvokeToggleIsPassword(); textFieldCell.Entry.InvokeToggleIsPassword();
textFieldCell.Button1.Image = textFieldCell.Button1.Image = "eye" +
"eye" + (!textFieldCell.Entry.IsPasswordFromToggled ? "_slash" : string.Empty) + ".png"; (!textFieldCell.Entry.IsPasswordFromToggled ? "_slash" : string.Empty) + ".png";
}); });
} }
cell = textFieldCell; cell = textFieldCell;
@ -386,7 +386,7 @@ namespace Bit.App.Utilities
public static FormEntryCell MakeUriCell(string value, UriMatchType? match, TableSection urisSection, Page page) public static FormEntryCell MakeUriCell(string value, UriMatchType? match, TableSection urisSection, Page page)
{ {
var label = string.Format(AppResources.URIPosition, urisSection.Count); var label = string.Format(AppResources.URIPosition, urisSection.Count);
var cell = new FormEntryCell(label, entryKeyboard: Keyboard.Url, button1: "cog.png"); var cell = new FormEntryCell(label, entryKeyboard: Keyboard.Url, button1: "cog_alt.png");
cell.Entry.Text = value; cell.Entry.Text = value;
cell.Entry.DisableAutocapitalize = true; cell.Entry.DisableAutocapitalize = true;
cell.Entry.Autocorrect = false; cell.Entry.Autocorrect = false;

Binary file not shown.

After

Width:  |  Height:  |  Size: 590 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1005 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@ -719,5 +719,14 @@
<ItemGroup> <ItemGroup>
<BundleResource Include="Resources\refresh_alt%403x.png" /> <BundleResource Include="Resources\refresh_alt%403x.png" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\cog_alt.png" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\cog_alt%402x.png" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\cog_alt%403x.png" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project> </Project>