Skip to content

Commit

Permalink
Merge pull request #247 from OudomMunint/dev
Browse files Browse the repository at this point in the history 
PR: Dev => Main
  • Loading branch information
@OudomMunint
OudomMunint authored Sep 3, 2024
2 parents 190f792 + 5dd5373 commit 465727c
Show file tree
Hide file tree
Showing 5 changed files with 82 additions and 75 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ jobs:
- name: Create Release
uses: ncipollo/[email protected]
with:
tag: v1.7.7.5
tag: v1.7.7.6
2 changes: 1 addition & 1 deletion ToDoListApp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<ApplicationIdGuid>14966315-2970-4b3d-9ece-fe82a9956394</ApplicationIdGuid>

<!-- Versions -->
<ApplicationDisplayVersion>1.7.7.5</ApplicationDisplayVersion> <!--is = Release Tags-->
<ApplicationDisplayVersion>1.7.7.6</ApplicationDisplayVersion> <!--is = Release Tags-->
<ApplicationVersion>$([System.DateTime]::Now.ToString('yyyyMMddHH'))</ApplicationVersion>

<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
Expand Down
86 changes: 49 additions & 37 deletions Views/Settings.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,17 @@
<StackLayout Grid.Column="1">
<!--Theme settings-->
<HorizontalStackLayout Margin="10,0,0,10">
<Label Text="Appearance" FontSize="Title"/>
<Label Text="Appearance" FontSize="Title" />
<!--<Image Source="{AppThemeBinding Light=theme.png, Dark=themewhite.png}" Aspect="AspectFit" HeightRequest="30"/>-->
</HorizontalStackLayout>

<Frame CornerRadius="20" HeightRequest="70" Style="{DynamicResource SettingsFrame}">
<Grid Margin="0" HorizontalOptions="FillAndExpand" HeightRequest="40" ColumnDefinitions="*,auto,auto">
<Label Grid.Column="0" Grid.Row="0" HorizontalOptions="Start" VerticalOptions="CenterAndExpand" Text="Dark Mode" FontAutoScalingEnabled="False"/>
<Switch Grid.Row="0"
x:Name="DarkModeSwitch"
HorizontalOptions="EndAndExpand"
VerticalOptions="CenterAndExpand"
ThumbColor="Gray"
OnColor="BlueViolet"
<Grid Margin="0" HorizontalOptions="FillAndExpand" HeightRequest="40"
ColumnDefinitions="*,auto,auto">
<Label Grid.Column="0" Grid.Row="0" HorizontalOptions="Start" VerticalOptions="CenterAndExpand"
Text="Dark Mode" FontAutoScalingEnabled="False" />
<Switch Grid.Row="0" x:Name="DarkModeSwitch" HorizontalOptions="EndAndExpand"
VerticalOptions="CenterAndExpand" ThumbColor="Gray" OnColor="BlueViolet"
Toggled="DarkMode">
</Switch>
</Grid>
Expand All @@ -36,30 +34,36 @@
<!--Reset-->
<Frame CornerRadius="20" HeightRequest="70" Style="{DynamicResource SettingsFrame}" Margin="0,15,0,0">
<Grid Margin="0" HorizontalOptions="FillAndExpand" HeightRequest="40" ColumnDefinitions="*,*">
<Label Grid.Column="0" Grid.Row="0" HorizontalOptions="Start" VerticalOptions="CenterAndExpand" Text="Reset Application" FontAutoScalingEnabled="False"/>
<Button Grid.Column="1" Text="Reset" BackgroundColor="Red" TextColor="White" Pressed="Reset_Button_Pressed"/>
</Grid>
<Label Grid.Column="0" Grid.Row="0" HorizontalOptions="Start" VerticalOptions="CenterAndExpand"
Text="Reset Application" FontAutoScalingEnabled="False" />
<Button Grid.Column="1" Text="Reset" BackgroundColor="Red" TextColor="White"
Pressed="Reset_Button_Pressed" />
</Grid>
</Frame>

