mirror of
https://github.com/bitwarden/mobile
synced 2025-02-09 00:18:53 +01:00
Changed all background colors for pages. Got rid of custom label colors in favor of defaults.
This commit is contained in:
parent
a642d9cef2
commit
aac1c22c56
5666
src/Android/Resources/Resource.Designer.cs
generated
5666
src/Android/Resources/Resource.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
@ -3,7 +3,7 @@
|
|||||||
<color name="white">#FFFFFF</color>
|
<color name="white">#FFFFFF</color>
|
||||||
<color name="darkgray">#333333</color>
|
<color name="darkgray">#333333</color>
|
||||||
<color name="gray">#738182</color>
|
<color name="gray">#738182</color>
|
||||||
<color name="lightgray">#ecf0f5</color>
|
<color name="lightgray">#efeff4</color>
|
||||||
<color name="primary">#222d32</color>
|
<color name="primary">#222d32</color>
|
||||||
<color name="accent">#3c8dbc</color>
|
<color name="accent">#3c8dbc</color>
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -147,13 +147,6 @@ namespace Bit.App
|
|||||||
|
|
||||||
// Labels
|
// Labels
|
||||||
|
|
||||||
Resources.Add(new Style(typeof(Label))
|
|
||||||
{
|
|
||||||
Setters = {
|
|
||||||
new Setter { Property = Label.TextColorProperty, Value = gray }
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
Resources.Add("text-muted", new Style(typeof(Label))
|
Resources.Add("text-muted", new Style(typeof(Label))
|
||||||
{
|
{
|
||||||
Setters = {
|
Setters = {
|
||||||
@ -204,24 +197,6 @@ namespace Bit.App
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Editors
|
|
||||||
|
|
||||||
Resources.Add(new Style(typeof(Editor))
|
|
||||||
{
|
|
||||||
Setters = {
|
|
||||||
new Setter { Property = Editor.TextColorProperty, Value = gray }
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Entries
|
|
||||||
|
|
||||||
Resources.Add(new Style(typeof(Entry))
|
|
||||||
{
|
|
||||||
Setters = {
|
|
||||||
new Setter { Property = Entry.TextColorProperty, Value = gray }
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// List View
|
// List View
|
||||||
|
|
||||||
Resources.Add(new Style(typeof(ListView))
|
Resources.Add(new Style(typeof(ListView))
|
||||||
|
@ -53,6 +53,7 @@
|
|||||||
<Compile Include="Controls\EntryLabel.cs" />
|
<Compile Include="Controls\EntryLabel.cs" />
|
||||||
<Compile Include="Controls\ExtendedEditor.cs" />
|
<Compile Include="Controls\ExtendedEditor.cs" />
|
||||||
<Compile Include="Controls\ExtendedNavigationPage.cs" />
|
<Compile Include="Controls\ExtendedNavigationPage.cs" />
|
||||||
|
<Compile Include="Controls\ExtendedContentPage.cs" />
|
||||||
<Compile Include="Controls\ExtendedTableView.cs" />
|
<Compile Include="Controls\ExtendedTableView.cs" />
|
||||||
<Compile Include="Controls\ExtendedPicker.cs" />
|
<Compile Include="Controls\ExtendedPicker.cs" />
|
||||||
<Compile Include="Controls\ExtendedEntry.cs" />
|
<Compile Include="Controls\ExtendedEntry.cs" />
|
||||||
|
13
src/App/Controls/ExtendedContentPage.cs
Normal file
13
src/App/Controls/ExtendedContentPage.cs
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
using System;
|
||||||
|
using Xamarin.Forms;
|
||||||
|
|
||||||
|
namespace Bit.App.Controls
|
||||||
|
{
|
||||||
|
public class ExtendedContentPage : ContentPage
|
||||||
|
{
|
||||||
|
public ExtendedContentPage()
|
||||||
|
{
|
||||||
|
BackgroundColor = Color.FromHex("efeff4");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -5,11 +5,6 @@ namespace Bit.App.Controls
|
|||||||
{
|
{
|
||||||
public class ExtendedEditor : Editor
|
public class ExtendedEditor : Editor
|
||||||
{
|
{
|
||||||
public ExtendedEditor()
|
|
||||||
{
|
|
||||||
TextColor = Color.FromHex("333333");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static readonly BindableProperty HasBorderProperty =
|
public static readonly BindableProperty HasBorderProperty =
|
||||||
BindableProperty.Create(nameof(HasBorder), typeof(bool), typeof(ExtendedEditor), true);
|
BindableProperty.Create(nameof(HasBorder), typeof(bool), typeof(ExtendedEditor), true);
|
||||||
|
|
||||||
|
@ -6,11 +6,6 @@ namespace Bit.App.Controls
|
|||||||
{
|
{
|
||||||
public class ExtendedEntry : Entry
|
public class ExtendedEntry : Entry
|
||||||
{
|
{
|
||||||
public ExtendedEntry()
|
|
||||||
{
|
|
||||||
TextColor = Color.FromHex("333333");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static readonly BindableProperty HasBorderProperty =
|
public static readonly BindableProperty HasBorderProperty =
|
||||||
BindableProperty.Create(nameof(HasBorder), typeof(bool), typeof(ExtendedEntry), true);
|
BindableProperty.Create(nameof(HasBorder), typeof(bool), typeof(ExtendedEntry), true);
|
||||||
|
|
||||||
|
@ -5,6 +5,11 @@ namespace Bit.App.Controls
|
|||||||
{
|
{
|
||||||
public class ExtendedTabbedPage : TabbedPage
|
public class ExtendedTabbedPage : TabbedPage
|
||||||
{
|
{
|
||||||
|
public ExtendedTabbedPage()
|
||||||
|
{
|
||||||
|
BackgroundColor = Color.FromHex("efeff4");
|
||||||
|
}
|
||||||
|
|
||||||
public static readonly BindableProperty TintColorProperty =
|
public static readonly BindableProperty TintColorProperty =
|
||||||
BindableProperty.Create(nameof(TintColor), typeof(Color), typeof(ExtendedTabbedPage), Color.White);
|
BindableProperty.Create(nameof(TintColor), typeof(Color), typeof(ExtendedTabbedPage), Color.White);
|
||||||
|
|
||||||
|
@ -7,7 +7,6 @@ namespace Bit.App.Controls
|
|||||||
{
|
{
|
||||||
public ExtendedTextCell()
|
public ExtendedTextCell()
|
||||||
{
|
{
|
||||||
TextColor = Color.FromHex("333333");
|
|
||||||
DetailColor = Color.FromHex("777777");
|
DetailColor = Color.FromHex("777777");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ using Bit.App.Controls;
|
|||||||
|
|
||||||
namespace Bit.App.Pages
|
namespace Bit.App.Pages
|
||||||
{
|
{
|
||||||
public class HomePage : ContentPage
|
public class HomePage : ExtendedContentPage
|
||||||
{
|
{
|
||||||
private readonly IAuthService _authService;
|
private readonly IAuthService _authService;
|
||||||
private readonly IUserDialogs _userDialogs;
|
private readonly IUserDialogs _userDialogs;
|
||||||
@ -73,7 +73,6 @@ namespace Bit.App.Pages
|
|||||||
|
|
||||||
Title = "bitwarden";
|
Title = "bitwarden";
|
||||||
Content = buttonStackLayout;
|
Content = buttonStackLayout;
|
||||||
BackgroundColor = Color.FromHex("ecf0f5");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task LoginAsync()
|
public async Task LoginAsync()
|
||||||
|
@ -4,7 +4,6 @@ using Acr.UserDialogs;
|
|||||||
using Bit.App.Abstractions;
|
using Bit.App.Abstractions;
|
||||||
using Bit.App.Controls;
|
using Bit.App.Controls;
|
||||||
using Bit.App.Resources;
|
using Bit.App.Resources;
|
||||||
using Plugin.Connectivity.Abstractions;
|
|
||||||
using Xamarin.Forms;
|
using Xamarin.Forms;
|
||||||
using XLabs.Ioc;
|
using XLabs.Ioc;
|
||||||
using Plugin.Fingerprint.Abstractions;
|
using Plugin.Fingerprint.Abstractions;
|
||||||
@ -12,7 +11,7 @@ using Plugin.Settings.Abstractions;
|
|||||||
|
|
||||||
namespace Bit.App.Pages
|
namespace Bit.App.Pages
|
||||||
{
|
{
|
||||||
public class LockFingerprintPage : ContentPage
|
public class LockFingerprintPage : ExtendedContentPage
|
||||||
{
|
{
|
||||||
private readonly IFingerprint _fingerprint;
|
private readonly IFingerprint _fingerprint;
|
||||||
private readonly IAuthService _authService;
|
private readonly IAuthService _authService;
|
||||||
@ -55,7 +54,6 @@ namespace Bit.App.Pages
|
|||||||
|
|
||||||
Title = "Verify Fingerprint";
|
Title = "Verify Fingerprint";
|
||||||
Content = stackLayout;
|
Content = stackLayout;
|
||||||
BackgroundImage = "bg.png";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override bool OnBackButtonPressed()
|
protected override bool OnBackButtonPressed()
|
||||||
|
@ -11,7 +11,7 @@ using Bit.App.Controls;
|
|||||||
|
|
||||||
namespace Bit.App.Pages
|
namespace Bit.App.Pages
|
||||||
{
|
{
|
||||||
public class LockPinPage : ContentPage
|
public class LockPinPage : ExtendedContentPage
|
||||||
{
|
{
|
||||||
private readonly IAuthService _authService;
|
private readonly IAuthService _authService;
|
||||||
private readonly IUserDialogs _userDialogs;
|
private readonly IUserDialogs _userDialogs;
|
||||||
@ -57,7 +57,6 @@ namespace Bit.App.Pages
|
|||||||
Title = "Verify PIN";
|
Title = "Verify PIN";
|
||||||
Content = stackLayout;
|
Content = stackLayout;
|
||||||
Content.GestureRecognizers.Add(tgr);
|
Content.GestureRecognizers.Add(tgr);
|
||||||
BackgroundImage = "bg.png";
|
|
||||||
BindingContext = Model;
|
BindingContext = Model;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace Bit.App.Pages
|
namespace Bit.App.Pages
|
||||||
{
|
{
|
||||||
public class LoginPage : ContentPage
|
public class LoginPage : ExtendedContentPage
|
||||||
{
|
{
|
||||||
private ICryptoService _cryptoService;
|
private ICryptoService _cryptoService;
|
||||||
private IAuthService _authService;
|
private IAuthService _authService;
|
||||||
@ -44,7 +44,6 @@ namespace Bit.App.Pages
|
|||||||
|
|
||||||
var table = new ExtendedTableView
|
var table = new ExtendedTableView
|
||||||
{
|
{
|
||||||
BackgroundColor = Color.FromHex("ecf0f5"),
|
|
||||||
Intent = TableIntent.Settings,
|
Intent = TableIntent.Settings,
|
||||||
EnableScrolling = true,
|
EnableScrolling = true,
|
||||||
HasUnevenRows = true,
|
HasUnevenRows = true,
|
||||||
@ -74,7 +73,6 @@ namespace Bit.App.Pages
|
|||||||
ToolbarItems.Add(loginToolbarItem);
|
ToolbarItems.Add(loginToolbarItem);
|
||||||
Title = AppResources.Bitwarden;
|
Title = AppResources.Bitwarden;
|
||||||
Content = table;
|
Content = table;
|
||||||
BackgroundColor = Color.FromHex("ecf0f5");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnAppearing()
|
protected override void OnAppearing()
|
||||||
|
@ -11,7 +11,7 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace Bit.App.Pages
|
namespace Bit.App.Pages
|
||||||
{
|
{
|
||||||
public class RegisterPage : ContentPage
|
public class RegisterPage : ExtendedContentPage
|
||||||
{
|
{
|
||||||
private ICryptoService _cryptoService;
|
private ICryptoService _cryptoService;
|
||||||
private IUserDialogs _userDialogs;
|
private IUserDialogs _userDialogs;
|
||||||
@ -45,7 +45,6 @@ namespace Bit.App.Pages
|
|||||||
|
|
||||||
var table = new ExtendedTableView
|
var table = new ExtendedTableView
|
||||||
{
|
{
|
||||||
BackgroundColor = Color.FromHex("ecf0f5"),
|
|
||||||
Intent = TableIntent.Settings,
|
Intent = TableIntent.Settings,
|
||||||
EnableScrolling = true,
|
EnableScrolling = true,
|
||||||
HasUnevenRows = true,
|
HasUnevenRows = true,
|
||||||
@ -78,7 +77,6 @@ namespace Bit.App.Pages
|
|||||||
ToolbarItems.Add(loginToolbarItem);
|
ToolbarItems.Add(loginToolbarItem);
|
||||||
Title = "Create Account";
|
Title = "Create Account";
|
||||||
Content = table;
|
Content = table;
|
||||||
BackgroundColor = Color.FromHex("ecf0f5");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnAppearing()
|
protected override void OnAppearing()
|
||||||
|
@ -10,7 +10,7 @@ using XLabs.Ioc;
|
|||||||
|
|
||||||
namespace Bit.App.Pages
|
namespace Bit.App.Pages
|
||||||
{
|
{
|
||||||
public class SettingsAddFolderPage : ContentPage
|
public class SettingsAddFolderPage : ExtendedContentPage
|
||||||
{
|
{
|
||||||
private readonly IFolderService _folderService;
|
private readonly IFolderService _folderService;
|
||||||
private readonly IUserDialogs _userDialogs;
|
private readonly IUserDialogs _userDialogs;
|
||||||
|
@ -9,7 +9,7 @@ using XLabs.Ioc;
|
|||||||
|
|
||||||
namespace Bit.App.Pages
|
namespace Bit.App.Pages
|
||||||
{
|
{
|
||||||
public class SettingsEditFolderPage : ContentPage
|
public class SettingsEditFolderPage : ExtendedContentPage
|
||||||
{
|
{
|
||||||
private readonly string _folderId;
|
private readonly string _folderId;
|
||||||
private readonly IFolderService _folderService;
|
private readonly IFolderService _folderService;
|
||||||
|
@ -13,7 +13,7 @@ using XLabs.Ioc;
|
|||||||
|
|
||||||
namespace Bit.App.Pages
|
namespace Bit.App.Pages
|
||||||
{
|
{
|
||||||
public class SettingsListFoldersPage : ContentPage
|
public class SettingsListFoldersPage : ExtendedContentPage
|
||||||
{
|
{
|
||||||
private readonly IFolderService _folderService;
|
private readonly IFolderService _folderService;
|
||||||
private readonly IUserDialogs _userDialogs;
|
private readonly IUserDialogs _userDialogs;
|
||||||
@ -86,7 +86,6 @@ namespace Bit.App.Pages
|
|||||||
public SettingsFolderListViewCell(SettingsListFoldersPage page)
|
public SettingsFolderListViewCell(SettingsListFoldersPage page)
|
||||||
{
|
{
|
||||||
this.SetBinding<SettingsFolderPageModel>(TextProperty, s => s.Name);
|
this.SetBinding<SettingsFolderPageModel>(TextProperty, s => s.Name);
|
||||||
TextColor = Color.FromHex("333333");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -10,7 +10,7 @@ using Plugin.Fingerprint.Abstractions;
|
|||||||
|
|
||||||
namespace Bit.App.Pages
|
namespace Bit.App.Pages
|
||||||
{
|
{
|
||||||
public class SettingsPage : ContentPage
|
public class SettingsPage : ExtendedContentPage
|
||||||
{
|
{
|
||||||
private readonly IAuthService _authService;
|
private readonly IAuthService _authService;
|
||||||
private readonly IUserDialogs _userDialogs;
|
private readonly IUserDialogs _userDialogs;
|
||||||
@ -54,37 +54,32 @@ namespace Bit.App.Pages
|
|||||||
{
|
{
|
||||||
Text = "Lock Options",
|
Text = "Lock Options",
|
||||||
Detail = GetLockOptionsDetailsText(),
|
Detail = GetLockOptionsDetailsText(),
|
||||||
ShowDisclousure = true,
|
ShowDisclousure = true
|
||||||
TextColor = Color.FromHex("333333")
|
|
||||||
};
|
};
|
||||||
LockOptionsCell.Tapped += LockOptionsCell_Tapped;
|
LockOptionsCell.Tapped += LockOptionsCell_Tapped;
|
||||||
|
|
||||||
var changeMasterPasswordCell = new ExtendedTextCell
|
var changeMasterPasswordCell = new ExtendedTextCell
|
||||||
{
|
{
|
||||||
Text = "Change Master Password",
|
Text = "Change Master Password"
|
||||||
TextColor = Color.FromHex("333333")
|
|
||||||
};
|
};
|
||||||
changeMasterPasswordCell.Tapped += ChangeMasterPasswordCell_Tapped;
|
changeMasterPasswordCell.Tapped += ChangeMasterPasswordCell_Tapped;
|
||||||
|
|
||||||
var foldersCell = new ExtendedTextCell
|
var foldersCell = new ExtendedTextCell
|
||||||
{
|
{
|
||||||
Text = "Folders",
|
Text = "Folders",
|
||||||
ShowDisclousure = true,
|
ShowDisclousure = true
|
||||||
TextColor = Color.FromHex("333333")
|
|
||||||
};
|
};
|
||||||
foldersCell.Tapped += FoldersCell_Tapped;
|
foldersCell.Tapped += FoldersCell_Tapped;
|
||||||
|
|
||||||
var lockCell = new ExtendedTextCell
|
var lockCell = new ExtendedTextCell
|
||||||
{
|
{
|
||||||
Text = "Lock",
|
Text = "Lock"
|
||||||
TextColor = Color.FromHex("333333")
|
|
||||||
};
|
};
|
||||||
lockCell.Tapped += LockCell_Tapped;
|
lockCell.Tapped += LockCell_Tapped;
|
||||||
|
|
||||||
var logOutCell = new ExtendedTextCell
|
var logOutCell = new ExtendedTextCell
|
||||||
{
|
{
|
||||||
Text = "Log Out",
|
Text = "Log Out"
|
||||||
TextColor = Color.FromHex("333333")
|
|
||||||
};
|
};
|
||||||
logOutCell.Tapped += LogOutCell_Tapped;
|
logOutCell.Tapped += LogOutCell_Tapped;
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ using Bit.App.Controls;
|
|||||||
|
|
||||||
namespace Bit.App.Pages
|
namespace Bit.App.Pages
|
||||||
{
|
{
|
||||||
public class SettingsPinPage : ContentPage
|
public class SettingsPinPage : ExtendedContentPage
|
||||||
{
|
{
|
||||||
private readonly IUserDialogs _userDialogs;
|
private readonly IUserDialogs _userDialogs;
|
||||||
private readonly ISettings _settings;
|
private readonly ISettings _settings;
|
||||||
|
@ -10,7 +10,7 @@ using XLabs.Ioc;
|
|||||||
|
|
||||||
namespace Bit.App.Pages
|
namespace Bit.App.Pages
|
||||||
{
|
{
|
||||||
public class SyncPage : ContentPage
|
public class SyncPage : ExtendedContentPage
|
||||||
{
|
{
|
||||||
private readonly ISyncService _syncService;
|
private readonly ISyncService _syncService;
|
||||||
private readonly IUserDialogs _userDialogs;
|
private readonly IUserDialogs _userDialogs;
|
||||||
|
@ -12,7 +12,7 @@ using XLabs.Ioc;
|
|||||||
|
|
||||||
namespace Bit.App.Pages
|
namespace Bit.App.Pages
|
||||||
{
|
{
|
||||||
public class VaultAddSitePage : ContentPage
|
public class VaultAddSitePage : ExtendedContentPage
|
||||||
{
|
{
|
||||||
private readonly ISiteService _siteService;
|
private readonly ISiteService _siteService;
|
||||||
private readonly IFolderService _folderService;
|
private readonly IFolderService _folderService;
|
||||||
|
@ -11,7 +11,7 @@ using XLabs.Ioc;
|
|||||||
|
|
||||||
namespace Bit.App.Pages
|
namespace Bit.App.Pages
|
||||||
{
|
{
|
||||||
public class VaultEditSitePage : ContentPage
|
public class VaultEditSitePage : ExtendedContentPage
|
||||||
{
|
{
|
||||||
private readonly string _siteId;
|
private readonly string _siteId;
|
||||||
private readonly ISiteService _siteService;
|
private readonly ISiteService _siteService;
|
||||||
|
@ -13,7 +13,7 @@ using Bit.App.Utilities;
|
|||||||
|
|
||||||
namespace Bit.App.Pages
|
namespace Bit.App.Pages
|
||||||
{
|
{
|
||||||
public class VaultListSitesPage : ContentPage
|
public class VaultListSitesPage : ExtendedContentPage
|
||||||
{
|
{
|
||||||
private readonly IFolderService _folderService;
|
private readonly IFolderService _folderService;
|
||||||
private readonly ISiteService _siteService;
|
private readonly ISiteService _siteService;
|
||||||
@ -231,8 +231,7 @@ namespace Bit.App.Pages
|
|||||||
{
|
{
|
||||||
Orientation = StackOrientation.Horizontal,
|
Orientation = StackOrientation.Horizontal,
|
||||||
VerticalOptions = LayoutOptions.FillAndExpand,
|
VerticalOptions = LayoutOptions.FillAndExpand,
|
||||||
Children = { image, label },
|
Children = { image, label }
|
||||||
BackgroundColor = Color.FromHex("ecf0f5")
|
|
||||||
};
|
};
|
||||||
|
|
||||||
View = stackLayout;
|
View = stackLayout;
|
||||||
|
@ -9,7 +9,7 @@ using XLabs.Ioc;
|
|||||||
|
|
||||||
namespace Bit.App.Pages
|
namespace Bit.App.Pages
|
||||||
{
|
{
|
||||||
public class VaultViewSitePage : ContentPage
|
public class VaultViewSitePage : ExtendedContentPage
|
||||||
{
|
{
|
||||||
private readonly string _siteId;
|
private readonly string _siteId;
|
||||||
private readonly ISiteService _siteService;
|
private readonly ISiteService _siteService;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user