-
Notifications
You must be signed in to change notification settings - Fork 8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
🐛 Mobile | Scanner and QR code improvements #912
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
904f3d7
Allow ScanPage to be disposed and disconnect scanner
zacharykeeping ab123f0
Allow tapping the QR code to bring up a larger version with the brigh…
zacharykeeping c5f48a0
Remove unneeded Grid
zacharykeeping a828d60
Split out FlyoutFooter and add button and replace QR image with button
zacharykeeping 632629b
Cleanup
zacharykeeping eb5eda2
Fix icon alignment on Android
zacharykeeping 821a986
Fix email alignment
zacharykeeping File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,171 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<VerticalStackLayout xmlns="http://schemas.microsoft.com/dotnet/2021/maui" | ||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" | ||
x:Class="SSW.Rewards.Mobile.Controls.FlyoutFooter" | ||
xmlns:resolver="clr-namespace:Maui.Plugins.PageResolver;assembly=Maui.Plugins.PageResolver" | ||
xmlns:vm="clr-namespace:SSW.Rewards.Mobile.ViewModels" | ||
x:DataType="vm:FlyoutFooterViewModel" | ||
Margin="0,0,0,5" | ||
Padding="20,0" | ||
Spacing="10"> | ||
<VerticalStackLayout.BindingContext> | ||
<resolver:ResolveViewModel x:TypeArguments="vm:FlyoutFooterViewModel"/> | ||
</VerticalStackLayout.BindingContext> | ||
|
||
<VerticalStackLayout Spacing="10"> | ||
<VerticalStackLayout.Triggers> | ||
<!-- Setting Opacity to hide here as using IsVisible can mess up the layout --> | ||
<DataTrigger TargetType="VerticalStackLayout" Binding="{Binding IsStaff}" Value="False"> | ||
<Setter Property="Opacity" Value="0" /> | ||
<Setter Property="InputTransparent" Value="True" /> | ||
</DataTrigger> | ||
</VerticalStackLayout.Triggers> | ||
<VerticalStackLayout VerticalOptions="Start"> | ||
<BoxView HorizontalOptions="FillAndExpand" | ||
HeightRequest="1" | ||
Color="#171717" | ||
VerticalOptions="End"/> | ||
<BoxView HorizontalOptions="FillAndExpand" | ||
HeightRequest="1" | ||
Color="#404040" | ||
VerticalOptions="Start"/> | ||
</VerticalStackLayout> | ||
|
||
<!-- QR Code button --> | ||
<Grid | ||
VerticalOptions="End" | ||
ColumnDefinitions="Auto,*"> | ||
<Grid.GestureRecognizers> | ||
<TapGestureRecognizer NumberOfTapsRequired="1" | ||
Command="{Binding MyQrCodeTappedCommand}"/> | ||
</Grid.GestureRecognizers> | ||
<Label Grid.Column="0" | ||
HeightRequest="30" | ||
WidthRequest="30" | ||
VerticalOptions="Center" | ||
VerticalTextAlignment="Center" | ||
FontSize="16" | ||
FontFamily="FluentIcons" | ||
TextColor="#DDDDDD" | ||
Text=""> | ||
</Label> | ||
<Label Grid.Column="1" | ||
Style="{StaticResource LabelBold}" | ||
TextColor="#DDDDDD" | ||
HorizontalOptions="Start" | ||
VerticalOptions="Center" | ||
FontSize="16" | ||
Text="My QR Code" /> | ||
</Grid> | ||
</VerticalStackLayout> | ||
<VerticalStackLayout VerticalOptions="Start"> | ||
<BoxView HorizontalOptions="FillAndExpand" | ||
HeightRequest="1" | ||
Color="#171717" | ||
VerticalOptions="End"/> | ||
<BoxView HorizontalOptions="FillAndExpand" | ||
HeightRequest="1" | ||
Color="#404040" | ||
VerticalOptions="Start"/> | ||
</VerticalStackLayout> | ||
|
||
<!-- Settings button --> | ||
<Grid | ||
VerticalOptions="End" | ||
ColumnDefinitions="Auto,*"> | ||
<Grid.GestureRecognizers> | ||
<TapGestureRecognizer NumberOfTapsRequired="1" | ||
Command="{Binding MySettingsTappedCommand}"/> | ||
</Grid.GestureRecognizers> | ||
<Label Grid.Column="0" | ||
HeightRequest="30" | ||
WidthRequest="30" | ||
VerticalOptions="Center" | ||
VerticalTextAlignment="Center" | ||
FontSize="16" | ||
FontFamily="FA6Solid" | ||
TextColor="#DDDDDD" | ||
Text=""> | ||
</Label> | ||
<Label Grid.Column="1" | ||
Style="{StaticResource LabelBold}" | ||
TextColor="#DDDDDD" | ||
HorizontalOptions="Start" | ||
VerticalOptions="Center" | ||
FontSize="16" | ||
Text="My Settings" /> | ||
</Grid> | ||
|
||
<VerticalStackLayout VerticalOptions="Start"> | ||
<BoxView HorizontalOptions="FillAndExpand" | ||
HeightRequest="1" | ||
Color="#171717" | ||
VerticalOptions="End"/> | ||
<BoxView HorizontalOptions="FillAndExpand" | ||
HeightRequest="1" | ||
Color="#404040" | ||
VerticalOptions="Start"/> | ||
</VerticalStackLayout> | ||
|
||
<!-- Logout Button --> | ||
<Grid | ||
VerticalOptions="End" | ||
ColumnDefinitions="Auto,*"> | ||
<Grid.GestureRecognizers> | ||
<TapGestureRecognizer NumberOfTapsRequired="1" | ||
Command="{Binding LogOutTappedCommand}"/> | ||
</Grid.GestureRecognizers> | ||
<Label Grid.Column="0" | ||
HeightRequest="30" | ||
WidthRequest="30" | ||
VerticalOptions="Center" | ||
VerticalTextAlignment="Center" | ||
FontSize="16" | ||
FontFamily="FA6Solid" | ||
TextColor="#DDDDDD" | ||
Text=""> | ||
</Label> | ||
|
||
<Label Grid.Column="1" | ||
Style="{StaticResource LabelBold}" | ||
TextColor="#DDDDDD" | ||
HorizontalOptions="Start" | ||
VerticalOptions="Center" | ||
FontSize="16" | ||
Text="Log Out" /> | ||
</Grid> | ||
|
||
<VerticalStackLayout VerticalOptions="Start"> | ||
<BoxView HorizontalOptions="FillAndExpand" | ||
HeightRequest="1" | ||
Color="#171717" | ||
VerticalOptions="End"/> | ||
<BoxView HorizontalOptions="FillAndExpand" | ||
HeightRequest="1" | ||
Color="#404040" | ||
VerticalOptions="Start"/> | ||
</VerticalStackLayout> | ||
|
||
<FlexLayout JustifyContent="SpaceBetween"> | ||
<Label | ||
Padding="0,10,0,0" | ||
TextColor="#DDDDDD" | ||
HorizontalOptions="Start" | ||
VerticalOptions="Center" | ||
FontSize="12" | ||
Text="Powered by .NET MAUI" /> | ||
|
||
<Label HorizontalOptions="End" | ||
VerticalTextAlignment="Center" | ||
Padding="0,10,0,0" | ||
FontSize="12" | ||
TextColor="#DDDDDD" | ||
Text="{Binding VersionNumber}"/> | ||
</FlexLayout> | ||
|
||
<!-- workaround for iOS footer safe area --> | ||
<Label | ||
Text=" " | ||
IsVisible="{OnPlatform Android='False', iOS='True'}"/> | ||
|
||
</VerticalStackLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
namespace SSW.Rewards.Mobile.Controls; | ||
|
||
public partial class FlyoutFooter | ||
{ | ||
public FlyoutFooter() | ||
{ | ||
InitializeComponent(); | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Love it 👍