mirror of
https://github.com/bitwarden/mobile
synced 2025-12-15 15:53:44 +00:00
PS-70 code format
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using Bit.App.Pages;
|
using Bit.App.Pages;
|
||||||
using Bit.App.Utilities;
|
using Bit.App.Utilities;
|
||||||
using Bit.Core.Models.View;
|
using Bit.Core.Models.View;
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ namespace Bit.App.Controls
|
|||||||
protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
|
protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
|
||||||
{
|
{
|
||||||
base.OnPropertyChanged(propertyName);
|
base.OnPropertyChanged(propertyName);
|
||||||
if(propertyName == nameof(Progress) && _progressDrawer == null)
|
if (propertyName == nameof(Progress) && _progressDrawer == null)
|
||||||
{
|
{
|
||||||
var circle = new Circle(Radius * (float)DeviceDisplay.MainDisplayInfo.Density, (info) => new SKPoint((float)info.Width / 2, (float)info.Height / 2));
|
var circle = new Circle(Radius * (float)DeviceDisplay.MainDisplayInfo.Density, (info) => new SKPoint((float)info.Width / 2, (float)info.Height / 2));
|
||||||
_progressDrawer = new ProgressDrawer(SkCanvasView, circle, () => (float)Progress, StrokeWidth * (float)DeviceDisplay.MainDisplayInfo.Density, BackgroundProgressColor.ToSKColor(), ProgressColor.ToSKColor(), EndingProgressColor.ToSKColor());
|
_progressDrawer = new ProgressDrawer(SkCanvasView, circle, () => (float)Progress, StrokeWidth * (float)DeviceDisplay.MainDisplayInfo.Density, BackgroundProgressColor.ToSKColor(), ProgressColor.ToSKColor(), EndingProgressColor.ToSKColor());
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Bit.App.Resources;
|
using Bit.App.Resources;
|
||||||
using Bit.App.Utilities;
|
using Bit.App.Utilities;
|
||||||
|
|||||||
@@ -199,7 +199,7 @@ namespace Bit.App.Pages
|
|||||||
var surface = args.Surface;
|
var surface = args.Surface;
|
||||||
var canvas = surface.Canvas;
|
var canvas = surface.Canvas;
|
||||||
var margins = 20;
|
var margins = 20;
|
||||||
var maxSquareSize = (Math.Min(info.Height, info.Width)*0.9f - margins) * _scale;
|
var maxSquareSize = (Math.Min(info.Height, info.Width) * 0.9f - margins) * _scale;
|
||||||
var squareSize = maxSquareSize;
|
var squareSize = maxSquareSize;
|
||||||
var lineSize = squareSize * 0.15f;
|
var lineSize = squareSize * 0.15f;
|
||||||
var startXPoint = (info.Width / 2) - (squareSize / 2);
|
var startXPoint = (info.Width / 2) - (squareSize / 2);
|
||||||
@@ -207,25 +207,25 @@ namespace Bit.App.Pages
|
|||||||
canvas.Clear(SKColors.Transparent);
|
canvas.Clear(SKColors.Transparent);
|
||||||
|
|
||||||
using (var strokePaint = new SKPaint
|
using (var strokePaint = new SKPaint
|
||||||
{
|
|
||||||
Color = _qrcodeFound ? _greenSKColor : _blueSKColor,
|
|
||||||
StrokeWidth = 9 * _scale,
|
|
||||||
StrokeCap = SKStrokeCap.Round,
|
|
||||||
})
|
|
||||||
{
|
{
|
||||||
canvas.Scale(1,1);
|
Color = _qrcodeFound ? _greenSKColor : _blueSKColor,
|
||||||
|
StrokeWidth = 9 * _scale,
|
||||||
|
StrokeCap = SKStrokeCap.Round,
|
||||||
|
})
|
||||||
|
{
|
||||||
|
canvas.Scale(1, 1);
|
||||||
//top left
|
//top left
|
||||||
canvas.DrawLine (startXPoint, startYPoint, startXPoint, startYPoint+lineSize, strokePaint);
|
canvas.DrawLine(startXPoint, startYPoint, startXPoint, startYPoint + lineSize, strokePaint);
|
||||||
canvas.DrawLine (startXPoint, startYPoint, startXPoint+lineSize, startYPoint, strokePaint);
|
canvas.DrawLine(startXPoint, startYPoint, startXPoint + lineSize, startYPoint, strokePaint);
|
||||||
//bot left
|
//bot left
|
||||||
canvas.DrawLine (startXPoint, startYPoint+squareSize, startXPoint, startYPoint+squareSize-lineSize, strokePaint);
|
canvas.DrawLine(startXPoint, startYPoint + squareSize, startXPoint, startYPoint + squareSize - lineSize, strokePaint);
|
||||||
canvas.DrawLine (startXPoint, startYPoint+squareSize, startXPoint+lineSize, startYPoint+squareSize, strokePaint);
|
canvas.DrawLine(startXPoint, startYPoint + squareSize, startXPoint + lineSize, startYPoint + squareSize, strokePaint);
|
||||||
//top right
|
//top right
|
||||||
canvas.DrawLine (startXPoint+squareSize, startYPoint, startXPoint+squareSize-lineSize, startYPoint, strokePaint);
|
canvas.DrawLine(startXPoint + squareSize, startYPoint, startXPoint + squareSize - lineSize, startYPoint, strokePaint);
|
||||||
canvas.DrawLine (startXPoint+squareSize, startYPoint, startXPoint+squareSize, startYPoint+lineSize, strokePaint);
|
canvas.DrawLine(startXPoint + squareSize, startYPoint, startXPoint + squareSize, startYPoint + lineSize, strokePaint);
|
||||||
//bot right
|
//bot right
|
||||||
canvas.DrawLine (startXPoint+squareSize, startYPoint+squareSize, startXPoint+squareSize-lineSize, startYPoint+squareSize, strokePaint);
|
canvas.DrawLine(startXPoint + squareSize, startYPoint + squareSize, startXPoint + squareSize - lineSize, startYPoint + squareSize, strokePaint);
|
||||||
canvas.DrawLine (startXPoint+squareSize, startYPoint+squareSize, startXPoint+squareSize, startYPoint+squareSize-lineSize, strokePaint);
|
canvas.DrawLine(startXPoint + squareSize, startYPoint + squareSize, startXPoint + squareSize, startYPoint + squareSize - lineSize, strokePaint);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
async Task AnimationLoopAsync()
|
async Task AnimationLoopAsync()
|
||||||
@@ -234,10 +234,10 @@ namespace Bit.App.Pages
|
|||||||
while (_pageIsActive)
|
while (_pageIsActive)
|
||||||
{
|
{
|
||||||
var t = _stopwatch.Elapsed.TotalSeconds % 2 / 2;
|
var t = _stopwatch.Elapsed.TotalSeconds % 2 / 2;
|
||||||
_scale = (20-(1-(float)Math.Sin(4*Math.PI*t))) / 20;
|
_scale = (20 - (1 - (float)Math.Sin(4 * Math.PI * t))) / 20;
|
||||||
SkCanvasView.InvalidateSurface();
|
SkCanvasView.InvalidateSurface();
|
||||||
await Task.Delay(TimeSpan.FromSeconds(1.0 / 30));
|
await Task.Delay(TimeSpan.FromSeconds(1.0 / 30));
|
||||||
if(_qrcodeFound && _scale > 0.98f)
|
if (_qrcodeFound && _scale > 0.98f)
|
||||||
{
|
{
|
||||||
_checkIcon.TextColor = _greenColor;
|
_checkIcon.TextColor = _greenColor;
|
||||||
SkCanvasView.InvalidateSurface();
|
SkCanvasView.InvalidateSurface();
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ using Xamarin.Forms;
|
|||||||
|
|
||||||
namespace Bit.App.Pages
|
namespace Bit.App.Pages
|
||||||
{
|
{
|
||||||
public class ScanPageViewModel: BaseViewModel
|
public class ScanPageViewModel : BaseViewModel
|
||||||
{
|
{
|
||||||
private bool _showScanner;
|
private bool _showScanner;
|
||||||
private string _totpAuthenticationKey;
|
private string _totpAuthenticationKey;
|
||||||
|
|||||||
Reference in New Issue
Block a user