Skip to content

Commit

Permalink
icon and splah updated
Browse files Browse the repository at this point in the history
  • Loading branch information
Ben Harnett committed Dec 4, 2023
1 parent fffddc1 commit 4f638d6
Show file tree
Hide file tree
Showing 20 changed files with 86 additions and 158 deletions.
2 changes: 1 addition & 1 deletion RightToAskClient/RightToAskClient.Maui/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
ApplyToDerivedTypes="True">
<Setter Property="TextColor"
Value="{AppThemeBinding Light={StaticResource Purple}, Dark={StaticResource DarkModePurple}}" />
<Setter Property="FontSize" Value="14" />
<Setter Property="FontSize" Value="20" />
<Setter Property="BackgroundColor" Value="{AppThemeBinding Light=White, Dark=Black}" />
</Style>
<Style x:Key="PopupCancelButton" BasedOn="{StaticResource PopupButton}" TargetType="Button"
Expand Down
4 changes: 2 additions & 2 deletions RightToAskClient/RightToAskClient.Maui/AppShell.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@
<FlyoutItem Title="Account" FlyoutIcon="info_48.png">
<ShellContent Route="Account" ContentTemplate="{DataTemplate local:AccountPage}" />
</FlyoutItem>
<FlyoutItem Title="How To">
<FlyoutItem Title="How To" FlyoutIcon="edit_note_48.png">
<ShellContent Route="HowToPublishPage" ContentTemplate="{DataTemplate local:HowToPublishPage}" />
</FlyoutItem>
<FlyoutItem Title="About" FlyoutIcon="emu_75.png">
<FlyoutItem Title="About" FlyoutIcon="expand_48.png">
<ShellContent Route="AboutPage" ContentTemplate="{DataTemplate local:AboutPage}" />
</FlyoutItem>

Expand Down
1 change: 1 addition & 0 deletions RightToAskClient/RightToAskClient.Maui/AppShell.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public AppShell()
Routing.RegisterRoute(nameof(SelectableListPage), typeof(SelectableListPage));
Routing.RegisterRoute(nameof(ReportQuestionPage), typeof(ReportQuestionPage));
Routing.RegisterRoute(nameof(CodeOfConductPage), typeof(CodeOfConductPage));
Routing.RegisterRoute(nameof(WriteQuestionPage), typeof(WriteQuestionPage));
// Routing.RegisterRoute(nameof(FindMPsPage), typeof(FindMPsPage));
}

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

18 changes: 10 additions & 8 deletions RightToAskClient/RightToAskClient.Maui/Resources/Splash/splash.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,13 @@

<ItemGroup>
<!-- App Icon -->
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
<MauiIcon Include="Resources\AppIcon\appicon.svg" Color="#FFFFFF" />

<!-- Splash Screen -->
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#FFFFFF" BaseSize="128,128" />

<!-- Images -->
<MauiImage Include="Resources\Images\*" />
<MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />

