mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-27 11:28:28 +03:00
Code Issues Projects Releases Packages Wiki Activity

PM-3349 Changed the "track color" for the Android switch so that the color is different from the "thumb"

Browse source
This commit is contained in:
Dinis Vieira 2023-12-23 23:09:11 +00:00
parent 5d2fc4530f
commit fa4a2247e3
No known key found for this signature in database
GPG key ID: 9389160FF6C295F3
2 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/App/Platforms/Android/Handlers/SwitchHandlerMappings.cs
View file

@ -2,7 +2,10 @@
using Android.Graphics.Drawables; using Android.Graphics.Drawables;
using Android.OS; using Android.OS;
using AndroidX.Core.Content.Resources; using AndroidX.Core.Content.Resources;
using AndroidX.Core.Graphics;
using Bit.App.Droid.Utilities; using Bit.App.Droid.Utilities;
using Bit.App.Utilities;
using Microsoft.Maui.Platform;
namespace Bit.App.Handlers namespace Bit.App.Handlers
{ {
@ -37,6 +40,31 @@ namespace Bit.App.Handlers
}; };
handler.PlatformView.ThumbTintList = new ColorStateList(thumbStates, thumbColors); handler.PlatformView.ThumbTintList = new ColorStateList(thumbStates, thumbColors);
}); });
Microsoft.Maui.Handlers.SwitchHandler.Mapper.AppendToMapping(nameof(ISwitch.TrackColor), (handler, mauiSwitch) =>
{
var trackStates = new[]
{
new[] { Android.Resource.Attribute.StateChecked }, // checked
new[] { -Android.Resource.Attribute.StateChecked }, // unchecked
};
var selectedColor = ColorUtils.BlendARGB(ThemeHelpers.SwitchOnColor.ToArgb(), Colors.Black.ToPlatform().ToArgb(), 0.5f);
var unselectedColor = ColorUtils.BlendARGB(ThemeHelpers.SwitchThumbColor.ToArgb(), Colors.Black.ToPlatform().ToArgb(), 0.7f);
if (ThemeManager.UsingLightTheme)
{
selectedColor = ColorUtils.BlendARGB(ThemeHelpers.SwitchOnColor.ToArgb(), Colors.White.ToPlatform().ToArgb(), 0.7f);
unselectedColor = ColorUtils.BlendARGB(ThemeHelpers.SwitchThumbColor.ToArgb(), Colors.Black.ToPlatform().ToArgb(), 0.3f);
}
var trackColors = new int[]
{
selectedColor,
unselectedColor
};
handler.PlatformView.TrackTintList = new ColorStateList(trackStates, trackColors);
});
} }
} }
} }

5
src/Core/Resources/Styles/Android.xaml
View file

@ -42,11 +42,6 @@
<Setter Property="Margin" <Setter Property="Margin"
Value="-4, 0, -4, -4" /> Value="-4, 0, -4, -4" />
</Style> </Style>
<Style TargetType="Switch"
ApplyToDerivedTypes="True">
<Setter Property="OnColor"
Value="{DynamicResource SwitchOnColor}" />
</Style>
<Style TargetType="SearchBar" <Style TargetType="SearchBar"
ApplyToDerivedTypes="True"> ApplyToDerivedTypes="True">
<Setter Property="BackgroundColor" <Setter Property="BackgroundColor"