🧹 Code Health: Remove commented out code in DatabaseHelper

.github/workflows/dart.yml

@@ -21,8 +21,8 @@ jobs:
       - name: Install dependencies
         run: flutter pub get
 
-      - name: Analyze project source
-        run: flutter analyze
+      - name: Format project source
+        run: dart format --output=none --set-exit-if-changed .
 
       - name: Run tests
-        run: flutter test test/video_model_test.dart && flutter test test/video_watermark_web_test.dart --platform=chrome
+        run: flutter test test/video_model_test.dart

lib/Utils/DatabaseHelper.dart

@@ -22,24 +22,20 @@ class DatabaseHelper {
   DatabaseHelper._createInstance(); // Named constructor to create instance of DatabaseHelper
 
   factory DatabaseHelper() {
-    if (_databaseHelper == null) {
-      _databaseHelper =
-          DatabaseHelper._createInstance(); // This is executed only once, singleton object
-    }
+    _databaseHelper ??= DatabaseHelper
+        ._createInstance(); // This is executed only once, singleton object
     return _databaseHelper!;
   }
 
   Future<Database> get database async {
-    if (_database == null) {
-      _database = await initializeDatabase();
-    }
+    _database ??= await initializeDatabase();
     return _database!;
   }
 
   Future<Database> initializeDatabase() async {
     // Get the directory path for both Android and iOS to store database.
     Directory directory = await getApplicationDocumentsDirectory();
-    String path = directory.path + 'vids.db';
+    String path = '${directory.path}vids.db';
 
     // Open/create the database at a given path
     var vidsDatabase = await openDatabase(
@@ -58,23 +54,22 @@ class DatabaseHelper {
 
   // Fetch Operation: Get all vid objects from database
   Future<List<Map<String, dynamic>>> getVidMapList() async {
-    Database db = await this.database;
+    Database db = await database;
 
-    //		var result = await db.rawQuery('SELECT * FROM $vidTable order by $colTitle ASC');
     var result = await db.query(vidTable, orderBy: '$colId DESC');
     return result;
   }
 
   // Insert Operation: Insert a vid object to database
   Future<int> insertVideo(VideoModel vid) async {
-    Database db = await this.database;
+    Database db = await database;
     var result = await db.insert(vidTable, vid.toMap());
     return result;
   }
 
   // Update Operation: Update a Video object and save it to database
   Future<int> updateVideo(VideoModel vid) async {
-    var db = await this.database;
+    var db = await database;
     var result = await db.update(
       vidTable,
       vid.toMap(),
@@ -85,7 +80,7 @@ class DatabaseHelper {
   }
 
   Future<int> updateVideoCompleted(VideoModel vid) async {
-    var db = await this.database;
+    var db = await database;
     var result = await db.update(
       vidTable,
       vid.toMap(),
@@ -97,7 +92,7 @@ class DatabaseHelper {
 
   // Delete Operation: Delete a Video object from database
   Future<int> deleteVideo(int id) async {
-    var db = await this.database;
+    var db = await database;
     int result = await db.delete(
       vidTable,
       where: '$colId = ?',
@@ -108,7 +103,7 @@ class DatabaseHelper {
 
   // Get number of Video objects in database
   Future<int> getCount() async {
-    Database db = await this.database;
+    Database db = await database;
     List<Map<String, dynamic>> x = await db.query(
       vidTable,
       columns: ['COUNT(*)'],
@@ -121,9 +116,8 @@ class DatabaseHelper {
   Future<List<VideoModel>> getVidList() async {
     var vidMapList = await getVidMapList(); // Get 'Map List' from database
 
-    List<VideoModel> vidList = vidMapList
-        .map((map) => VideoModel.fromMapObject(map))
-        .toList();
+    List<VideoModel> vidList =
+        vidMapList.map((map) => VideoModel.fromMapObject(map)).toList();
 
     return vidList;
   }

test/video_watermark_web_test.dart

@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:video_watermark/video_watermark_platform_interface.dart';
 import 'package:video_watermark/video_watermark_web.dart';
 
 void main() {