Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor #163

Closed
wants to merge 2 commits into from
Closed

Refactor #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b779868
Refactor homepage and view workout
a-mabe Sep 1, 2024
895c225
Undo ios changes
a-mabe Sep 1, 2024
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
110 changes: 8 additions & 102 deletions lib/constants/snackbars.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,106 +1,12 @@
import 'package:flutter/material.dart';

const invalidJsonSnackBar = SnackBar(
content: Text('File contains invalid JSON'),
behavior: SnackBarBehavior.fixed,
duration: Duration(seconds: 4),
showCloseIcon: true,
const errorDeletingWorkoutSnackBar = SnackBar(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not use the method below instead of this?

content: Text('Error deleting workout'),
);

const invalidConfigSnackBar = SnackBar(
content: Text('File contains invalid workout configuration'),
behavior: SnackBarBehavior.fixed,
duration: Duration(seconds: 4),
showCloseIcon: true,
);

const invalidJsonMultipleSnackBar = SnackBar(
content: Text('Not all files imported, found invalid JSON'),
behavior: SnackBarBehavior.fixed,
duration: Duration(seconds: 4),
showCloseIcon: true,
);

const invalidConfigMultipleSnackBar = SnackBar(
content: Text('Not all files imported, found invalid workout configuration'),
behavior: SnackBarBehavior.fixed,
duration: Duration(seconds: 4),
showCloseIcon: true,
);

const successfulImportSnackBar = SnackBar(
content: Text('Import successful!'),
behavior: SnackBarBehavior.fixed,
duration: Duration(seconds: 4),
showCloseIcon: true,
);

const successfulShareSnackBar = SnackBar(
content: Text('Share successful!'),
behavior: SnackBarBehavior.fixed,
duration: Duration(seconds: 4),
showCloseIcon: true,
);

const errorShareSnackBar = SnackBar(
backgroundColor: Color.fromARGB(255, 132, 19, 11),
content: Text('Share not completed', style: TextStyle(color: Colors.white)),
behavior: SnackBarBehavior.fixed,
duration: Duration(seconds: 4),
showCloseIcon: true,
);

const successfulShareMultipleSnackBar = SnackBar(
content: Text('Files shared successfully!'),
behavior: SnackBarBehavior.fixed,
duration: Duration(seconds: 4),
showCloseIcon: true,
);

const successfulSaveMultipleToDeviceSnackBar = SnackBar(
content: Text('Files successfully saved to device!'),
behavior: SnackBarBehavior.fixed,
duration: Duration(seconds: 4),
showCloseIcon: true,
);

const successfulSaveToDeviceSnackBar = SnackBar(
content: Text('Saved file to device!'),
behavior: SnackBarBehavior.fixed,
duration: Duration(seconds: 4),
showCloseIcon: true,
);

const errorTimerExists = SnackBar(
content: Text('Could not import, timer with same ID exists'),
behavior: SnackBarBehavior.fixed,
duration: Duration(seconds: 4),
showCloseIcon: true,
);

const errorMultipleTimerExists = SnackBar(
content: Text(
'Not all files imported, timer with same ID exists',
style: TextStyle(color: Colors.white),
),
backgroundColor: Color.fromARGB(255, 132, 19, 11),
behavior: SnackBarBehavior.fixed,
duration: Duration(seconds: 4),
showCloseIcon: true,
);

const errorShareMultipleSnackBar = SnackBar(
content: Text('Share not completed', style: TextStyle(color: Colors.white)),
backgroundColor: Color.fromARGB(255, 132, 19, 11),
behavior: SnackBarBehavior.fixed,
duration: Duration(seconds: 4),
showCloseIcon: true,
);

const errorSaveMultipleSnackBar = SnackBar(
content: Text('Save not completed', style: TextStyle(color: Colors.white)),
backgroundColor: Color.fromARGB(255, 132, 19, 11),
behavior: SnackBarBehavior.fixed,
duration: Duration(seconds: 4),
showCloseIcon: true,
);
SnackBar createErrorSnackbar({required String errorMessage}) {
return SnackBar(
content: Text(errorMessage),
backgroundColor: Colors.red[900],
);
}
207 changes: 101 additions & 106 deletions lib/database/database_manager.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import 'dart:async';
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:path/path.dart';
import 'package:sqflite_common_ffi/sqflite_ffi.dart';
import '../workout_data_type/workout_type.dart';
import '../log/log.dart';
import '../old/workout_data_type/workout_type.dart';

class DatabaseManager {
/// The name of the database.
Expand All @@ -18,83 +18,43 @@ class DatabaseManager {
///
static const String _workoutTableName = "WorkoutTable";

/// Initialize the database.
///
Future<Database> initDB() async {
debugPrint("initDB executed");
logger.d("Initializing database");

/// Get a path to the database.
///
String path = join(await getDatabasesPath(), _databaseName);

/// The version of the database.
///
int databaseVersion = 6;

/// The version to start any migrations from.
///
int versionToStartMigration = 2;

/// If the platform is Windows or Linux, use the FFI database factory.
/// Full app functionaly for Windows / Linux is not yet available.
///
if (Platform.isWindows || Platform.isLinux) {
logger.d("Platform is Windows or Linu, using FFI database factory");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo

Suggested change
logger.d("Platform is Windows or Linu, using FFI database factory");
logger.d("Platform is Windows or Linux, using FFI database factory");


// Initialize FFI
sqfliteFfiInit();

// Change the default factory
databaseFactory = databaseFactoryFfiNoIsolate;
}

//Directory documentsDirectory = await getApplicationDocumentsDirectory();
String path = join(await getDatabasesPath(), _databaseName);
// Clear database for testing
// await deleteDatabase(path);
if (Platform.isWindows || Platform.isLinux) {
return await openDatabase(
inMemoryDatabasePath,
version: 5,
onCreate: (db, version) async {
await db.execute('''
CREATE TABLE IF NOT EXISTS WorkoutTable(id TEXT PRIMARY KEY,
title TEXT,
numExercises INTEGER,
exercises TEXT,
getReadyTime INTEGER,
exerciseTime INTEGER,
restTime INTEGER,
halfTime INTEGER,
breakTime INTEGER,
warmupTime INTEGER,
cooldownTime INTEGER,
iterations INTEGER,
halfwayMark INTEGER,
workSound TEXT,
restSound TEXT,
halfwaySound TEXT,
completeSound TEXT,
countdownSound TEXT,
colorInt INTEGER,
workoutIndex INTEGER,
showMinutes INTEGER
)
''');
},
onUpgrade: (db, oldVersion, newVersion) async {
if (oldVersion == 1) {
await db.execute(
"ALTER TABLE WorkoutTable ADD COLUMN colorInt INTEGER;");
}
if (oldVersion == 2) {
await db.execute(
"ALTER TABLE WorkoutTable ADD COLUMN workoutIndex INTEGER;");
}
if (oldVersion == 3) {
await db.execute(
"ALTER TABLE WorkoutTable ADD COLUMN showMinutes INTEGER;");
}
if (oldVersion < newVersion) {
print("Add columns");
await db.execute(
"ALTER TABLE WorkoutTable ADD COLUMN getReadyTime INTEGER;");
await db.execute(
"ALTER TABLE WorkoutTable ADD COLUMN breakTime INTEGER;");
await db.execute(
"ALTER TABLE WorkoutTable ADD COLUMN warmupTime INTEGER;");
await db.execute(
"ALTER TABLE WorkoutTable ADD COLUMN cooldownTime INTEGER;");
await db.execute(
"ALTER TABLE WorkoutTable ADD COLUMN iterations INTEGER;");
}
},
);
// Set the path to an in-memory database
path = inMemoryDatabasePath;
}

return await openDatabase(
path,
version: 6,
onCreate: (Database db, int version) async {
version: databaseVersion,
onCreate: (db, version) async {
await db.execute('''
CREATE TABLE IF NOT EXISTS WorkoutTable(id TEXT PRIMARY KEY,
title TEXT,
Expand All @@ -121,38 +81,49 @@ class DatabaseManager {
''');
},
onUpgrade: (db, oldVersion, newVersion) async {
if (oldVersion == 2) {
await db
.execute("ALTER TABLE WorkoutTable ADD COLUMN colorInt INTEGER;");
}
if (oldVersion == 3) {
await db.execute(
"ALTER TABLE WorkoutTable ADD COLUMN workoutIndex INTEGER;");
}
if (oldVersion == 4) {
await db.execute(
"ALTER TABLE WorkoutTable ADD COLUMN showMinutes INTEGER;");
}
if (oldVersion < newVersion) {
print("Add columns");
await db.execute(
"ALTER TABLE WorkoutTable ADD COLUMN getReadyTime INTEGER;");
await db.execute(
"ALTER TABLE WorkoutTable ADD COLUMN breakTime INTEGER;");
await db.execute(
"ALTER TABLE WorkoutTable ADD COLUMN warmupTime INTEGER;");
await db.execute(
"ALTER TABLE WorkoutTable ADD COLUMN cooldownTime INTEGER;");
await db.execute(
"ALTER TABLE WorkoutTable ADD COLUMN iterations INTEGER;");
}
migrateDatabase(oldVersion, newVersion, db, versionToStartMigration);
},
);
}

/// Migrate the database from one version to another.
/// - [oldVersion] The current version of the database.
/// - [newVersion] The new version of the database.
/// - [db] The database to migrate.
/// - [versionToStartMigration] The version to start the migration from.
///
Future<void> migrateDatabase(int oldVersion, int newVersion, Database db,
int versionToStartMigration) async {
if (oldVersion == versionToStartMigration) {
await db.execute("ALTER TABLE WorkoutTable ADD COLUMN colorInt INTEGER;");
}
if (oldVersion == versionToStartMigration + 1) {
await db
.execute("ALTER TABLE WorkoutTable ADD COLUMN workoutIndex INTEGER;");
}
if (oldVersion == versionToStartMigration + 2) {
await db
.execute("ALTER TABLE WorkoutTable ADD COLUMN showMinutes INTEGER;");
}
if (oldVersion < newVersion) {
await db
.execute("ALTER TABLE WorkoutTable ADD COLUMN getReadyTime INTEGER;");
await db
.execute("ALTER TABLE WorkoutTable ADD COLUMN breakTime INTEGER;");
await db
.execute("ALTER TABLE WorkoutTable ADD COLUMN warmupTime INTEGER;");
await db
.execute("ALTER TABLE WorkoutTable ADD COLUMN cooldownTime INTEGER;");
await db
.execute("ALTER TABLE WorkoutTable ADD COLUMN iterations INTEGER;");
}
}

/// Inserts the given list into the given database.
/// - [workout] The workout to insert.
/// - [database] The database to insert the workout into.
///
Future<void> insertList(Workout workout, Database database) async {
Future<void> insertWorkout(Workout workout, Database database) async {
/// Get a reference to the database.
///
final db = database;
Expand All @@ -169,8 +140,10 @@ class DatabaseManager {
}

/// Update the given list in the given database.
/// - [workout] The workout to update.
/// - [database] The database to update the workout in.
///
Future<void> updateList(Workout workout, Database database) async {
Future<void> updateWorkout(Workout workout, Database database) async {
/// Get a reference to the database.
///
final db = database;
Expand All @@ -185,12 +158,8 @@ class DatabaseManager {
);
}

Future<void> deleteList(String id, Future<Database> database) async {
/// Get a reference to the database.
///
final db = await database;

await db.delete(
Future<void> deleteWorkout(String id, Database database) async {
await database.delete(
_workoutTableName,
where: 'id = ?', // Use a `where` clause to delete a specific list.
whereArgs: [
Expand All @@ -199,14 +168,40 @@ class DatabaseManager {
);
}

Future<List<Workout>> lists(Future<Database> database) async {
/// Get a reference to the database.
///
final db = await database;
/// Asynchronously deletes a workout list from the database and updates the
/// workout indices of remaining lists accordingly.
///
/// Parameters:
/// - [workoutArgument]: The 'Workout' object representing the list to be deleted.
///
/// Returns:
/// - A Future representing the completion of the delete operation.
Future<void> deleteWorkoutAndReorder(
Workout workout, Database database) async {
// Delete the specified workout list from the database.
await DatabaseManager()
.deleteWorkout(workout.id, database)
.then((value) async {
// Retrieve the updated list of workouts from the database.
List<Workout> workouts = await DatabaseManager().workouts(database);

// Sort the workouts based on their workout indices.
workouts.sort((a, b) => a.workoutIndex.compareTo(b.workoutIndex));

// Update the workout indices of remaining lists after the deleted list.
for (int i = workout.workoutIndex; i < workouts.length; i++) {
workouts[i].workoutIndex = i;
await DatabaseManager()
.updateWorkout(workouts[i], await DatabaseManager().initDB());
}
});
}

Future<List<Workout>> workouts(Database database) async {
/// Query the table for all the TodoLists.
///
final List<Map<String, dynamic>> maps = await db.query(_workoutTableName);
final List<Map<String, dynamic>> maps =
await database.query(_workoutTableName);

/// Convert the List<Map<String, dynamic> into a List<TodoList>.
///
Expand Down
Loading
Loading