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
31 changes: 19 additions & 12 deletions android/app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
import com.android.build.api.dsl.ApplicationExtension
import org.gradle.kotlin.dsl.configure
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id("com.android.application")
id("kotlin-android")
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
id("dev.flutter.flutter-gradle-plugin")
}

kotlin {
compilerOptions {
jvmTarget.set(
org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
)
}
}

android {
extensions.configure<ApplicationExtension> {
namespace = "com.onimusha.ascend"
compileSdk = 37
compileSdk = flutter.compileSdkVersion
ndkVersion = flutter.ndkVersion

compileOptions {
Expand All @@ -25,24 +21,35 @@ android {
}

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId = "com.onimusha.ascend"
// You can update the following values to match your application needs.
// For more information, see: https://flutter.dev/to/review-gradle-config.
minSdk = flutter.minSdkVersion
targetSdk = 37
targetSdk = flutter.targetSdkVersion
versionCode = flutter.versionCode
versionName = flutter.versionName
}

buildTypes {
release {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
signingConfig = signingConfigs.getByName("debug")
}
}
}

kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}

dependencies {
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
}

flutter {
source = "../.."
}
}
34 changes: 25 additions & 9 deletions lib/db/db/app_database.dart → lib/database/db/app_database.dart
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
import 'package:drift/drift.dart';
import 'package:drift_flutter/drift_flutter.dart';
import 'package:ascend/db/db/dao/note_dao.dart';
import 'package:ascend/db/db/dao/task_category_dao.dart';
import 'package:ascend/db/db/dao/user_progress_dao.dart';
import 'package:ascend/db/db/tables/note_table.dart';
import 'package:ascend/db/db/tables/task_categories_table.dart';
import 'package:ascend/db/db/tables/user_progress_table.dart';
import 'package:ascend/database/db/dao/task_dao.dart';
import 'package:ascend/database/db/dao/folder/folder_dao.dart';
import 'package:ascend/database/db/dao/note/note_dao.dart';
import 'package:ascend/database/db/dao/task_category_dao.dart';
import 'package:ascend/database/db/dao/user_progress_dao.dart';
import 'package:ascend/database/db/tables/task_table.dart';
import 'package:ascend/database/db/tables/TABLES/folders_table.dart';
import 'package:ascend/database/db/tables/TABLES/notes_table.dart';
import 'package:ascend/database/db/tables/task_categories_table.dart';
import 'package:ascend/database/db/tables/user_progress_table.dart';
import 'package:ascend/core/constants/constants.dart';
import 'package:path_provider/path_provider.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
Expand All @@ -25,14 +29,20 @@ AppDatabase appDatabaseProvider(Ref ref) {

// this is the main db class
@DriftDatabase(
tables: [NoteTable, TaskCategoriesTable, UserProgressTable],
daos: [NoteDao, TaskCategoryDao, UserProgressDao],
tables: [
NoteTable,
TaskCategoriesTable,
UserProgressTable,
FoldersTable,
NotesTable,
],
daos: [NoteDao, NotesDao, FolderDao, TaskCategoryDao, UserProgressDao],
)
class AppDatabase extends _$AppDatabase {
AppDatabase([QueryExecutor? executor]) : super(executor ?? _openConnection());

@override
int get schemaVersion => 4;
int get schemaVersion => 5;

// migration strategy to add new columns to the db
@override
Expand All @@ -55,13 +65,19 @@ class AppDatabase extends _$AppDatabase {
await migrator.addColumn(noteTable, noteTable.difficulty);
await migrator.createTable(userProgressTable);
}
if (from < 5) {
await migrator.createTable(foldersTable);
await migrator.createTable(notesTable);
}
},
);

Future<void> clearAllData() async {
await transaction(() async {
await delete(noteTable).go();
await delete(taskCategoriesTable).go();
await delete(foldersTable).go();
await delete(notesTable).go();
});
}

Expand Down
Loading