Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
- '**.props'

env:
DOTNET_VERSION: '9.0.x' # The .NET SDK version to use
DOTNET_VERSION: '10.0.x' # The .NET SDK version to use

jobs:
build:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0-android</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net9.0-windows10.0.19041</TargetFrameworks>
<TargetFrameworks>net10.0-android</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net10.0-ios;net10.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net10.0-windows10.0.19041</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>MonkeyFinder</RootNamespace>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>preview</LangVersion>

<!-- Display name -->
<ApplicationTitle>MonkeyFinder</ApplicationTitle>
Expand Down Expand Up @@ -44,7 +45,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Essentials" Version="$(MauiVersion)" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ public partial class BaseViewModel : ObservableObject
{
[ObservableProperty]
[NotifyPropertyChangedFor(nameof(IsNotBusy))]
bool isBusy;
public partial bool IsBusy { get; set; }

[ObservableProperty]
string title;
public partial string Title { get; set; }

public bool IsNotBusy => !IsBusy;
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public MonkeyDetailsViewModel(IMap map)
}

[ObservableProperty]
Monkey monkey;
public partial Monkey Monkey { get; set; }

[RelayCommand]
async Task OpenMap()
Expand All @@ -26,7 +26,7 @@ async Task OpenMap()
catch (Exception ex)
{
Debug.WriteLine($"Unable to launch maps: {ex.Message}");
await Shell.Current.DisplayAlert("Error, no Maps app!", ex.Message, "OK");
await Shell.Current.DisplayAlertAsync("Error, no Maps app!", ex.Message, "OK");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ async Task GoToDetails(Monkey monkey)
}

[ObservableProperty]
bool isRefreshing;
public partial bool IsRefreshing { get; set; }