<!--Onboarding-->
<Frame CornerRadius="20" HeightRequest="70" Style="{DynamicResource SettingsFrame}" Margin="0,15,0,0">
<Grid Margin="0" HorizontalOptions="FillAndExpand" HeightRequest="40" ColumnDefinitions="*,*">
<Label Grid.Column="0" Grid.Row="0" HorizontalOptions="Start" VerticalOptions="CenterAndExpand" Text="Tutorial" FontAutoScalingEnabled="False"/>
<Button Grid.Column="1" Text="Show Tutorial" BackgroundColor="Gray" TextColor="White" Pressed="Go_To_Welcome_Button_Pressed"/>
<Label Grid.Column="0" Grid.Row="0" HorizontalOptions="Start" VerticalOptions="CenterAndExpand"
Text="Tutorial" FontAutoScalingEnabled="False" />
<Button Grid.Column="1" Text="Show Tutorial" BackgroundColor="Gray" TextColor="White"
Pressed="Go_To_Welcome_Button_Pressed" />
</Grid>
</Frame>

<!--Generate data-->
<Frame CornerRadius="20" HeightRequest="70" Style="{DynamicResource SettingsFrame}" Margin="0,15,0,0">
<Grid Margin="0" HorizontalOptions="FillAndExpand" HeightRequest="40" ColumnDefinitions="*,*">
<Label Grid.Column="0" Grid.Row="0" HorizontalOptions="Start" VerticalOptions="CenterAndExpand" Text="Dummy data" FontAutoScalingEnabled="False"/>
<Button Grid.Column="1" Text="Generate data" BackgroundColor="Gray" TextColor="White" Pressed="GenerateData_Button_Pressed"/>
<Label Grid.Column="0" Grid.Row="0" HorizontalOptions="Start" VerticalOptions="CenterAndExpand"
Text="Dummy data" FontAutoScalingEnabled="False" />
<Button Grid.Column="1" Text="Generate data" BackgroundColor="Gray" TextColor="White"
Pressed="GenerateData_Button_Pressed" />
</Grid>
</Frame>

<!--App info-->
<HorizontalStackLayout Margin="10,10,0,10">
<Label Text="Contact" FontSize="Title"/>
<Label Text="Contact" FontSize="Title" />
<!--<Image Source="description.png" Aspect="AspectFit" HeightRequest="30"/>-->
</HorizontalStackLayout>

Expand All @@ -77,51 +81,59 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Image Grid.Column="0" Grid.Row="0" Source="globe.png" Aspect="AspectFit" HeightRequest="30" HorizontalOptions="Start"/>
<Label Margin="20,0,0,0" Grid.Column="1" Grid.Row="0" Text="Home Page" HorizontalOptions="Start" VerticalOptions="Center">
<Image Grid.Column="0" Grid.Row="0" Source="globe.png" Aspect="AspectFit" HeightRequest="30"
HorizontalOptions="Start" />
<Label Margin="20,0,0,0" Grid.Column="1" Grid.Row="0" Text="Home Page" HorizontalOptions="Start"
VerticalOptions="Center">
<Label.GestureRecognizers>
<TapGestureRecognizer Tapped="Home_Clicked"/>
<TapGestureRecognizer Tapped="Home_Clicked" />
</Label.GestureRecognizers>
</Label>
<ImageButton x:Name="Home" Style="{StaticResource SettingsCaret}" Grid.Column="2" Grid.Row="0" Clicked="Home_Clicked"/>
<ImageButton x:Name="Home" Style="{StaticResource SettingsCaret}" Grid.Column="2" Grid.Row="0"
Clicked="Home_Clicked" />

<Image Grid.Column="0" Grid.Row="1" Source="priority.png" Aspect="AspectFit" HeightRequest="30" HorizontalOptions="Start"/>
<Label Margin="20,0,0,0" Grid.Column="1" Grid.Row="1" Text="Feedback &amp; Sugguestions" HorizontalOptions="Start" VerticalOptions="Center">
<Label.GestureRecognizers>
<TapGestureRecognizer Tapped="Feedback_Clicked"/>
<Image Grid.Column="0" Grid.Row="1" Source="priority.png" Aspect="AspectFit" HeightRequest="30"
HorizontalOptions="Start" />
<Label Margin="20,0,0,0" Grid.Column="1" Grid.Row="1" Text="Feedback &amp; Sugguestions"
HorizontalOptions="Start" VerticalOptions="Center">
<Label.GestureRecognizers>
<TapGestureRecognizer Tapped="Feedback_Clicked" />
</Label.GestureRecognizers>
</Label>
<ImageButton x:Name="Feedback" Style="{StaticResource SettingsCaret}" Grid.Column="2" Grid.Row="1" Clicked="Feedback_Clicked"/>
<ImageButton x:Name="Feedback" Style="{StaticResource SettingsCaret}" Grid.Column="2"
Grid.Row="1" Clicked="Feedback_Clicked" />

