Added: QR-Code Changes

This commit is contained in:
TheJoKlLa 2023-02-01 14:38:44 +01:00
parent 28687274c0
commit 38238ef9a6
6 changed files with 18 additions and 22 deletions

View File

@ -6,7 +6,14 @@
x:Class="Borepin.Page.ScanPage"> x:Class="Borepin.Page.ScanPage">
<ContentPage.Content> <ContentPage.Content>
<StackLayout IsVisible="{Binding IsVisible}"> <StackLayout IsVisible="{Binding IsVisible}">
<zxing:ZXingScannerView Result="{Binding ScanResult, Mode=TwoWay}" ScanResultCommand="{Binding ScannedCommand}" IsScanning="{Binding IsScanning}" WidthRequest="300" HeightRequest="500" VerticalOptions="CenterAndExpand" HorizontalOptions="CenterAndExpand" Options="{Binding ScanOptions}"/> <zxing:ZXingScannerView
Result="{Binding ScanResult, Mode=TwoWay}"
ScanResultCommand="{Binding ScannedCommand}"
IsScanning="{Binding IsScanning}"
Options="{Binding ScanOptions}"
VerticalOptions="FillAndExpand"
HorizontalOptions="FillAndExpand"
Margin="10"/>
<Button Text="{x:Static resource_text:TextResource.CANCEL}" Command="{Binding CancelCommand}"/> <Button Text="{x:Static resource_text:TextResource.CANCEL}" Command="{Binding CancelCommand}"/>
</StackLayout> </StackLayout>
</ContentPage.Content> </ContentPage.Content>

View File

@ -6,7 +6,14 @@
x:Class="Borepin.Page.ScanURNPage"> x:Class="Borepin.Page.ScanURNPage">
<ContentPage.Content> <ContentPage.Content>
<StackLayout IsVisible="{Binding IsVisible}"> <StackLayout IsVisible="{Binding IsVisible}">
<zxing:ZXingScannerView Result="{Binding ScanResult, Mode=TwoWay}" ScanResultCommand="{Binding ScannedCommand}" IsScanning="{Binding IsScanning}" WidthRequest="300" HeightRequest="500" VerticalOptions="CenterAndExpand" HorizontalOptions="CenterAndExpand" Options="{Binding ScanOptions}"/> <zxing:ZXingScannerView
Result="{Binding ScanResult, Mode=TwoWay}"
ScanResultCommand="{Binding ScannedCommand}"
IsScanning="{Binding IsScanning}"
Options="{Binding ScanOptions}"
VerticalOptions="FillAndExpand"
HorizontalOptions="FillAndExpand"
Margin="10"/>
<Button Text="{x:Static resource_text:TextResource.CANCEL}" Command="{Binding CancelCommand}"/> <Button Text="{x:Static resource_text:TextResource.CANCEL}" Command="{Binding CancelCommand}"/>
</StackLayout> </StackLayout>
</ContentPage.Content> </ContentPage.Content>

View File

@ -125,13 +125,6 @@ namespace Borepin.PageModel
get => _MachineListItemViewModel_List; get => _MachineListItemViewModel_List;
set => SetProperty(ref _MachineListItemViewModel_List, value); set => SetProperty(ref _MachineListItemViewModel_List, value);
} }
private bool _IsRefreshing;
public bool IsRefreshing
{
get => _IsRefreshing;
set => SetProperty(ref _IsRefreshing, value);
}
#endregion #endregion
#region Commands #region Commands
@ -155,8 +148,6 @@ namespace Borepin.PageModel
} }
} }
IsRefreshing = false;
} }
private ICommand _ScanCodeCommand; private ICommand _ScanCodeCommand;

View File

@ -64,13 +64,6 @@ namespace Borepin.PageModel
set => SetProperty(ref _FilteredUserListItemViewModel_List, value); set => SetProperty(ref _FilteredUserListItemViewModel_List, value);
} }
private bool _IsRefreshing;
public bool IsRefreshing
{
get => _IsRefreshing;
set => SetProperty(ref _IsRefreshing, value);
}
private string _SearchUsername; private string _SearchUsername;
public string SearchUsername public string SearchUsername
{ {
@ -99,8 +92,6 @@ namespace Borepin.PageModel
// TODO // TODO
} }
} }
IsRefreshing = false;
} }
private ICommand _AddUserCommand; private ICommand _AddUserCommand;

2
external/NFC vendored

@ -1 +1 @@
Subproject commit 4420dbf1b1e820d94d6adaa2b65a851ac582be8f Subproject commit e79b6aace26c8b362a5f450345a67ba700f06805

@ -1 +1 @@
Subproject commit 63e63853c1d5ca9f223aa3627ad391ce434a0683 Subproject commit 1be9ffbf8acbc9770f2d5b67c961fb60e49e5ec5