Skip to content

Commit

Permalink
♻️ Mobile | Settings improvements (#890)
Browse files Browse the repository at this point in the history
* Reorganise Settings page

* Improve settings layout

* Make whole of Settings and Log Out tappable

* Update Settings layout and update About popup

* Add CornerRadius to LoginPage

* Add version info and update design of About popup

* Remove delete icon
zacharykeeping authored May 3, 2024
1 parent 37ae4ec commit 869e290
Showing 6 changed files with 42 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/MobileUI/AppShell.xaml
Original file line number Diff line number Diff line change
@@ -159,7 +159,7 @@
HorizontalOptions="Start"
VerticalOptions="Center"
FontSize="16"
Text="Settings" />
Text="My Settings" />
</Grid>

<VerticalStackLayout Grid.Column="0"
1 change: 1 addition & 0 deletions src/MobileUI/Pages/LoginPage.xaml
Original file line number Diff line number Diff line change
@@ -27,6 +27,7 @@
TextColor="{StaticResource White}"
VerticalOptions="End"
Margin="50,0,50,150"
CornerRadius="10"
IsEnabled="{Binding LoginButtonEnabled}"
BackgroundColor="{StaticResource SSWRed}"/>

14 changes: 7 additions & 7 deletions src/MobileUI/Pages/SettingsPage.xaml
Original file line number Diff line number Diff line change
@@ -9,17 +9,17 @@
BackgroundColor="{StaticResource Background}">
<TableView Intent="Menu" BackgroundColor="Transparent">
<TableRoot>
<TableSection Title="General" TextColor="{StaticResource Gray400}">
<TextCell Text="Intro" TextColor="White" Command="{Binding IntroClickedCommand}"/>
<TableSection Title="Social Media" TextColor="{StaticResource Gray400}">
<TextCell Text="Add / Update LinkedIn Profile" TextColor="White" Command="{Binding AddLinkedInCommand}"/>
</TableSection>

<TableSection Title="Your Account" TextColor="{StaticResource Gray400}">
<TextCell Text="Add / Update LinkedIn profile" TextColor="White" Command="{Binding AddLinkedInCommand}"/>

<TableSection Title="General" TextColor="{StaticResource Gray400}">
<TextCell Text="My Profile" TextColor="White" Command="{Binding ProfileClickedCommand}" />
<TextCell Text="Delete Profile" TextColor="White" Command="{Binding DeleteClickedCommand}" />
<TextCell Text="Delete Profile" TextColor="{StaticResource SSWRed}" Command="{Binding DeleteClickedCommand}" />
</TableSection>

<TableSection Title="Info &amp; Support" TextColor="{StaticResource Gray400}">
<TableSection Title="Help" TextColor="{StaticResource Gray400}">
<TextCell Text="Replay Intro" TextColor="White" Command="{Binding IntroClickedCommand}"/>
<TextCell Text="About" TextColor="White" Command="{Binding AboutClickedCommand}" />
</TableSection>
</TableRoot>
34 changes: 26 additions & 8 deletions src/MobileUI/PopupPages/AboutSswPage.xaml
Original file line number Diff line number Diff line change
@@ -26,26 +26,44 @@
StrokeThickness="1"
StrokeShape="RoundRectangle 10"
BackgroundColor="{StaticResource ProfileBackgroundColour}">
<VerticalStackLayout Spacing="6">
<VerticalStackLayout Spacing="20">
<Label HorizontalTextAlignment="Center"
TextColor="{StaticResource SSWRed}"
FontSize="Large"
Text="About SSW"/>
FontSize="24"
Text="About"/>
<Label HorizontalTextAlignment="Center"
Margin="20"
TextColor="White"
TextColor="#DDDDDD"
FontSize="16"
Text="SSW's Consulting Services have delivered best of breed Microsoft solutions for more than 1,000 clients in 15 countries. With 50 consultants in 3 countries, SSW's developers are some of the best in the business. We have many Microsoft Certifications, 5 MVPs, and a Microsoft Regional Director."/>
<Label HorizontalTextAlignment="Center"
TextColor="White"
Margin="20"
TextColor="#DDDDDD"
FontSize="16"
Text="We deliver scalable and extensible custom solutions with the future in mind. Our solutions improve businesses' bottom lines, with real time savings and long term value. We will provide you with the competitive advantage you need."/>
<Button
Clicked="FindoutMore_Tapped"
BackgroundColor="{StaticResource SSWRed}"
HeightRequest="60"
ImageSource="external_link"
Text="Find out more..."
FontSize="12"
Text="ssw.com.au/company/about-us"
CornerRadius="10"/>

<Grid ColumnDefinitions="Auto, *, Auto">
<Label
Grid.Column="0"
TextColor="#DDDDDD"
HorizontalOptions="Start"
VerticalOptions="Center"
FontSize="14"
Text="Powered by .NET MAUI" />

<Label HorizontalOptions="End"
VerticalTextAlignment="Center"
x:Name="VersionLabel"
FontSize="14"
Grid.Column="2"
TextColor="#DDDDDD"/>
</Grid>
</VerticalStackLayout>
</Border>

6 changes: 6 additions & 0 deletions src/MobileUI/PopupPages/AboutSswPage.xaml.cs
Original file line number Diff line number Diff line change
@@ -13,6 +13,12 @@ public AboutSswPage(Color parentPageStatusBarColor = null)
_parentPageStatusBarColor = parentPageStatusBarColor ?? Colors.Black;
InitializeComponent();
}

protected override void OnAppearing()
{
base.OnAppearing();
VersionLabel.Text = $"Version {AppInfo.VersionString}";
}

private async void Handle_CloseTapped(object sender, EventArgs args)
{
2 changes: 1 addition & 1 deletion src/MobileUI/ViewModels/SettingsViewModel.cs
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ private async Task DeleteClicked()

// Remove all remaining code in this method after the fix is available

var sure = await App.Current.MainPage.DisplayAlert("Delete Profile", "If you no longer want an SSW or SSW Rewards account, you can submit a request to SSW to delete your profile and all associated data. Are you sure you want to delete your profile and all associated data?", "Yes", "No");
var sure = await App.Current.MainPage.DisplayAlert("Delete Profile", "If you no longer want an SSW or SSW Rewards account, you can submit a request to SSW to delete your profile and all associated data. Are you sure you want to delete your profile and all associated data?", "Yes", "Cancel");

if (sure)
{

0 comments on commit 869e290

Please sign in to comment.