Database is no longer static. (#596)

Author: davidbritch

9.0/Data/TodoSQLite/TodoSQLite/Data/TodoItemDatabase.cs

@@ -5,56 +5,54 @@ namespace TodoSQLite.Data;
 
 public class TodoItemDatabase
 {
-    SQLiteAsyncConnection Database;
-    public TodoItemDatabase()
-    {
-    }
+    SQLiteAsyncConnection database;
+
     async Task Init()
     {
-        if (Database is not null)
+        if (database is not null)
             return;
 
-        Database = new SQLiteAsyncConnection(Constants.DatabasePath, Constants.Flags);
-        var result = await Database.CreateTableAsync<TodoItem>();
+        database = new SQLiteAsyncConnection(Constants.DatabasePath, Constants.Flags);
+        var result = await database.CreateTableAsync<TodoItem>();
     }
 
     public async Task<List<TodoItem>> GetItemsAsync()
     {
         await Init();
-        return await Database.Table<TodoItem>().ToListAsync();
+        return await database.Table<TodoItem>().ToListAsync();
     }
 
     public async Task<List<TodoItem>> GetItemsNotDoneAsync()
     {
         await Init();
-        return await Database.Table<TodoItem>().Where(t => t.Done).ToListAsync();
+        return await database.Table<TodoItem>().Where(t => t.Done).ToListAsync();
 
         // SQL queries are also possible
-        //return await Database.QueryAsync<TodoItem>("SELECT * FROM [TodoItem] WHERE [Done] = 0");
+        //return await database.QueryAsync<TodoItem>("SELECT * FROM [TodoItem] WHERE [Done] = 0");
     }
 
     public async Task<TodoItem> GetItemAsync(int id)
     {
         await Init();
-        return await Database.Table<TodoItem>().Where(i => i.ID == id).FirstOrDefaultAsync();
+        return await database.Table<TodoItem>().Where(i => i.ID == id).FirstOrDefaultAsync();
     }
 
     public async Task<int> SaveItemAsync(TodoItem item)
     {
         await Init();
         if (item.ID != 0)
         {
-            return await Database.UpdateAsync(item);
+            return await database.UpdateAsync(item);
         }
         else
         {
-            return await Database.InsertAsync(item);
+            return await database.InsertAsync(item);
         }
     }
 
     public async Task<int> DeleteItemAsync(TodoItem item)
     {
         await Init();
-        return await Database.DeleteAsync(item);
+        return await database.DeleteAsync(item);
     }
 }

9.0/Data/TodoSQLite/TodoSQLite/MauiProgram.cs

@@ -1,5 +1,4 @@
-using Microsoft.Extensions.DependencyInjection.Extensions;
-using TodoSQLite.Data;
+using TodoSQLite.Data;
 using TodoSQLite.Views;
 
 namespace TodoSQLite;
@@ -19,7 +18,6 @@ public static MauiApp CreateMauiApp()
 
 		builder.Services.AddSingleton<TodoListPage>();
 		builder.Services.AddTransient<TodoItemPage>();
-
 		builder.Services.AddSingleton<TodoItemDatabase>();
 
 		return builder.Build();

9.0/Data/TodoSQLite/TodoSQLite/TodoSQLite.csproj

@@ -39,6 +39,7 @@
 		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
 	</PropertyGroup>
+
 	<ItemGroup>
 		<!-- App Icon -->
 		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
@@ -62,8 +63,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="sqlite-net-pcl" Version="1.8.116" />
-	  <PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.2" />
+		<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
 		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
 	</ItemGroup>

9.0/Data/TodoSQLite/TodoSQLite/Views/TodoItemPage.xaml.cs

@@ -6,13 +6,14 @@ namespace TodoSQLite.Views;
 [QueryProperty("Item", "Item")]
 public partial class TodoItemPage : ContentPage
 {
-	TodoItem item;
-	public TodoItem Item
+    TodoItemDatabase database;
+
+    public TodoItem Item
 	{
 		get => BindingContext as TodoItem;
 		set => BindingContext = value;
 	}
-    TodoItemDatabase database;
+
     public TodoItemPage(TodoItemDatabase todoItemDatabase)
     {
         InitializeComponent();

9.0/Data/TodoSQLite/TodoSQLite/Views/TodoListPage.xaml.cs

@@ -7,15 +7,16 @@ namespace TodoSQLite.Views;
 public partial class TodoListPage : ContentPage
 {
     TodoItemDatabase database;
+    
     public ObservableCollection<TodoItem> Items { get; set; } = new();
+
     public TodoListPage(TodoItemDatabase todoItemDatabase)
 	{
 		InitializeComponent();
         database = todoItemDatabase;
         BindingContext = this;
     }
 
-
     protected override async void OnNavigatedTo(NavigatedToEventArgs args)
     {
         base.OnNavigatedTo(args);