[RelayCommand]
async Task GetMonkeysAsync()
Expand All @@ -41,7 +41,7 @@ async Task GetMonkeysAsync()
{
if (connectivity.NetworkAccess != NetworkAccess.Internet)
{
await Shell.Current.DisplayAlert("No connectivity!",
await Shell.Current.DisplayAlertAsync("No connectivity!",
$"Please check internet and try again.", "OK");
return;
}
Expand All @@ -59,7 +59,7 @@ await Shell.Current.DisplayAlert("No connectivity!",
catch (Exception ex)
{
Debug.WriteLine($"Unable to get monkeys: {ex.Message}");
await Shell.Current.DisplayAlert("Error!", ex.Message, "OK");
await Shell.Current.DisplayAlertAsync("Error!", ex.Message, "OK");
}
finally
{
Expand Down Expand Up @@ -93,14 +93,14 @@ async Task GetClosestMonkey()
new Location(m.Latitude, m.Longitude), DistanceUnits.Miles))
.FirstOrDefault();

await Shell.Current.DisplayAlert("", first.Name + " " +
await Shell.Current.DisplayAlertAsync("", first.Name + " " +
first.Location, "OK");

}
catch (Exception ex)
{
Debug.WriteLine($"Unable to query location: {ex.Message}");
await Shell.Current.DisplayAlert("Error!", ex.Message, "OK");
await Shell.Current.DisplayAlertAsync("Error!", ex.Message, "OK");
}
}
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0-android</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net9.0-windows10.0.19041</TargetFrameworks>
<TargetFrameworks>net10.0-android</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net10.0-ios;net10.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net10.0-windows10.0.19041</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>MonkeyFinder</RootNamespace>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>preview</LangVersion>

<!-- Display name -->
<ApplicationTitle>MonkeyFinder</ApplicationTitle>
Expand Down Expand Up @@ -44,6 +45,6 @@

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Essentials" Version="$(MauiVersion)" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ public partial class BaseViewModel : ObservableObject
{
[ObservableProperty]
[NotifyPropertyChangedFor(nameof(IsNotBusy))]
bool isBusy;
public partial bool IsBusy { get; set; }

[ObservableProperty]
string title;
public partial string Title { get; set; }

public bool IsNotBusy => !IsBusy;
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public MonkeyDetailsViewModel(IMap map)
}

[ObservableProperty]
Monkey monkey;
public partial Monkey Monkey { get; set; }

[RelayCommand]
async Task OpenMap()
Expand All @@ -26,7 +26,7 @@ async Task OpenMap()
catch (Exception ex)
{
Debug.WriteLine($"Unable to launch maps: {ex.Message}");
await Shell.Current.DisplayAlert("Error, no Maps app!", ex.Message, "OK");
await Shell.Current.DisplayAlertAsync("Error, no Maps app!", ex.Message, "OK");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ async Task GoToDetails(Monkey monkey)
}

[ObservableProperty]
bool isRefreshing;
public partial bool IsRefreshing { get; set; }

[RelayCommand]
async Task GetMonkeysAsync()
Expand All @@ -41,7 +41,7 @@ async Task GetMonkeysAsync()
{
if (connectivity.NetworkAccess != NetworkAccess.Internet)
{
await Shell.Current.DisplayAlert("No connectivity!",
await Shell.Current.DisplayAlertAsync("No connectivity!",
$"Please check internet and try again.", "OK");
return;
}
Expand All @@ -59,7 +59,7 @@ await Shell.Current.DisplayAlert("No connectivity!",
catch (Exception ex)
{
Debug.WriteLine($"Unable to get monkeys: {ex.Message}");
await Shell.Current.DisplayAlert("Error!", ex.Message, "OK");
await Shell.Current.DisplayAlertAsync("Error!", ex.Message, "OK");
}
finally
{
Expand Down Expand Up @@ -93,14 +93,14 @@ async Task GetClosestMonkey()
new Location(m.Latitude, m.Longitude), DistanceUnits.Miles))
.FirstOrDefault();

await Shell.Current.DisplayAlert("", first.Name + " " +
await Shell.Current.DisplayAlertAsync("", first.Name + " " +
first.Location, "OK");

}
catch (Exception ex)
{
Debug.WriteLine($"Unable to query location: {ex.Message}");
await Shell.Current.DisplayAlert("Error!", ex.Message, "OK");
await Shell.Current.DisplayAlertAsync("Error!", ex.Message, "OK");
}
}
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0-android</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net9.0-windows10.0.19041</TargetFrameworks>
<TargetFrameworks>net10.0-android</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net10.0-ios;net10.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net10.0-windows10.0.19041</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>MonkeyFinder</RootNamespace>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>preview</LangVersion>

<!-- Display name -->
<ApplicationTitle>MonkeyFinder</ApplicationTitle>
Expand Down Expand Up @@ -44,7 +45,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Essentials" Version="$(MauiVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public ButtonOutline()
}
}

public class CardView : Frame
public class CardView : Border
{
public CardView()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ public partial class BaseViewModel : ObservableObject
{
[ObservableProperty]
[NotifyPropertyChangedFor(nameof(IsNotBusy))]
bool isBusy;
public partial bool IsBusy { get; set; }

[ObservableProperty]
string title;
public partial string Title { get; set; }

public bool IsNotBusy => !IsBusy;
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public MonkeyDetailsViewModel(IMap map)
}

[ObservableProperty]
Monkey monkey;
public partial Monkey Monkey { get; set; }

[RelayCommand]
async Task OpenMap()
Expand All @@ -26,7 +26,7 @@ async Task OpenMap()
catch (Exception ex)
{
Debug.WriteLine($"Unable to launch maps: {ex.Message}");
await Shell.Current.DisplayAlert("Error, no Maps app!", ex.Message, "OK");
await Shell.Current.DisplayAlertAsync("Error, no Maps app!", ex.Message, "OK");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ async Task GoToDetails(Monkey monkey)
}

[ObservableProperty]
bool isRefreshing;
public partial bool IsRefreshing { get; set; }

[RelayCommand]
async Task GetMonkeysAsync()
Expand All @@ -41,7 +41,7 @@ async Task GetMonkeysAsync()
{
if (connectivity.NetworkAccess != NetworkAccess.Internet)
{
await Shell.Current.DisplayAlert("No connectivity!",
await Shell.Current.DisplayAlertAsync("No connectivity!",
$"Please check internet and try again.", "OK");
return;
}
Expand All @@ -59,7 +59,7 @@ await Shell.Current.DisplayAlert("No connectivity!",
catch (Exception ex)
{
Debug.WriteLine($"Unable to get monkeys: {ex.Message}");
await Shell.Current.DisplayAlert("Error!", ex.Message, "OK");
await Shell.Current.DisplayAlertAsync("Error!", ex.Message, "OK");
}
finally
{
Expand Down Expand Up @@ -93,14 +93,14 @@ async Task GetClosestMonkey()
new Location(m.Latitude, m.Longitude), DistanceUnits.Miles))
.FirstOrDefault();

await Shell.Current.DisplayAlert("", first.Name + " " +
await Shell.Current.DisplayAlertAsync("", first.Name + " " +
first.Location, "OK");

}
catch (Exception ex)
{
Debug.WriteLine($"Unable to query location: {ex.Message}");
await Shell.Current.DisplayAlert("Error!", ex.Message, "OK");
await Shell.Current.DisplayAlertAsync("Error!", ex.Message, "OK");
}
}
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0-android</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net9.0-windows10.0.19041</TargetFrameworks>
<TargetFrameworks>net10.0-android</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net10.0-ios;net10.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net10.0-windows10.0.19041</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>MonkeyFinder</RootNamespace>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>preview</LangVersion>

<!-- Display name -->
<ApplicationTitle>MonkeyFinder</ApplicationTitle>
Expand Down Expand Up @@ -44,7 +45,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Essentials" Version="$(MauiVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public StandardButton()
}
}

public class CardView : Frame
public class CardView : Border
{
public CardView()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ public partial class BaseViewModel : ObservableObject
{
[ObservableProperty]
[NotifyPropertyChangedFor(nameof(IsNotBusy))]
bool isBusy;
public partial bool IsBusy { get; set; }

[ObservableProperty]
string title;
public partial string Title { get; set; }

public bool IsNotBusy => !IsBusy;
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public MonkeyDetailsViewModel(IMap map)
}

[ObservableProperty]
Monkey monkey;
public partial Monkey Monkey { get; set; }

[RelayCommand]
async Task OpenMap()
Expand All @@ -26,7 +26,7 @@ async Task OpenMap()
catch (Exception ex)
{
Debug.WriteLine($"Unable to launch maps: {ex.Message}");
await Shell.Current.DisplayAlert("Error, no Maps app!", ex.Message, "OK");
await Shell.Current.DisplayAlertAsync("Error, no Maps app!", ex.Message, "OK");
}
}
}
Loading