<Image Grid.Column="0" Grid.Row="2" Source="dotnet_bot.png" Aspect="AspectFit" HeightRequest="30" HorizontalOptions="Center"/>
<Label Margin="20,0,0,0" Grid.Column="1" Grid.Row="2" Text="About Me" HorizontalOptions="Start" VerticalOptions="Center">
<Image Grid.Column="0" Grid.Row="2" Source="dotnet_bot.png" Aspect="AspectFit"
HeightRequest="30" HorizontalOptions="Center" />
<Label Margin="20,0,0,0" Grid.Column="1" Grid.Row="2" Text="About Me" HorizontalOptions="Start"
VerticalOptions="Center">
<Label.GestureRecognizers>
<TapGestureRecognizer Tapped="AboutMe_Clicked"/>
<TapGestureRecognizer Tapped="AboutMe_Clicked" />
</Label.GestureRecognizers>
</Label>
<ImageButton x:Name="AboutMe" Style="{StaticResource SettingsCaret}" Grid.Column="2" Grid.Row="2" Clicked="AboutMe_Clicked"/>
<ImageButton x:Name="AboutMe" Style="{StaticResource SettingsCaret}" Grid.Column="2"
Grid.Row="2" Clicked="AboutMe_Clicked" />
</Grid>
</Frame>

<HorizontalStackLayout Margin="10,10,0,0">
<Label Text="About" FontSize="Title"/>
<Label Text="About" FontSize="Title" />
<!--<Image Source="description.png" Aspect="AspectFit" HeightRequest="30"/>-->
</HorizontalStackLayout>

<Frame CornerRadius="20" Style="{DynamicResource SettingsFrame}" Margin="0,15,0,0">
<StackLayout Spacing="15" Padding="-2">
<Label x:Name="formattedVersionInfo" HorizontalTextAlignment="Center"/>
<Label Text="See Previous versions" TextColor="{AppThemeBinding Dark=lightgray, Light=blue}" TextDecorations="Underline"
HorizontalTextAlignment="Center">
<Label x:Name="formattedVersionInfo" HorizontalTextAlignment="Center" HorizontalOptions="Center" />
<Label Text="See Previous versions" TextColor="{AppThemeBinding Dark=lightgray, Light=blue}"
TextDecorations="Underline" HorizontalTextAlignment="Center">
<Label.GestureRecognizers>
<TapGestureRecognizer x:Name="seePrevious" Tapped="seePrevious_Tapped" NumberOfTapsRequired="1"/>
<TapGestureRecognizer Tapped="SeePrevious_Tapped" NumberOfTapsRequired="1" />
</Label.GestureRecognizers>
</Label>
</StackLayout>
</Frame>

</StackLayout>
</Grid>
</ScrollView>

</ContentPage>
65 changes: 30 additions & 35 deletions Views/Settings.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ public partial class Settings : ContentPage

public bool hasErrorShown = false;

public string runtimeOS = DeviceInfo.Platform.ToString();