<!-- Custom Fonts -->
<MauiFont Include="Resources\Fonts\*" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ public WriteQuestionViewModel() : base(false, false)
// AppResources.CancelButtonText,
// AppResources.GoHomeButtonText,
// false);
var popupResult = await App.Current.MainPage.DisplayPromptAsync(AppResources.GoHomePopupTitle,
var popupResult = await App.Current.MainPage.DisplayAlert(AppResources.GoHomePopupTitle,
AppResources.GoHomePopupText,
AppResources.GoHomeButtonText,
AppResources.CancelButtonText);
if (popupResult == AppResources.GoHomeButtonText)
if (popupResult)
{
await App.Current.MainPage.Navigation.PopAsync();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<Button Text="{Binding RegisterMPButtonText}"
Command="{Binding ChooseMPToRegisterButtonCommand}"
IsVisible="{Binding ShowRegisterMPButton}" Style="{StaticResource EditorProceed}"
HorizontalOptions="Start"
HorizontalOptions="Start" HeightRequest="80"
SemanticProperties.Hint="{x:Static strings:AppResources.RegisterMPButtonHint}"
SemanticProperties.Description="{Binding RegisterMPButtonText}"/>
<ImageButton Source="arrow_forward.png"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@
<StackLayout Orientation="Horizontal" HorizontalOptions="FillAndExpand" Margin="16">
<Button Style="{StaticResource NormalButton}"
x:Name="DoneButton"
HeightRequest="40"
Text="{x:Static strings:AppResources.SaveButtonText}"
Command="{Binding SaveMPsButtonCommand}"
IsEnabled="{Binding EnableFindMPsButton}" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
x:Class="RightToAskClient.Maui.Views.HowToPublishView">
<ContentView.Content>
<StackLayout Margin="10" VerticalOptions="FillAndExpand" BackgroundColor="Transparent" >
<Grid RowDefinitions="auto,auto,auto,auto,auto,auto,auto" ColumnDefinitions="auto,*"
<Grid RowDefinitions="auto,auto,auto,auto,auto,auto,auto,auto" ColumnDefinitions="auto,*"
BackgroundColor="Transparent" VerticalOptions="FillAndExpand" ColumnSpacing="0" Padding="10" RowSpacing="5">
<!--Main Header-->
<Label Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Text="{x:Static strings:AppResources.HowToHeaderText}" Style="{StaticResource Header1}"
Expand Down Expand Up @@ -43,7 +43,7 @@
</FormattedString>
</Label.FormattedText>
</Label>
<Grid Grid.Row="3" Grid.Column="1" RowDefinitions="auto,auto"
<Grid Grid.Row="3" Grid.Column="1" RowDefinitions="auto,auto,auto"
ColumnDefinitions="auto,auto" BackgroundColor="Transparent" Padding="10">
<Label Text="{x:Static strings:AppResources.HowToStep2aLetter}" Grid.Row="0" Grid.Column="0" VerticalOptions="Start" VerticalTextAlignment="End" HorizontalTextAlignment="Start"/>
<Label Text="{x:Static strings:AppResources.HowToStep2bLetter}" Grid.Row="2" Grid.Column="0" VerticalOptions="Start" VerticalTextAlignment="End" HorizontalTextAlignment="Start"/>
Expand All @@ -52,7 +52,7 @@
<Label Grid.Row="1" Grid.Column="1" Text="{x:Static strings:AppResources.HowToStep2a}"
VerticalOptions="Start" Style="{StaticResource NormalText}"/>
<!-- <Label Grid.Row="2" BackgroundColor="Aqua" Grid.Column="1" VerticalOptions="Start" Text="{x:Static strings:AppResources.HowToStep2Or}" Style="{StaticResource NormalText}" /> -->
<Label Grid.Row="2" Grid.Column="1" VerticalOptions="Start" x:Name="RaisedLabel" Style="{StaticResource NormalText}">
<Label WidthRequest="320" Grid.Row="2" Grid.Column="1" x:Name="RaisedLabel" Style="{StaticResource NormalText}">
<Label.FormattedText>
<FormattedString>
<Span Text="{x:Static strings:AppResources.HowToStep2b }" Style="{StaticResource NormalText}" />
Expand Down Expand Up @@ -104,7 +104,7 @@
</FormattedString>
</Label.FormattedText>
</Label>
<Label Grid.Row="7" Grid.Column="1" VerticalOptions="Start" VerticalTextAlignment="End" Style="{StaticResource NormalText}" BackgroundColor="Transparent" Margin="0">
<Label Grid.Row="8" Grid.Column="1" VerticalOptions="Start" VerticalTextAlignment="End" Style="{StaticResource NormalText}" BackgroundColor="Transparent" Margin="0">
<Label.FormattedText>
<FormattedString>
<Span Text="{x:Static strings:AppResources.HowToStep5Bold}" Style="{StaticResource BoldNormalText}"/>
Expand Down
Loading

0 comments on commit 4f638d6

Please sign in to comment.