From f9679e84cdbbff5b06c292df7c58a1d09bb72d8b Mon Sep 17 00:00:00 2001
From: Tobias Scholze <t.scholze@anfe.ma>
Date: Tue, 20 Feb 2024 17:34:38 +0100
Subject: [PATCH] Enhanced BeginnersSeries sample (MauiApp2) to be more
 beginner's friendly

- Updated solution, project and namespace to 'BeginnersTask' to be aligned with other samples naming structure
- Fixed missing indents
- Added comment to MauiProgram.cs with helpful links to Microsoft Learn
- Added comment to MainViewModel.cs with helpful code pointers to see related setups and receivers of routings
---
 .../{MauiApp2.sln => BeginnersTask.sln}       |   2 +-
 .../{MauiApp2 => BeginnersTask}/App.xaml      |   4 ++--
 .../{MauiApp2 => BeginnersTask}/App.xaml.cs   |   2 +-
 .../{MauiApp2 => BeginnersTask}/AppShell.xaml |   5 ++---
 .../AppShell.xaml.cs                          |   2 +-
 .../BeginnersTask.csproj}                     |   6 +++---
 .../DetailPage.xaml                           |   8 ++++----
 .../DetailPage.xaml.cs                        |   4 ++--
 .../{MauiApp2 => BeginnersTask}/MainPage.xaml |   4 ++--
 .../MainPage.xaml.cs                          |   4 ++--
 .../MauiProgram.cs                            |  10 +++++----
 .../Platforms/Android/AndroidManifest.xml     |   2 +-
 .../Platforms/Android/MainActivity.cs         |   2 +-
 .../Platforms/Android/MainApplication.cs      |   2 +-
 .../Android/Resources/values/colors.xml       |   0
 .../Platforms/MacCatalyst}/AppDelegate.cs     |   2 +-
 .../Platforms/MacCatalyst/Info.plist          |   0
 .../Platforms/MacCatalyst}/Program.cs         |   2 +-
 .../Platforms/Tizen/Main.cs                   |   2 +-
 .../Platforms/Tizen/tizen-manifest.xml        |   6 +++---
 .../Platforms/Windows/App.xaml                |   4 ++--
 .../Platforms/Windows/App.xaml.cs             |   2 +-
 .../Platforms/Windows/Package.appxmanifest    |   0
 .../Platforms/Windows/app.manifest            |   2 +-
 .../Platforms/iOS}/AppDelegate.cs             |   2 +-
 .../Platforms/iOS/Info.plist                  |   0
 .../Platforms/iOS}/Program.cs                 |   2 +-
 .../Properties/launchSettings.json            |   0
 .../Resources/Colors.xaml                     |   0
 .../Resources/Fonts/OpenSans-Regular.ttf      | Bin
 .../Resources/Fonts/OpenSans-Semibold.ttf     | Bin
 .../Resources/Images/dotnet_bot.svg           |   0
 .../Resources/Images/logo.png                 | Bin
 .../Resources/Raw/AboutAssets.txt             |   0
 .../Resources/Styles.xaml                     |   0
 .../Resources/appicon.svg                     |   0
 .../Resources/appiconfg.svg                   |   0
 .../ViewModel/DetailViewModel.cs              |   2 +-
 .../ViewModel/MainViewModel.cs                |  19 +++++++++++++-----
 39 files changed, 56 insertions(+), 46 deletions(-)
 rename 8.0/Beginners-Series/{MauiApp2.sln => BeginnersTask.sln} (88%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/App.xaml (84%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/App.xaml.cs (80%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/AppShell.xaml (79%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/AppShell.xaml.cs (86%)
 rename 8.0/Beginners-Series/{MauiApp2/MauiApp2.csproj => BeginnersTask/BeginnersTask.csproj} (95%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/DetailPage.xaml (69%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/DetailPage.xaml.cs (71%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/MainPage.xaml (95%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/MainPage.xaml.cs (69%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/MauiProgram.cs (71%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/Platforms/Android/AndroidManifest.xml (93%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/Platforms/Android/MainActivity.cs (93%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/Platforms/Android/MainApplication.cs (91%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/Platforms/Android/Resources/values/colors.xml (100%)
 rename 8.0/Beginners-Series/{MauiApp2/Platforms/iOS => BeginnersTask/Platforms/MacCatalyst}/AppDelegate.cs (87%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/Platforms/MacCatalyst/Info.plist (100%)
 rename 8.0/Beginners-Series/{MauiApp2/Platforms/iOS => BeginnersTask/Platforms/MacCatalyst}/Program.cs (92%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/Platforms/Tizen/Main.cs (91%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/Platforms/Tizen/tizen-manifest.xml (54%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/Platforms/Windows/App.xaml (72%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/Platforms/Windows/App.xaml.cs (95%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/Platforms/Windows/Package.appxmanifest (100%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/Platforms/Windows/app.manifest (90%)
 rename 8.0/Beginners-Series/{MauiApp2/Platforms/MacCatalyst => BeginnersTask/Platforms/iOS}/AppDelegate.cs (87%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/Platforms/iOS/Info.plist (100%)
 rename 8.0/Beginners-Series/{MauiApp2/Platforms/MacCatalyst => BeginnersTask/Platforms/iOS}/Program.cs (92%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/Properties/launchSettings.json (100%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/Resources/Colors.xaml (100%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/Resources/Fonts/OpenSans-Regular.ttf (100%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/Resources/Fonts/OpenSans-Semibold.ttf (100%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/Resources/Images/dotnet_bot.svg (100%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/Resources/Images/logo.png (100%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/Resources/Raw/AboutAssets.txt (100%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/Resources/Styles.xaml (100%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/Resources/appicon.svg (100%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/Resources/appiconfg.svg (100%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/ViewModel/DetailViewModel.cs (89%)
 rename 8.0/Beginners-Series/{MauiApp2 => BeginnersTask}/ViewModel/MainViewModel.cs (64%)

diff --git a/8.0/Beginners-Series/MauiApp2.sln b/8.0/Beginners-Series/BeginnersTask.sln
similarity index 88%
rename from 8.0/Beginners-Series/MauiApp2.sln
rename to 8.0/Beginners-Series/BeginnersTask.sln
index 124e276ad..a43c0bef4 100644
--- a/8.0/Beginners-Series/MauiApp2.sln
+++ b/8.0/Beginners-Series/BeginnersTask.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31611.283
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiApp2", "MauiApp2\MauiApp2.csproj", "{E00D4313-A6CA-4A1D-A1DB-C242961F1D15}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeginnersTask", "BeginnersTask\BeginnersTask.csproj", "{E00D4313-A6CA-4A1D-A1DB-C242961F1D15}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/8.0/Beginners-Series/MauiApp2/App.xaml b/8.0/Beginners-Series/BeginnersTask/App.xaml
similarity index 84%
rename from 8.0/Beginners-Series/MauiApp2/App.xaml
rename to 8.0/Beginners-Series/BeginnersTask/App.xaml
index a4492a0bd..a0f53e361 100644
--- a/8.0/Beginners-Series/MauiApp2/App.xaml
+++ b/8.0/Beginners-Series/BeginnersTask/App.xaml
@@ -1,8 +1,8 @@
 <?xml version = "1.0" encoding = "UTF-8" ?>
 <Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace:MauiApp2"
-             x:Class="MauiApp2.App">
+             xmlns:local="clr-namespace:BeginnersTasks"
+             x:Class="BeginnersTasks.App">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/8.0/Beginners-Series/MauiApp2/App.xaml.cs b/8.0/Beginners-Series/BeginnersTask/App.xaml.cs
similarity index 80%
rename from 8.0/Beginners-Series/MauiApp2/App.xaml.cs
rename to 8.0/Beginners-Series/BeginnersTask/App.xaml.cs
index 343ae2ac4..68f0dc474 100644
--- a/8.0/Beginners-Series/MauiApp2/App.xaml.cs
+++ b/8.0/Beginners-Series/BeginnersTask/App.xaml.cs
@@ -1,4 +1,4 @@
-namespace MauiApp2;
+namespace BeginnersTasks;
 
 public partial class App : Application
 {
diff --git a/8.0/Beginners-Series/MauiApp2/AppShell.xaml b/8.0/Beginners-Series/BeginnersTask/AppShell.xaml
similarity index 79%
rename from 8.0/Beginners-Series/MauiApp2/AppShell.xaml
rename to 8.0/Beginners-Series/BeginnersTask/AppShell.xaml
index 956c6fba7..4cce020dd 100644
--- a/8.0/Beginners-Series/MauiApp2/AppShell.xaml
+++ b/8.0/Beginners-Series/BeginnersTask/AppShell.xaml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <Shell
-    x:Class="MauiApp2.AppShell"
+    x:Class="BeginnersTasks.AppShell"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:local="clr-namespace:MauiApp2"
+    xmlns:local="clr-namespace:BeginnersTasks"
     Shell.FlyoutBehavior="Disabled">
     <ShellContent
         Title="Home"
         ContentTemplate="{DataTemplate local:MainPage}"
         Route="MainPage" />
-
 </Shell>
diff --git a/8.0/Beginners-Series/MauiApp2/AppShell.xaml.cs b/8.0/Beginners-Series/BeginnersTask/AppShell.xaml.cs
similarity index 86%
rename from 8.0/Beginners-Series/MauiApp2/AppShell.xaml.cs
rename to 8.0/Beginners-Series/BeginnersTask/AppShell.xaml.cs
index c39debce5..24f219c53 100644
--- a/8.0/Beginners-Series/MauiApp2/AppShell.xaml.cs
+++ b/8.0/Beginners-Series/BeginnersTask/AppShell.xaml.cs
@@ -1,4 +1,4 @@
-namespace MauiApp2;
+namespace BeginnersTasks;
 
 public partial class AppShell : Shell
 {
diff --git a/8.0/Beginners-Series/MauiApp2/MauiApp2.csproj b/8.0/Beginners-Series/BeginnersTask/BeginnersTask.csproj
similarity index 95%
rename from 8.0/Beginners-Series/MauiApp2/MauiApp2.csproj
rename to 8.0/Beginners-Series/BeginnersTask/BeginnersTask.csproj
index b8be842a0..b10b5e3f3 100644
--- a/8.0/Beginners-Series/MauiApp2/MauiApp2.csproj
+++ b/8.0/Beginners-Series/BeginnersTask/BeginnersTask.csproj
@@ -14,16 +14,16 @@
 		<!-- For example: <RuntimeIdentifiers>maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers> -->
 
 		<OutputType>Exe</OutputType>
-		<RootNamespace>MauiApp2</RootNamespace>
+		<RootNamespace>BeginnersTasks</RootNamespace>
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
 
 		<!-- Display name -->
-		<ApplicationTitle>MauiApp2</ApplicationTitle>
+		<ApplicationTitle>BeginnersTasks</ApplicationTitle>
 
 		<!-- App Identifier -->
-		<ApplicationId>com.companyname.mauiapp2</ApplicationId>
+		<ApplicationId>com.companyname.BeginnersTasks</ApplicationId>
 
 		<!-- Versions -->
 		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
diff --git a/8.0/Beginners-Series/MauiApp2/DetailPage.xaml b/8.0/Beginners-Series/BeginnersTask/DetailPage.xaml
similarity index 69%
rename from 8.0/Beginners-Series/MauiApp2/DetailPage.xaml
rename to 8.0/Beginners-Series/BeginnersTask/DetailPage.xaml
index 4c3ce6a04..2ee7167db 100644
--- a/8.0/Beginners-Series/MauiApp2/DetailPage.xaml
+++ b/8.0/Beginners-Series/BeginnersTask/DetailPage.xaml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="MauiApp2.DetailPage"
-             xmlns:viewmodel="clr-namespace:MauiApp2.ViewModel"
+             x:Class="BeginnersTasks.DetailPage"
+             xmlns:viewmodel="clr-namespace:BeginnersTasks.ViewModel"
              x:DataType="viewmodel:DetailViewModel"
              Title="DetailPage">
     <StackLayout Padding="20">
         <Label Text="{Binding Text}"
                FontSize="25"
-                VerticalOptions="Center" 
-                HorizontalOptions="Center" />
+               VerticalOptions="Center" 
+               HorizontalOptions="Center" />
 
         <Button Text="Go Back"
                 Command="{Binding GoBackCommand}"/>
diff --git a/8.0/Beginners-Series/MauiApp2/DetailPage.xaml.cs b/8.0/Beginners-Series/BeginnersTask/DetailPage.xaml.cs
similarity index 71%
rename from 8.0/Beginners-Series/MauiApp2/DetailPage.xaml.cs
rename to 8.0/Beginners-Series/BeginnersTask/DetailPage.xaml.cs
index 96012438d..54a0896a9 100644
--- a/8.0/Beginners-Series/MauiApp2/DetailPage.xaml.cs
+++ b/8.0/Beginners-Series/BeginnersTask/DetailPage.xaml.cs
@@ -1,6 +1,6 @@
-using MauiApp2.ViewModel;
+using BeginnersTasks.ViewModel;
 
-namespace MauiApp2;
+namespace BeginnersTasks;
 
 public partial class DetailPage : ContentPage
 {
diff --git a/8.0/Beginners-Series/MauiApp2/MainPage.xaml b/8.0/Beginners-Series/BeginnersTask/MainPage.xaml
similarity index 95%
rename from 8.0/Beginners-Series/MauiApp2/MainPage.xaml
rename to 8.0/Beginners-Series/BeginnersTask/MainPage.xaml
index c497711f1..129f93cea 100644
--- a/8.0/Beginners-Series/MauiApp2/MainPage.xaml
+++ b/8.0/Beginners-Series/BeginnersTask/MainPage.xaml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="MauiApp2.MainPage"
-             xmlns:viewmodel="clr-namespace:MauiApp2.ViewModel"
+             x:Class="BeginnersTasks.MainPage"
+             xmlns:viewmodel="clr-namespace:BeginnersTasks.ViewModel"
              x:DataType="viewmodel:MainViewModel">
 
     <Grid RowDefinitions="100, Auto, *"
diff --git a/8.0/Beginners-Series/MauiApp2/MainPage.xaml.cs b/8.0/Beginners-Series/BeginnersTask/MainPage.xaml.cs
similarity index 69%
rename from 8.0/Beginners-Series/MauiApp2/MainPage.xaml.cs
rename to 8.0/Beginners-Series/BeginnersTask/MainPage.xaml.cs
index 26a565b32..000621a6e 100644
--- a/8.0/Beginners-Series/MauiApp2/MainPage.xaml.cs
+++ b/8.0/Beginners-Series/BeginnersTask/MainPage.xaml.cs
@@ -1,6 +1,6 @@
-using MauiApp2.ViewModel;
+using BeginnersTasks.ViewModel;
 
-namespace MauiApp2;
+namespace BeginnersTasks;
 
 public partial class MainPage : ContentPage
 {
diff --git a/8.0/Beginners-Series/MauiApp2/MauiProgram.cs b/8.0/Beginners-Series/BeginnersTask/MauiProgram.cs
similarity index 71%
rename from 8.0/Beginners-Series/MauiApp2/MauiProgram.cs
rename to 8.0/Beginners-Series/BeginnersTask/MauiProgram.cs
index 16ac4f599..fd4308530 100644
--- a/8.0/Beginners-Series/MauiApp2/MauiProgram.cs
+++ b/8.0/Beginners-Series/BeginnersTask/MauiProgram.cs
@@ -1,6 +1,6 @@
-using MauiApp2.ViewModel;
+using BeginnersTasks.ViewModel;
 
-namespace MauiApp2;
+namespace BeginnersTasks;
 
 public static class MauiProgram
 {
@@ -14,13 +14,15 @@ public static MauiApp CreateMauiApp()
 				fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
 				fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
 			});
-
+		
+		// See https://learn.microsoft.com/en-us/dotnet/core/extensions/dependency-injection#service-lifetimes
+		// to understand the differences between [AddSingleton] and [AddTransient].
+		
 		builder.Services.AddSingleton<IConnectivity>(Connectivity.Current);
 
 		builder.Services.AddSingleton<MainPage>();
 		builder.Services.AddSingleton<MainViewModel>();
 
-
         builder.Services.AddTransient<DetailPage>();
         builder.Services.AddTransient<DetailViewModel>();
 
diff --git a/8.0/Beginners-Series/MauiApp2/Platforms/Android/AndroidManifest.xml b/8.0/Beginners-Series/BeginnersTask/Platforms/Android/AndroidManifest.xml
similarity index 93%
rename from 8.0/Beginners-Series/MauiApp2/Platforms/Android/AndroidManifest.xml
rename to 8.0/Beginners-Series/BeginnersTask/Platforms/Android/AndroidManifest.xml
index e9937ad77..0cda02fa0 100644
--- a/8.0/Beginners-Series/MauiApp2/Platforms/Android/AndroidManifest.xml
+++ b/8.0/Beginners-Series/BeginnersTask/Platforms/Android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true"></application>
+	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.INTERNET" />
 </manifest>
\ No newline at end of file
diff --git a/8.0/Beginners-Series/MauiApp2/Platforms/Android/MainActivity.cs b/8.0/Beginners-Series/BeginnersTask/Platforms/Android/MainActivity.cs
similarity index 93%
rename from 8.0/Beginners-Series/MauiApp2/Platforms/Android/MainActivity.cs
rename to 8.0/Beginners-Series/BeginnersTask/Platforms/Android/MainActivity.cs
index 5aacae217..68ccc44e8 100644
--- a/8.0/Beginners-Series/MauiApp2/Platforms/Android/MainActivity.cs
+++ b/8.0/Beginners-Series/BeginnersTask/Platforms/Android/MainActivity.cs
@@ -2,7 +2,7 @@
 using Android.Content.PM;
 using Android.OS;
 
-namespace MauiApp2;
+namespace BeginnersTasks;
 
 [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)]
 public class MainActivity : MauiAppCompatActivity
diff --git a/8.0/Beginners-Series/MauiApp2/Platforms/Android/MainApplication.cs b/8.0/Beginners-Series/BeginnersTask/Platforms/Android/MainApplication.cs
similarity index 91%
rename from 8.0/Beginners-Series/MauiApp2/Platforms/Android/MainApplication.cs
rename to 8.0/Beginners-Series/BeginnersTask/Platforms/Android/MainApplication.cs
index 65adb2e5b..c04333f66 100644
--- a/8.0/Beginners-Series/MauiApp2/Platforms/Android/MainApplication.cs
+++ b/8.0/Beginners-Series/BeginnersTask/Platforms/Android/MainApplication.cs
@@ -1,7 +1,7 @@
 using Android.App;
 using Android.Runtime;
 
-namespace MauiApp2;
+namespace BeginnersTasks;
 
 [Application]
 public class MainApplication : MauiApplication
diff --git a/8.0/Beginners-Series/MauiApp2/Platforms/Android/Resources/values/colors.xml b/8.0/Beginners-Series/BeginnersTask/Platforms/Android/Resources/values/colors.xml
similarity index 100%
rename from 8.0/Beginners-Series/MauiApp2/Platforms/Android/Resources/values/colors.xml
rename to 8.0/Beginners-Series/BeginnersTask/Platforms/Android/Resources/values/colors.xml
diff --git a/8.0/Beginners-Series/MauiApp2/Platforms/iOS/AppDelegate.cs b/8.0/Beginners-Series/BeginnersTask/Platforms/MacCatalyst/AppDelegate.cs
similarity index 87%
rename from 8.0/Beginners-Series/MauiApp2/Platforms/iOS/AppDelegate.cs
rename to 8.0/Beginners-Series/BeginnersTask/Platforms/MacCatalyst/AppDelegate.cs
index 37d32d072..766d4f9c3 100644
--- a/8.0/Beginners-Series/MauiApp2/Platforms/iOS/AppDelegate.cs
+++ b/8.0/Beginners-Series/BeginnersTask/Platforms/MacCatalyst/AppDelegate.cs
@@ -1,6 +1,6 @@
 using Foundation;
 
-namespace MauiApp2;
+namespace BeginnersTasks;
 
 [Register("AppDelegate")]
 public class AppDelegate : MauiUIApplicationDelegate
diff --git a/8.0/Beginners-Series/MauiApp2/Platforms/MacCatalyst/Info.plist b/8.0/Beginners-Series/BeginnersTask/Platforms/MacCatalyst/Info.plist
similarity index 100%
rename from 8.0/Beginners-Series/MauiApp2/Platforms/MacCatalyst/Info.plist
rename to 8.0/Beginners-Series/BeginnersTask/Platforms/MacCatalyst/Info.plist
diff --git a/8.0/Beginners-Series/MauiApp2/Platforms/iOS/Program.cs b/8.0/Beginners-Series/BeginnersTask/Platforms/MacCatalyst/Program.cs
similarity index 92%
rename from 8.0/Beginners-Series/MauiApp2/Platforms/iOS/Program.cs
rename to 8.0/Beginners-Series/BeginnersTask/Platforms/MacCatalyst/Program.cs
index 3514a4d84..49f0a34c5 100644
--- a/8.0/Beginners-Series/MauiApp2/Platforms/iOS/Program.cs
+++ b/8.0/Beginners-Series/BeginnersTask/Platforms/MacCatalyst/Program.cs
@@ -1,7 +1,7 @@
 using ObjCRuntime;
 using UIKit;
 
-namespace MauiApp2;
+namespace BeginnersTasks;
 
 public class Program
 {
diff --git a/8.0/Beginners-Series/MauiApp2/Platforms/Tizen/Main.cs b/8.0/Beginners-Series/BeginnersTask/Platforms/Tizen/Main.cs
similarity index 91%
rename from 8.0/Beginners-Series/MauiApp2/Platforms/Tizen/Main.cs
rename to 8.0/Beginners-Series/BeginnersTask/Platforms/Tizen/Main.cs
index 3850b2ef3..ffc8e6799 100644
--- a/8.0/Beginners-Series/MauiApp2/Platforms/Tizen/Main.cs
+++ b/8.0/Beginners-Series/BeginnersTask/Platforms/Tizen/Main.cs
@@ -2,7 +2,7 @@
 using Microsoft.Maui;
 using Microsoft.Maui.Hosting;
 
-namespace MauiApp2;
+namespace BeginnersTasks;
 
 class Program : MauiApplication
 {
diff --git a/8.0/Beginners-Series/MauiApp2/Platforms/Tizen/tizen-manifest.xml b/8.0/Beginners-Series/BeginnersTask/Platforms/Tizen/tizen-manifest.xml
similarity index 54%
rename from 8.0/Beginners-Series/MauiApp2/Platforms/Tizen/tizen-manifest.xml
rename to 8.0/Beginners-Series/BeginnersTask/Platforms/Tizen/tizen-manifest.xml
index d98ed84e4..79908e0b6 100644
--- a/8.0/Beginners-Series/MauiApp2/Platforms/Tizen/tizen-manifest.xml
+++ b/8.0/Beginners-Series/BeginnersTask/Platforms/Tizen/tizen-manifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.companyname.MauiApp2" version="1.0.0" api-version="7" xmlns="http://tizen.org/ns/packages">
+<manifest package="com.companyname.BeginnersTask" version="1.0.0" api-version="7" xmlns="http://tizen.org/ns/packages">
   <profile name="common" />
-  <ui-application appid="com.companyname.MauiApp2" exec="MauiApp2.dll" multiple="false" nodisplay="false" taskmanage="true" type="dotnet" launch_mode="single">
-    <label>MauiApp2</label>
+  <ui-application appid="com.companyname.BeginnersTask" exec="BeginnersTask.dll" multiple="false" nodisplay="false" taskmanage="true" type="dotnet" launch_mode="single">
+    <label>BeginnersTask</label>
     <icon>appicon.xhigh.png</icon>
     <metadata key="http://tizen.org/metadata/prefer_dotnet_aot" value="true" />
   </ui-application>
diff --git a/8.0/Beginners-Series/MauiApp2/Platforms/Windows/App.xaml b/8.0/Beginners-Series/BeginnersTask/Platforms/Windows/App.xaml
similarity index 72%
rename from 8.0/Beginners-Series/MauiApp2/Platforms/Windows/App.xaml
rename to 8.0/Beginners-Series/BeginnersTask/Platforms/Windows/App.xaml
index a8122fae4..eba105c01 100644
--- a/8.0/Beginners-Series/MauiApp2/Platforms/Windows/App.xaml
+++ b/8.0/Beginners-Series/BeginnersTask/Platforms/Windows/App.xaml
@@ -1,8 +1,8 @@
 <maui:MauiWinUIApplication
-    x:Class="MauiApp2.WinUI.App"
+    x:Class="BeginnersTasks.WinUI.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:maui="using:Microsoft.Maui"
-    xmlns:local="using:MauiApp2.WinUI">
+    xmlns:local="using:BeginnersTasks.WinUI">
 
 </maui:MauiWinUIApplication>
diff --git a/8.0/Beginners-Series/MauiApp2/Platforms/Windows/App.xaml.cs b/8.0/Beginners-Series/BeginnersTask/Platforms/Windows/App.xaml.cs
similarity index 95%
rename from 8.0/Beginners-Series/MauiApp2/Platforms/Windows/App.xaml.cs
rename to 8.0/Beginners-Series/BeginnersTask/Platforms/Windows/App.xaml.cs
index 865058475..db53e813d 100644
--- a/8.0/Beginners-Series/MauiApp2/Platforms/Windows/App.xaml.cs
+++ b/8.0/Beginners-Series/BeginnersTask/Platforms/Windows/App.xaml.cs
@@ -3,7 +3,7 @@
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
 
-namespace MauiApp2.WinUI;
+namespace BeginnersTasks.WinUI;
 
 /// <summary>
 /// Provides application-specific behavior to supplement the default Application class.
diff --git a/8.0/Beginners-Series/MauiApp2/Platforms/Windows/Package.appxmanifest b/8.0/Beginners-Series/BeginnersTask/Platforms/Windows/Package.appxmanifest
similarity index 100%
rename from 8.0/Beginners-Series/MauiApp2/Platforms/Windows/Package.appxmanifest
rename to 8.0/Beginners-Series/BeginnersTask/Platforms/Windows/Package.appxmanifest
diff --git a/8.0/Beginners-Series/MauiApp2/Platforms/Windows/app.manifest b/8.0/Beginners-Series/BeginnersTask/Platforms/Windows/app.manifest
similarity index 90%
rename from 8.0/Beginners-Series/MauiApp2/Platforms/Windows/app.manifest
rename to 8.0/Beginners-Series/BeginnersTask/Platforms/Windows/app.manifest
index 1e6c24ef2..6d6e5cfa9 100644
--- a/8.0/Beginners-Series/MauiApp2/Platforms/Windows/app.manifest
+++ b/8.0/Beginners-Series/BeginnersTask/Platforms/Windows/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="MauiApp2.WinUI.app"/>
+  <assemblyIdentity version="1.0.0.0" name="BeginnersTasks.WinUI.app"/>
 
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>
diff --git a/8.0/Beginners-Series/MauiApp2/Platforms/MacCatalyst/AppDelegate.cs b/8.0/Beginners-Series/BeginnersTask/Platforms/iOS/AppDelegate.cs
similarity index 87%
rename from 8.0/Beginners-Series/MauiApp2/Platforms/MacCatalyst/AppDelegate.cs
rename to 8.0/Beginners-Series/BeginnersTask/Platforms/iOS/AppDelegate.cs
index 37d32d072..766d4f9c3 100644
--- a/8.0/Beginners-Series/MauiApp2/Platforms/MacCatalyst/AppDelegate.cs
+++ b/8.0/Beginners-Series/BeginnersTask/Platforms/iOS/AppDelegate.cs
@@ -1,6 +1,6 @@
 using Foundation;
 
-namespace MauiApp2;
+namespace BeginnersTasks;
 
 [Register("AppDelegate")]
 public class AppDelegate : MauiUIApplicationDelegate
diff --git a/8.0/Beginners-Series/MauiApp2/Platforms/iOS/Info.plist b/8.0/Beginners-Series/BeginnersTask/Platforms/iOS/Info.plist
similarity index 100%
rename from 8.0/Beginners-Series/MauiApp2/Platforms/iOS/Info.plist
rename to 8.0/Beginners-Series/BeginnersTask/Platforms/iOS/Info.plist
diff --git a/8.0/Beginners-Series/MauiApp2/Platforms/MacCatalyst/Program.cs b/8.0/Beginners-Series/BeginnersTask/Platforms/iOS/Program.cs
similarity index 92%
rename from 8.0/Beginners-Series/MauiApp2/Platforms/MacCatalyst/Program.cs
rename to 8.0/Beginners-Series/BeginnersTask/Platforms/iOS/Program.cs
index 3514a4d84..49f0a34c5 100644
--- a/8.0/Beginners-Series/MauiApp2/Platforms/MacCatalyst/Program.cs
+++ b/8.0/Beginners-Series/BeginnersTask/Platforms/iOS/Program.cs
@@ -1,7 +1,7 @@
 using ObjCRuntime;
 using UIKit;
 
-namespace MauiApp2;
+namespace BeginnersTasks;
 
 public class Program
 {
diff --git a/8.0/Beginners-Series/MauiApp2/Properties/launchSettings.json b/8.0/Beginners-Series/BeginnersTask/Properties/launchSettings.json
similarity index 100%
rename from 8.0/Beginners-Series/MauiApp2/Properties/launchSettings.json
rename to 8.0/Beginners-Series/BeginnersTask/Properties/launchSettings.json
diff --git a/8.0/Beginners-Series/MauiApp2/Resources/Colors.xaml b/8.0/Beginners-Series/BeginnersTask/Resources/Colors.xaml
similarity index 100%
rename from 8.0/Beginners-Series/MauiApp2/Resources/Colors.xaml
rename to 8.0/Beginners-Series/BeginnersTask/Resources/Colors.xaml
diff --git a/8.0/Beginners-Series/MauiApp2/Resources/Fonts/OpenSans-Regular.ttf b/8.0/Beginners-Series/BeginnersTask/Resources/Fonts/OpenSans-Regular.ttf
similarity index 100%
rename from 8.0/Beginners-Series/MauiApp2/Resources/Fonts/OpenSans-Regular.ttf
rename to 8.0/Beginners-Series/BeginnersTask/Resources/Fonts/OpenSans-Regular.ttf
diff --git a/8.0/Beginners-Series/MauiApp2/Resources/Fonts/OpenSans-Semibold.ttf b/8.0/Beginners-Series/BeginnersTask/Resources/Fonts/OpenSans-Semibold.ttf
similarity index 100%
rename from 8.0/Beginners-Series/MauiApp2/Resources/Fonts/OpenSans-Semibold.ttf
rename to 8.0/Beginners-Series/BeginnersTask/Resources/Fonts/OpenSans-Semibold.ttf
diff --git a/8.0/Beginners-Series/MauiApp2/Resources/Images/dotnet_bot.svg b/8.0/Beginners-Series/BeginnersTask/Resources/Images/dotnet_bot.svg
similarity index 100%
rename from 8.0/Beginners-Series/MauiApp2/Resources/Images/dotnet_bot.svg
rename to 8.0/Beginners-Series/BeginnersTask/Resources/Images/dotnet_bot.svg
diff --git a/8.0/Beginners-Series/MauiApp2/Resources/Images/logo.png b/8.0/Beginners-Series/BeginnersTask/Resources/Images/logo.png
similarity index 100%
rename from 8.0/Beginners-Series/MauiApp2/Resources/Images/logo.png
rename to 8.0/Beginners-Series/BeginnersTask/Resources/Images/logo.png
diff --git a/8.0/Beginners-Series/MauiApp2/Resources/Raw/AboutAssets.txt b/8.0/Beginners-Series/BeginnersTask/Resources/Raw/AboutAssets.txt
similarity index 100%
rename from 8.0/Beginners-Series/MauiApp2/Resources/Raw/AboutAssets.txt
rename to 8.0/Beginners-Series/BeginnersTask/Resources/Raw/AboutAssets.txt
diff --git a/8.0/Beginners-Series/MauiApp2/Resources/Styles.xaml b/8.0/Beginners-Series/BeginnersTask/Resources/Styles.xaml
similarity index 100%
rename from 8.0/Beginners-Series/MauiApp2/Resources/Styles.xaml
rename to 8.0/Beginners-Series/BeginnersTask/Resources/Styles.xaml
diff --git a/8.0/Beginners-Series/MauiApp2/Resources/appicon.svg b/8.0/Beginners-Series/BeginnersTask/Resources/appicon.svg
similarity index 100%
rename from 8.0/Beginners-Series/MauiApp2/Resources/appicon.svg
rename to 8.0/Beginners-Series/BeginnersTask/Resources/appicon.svg
diff --git a/8.0/Beginners-Series/MauiApp2/Resources/appiconfg.svg b/8.0/Beginners-Series/BeginnersTask/Resources/appiconfg.svg
similarity index 100%
rename from 8.0/Beginners-Series/MauiApp2/Resources/appiconfg.svg
rename to 8.0/Beginners-Series/BeginnersTask/Resources/appiconfg.svg
diff --git a/8.0/Beginners-Series/MauiApp2/ViewModel/DetailViewModel.cs b/8.0/Beginners-Series/BeginnersTask/ViewModel/DetailViewModel.cs
similarity index 89%
rename from 8.0/Beginners-Series/MauiApp2/ViewModel/DetailViewModel.cs
rename to 8.0/Beginners-Series/BeginnersTask/ViewModel/DetailViewModel.cs
index 68d5236c4..fcfc7d0de 100644
--- a/8.0/Beginners-Series/MauiApp2/ViewModel/DetailViewModel.cs
+++ b/8.0/Beginners-Series/BeginnersTask/ViewModel/DetailViewModel.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 
-namespace MauiApp2.ViewModel;
+namespace BeginnersTasks.ViewModel;
 
 [QueryProperty("Text", "Text")]
 public partial class DetailViewModel : ObservableObject
diff --git a/8.0/Beginners-Series/MauiApp2/ViewModel/MainViewModel.cs b/8.0/Beginners-Series/BeginnersTask/ViewModel/MainViewModel.cs
similarity index 64%
rename from 8.0/Beginners-Series/MauiApp2/ViewModel/MainViewModel.cs
rename to 8.0/Beginners-Series/BeginnersTask/ViewModel/MainViewModel.cs
index 76931a665..3e132f7d9 100644
--- a/8.0/Beginners-Series/MauiApp2/ViewModel/MainViewModel.cs
+++ b/8.0/Beginners-Series/BeginnersTask/ViewModel/MainViewModel.cs
@@ -3,14 +3,14 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 
-namespace MauiApp2.ViewModel;
+namespace BeginnersTasks.ViewModel;
 
 public partial class MainViewModel : ObservableObject
 {
-    IConnectivity connectivity;
+    readonly IConnectivity connectivity;
     public MainViewModel(IConnectivity connectivity)
     {
-        Items = new ObservableCollection<string>();
+        Items = [];
         this.connectivity = connectivity;
     }
 
@@ -23,23 +23,30 @@ public MainViewModel(IConnectivity connectivity)
     [RelayCommand]
     async Task Add()
     {
+        // Assure text is not empty
         if (string.IsNullOrWhiteSpace(Text))
             return;
 
+        // Assure there's an internet connection
+        // else show an alert
         if(connectivity.NetworkAccess != NetworkAccess.Internet)
         {
             await Shell.Current.DisplayAlert("Uh Oh!", "No Internet", "OK");
             return;
         }
 
+        // Add text to list of todos
         Items.Add(Text);
-        // add our item
+        
+        // Reset Text
         Text = string.Empty;
     }
 
     [RelayCommand]
     void Delete(string s)
     {
+        // If the list of todos contains
+        // given string, remove it from list
         if(Items.Contains(s))
         {
             Items.Remove(s);
@@ -49,7 +56,9 @@ void Delete(string s)
     [RelayCommand]
     async Task Tap(string s)
     {
+        // Trigger a navigation to the detail page
+        //  - See [AppShell] for how to add a routing to the app's navigation
+        //  - See [DetailViewModel] for how to resolve the 'Text' query parameter
         await Shell.Current.GoToAsync($"{nameof(DetailPage)}?Text={s}");
     }
-
 }