private bool IsConnectedToInternet()
{
var current = Connectivity.NetworkAccess;
Expand Down Expand Up @@ -55,7 +57,7 @@ protected override void OnAppearing()

private void VersionTracker()
{
formattedVersionInfo.Text = $"Checkmate Mobile Version {VersionTracking.Default.CurrentVersion} ({VersionTracking.Default.CurrentBuild})";
formattedVersionInfo.Text = $"Checkmate {runtimeOS} Version {VersionTracking.Default.CurrentVersion} ({VersionTracking.Default.CurrentBuild})";
}

// Dark Mode
Expand Down Expand Up @@ -189,13 +191,13 @@ private async Task MakeDummyData(bool includeAttachments)
private async void GenerateData_Button_Pressed(System.Object sender, System.EventArgs e)
{
var titlestring = "You need an internet connection if you choose with attachments.";
string action = await Application.Current.MainPage.DisplayActionSheet( titlestring, "Cancel", null, "With Attachments", "Without Attachments");
string action = await Application.Current.MainPage.DisplayActionSheet(titlestring, "Cancel", null, "With Attachments", "Without Attachments");

if (action == "With Attachments")
{
await MakeDummyData(true);
HapticFeedback.Perform(HapticFeedbackType.Click);

if (hasErrorShown)
{
await ShowToastAsync("Data Not Generated ❎", 16, ToastDuration.Short);
Expand Down Expand Up @@ -225,52 +227,45 @@ await MainThread.InvokeOnMainThreadAsync(async () =>

private async void Home_Clicked(System.Object sender, System.EventArgs e)
{
try
{
Uri uri = new("https://github.com/OudomMunint/.NetMAUI-To-Do-List-App");
await Browser.Default.OpenAsync(uri, BrowserLaunchMode.SystemPreferred);
}
catch (Exception ex)
{
await DisplayAlert("Error", ex.ToString(), "Cancel");
}
Uri appRepo = new("https://github.com/OudomMunint/.NetMAUI-To-Do-List-App");
await OpenLinks(appRepo);
}

private async void Feedback_Clicked(System.Object sender, System.EventArgs e)
{
try
{
Uri uri = new("https://github.com/OudomMunint/.NetMAUI-To-Do-List-App/issues");
await Browser.Default.OpenAsync(uri, BrowserLaunchMode.SystemPreferred);
}
catch (Exception ex)
{
await DisplayAlert("Error", ex.ToString(), "Cancel");
}
Uri issues = new("https://github.com/OudomMunint/.NetMAUI-To-Do-List-App/issues");
await OpenLinks(issues);
}

private async void AboutMe_Clicked(System.Object sender, System.EventArgs e)
{
try
{
Uri uri = new("https://github.com/OudomMunint");
Uri uri2 = new("https://oudommunint.netlify.app");
Uri github = new("https://github.com/OudomMunint");
Uri portfolio = new("https://oudommunint.netlify.app");

bool result = await DisplayAlert("About Me", "Do you want to visit my GitHub or Portfolio?", "GitHub", "Portfolio");
await Browser.Default.OpenAsync(result ? uri : uri2, BrowserLaunchMode.SystemPreferred);
}
catch (Exception ex)
{
await DisplayAlert("Error", ex.ToString(), "Cancel");
}
bool result = await DisplayAlert("About Me", "Do you want to visit my GitHub or Portfolio?", "GitHub", "Portfolio");
await OpenLinks(result ? github : portfolio);
}

async void SeePrevious_Tapped(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)
{
Uri previousVersions = new("https://github.com/OudomMunint/.NetMAUI-To-Do-List-App/releases");
await OpenLinks(previousVersions);
}

async void seePrevious_Tapped(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)
private async Task OpenLinks(Uri url)
{
try
{
Uri uri = new("https://github.com/OudomMunint/.NetMAUI-To-Do-List-App/releases");
await Browser.Default.OpenAsync(uri, BrowserLaunchMode.SystemPreferred);
Uri uri = url;
BrowserLaunchOptions options = new BrowserLaunchOptions()
{
LaunchMode = BrowserLaunchMode.SystemPreferred,
TitleMode = BrowserTitleMode.Show,
PreferredToolbarColor = Colors.WhiteSmoke,
PreferredControlColor = Colors.Blue
};
await Browser.OpenAsync(uri, options);

}
catch (Exception ex)
{
Expand Down
2 changes: 1 addition & 1 deletion Views/TodoListPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<ImageButton Grid.Column="3" Source="trash.png" WidthRequest="25" HeightRequest="25" Clicked="DeleteSelectedItems"/>
<ImageButton Grid.Column="4" Source="prioritytoolbar.png" WidthRequest="25" HeightRequest="25" Clicked="SetSelectedItemPriority"/>
<ImageButton Grid.Column="5" Source="pin.png" WidthRequest="25" HeightRequest="25" Clicked="SetItemPinned"/>
<ImageButton Grid.Column="6" Source="menu.png" WidthRequest="25" Clicked="OpenMenu"/>
<ImageButton Grid.Column="6" Source="settingswhite.png" WidthRequest="25" Margin="{OnPlatform iOS=0, Android='0,0,5,0'}" Clicked="OpenMenu"/>
</Grid>
</NavigationPage.TitleView>

Expand Down

0 comments on commit 465727c

Please sign in to comment.