diff --git a/.gitmodules b/.gitmodules index c408353..15ff55f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "firka/lib/l10n"] path = firka/lib/l10n url = https://github.com/QwIT-Development/firka-localization -[submodule "firka_wear/vendor/wear_plus"] - path = firka_wear/vendor/wear_plus - url = https://git.firka.app/firka/wear_plus [submodule "firka/android/app/src/main/java/org/brotli"] path = firka/android/app/src/main/java/org/brotli url = https://git.firka.app/firka/org_brotli +[submodule "firka_wear/lib/l10n"] + path = firka_wear/lib/l10n + url = https://github.com/qwit-development/firka-localization diff --git a/firka_wear/.gitignore b/firka_wear/.gitignore index 2ce9e99..b163e9e 100644 --- a/firka_wear/.gitignore +++ b/firka_wear/.gitignore @@ -44,4 +44,7 @@ app.*.map.json /android/app/profile /android/app/release -coverage \ No newline at end of file +coverage + +# Generated files +*.g.dart \ No newline at end of file diff --git a/firka_wear/android/app/build.gradle.kts b/firka_wear/android/app/build.gradle.kts index c47a20f..ca8c9b1 100644 --- a/firka_wear/android/app/build.gradle.kts +++ b/firka_wear/android/app/build.gradle.kts @@ -14,7 +14,7 @@ import java.util.zip.ZipOutputStream.STORED plugins { id("com.android.application") id("kotlin-android") - id("org.jetbrains.kotlin.plugin.compose") version "2.2.0" + id("org.jetbrains.kotlin.plugin.compose") version "2.1.0" // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id("dev.flutter.flutter-gradle-plugin") } @@ -30,7 +30,7 @@ fun loadProperties(file: File): Properties { android { namespace = "app.firka.naplo" compileSdk = flutter.compileSdkVersion - ndkVersion = "27.0.12077973" + ndkVersion = "28.2.13676358" compileOptions { sourceCompatibility = JavaVersion.VERSION_17 @@ -97,52 +97,6 @@ flutter { source = "../.." } -tasks.register("transformAndResignDebugApk") { - group = "build" - description = "Transform and resign APK with debug key" - - dependsOn("assembleDebug") - - doLast { - transformApks(true) - } -} - -tasks.register("transformAndResignReleaseApk") { - group = "build" - description = "Transform and resign APK with release key" - - dependsOn("assembleRelease") - - doLast { - checkReleaseKey() - if (System.getenv("TRANSFORM_APK") != null - && System.getenv("TRANSFORM_APK") == "true") { - transformApks(false) - } - } -} - -tasks.register("transformAndResignReleaseBundle") { - group = "build" - description = "Transform and resign bundle with release key" - - dependsOn("bundleRelease") - - doLast { - if (System.getenv("TRANSFORM_AAB") != null - && System.getenv("TRANSFORM_AAB") == "true") { - transformAppBundle() - } - } -} - -afterEvaluate { - tasks.findByName("assembleDebug")?.finalizedBy("transformAndResignDebugApk") - tasks.findByName("assembleRelease")?.finalizedBy("transformAndResignReleaseApk") - tasks.findByName("bundleRelease")?.finalizedBy("transformAndResignReleaseBundle") -} - fun checkReleaseKey() { val secretsDir = File(projectDir.absolutePath, "../../../secrets/") val propsFile = File(secretsDir, "keystore.properties") diff --git a/firka_wear/android/app/proguard-rules.pro b/firka_wear/android/app/proguard-rules.pro index 1b493d5..e69de29 100644 --- a/firka_wear/android/app/proguard-rules.pro +++ b/firka_wear/android/app/proguard-rules.pro @@ -1 +0,0 @@ --keep class org.brotli.** { *; } \ No newline at end of file diff --git a/firka_wear/android/app/src/main/java/org/brotli b/firka_wear/android/app/src/main/java/org/brotli deleted file mode 120000 index 53542ea..0000000 --- a/firka_wear/android/app/src/main/java/org/brotli +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../firka/android/app/src/main/java/org/brotli \ No newline at end of file diff --git a/firka_wear/android/app/src/main/kotlin/app/firka/naplo/AppMain.kt b/firka_wear/android/app/src/main/kotlin/app/firka/naplo/AppMain.kt index 6a4ad1b..710794a 100644 --- a/firka_wear/android/app/src/main/kotlin/app/firka/naplo/AppMain.kt +++ b/firka_wear/android/app/src/main/kotlin/app/firka/naplo/AppMain.kt @@ -1,88 +1,5 @@ package app.firka.naplo -import android.annotation.SuppressLint import android.app.Application -import android.os.Build -import android.util.Log -import org.brotli.dec.BrotliInputStream -import org.json.JSONObject -import java.io.File -import java.io.FileOutputStream -import java.security.MessageDigest -import java.util.zip.ZipFile -class AppMain : Application() { - - private fun File.sha256(): String { - if (!exists()) return "0000000000000000000000000000000000000000000000000000000000000000" - - val md = MessageDigest.getInstance("SHA-256") - val digest = md.digest(this.readBytes()) - return digest.fold("") { str, it -> str + "%02x".format(it) } - } - - @SuppressLint("UnsafeDynamicallyLoadedCode") - override fun onCreate() { - super.onCreate() - - val abi = Build.SUPPORTED_ABIS[0] - - val apks = File(applicationInfo.nativeLibraryDir, "../..").absoluteFile - .listFiles()!! - .filter { file -> file.name.endsWith(".apk") } - .toList() - - var nativesApkN: ZipFile? = null - for (apk in apks) { - if (nativesApkN != null) break - - val zip = ZipFile(apk) - val entries = zip.entries() - - while (entries.hasMoreElements()) { - val entry = entries.nextElement() - - entry.name.endsWith("$abi/index.so") - zip.close() - nativesApkN = ZipFile(apk) - break - } - - zip.close() - } - - if (nativesApkN == null) { - throw Exception("Can't find native libraries") - } - val nativesApk: ZipFile = nativesApkN - - val compressedLibsIndex = nativesApk.getInputStream( - nativesApk.getEntry("lib/$abi/index.so") - ) - val compressedLibs = JSONObject(compressedLibsIndex.readBytes().toString(Charsets.UTF_8)) - - for (so in compressedLibs.keys()) { - val soFile = File(cacheDir, so) - - if (soFile.sha256() == compressedLibs.getString(so)) { - System.load(soFile.absolutePath) - return - } - - Log.d("AppMain", "Decompressing: $so") - val brInput = nativesApk.getInputStream( - nativesApk.getEntry("lib/$abi/${so.replace(".so", "-br.so")}") - ) - val soOutput = FileOutputStream(soFile) - - val brIn = BrotliInputStream(brInput) - brIn.copyTo(soOutput) - - brInput.close() - soOutput.close() - - System.load(soFile.absolutePath) - } - } - -} \ No newline at end of file +class AppMain : Application() {} diff --git a/firka_wear/android/build.gradle.kts b/firka_wear/android/build.gradle.kts index cac7250..3f32aa7 100644 --- a/firka_wear/android/build.gradle.kts +++ b/firka_wear/android/build.gradle.kts @@ -22,7 +22,7 @@ subprojects { if (plugins.hasPlugin("com.android.application") || plugins.hasPlugin("com.android.library")) { val androidExtension = extensions.getByName("android") as BaseExtension androidExtension.apply { - compileSdkVersion(35) + compileSdkVersion(36) buildToolsVersion = "35.0.0" } } diff --git a/firka_wear/android/gradle/wrapper/gradle-wrapper.properties b/firka_wear/android/gradle/wrapper/gradle-wrapper.properties index afa1e8e..efdcc4a 100644 --- a/firka_wear/android/gradle/wrapper/gradle-wrapper.properties +++ b/firka_wear/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip diff --git a/firka_wear/android/settings.gradle.kts b/firka_wear/android/settings.gradle.kts index a439442..43394ed 100644 --- a/firka_wear/android/settings.gradle.kts +++ b/firka_wear/android/settings.gradle.kts @@ -18,8 +18,8 @@ pluginManagement { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.7.0" apply false - id("org.jetbrains.kotlin.android") version "1.8.22" apply false + id("com.android.application") version "8.9.1" apply false + id("org.jetbrains.kotlin.android") version "2.1.0" apply false } include(":app") diff --git a/firka_wear/lib/helpers/api/client/kreta_client.dart b/firka_wear/lib/helpers/api/client/kreta_client.dart index ca27ea1..7fc9426 100644 --- a/firka_wear/lib/helpers/api/client/kreta_client.dart +++ b/firka_wear/lib/helpers/api/client/kreta_client.dart @@ -8,7 +8,7 @@ import 'package:firka_wear/helpers/db/models/generic_cache_model.dart'; import 'package:firka_wear/helpers/db/models/homework_cache_model.dart'; import 'package:firka_wear/helpers/db/models/timetable_cache_model.dart'; import 'package:intl/intl.dart'; -import 'package:isar/isar.dart'; +import 'package:isar_community/isar.dart'; import '../../../main.dart'; import '../../db/models/token_model.dart'; diff --git a/firka_wear/lib/helpers/db/models/app_settings_model.dart b/firka_wear/lib/helpers/db/models/app_settings_model.dart index de9a71a..cf4c07d 100644 --- a/firka_wear/lib/helpers/db/models/app_settings_model.dart +++ b/firka_wear/lib/helpers/db/models/app_settings_model.dart @@ -1,4 +1,4 @@ -import 'package:isar/isar.dart'; +import 'package:isar_community/isar.dart'; part 'app_settings_model.g.dart'; diff --git a/firka_wear/lib/helpers/db/models/app_settings_model.g.dart b/firka_wear/lib/helpers/db/models/app_settings_model.g.dart deleted file mode 100644 index da5fc47..0000000 --- a/firka_wear/lib/helpers/db/models/app_settings_model.g.dart +++ /dev/null @@ -1,569 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'app_settings_model.dart'; - -// ************************************************************************** -// IsarCollectionGenerator -// ************************************************************************** - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -extension GetAppSettingsModelCollection on Isar { - IsarCollection get appSettingsModels => this.collection(); -} - -const AppSettingsModelSchema = CollectionSchema( - name: r'AppSettingsModel', - id: -638838212012723081, - properties: { - r'customHost': PropertySchema( - id: 0, - name: r'customHost', - type: IsarType.string, - ), - r'useCustomHost': PropertySchema( - id: 1, - name: r'useCustomHost', - type: IsarType.bool, - ) - }, - estimateSize: _appSettingsModelEstimateSize, - serialize: _appSettingsModelSerialize, - deserialize: _appSettingsModelDeserialize, - deserializeProp: _appSettingsModelDeserializeProp, - idName: r'id', - indexes: {}, - links: {}, - embeddedSchemas: {}, - getId: _appSettingsModelGetId, - getLinks: _appSettingsModelGetLinks, - attach: _appSettingsModelAttach, - version: '3.1.0+1', -); - -int _appSettingsModelEstimateSize( - AppSettingsModel object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - { - final value = object.customHost; - if (value != null) { - bytesCount += 3 + value.length * 3; - } - } - return bytesCount; -} - -void _appSettingsModelSerialize( - AppSettingsModel object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeString(offsets[0], object.customHost); - writer.writeBool(offsets[1], object.useCustomHost); -} - -AppSettingsModel _appSettingsModelDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = AppSettingsModel(); - object.customHost = reader.readStringOrNull(offsets[0]); - object.id = id; - object.useCustomHost = reader.readBoolOrNull(offsets[1]); - return object; -} - -P _appSettingsModelDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readStringOrNull(offset)) as P; - case 1: - return (reader.readBoolOrNull(offset)) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -Id _appSettingsModelGetId(AppSettingsModel object) { - return object.id ?? Isar.autoIncrement; -} - -List> _appSettingsModelGetLinks(AppSettingsModel object) { - return []; -} - -void _appSettingsModelAttach( - IsarCollection col, Id id, AppSettingsModel object) { - object.id = id; -} - -extension AppSettingsModelQueryWhereSort - on QueryBuilder { - QueryBuilder anyId() { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(const IdWhereClause.any()); - }); - } -} - -extension AppSettingsModelQueryWhere - on QueryBuilder { - QueryBuilder idEqualTo( - Id id) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: id, - upper: id, - )); - }); - } - - QueryBuilder - idNotEqualTo(Id id) { - return QueryBuilder.apply(this, (query) { - if (query.whereSort == Sort.asc) { - return query - .addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: false), - ) - .addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: false), - ); - } else { - return query - .addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: false), - ) - .addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: false), - ); - } - }); - } - - QueryBuilder - idGreaterThan(Id id, {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: include), - ); - }); - } - - QueryBuilder - idLessThan(Id id, {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: include), - ); - }); - } - - QueryBuilder idBetween( - Id lowerId, - Id upperId, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: lowerId, - includeLower: includeLower, - upper: upperId, - includeUpper: includeUpper, - )); - }); - } -} - -extension AppSettingsModelQueryFilter - on QueryBuilder { - QueryBuilder - customHostIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'customHost', - )); - }); - } - - QueryBuilder - customHostIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'customHost', - )); - }); - } - - QueryBuilder - customHostEqualTo( - String? value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'customHost', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - customHostGreaterThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'customHost', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - customHostLessThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'customHost', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - customHostBetween( - String? lower, - String? upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'customHost', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - customHostStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'customHost', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - customHostEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'customHost', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - customHostContains(String value, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'customHost', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - customHostMatches(String pattern, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'customHost', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - customHostIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'customHost', - value: '', - )); - }); - } - - QueryBuilder - customHostIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'customHost', - value: '', - )); - }); - } - - QueryBuilder - idIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'id', - )); - }); - } - - QueryBuilder - idIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'id', - )); - }); - } - - QueryBuilder - idEqualTo(Id? value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'id', - value: value, - )); - }); - } - - QueryBuilder - idGreaterThan( - Id? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder - idLessThan( - Id? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder - idBetween( - Id? lower, - Id? upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'id', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder - useCustomHostIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'useCustomHost', - )); - }); - } - - QueryBuilder - useCustomHostIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'useCustomHost', - )); - }); - } - - QueryBuilder - useCustomHostEqualTo(bool? value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'useCustomHost', - value: value, - )); - }); - } -} - -extension AppSettingsModelQueryObject - on QueryBuilder {} - -extension AppSettingsModelQueryLinks - on QueryBuilder {} - -extension AppSettingsModelQuerySortBy - on QueryBuilder { - QueryBuilder - sortByCustomHost() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'customHost', Sort.asc); - }); - } - - QueryBuilder - sortByCustomHostDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'customHost', Sort.desc); - }); - } - - QueryBuilder - sortByUseCustomHost() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'useCustomHost', Sort.asc); - }); - } - - QueryBuilder - sortByUseCustomHostDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'useCustomHost', Sort.desc); - }); - } -} - -extension AppSettingsModelQuerySortThenBy - on QueryBuilder { - QueryBuilder - thenByCustomHost() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'customHost', Sort.asc); - }); - } - - QueryBuilder - thenByCustomHostDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'customHost', Sort.desc); - }); - } - - QueryBuilder thenById() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'id', Sort.asc); - }); - } - - QueryBuilder - thenByIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'id', Sort.desc); - }); - } - - QueryBuilder - thenByUseCustomHost() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'useCustomHost', Sort.asc); - }); - } - - QueryBuilder - thenByUseCustomHostDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'useCustomHost', Sort.desc); - }); - } -} - -extension AppSettingsModelQueryWhereDistinct - on QueryBuilder { - QueryBuilder - distinctByCustomHost({bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'customHost', caseSensitive: caseSensitive); - }); - } - - QueryBuilder - distinctByUseCustomHost() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'useCustomHost'); - }); - } -} - -extension AppSettingsModelQueryProperty - on QueryBuilder { - QueryBuilder idProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'id'); - }); - } - - QueryBuilder - customHostProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'customHost'); - }); - } - - QueryBuilder - useCustomHostProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'useCustomHost'); - }); - } -} diff --git a/firka_wear/lib/helpers/db/models/generic_cache_model.dart b/firka_wear/lib/helpers/db/models/generic_cache_model.dart index 026695d..8d238ba 100644 --- a/firka_wear/lib/helpers/db/models/generic_cache_model.dart +++ b/firka_wear/lib/helpers/db/models/generic_cache_model.dart @@ -1,4 +1,4 @@ -import 'package:isar/isar.dart'; +import 'package:isar_community/isar.dart'; part 'generic_cache_model.g.dart'; diff --git a/firka_wear/lib/helpers/db/models/generic_cache_model.g.dart b/firka_wear/lib/helpers/db/models/generic_cache_model.g.dart deleted file mode 100644 index 587d5d8..0000000 --- a/firka_wear/lib/helpers/db/models/generic_cache_model.g.dart +++ /dev/null @@ -1,494 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'generic_cache_model.dart'; - -// ************************************************************************** -// IsarCollectionGenerator -// ************************************************************************** - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -extension GetGenericCacheModelCollection on Isar { - IsarCollection get genericCacheModels => this.collection(); -} - -const GenericCacheModelSchema = CollectionSchema( - name: r'GenericCacheModel', - id: 3174486726793780620, - properties: { - r'cacheData': PropertySchema( - id: 0, - name: r'cacheData', - type: IsarType.string, - ) - }, - estimateSize: _genericCacheModelEstimateSize, - serialize: _genericCacheModelSerialize, - deserialize: _genericCacheModelDeserialize, - deserializeProp: _genericCacheModelDeserializeProp, - idName: r'cacheKey', - indexes: {}, - links: {}, - embeddedSchemas: {}, - getId: _genericCacheModelGetId, - getLinks: _genericCacheModelGetLinks, - attach: _genericCacheModelAttach, - version: '3.1.0+1', -); - -int _genericCacheModelEstimateSize( - GenericCacheModel object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - { - final value = object.cacheData; - if (value != null) { - bytesCount += 3 + value.length * 3; - } - } - return bytesCount; -} - -void _genericCacheModelSerialize( - GenericCacheModel object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeString(offsets[0], object.cacheData); -} - -GenericCacheModel _genericCacheModelDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = GenericCacheModel(); - object.cacheData = reader.readStringOrNull(offsets[0]); - object.cacheKey = id; - return object; -} - -P _genericCacheModelDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readStringOrNull(offset)) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -Id _genericCacheModelGetId(GenericCacheModel object) { - return object.cacheKey ?? Isar.autoIncrement; -} - -List> _genericCacheModelGetLinks( - GenericCacheModel object) { - return []; -} - -void _genericCacheModelAttach( - IsarCollection col, Id id, GenericCacheModel object) { - object.cacheKey = id; -} - -extension GenericCacheModelQueryWhereSort - on QueryBuilder { - QueryBuilder - anyCacheKey() { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(const IdWhereClause.any()); - }); - } -} - -extension GenericCacheModelQueryWhere - on QueryBuilder { - QueryBuilder - cacheKeyEqualTo(Id cacheKey) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: cacheKey, - upper: cacheKey, - )); - }); - } - - QueryBuilder - cacheKeyNotEqualTo(Id cacheKey) { - return QueryBuilder.apply(this, (query) { - if (query.whereSort == Sort.asc) { - return query - .addWhereClause( - IdWhereClause.lessThan(upper: cacheKey, includeUpper: false), - ) - .addWhereClause( - IdWhereClause.greaterThan(lower: cacheKey, includeLower: false), - ); - } else { - return query - .addWhereClause( - IdWhereClause.greaterThan(lower: cacheKey, includeLower: false), - ) - .addWhereClause( - IdWhereClause.lessThan(upper: cacheKey, includeUpper: false), - ); - } - }); - } - - QueryBuilder - cacheKeyGreaterThan(Id cacheKey, {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.greaterThan(lower: cacheKey, includeLower: include), - ); - }); - } - - QueryBuilder - cacheKeyLessThan(Id cacheKey, {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.lessThan(upper: cacheKey, includeUpper: include), - ); - }); - } - - QueryBuilder - cacheKeyBetween( - Id lowerCacheKey, - Id upperCacheKey, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: lowerCacheKey, - includeLower: includeLower, - upper: upperCacheKey, - includeUpper: includeUpper, - )); - }); - } -} - -extension GenericCacheModelQueryFilter - on QueryBuilder { - QueryBuilder - cacheDataIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'cacheData', - )); - }); - } - - QueryBuilder - cacheDataIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'cacheData', - )); - }); - } - - QueryBuilder - cacheDataEqualTo( - String? value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'cacheData', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - cacheDataGreaterThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'cacheData', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - cacheDataLessThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'cacheData', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - cacheDataBetween( - String? lower, - String? upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'cacheData', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - cacheDataStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'cacheData', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - cacheDataEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'cacheData', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - cacheDataContains(String value, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'cacheData', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - cacheDataMatches(String pattern, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'cacheData', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - cacheDataIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'cacheData', - value: '', - )); - }); - } - - QueryBuilder - cacheDataIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'cacheData', - value: '', - )); - }); - } - - QueryBuilder - cacheKeyIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'cacheKey', - )); - }); - } - - QueryBuilder - cacheKeyIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'cacheKey', - )); - }); - } - - QueryBuilder - cacheKeyEqualTo(Id? value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'cacheKey', - value: value, - )); - }); - } - - QueryBuilder - cacheKeyGreaterThan( - Id? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'cacheKey', - value: value, - )); - }); - } - - QueryBuilder - cacheKeyLessThan( - Id? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'cacheKey', - value: value, - )); - }); - } - - QueryBuilder - cacheKeyBetween( - Id? lower, - Id? upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'cacheKey', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } -} - -extension GenericCacheModelQueryObject - on QueryBuilder {} - -extension GenericCacheModelQueryLinks - on QueryBuilder {} - -extension GenericCacheModelQuerySortBy - on QueryBuilder { - QueryBuilder - sortByCacheData() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'cacheData', Sort.asc); - }); - } - - QueryBuilder - sortByCacheDataDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'cacheData', Sort.desc); - }); - } -} - -extension GenericCacheModelQuerySortThenBy - on QueryBuilder { - QueryBuilder - thenByCacheData() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'cacheData', Sort.asc); - }); - } - - QueryBuilder - thenByCacheDataDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'cacheData', Sort.desc); - }); - } - - QueryBuilder - thenByCacheKey() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'cacheKey', Sort.asc); - }); - } - - QueryBuilder - thenByCacheKeyDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'cacheKey', Sort.desc); - }); - } -} - -extension GenericCacheModelQueryWhereDistinct - on QueryBuilder { - QueryBuilder - distinctByCacheData({bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'cacheData', caseSensitive: caseSensitive); - }); - } -} - -extension GenericCacheModelQueryProperty - on QueryBuilder { - QueryBuilder cacheKeyProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'cacheKey'); - }); - } - - QueryBuilder - cacheDataProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'cacheData'); - }); - } -} diff --git a/firka_wear/lib/helpers/db/models/homework_cache_model.dart b/firka_wear/lib/helpers/db/models/homework_cache_model.dart index ca92f08..1fed7bd 100644 --- a/firka_wear/lib/helpers/db/models/homework_cache_model.dart +++ b/firka_wear/lib/helpers/db/models/homework_cache_model.dart @@ -1,4 +1,4 @@ -import 'package:isar/isar.dart'; +import 'package:isar_community/isar.dart'; import '../../debug_helper.dart'; import '../util.dart'; diff --git a/firka_wear/lib/helpers/db/models/homework_cache_model.g.dart b/firka_wear/lib/helpers/db/models/homework_cache_model.g.dart deleted file mode 100644 index fa95e9b..0000000 --- a/firka_wear/lib/helpers/db/models/homework_cache_model.g.dart +++ /dev/null @@ -1,562 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'homework_cache_model.dart'; - -// ************************************************************************** -// IsarCollectionGenerator -// ************************************************************************** - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -extension GetHomeworkCacheModelCollection on Isar { - IsarCollection get homeworkCacheModels => - this.collection(); -} - -const HomeworkCacheModelSchema = CollectionSchema( - name: r'HomeworkCacheModel', - id: -356692531669197690, - properties: { - r'values': PropertySchema( - id: 0, - name: r'values', - type: IsarType.stringList, - ) - }, - estimateSize: _homeworkCacheModelEstimateSize, - serialize: _homeworkCacheModelSerialize, - deserialize: _homeworkCacheModelDeserialize, - deserializeProp: _homeworkCacheModelDeserializeProp, - idName: r'cacheKey', - indexes: {}, - links: {}, - embeddedSchemas: {}, - getId: _homeworkCacheModelGetId, - getLinks: _homeworkCacheModelGetLinks, - attach: _homeworkCacheModelAttach, - version: '3.1.0+1', -); - -int _homeworkCacheModelEstimateSize( - HomeworkCacheModel object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - { - final list = object.values; - if (list != null) { - bytesCount += 3 + list.length * 3; - { - for (var i = 0; i < list.length; i++) { - final value = list[i]; - bytesCount += value.length * 3; - } - } - } - } - return bytesCount; -} - -void _homeworkCacheModelSerialize( - HomeworkCacheModel object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeStringList(offsets[0], object.values); -} - -HomeworkCacheModel _homeworkCacheModelDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = HomeworkCacheModel(); - object.cacheKey = id; - object.values = reader.readStringList(offsets[0]); - return object; -} - -P _homeworkCacheModelDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readStringList(offset)) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -Id _homeworkCacheModelGetId(HomeworkCacheModel object) { - return object.cacheKey ?? Isar.autoIncrement; -} - -List> _homeworkCacheModelGetLinks( - HomeworkCacheModel object) { - return []; -} - -void _homeworkCacheModelAttach( - IsarCollection col, Id id, HomeworkCacheModel object) { - object.cacheKey = id; -} - -extension HomeworkCacheModelQueryWhereSort - on QueryBuilder { - QueryBuilder - anyCacheKey() { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(const IdWhereClause.any()); - }); - } -} - -extension HomeworkCacheModelQueryWhere - on QueryBuilder { - QueryBuilder - cacheKeyEqualTo(Id cacheKey) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: cacheKey, - upper: cacheKey, - )); - }); - } - - QueryBuilder - cacheKeyNotEqualTo(Id cacheKey) { - return QueryBuilder.apply(this, (query) { - if (query.whereSort == Sort.asc) { - return query - .addWhereClause( - IdWhereClause.lessThan(upper: cacheKey, includeUpper: false), - ) - .addWhereClause( - IdWhereClause.greaterThan(lower: cacheKey, includeLower: false), - ); - } else { - return query - .addWhereClause( - IdWhereClause.greaterThan(lower: cacheKey, includeLower: false), - ) - .addWhereClause( - IdWhereClause.lessThan(upper: cacheKey, includeUpper: false), - ); - } - }); - } - - QueryBuilder - cacheKeyGreaterThan(Id cacheKey, {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.greaterThan(lower: cacheKey, includeLower: include), - ); - }); - } - - QueryBuilder - cacheKeyLessThan(Id cacheKey, {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.lessThan(upper: cacheKey, includeUpper: include), - ); - }); - } - - QueryBuilder - cacheKeyBetween( - Id lowerCacheKey, - Id upperCacheKey, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: lowerCacheKey, - includeLower: includeLower, - upper: upperCacheKey, - includeUpper: includeUpper, - )); - }); - } -} - -extension HomeworkCacheModelQueryFilter - on QueryBuilder { - QueryBuilder - cacheKeyIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'cacheKey', - )); - }); - } - - QueryBuilder - cacheKeyIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'cacheKey', - )); - }); - } - - QueryBuilder - cacheKeyEqualTo(Id? value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'cacheKey', - value: value, - )); - }); - } - - QueryBuilder - cacheKeyGreaterThan( - Id? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'cacheKey', - value: value, - )); - }); - } - - QueryBuilder - cacheKeyLessThan( - Id? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'cacheKey', - value: value, - )); - }); - } - - QueryBuilder - cacheKeyBetween( - Id? lower, - Id? upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'cacheKey', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder - valuesIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'values', - )); - }); - } - - QueryBuilder - valuesIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'values', - )); - }); - } - - QueryBuilder - valuesElementEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'values', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - valuesElementGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'values', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - valuesElementLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'values', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - valuesElementBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'values', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - valuesElementStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'values', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - valuesElementEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'values', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - valuesElementContains(String value, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'values', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - valuesElementMatches(String pattern, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'values', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - valuesElementIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'values', - value: '', - )); - }); - } - - QueryBuilder - valuesElementIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'values', - value: '', - )); - }); - } - - QueryBuilder - valuesLengthEqualTo(int length) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'values', - length, - true, - length, - true, - ); - }); - } - - QueryBuilder - valuesIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'values', - 0, - true, - 0, - true, - ); - }); - } - - QueryBuilder - valuesIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'values', - 0, - false, - 999999, - true, - ); - }); - } - - QueryBuilder - valuesLengthLessThan( - int length, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'values', - 0, - true, - length, - include, - ); - }); - } - - QueryBuilder - valuesLengthGreaterThan( - int length, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'values', - length, - include, - 999999, - true, - ); - }); - } - - QueryBuilder - valuesLengthBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'values', - lower, - includeLower, - upper, - includeUpper, - ); - }); - } -} - -extension HomeworkCacheModelQueryObject - on QueryBuilder {} - -extension HomeworkCacheModelQueryLinks - on QueryBuilder {} - -extension HomeworkCacheModelQuerySortBy - on QueryBuilder {} - -extension HomeworkCacheModelQuerySortThenBy - on QueryBuilder { - QueryBuilder - thenByCacheKey() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'cacheKey', Sort.asc); - }); - } - - QueryBuilder - thenByCacheKeyDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'cacheKey', Sort.desc); - }); - } -} - -extension HomeworkCacheModelQueryWhereDistinct - on QueryBuilder { - QueryBuilder - distinctByValues() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'values'); - }); - } -} - -extension HomeworkCacheModelQueryProperty - on QueryBuilder { - QueryBuilder cacheKeyProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'cacheKey'); - }); - } - - QueryBuilder?, QQueryOperations> - valuesProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'values'); - }); - } -} diff --git a/firka_wear/lib/helpers/db/models/timetable_cache_model.dart b/firka_wear/lib/helpers/db/models/timetable_cache_model.dart index 0883421..6deacbb 100644 --- a/firka_wear/lib/helpers/db/models/timetable_cache_model.dart +++ b/firka_wear/lib/helpers/db/models/timetable_cache_model.dart @@ -1,4 +1,4 @@ -import 'package:isar/isar.dart'; +import 'package:isar_community/isar.dart'; import '../../debug_helper.dart'; import '../util.dart'; diff --git a/firka_wear/lib/helpers/db/models/timetable_cache_model.g.dart b/firka_wear/lib/helpers/db/models/timetable_cache_model.g.dart deleted file mode 100644 index e2874b1..0000000 --- a/firka_wear/lib/helpers/db/models/timetable_cache_model.g.dart +++ /dev/null @@ -1,562 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'timetable_cache_model.dart'; - -// ************************************************************************** -// IsarCollectionGenerator -// ************************************************************************** - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -extension GetTimetableCacheModelCollection on Isar { - IsarCollection get timetableCacheModels => - this.collection(); -} - -const TimetableCacheModelSchema = CollectionSchema( - name: r'TimetableCacheModel', - id: -8626340955125680275, - properties: { - r'values': PropertySchema( - id: 0, - name: r'values', - type: IsarType.stringList, - ) - }, - estimateSize: _timetableCacheModelEstimateSize, - serialize: _timetableCacheModelSerialize, - deserialize: _timetableCacheModelDeserialize, - deserializeProp: _timetableCacheModelDeserializeProp, - idName: r'cacheKey', - indexes: {}, - links: {}, - embeddedSchemas: {}, - getId: _timetableCacheModelGetId, - getLinks: _timetableCacheModelGetLinks, - attach: _timetableCacheModelAttach, - version: '3.1.0+1', -); - -int _timetableCacheModelEstimateSize( - TimetableCacheModel object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - { - final list = object.values; - if (list != null) { - bytesCount += 3 + list.length * 3; - { - for (var i = 0; i < list.length; i++) { - final value = list[i]; - bytesCount += value.length * 3; - } - } - } - } - return bytesCount; -} - -void _timetableCacheModelSerialize( - TimetableCacheModel object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeStringList(offsets[0], object.values); -} - -TimetableCacheModel _timetableCacheModelDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = TimetableCacheModel(); - object.cacheKey = id; - object.values = reader.readStringList(offsets[0]); - return object; -} - -P _timetableCacheModelDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readStringList(offset)) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -Id _timetableCacheModelGetId(TimetableCacheModel object) { - return object.cacheKey ?? Isar.autoIncrement; -} - -List> _timetableCacheModelGetLinks( - TimetableCacheModel object) { - return []; -} - -void _timetableCacheModelAttach( - IsarCollection col, Id id, TimetableCacheModel object) { - object.cacheKey = id; -} - -extension TimetableCacheModelQueryWhereSort - on QueryBuilder { - QueryBuilder - anyCacheKey() { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(const IdWhereClause.any()); - }); - } -} - -extension TimetableCacheModelQueryWhere - on QueryBuilder { - QueryBuilder - cacheKeyEqualTo(Id cacheKey) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: cacheKey, - upper: cacheKey, - )); - }); - } - - QueryBuilder - cacheKeyNotEqualTo(Id cacheKey) { - return QueryBuilder.apply(this, (query) { - if (query.whereSort == Sort.asc) { - return query - .addWhereClause( - IdWhereClause.lessThan(upper: cacheKey, includeUpper: false), - ) - .addWhereClause( - IdWhereClause.greaterThan(lower: cacheKey, includeLower: false), - ); - } else { - return query - .addWhereClause( - IdWhereClause.greaterThan(lower: cacheKey, includeLower: false), - ) - .addWhereClause( - IdWhereClause.lessThan(upper: cacheKey, includeUpper: false), - ); - } - }); - } - - QueryBuilder - cacheKeyGreaterThan(Id cacheKey, {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.greaterThan(lower: cacheKey, includeLower: include), - ); - }); - } - - QueryBuilder - cacheKeyLessThan(Id cacheKey, {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.lessThan(upper: cacheKey, includeUpper: include), - ); - }); - } - - QueryBuilder - cacheKeyBetween( - Id lowerCacheKey, - Id upperCacheKey, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: lowerCacheKey, - includeLower: includeLower, - upper: upperCacheKey, - includeUpper: includeUpper, - )); - }); - } -} - -extension TimetableCacheModelQueryFilter on QueryBuilder { - QueryBuilder - cacheKeyIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'cacheKey', - )); - }); - } - - QueryBuilder - cacheKeyIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'cacheKey', - )); - }); - } - - QueryBuilder - cacheKeyEqualTo(Id? value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'cacheKey', - value: value, - )); - }); - } - - QueryBuilder - cacheKeyGreaterThan( - Id? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'cacheKey', - value: value, - )); - }); - } - - QueryBuilder - cacheKeyLessThan( - Id? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'cacheKey', - value: value, - )); - }); - } - - QueryBuilder - cacheKeyBetween( - Id? lower, - Id? upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'cacheKey', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder - valuesIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'values', - )); - }); - } - - QueryBuilder - valuesIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'values', - )); - }); - } - - QueryBuilder - valuesElementEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'values', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - valuesElementGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'values', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - valuesElementLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'values', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - valuesElementBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'values', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - valuesElementStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'values', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - valuesElementEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'values', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - valuesElementContains(String value, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'values', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - valuesElementMatches(String pattern, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'values', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - valuesElementIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'values', - value: '', - )); - }); - } - - QueryBuilder - valuesElementIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'values', - value: '', - )); - }); - } - - QueryBuilder - valuesLengthEqualTo(int length) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'values', - length, - true, - length, - true, - ); - }); - } - - QueryBuilder - valuesIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'values', - 0, - true, - 0, - true, - ); - }); - } - - QueryBuilder - valuesIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'values', - 0, - false, - 999999, - true, - ); - }); - } - - QueryBuilder - valuesLengthLessThan( - int length, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'values', - 0, - true, - length, - include, - ); - }); - } - - QueryBuilder - valuesLengthGreaterThan( - int length, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'values', - length, - include, - 999999, - true, - ); - }); - } - - QueryBuilder - valuesLengthBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'values', - lower, - includeLower, - upper, - includeUpper, - ); - }); - } -} - -extension TimetableCacheModelQueryObject on QueryBuilder {} - -extension TimetableCacheModelQueryLinks on QueryBuilder {} - -extension TimetableCacheModelQuerySortBy - on QueryBuilder {} - -extension TimetableCacheModelQuerySortThenBy - on QueryBuilder { - QueryBuilder - thenByCacheKey() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'cacheKey', Sort.asc); - }); - } - - QueryBuilder - thenByCacheKeyDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'cacheKey', Sort.desc); - }); - } -} - -extension TimetableCacheModelQueryWhereDistinct - on QueryBuilder { - QueryBuilder - distinctByValues() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'values'); - }); - } -} - -extension TimetableCacheModelQueryProperty - on QueryBuilder { - QueryBuilder cacheKeyProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'cacheKey'); - }); - } - - QueryBuilder?, QQueryOperations> - valuesProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'values'); - }); - } -} diff --git a/firka_wear/lib/helpers/db/models/token_model.dart b/firka_wear/lib/helpers/db/models/token_model.dart index 2061c3f..89d994a 100644 --- a/firka_wear/lib/helpers/db/models/token_model.dart +++ b/firka_wear/lib/helpers/db/models/token_model.dart @@ -1,6 +1,6 @@ import 'package:dart_jsonwebtoken/dart_jsonwebtoken.dart'; import 'package:firka_wear/helpers/api/resp/token_grant.dart'; -import 'package:isar/isar.dart'; +import 'package:isar_community/isar.dart'; import '../../api/resp/token_grant.dart'; import '../../debug_helper.dart'; diff --git a/firka_wear/lib/helpers/db/models/token_model.g.dart b/firka_wear/lib/helpers/db/models/token_model.g.dart deleted file mode 100644 index 9765a4c..0000000 --- a/firka_wear/lib/helpers/db/models/token_model.g.dart +++ /dev/null @@ -1,1413 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'token_model.dart'; - -// ************************************************************************** -// IsarCollectionGenerator -// ************************************************************************** - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -extension GetTokenModelCollection on Isar { - IsarCollection get tokenModels => this.collection(); -} - -const TokenModelSchema = CollectionSchema( - name: r'TokenModel', - id: 6587729607152393036, - properties: { - r'accessToken': PropertySchema( - id: 0, - name: r'accessToken', - type: IsarType.string, - ), - r'expiryDate': PropertySchema( - id: 1, - name: r'expiryDate', - type: IsarType.dateTime, - ), - r'idToken': PropertySchema( - id: 2, - name: r'idToken', - type: IsarType.string, - ), - r'iss': PropertySchema( - id: 3, - name: r'iss', - type: IsarType.string, - ), - r'refreshToken': PropertySchema( - id: 4, - name: r'refreshToken', - type: IsarType.string, - ), - r'studentId': PropertySchema( - id: 5, - name: r'studentId', - type: IsarType.string, - ) - }, - estimateSize: _tokenModelEstimateSize, - serialize: _tokenModelSerialize, - deserialize: _tokenModelDeserialize, - deserializeProp: _tokenModelDeserializeProp, - idName: r'studentIdNorm', - indexes: {}, - links: {}, - embeddedSchemas: {}, - getId: _tokenModelGetId, - getLinks: _tokenModelGetLinks, - attach: _tokenModelAttach, - version: '3.1.0+1', -); - -int _tokenModelEstimateSize( - TokenModel object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - { - final value = object.accessToken; - if (value != null) { - bytesCount += 3 + value.length * 3; - } - } - { - final value = object.idToken; - if (value != null) { - bytesCount += 3 + value.length * 3; - } - } - { - final value = object.iss; - if (value != null) { - bytesCount += 3 + value.length * 3; - } - } - { - final value = object.refreshToken; - if (value != null) { - bytesCount += 3 + value.length * 3; - } - } - { - final value = object.studentId; - if (value != null) { - bytesCount += 3 + value.length * 3; - } - } - return bytesCount; -} - -void _tokenModelSerialize( - TokenModel object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeString(offsets[0], object.accessToken); - writer.writeDateTime(offsets[1], object.expiryDate); - writer.writeString(offsets[2], object.idToken); - writer.writeString(offsets[3], object.iss); - writer.writeString(offsets[4], object.refreshToken); - writer.writeString(offsets[5], object.studentId); -} - -TokenModel _tokenModelDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = TokenModel(); - object.accessToken = reader.readStringOrNull(offsets[0]); - object.expiryDate = reader.readDateTimeOrNull(offsets[1]); - object.idToken = reader.readStringOrNull(offsets[2]); - object.iss = reader.readStringOrNull(offsets[3]); - object.refreshToken = reader.readStringOrNull(offsets[4]); - object.studentId = reader.readStringOrNull(offsets[5]); - object.studentIdNorm = id; - return object; -} - -P _tokenModelDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readStringOrNull(offset)) as P; - case 1: - return (reader.readDateTimeOrNull(offset)) as P; - case 2: - return (reader.readStringOrNull(offset)) as P; - case 3: - return (reader.readStringOrNull(offset)) as P; - case 4: - return (reader.readStringOrNull(offset)) as P; - case 5: - return (reader.readStringOrNull(offset)) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -Id _tokenModelGetId(TokenModel object) { - return object.studentIdNorm ?? Isar.autoIncrement; -} - -List> _tokenModelGetLinks(TokenModel object) { - return []; -} - -void _tokenModelAttach(IsarCollection col, Id id, TokenModel object) { - object.studentIdNorm = id; -} - -extension TokenModelQueryWhereSort - on QueryBuilder { - QueryBuilder anyStudentIdNorm() { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(const IdWhereClause.any()); - }); - } -} - -extension TokenModelQueryWhere - on QueryBuilder { - QueryBuilder studentIdNormEqualTo( - Id studentIdNorm) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: studentIdNorm, - upper: studentIdNorm, - )); - }); - } - - QueryBuilder - studentIdNormNotEqualTo(Id studentIdNorm) { - return QueryBuilder.apply(this, (query) { - if (query.whereSort == Sort.asc) { - return query - .addWhereClause( - IdWhereClause.lessThan(upper: studentIdNorm, includeUpper: false), - ) - .addWhereClause( - IdWhereClause.greaterThan( - lower: studentIdNorm, includeLower: false), - ); - } else { - return query - .addWhereClause( - IdWhereClause.greaterThan( - lower: studentIdNorm, includeLower: false), - ) - .addWhereClause( - IdWhereClause.lessThan(upper: studentIdNorm, includeUpper: false), - ); - } - }); - } - - QueryBuilder - studentIdNormGreaterThan(Id studentIdNorm, {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.greaterThan(lower: studentIdNorm, includeLower: include), - ); - }); - } - - QueryBuilder studentIdNormLessThan( - Id studentIdNorm, - {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.lessThan(upper: studentIdNorm, includeUpper: include), - ); - }); - } - - QueryBuilder studentIdNormBetween( - Id lowerStudentIdNorm, - Id upperStudentIdNorm, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: lowerStudentIdNorm, - includeLower: includeLower, - upper: upperStudentIdNorm, - includeUpper: includeUpper, - )); - }); - } -} - -extension TokenModelQueryFilter - on QueryBuilder { - QueryBuilder - accessTokenIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'accessToken', - )); - }); - } - - QueryBuilder - accessTokenIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'accessToken', - )); - }); - } - - QueryBuilder - accessTokenEqualTo( - String? value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'accessToken', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - accessTokenGreaterThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'accessToken', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - accessTokenLessThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'accessToken', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - accessTokenBetween( - String? lower, - String? upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'accessToken', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - accessTokenStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'accessToken', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - accessTokenEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'accessToken', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - accessTokenContains(String value, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'accessToken', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - accessTokenMatches(String pattern, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'accessToken', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - accessTokenIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'accessToken', - value: '', - )); - }); - } - - QueryBuilder - accessTokenIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'accessToken', - value: '', - )); - }); - } - - QueryBuilder - expiryDateIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'expiryDate', - )); - }); - } - - QueryBuilder - expiryDateIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'expiryDate', - )); - }); - } - - QueryBuilder expiryDateEqualTo( - DateTime? value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'expiryDate', - value: value, - )); - }); - } - - QueryBuilder - expiryDateGreaterThan( - DateTime? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'expiryDate', - value: value, - )); - }); - } - - QueryBuilder - expiryDateLessThan( - DateTime? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'expiryDate', - value: value, - )); - }); - } - - QueryBuilder expiryDateBetween( - DateTime? lower, - DateTime? upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'expiryDate', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder idTokenIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'idToken', - )); - }); - } - - QueryBuilder - idTokenIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'idToken', - )); - }); - } - - QueryBuilder idTokenEqualTo( - String? value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'idToken', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - idTokenGreaterThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'idToken', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder idTokenLessThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'idToken', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder idTokenBetween( - String? lower, - String? upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'idToken', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder idTokenStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'idToken', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder idTokenEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'idToken', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder idTokenContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'idToken', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder idTokenMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'idToken', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder idTokenIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'idToken', - value: '', - )); - }); - } - - QueryBuilder - idTokenIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'idToken', - value: '', - )); - }); - } - - QueryBuilder issIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'iss', - )); - }); - } - - QueryBuilder issIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'iss', - )); - }); - } - - QueryBuilder issEqualTo( - String? value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'iss', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder issGreaterThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'iss', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder issLessThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'iss', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder issBetween( - String? lower, - String? upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'iss', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder issStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'iss', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder issEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'iss', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder issContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'iss', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder issMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'iss', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder issIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'iss', - value: '', - )); - }); - } - - QueryBuilder issIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'iss', - value: '', - )); - }); - } - - QueryBuilder - refreshTokenIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'refreshToken', - )); - }); - } - - QueryBuilder - refreshTokenIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'refreshToken', - )); - }); - } - - QueryBuilder - refreshTokenEqualTo( - String? value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'refreshToken', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - refreshTokenGreaterThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'refreshToken', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - refreshTokenLessThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'refreshToken', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - refreshTokenBetween( - String? lower, - String? upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'refreshToken', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - refreshTokenStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'refreshToken', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - refreshTokenEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'refreshToken', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - refreshTokenContains(String value, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'refreshToken', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - refreshTokenMatches(String pattern, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'refreshToken', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - refreshTokenIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'refreshToken', - value: '', - )); - }); - } - - QueryBuilder - refreshTokenIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'refreshToken', - value: '', - )); - }); - } - - QueryBuilder - studentIdIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'studentId', - )); - }); - } - - QueryBuilder - studentIdIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'studentId', - )); - }); - } - - QueryBuilder studentIdEqualTo( - String? value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'studentId', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - studentIdGreaterThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'studentId', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder studentIdLessThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'studentId', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder studentIdBetween( - String? lower, - String? upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'studentId', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - studentIdStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'studentId', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder studentIdEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'studentId', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder studentIdContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'studentId', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder studentIdMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'studentId', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - studentIdIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'studentId', - value: '', - )); - }); - } - - QueryBuilder - studentIdIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'studentId', - value: '', - )); - }); - } - - QueryBuilder - studentIdNormIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'studentIdNorm', - )); - }); - } - - QueryBuilder - studentIdNormIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'studentIdNorm', - )); - }); - } - - QueryBuilder - studentIdNormEqualTo(Id? value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'studentIdNorm', - value: value, - )); - }); - } - - QueryBuilder - studentIdNormGreaterThan( - Id? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'studentIdNorm', - value: value, - )); - }); - } - - QueryBuilder - studentIdNormLessThan( - Id? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'studentIdNorm', - value: value, - )); - }); - } - - QueryBuilder - studentIdNormBetween( - Id? lower, - Id? upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'studentIdNorm', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } -} - -extension TokenModelQueryObject - on QueryBuilder {} - -extension TokenModelQueryLinks - on QueryBuilder {} - -extension TokenModelQuerySortBy - on QueryBuilder { - QueryBuilder sortByAccessToken() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'accessToken', Sort.asc); - }); - } - - QueryBuilder sortByAccessTokenDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'accessToken', Sort.desc); - }); - } - - QueryBuilder sortByExpiryDate() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'expiryDate', Sort.asc); - }); - } - - QueryBuilder sortByExpiryDateDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'expiryDate', Sort.desc); - }); - } - - QueryBuilder sortByIdToken() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'idToken', Sort.asc); - }); - } - - QueryBuilder sortByIdTokenDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'idToken', Sort.desc); - }); - } - - QueryBuilder sortByIss() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'iss', Sort.asc); - }); - } - - QueryBuilder sortByIssDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'iss', Sort.desc); - }); - } - - QueryBuilder sortByRefreshToken() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'refreshToken', Sort.asc); - }); - } - - QueryBuilder sortByRefreshTokenDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'refreshToken', Sort.desc); - }); - } - - QueryBuilder sortByStudentId() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'studentId', Sort.asc); - }); - } - - QueryBuilder sortByStudentIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'studentId', Sort.desc); - }); - } -} - -extension TokenModelQuerySortThenBy - on QueryBuilder { - QueryBuilder thenByAccessToken() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'accessToken', Sort.asc); - }); - } - - QueryBuilder thenByAccessTokenDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'accessToken', Sort.desc); - }); - } - - QueryBuilder thenByExpiryDate() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'expiryDate', Sort.asc); - }); - } - - QueryBuilder thenByExpiryDateDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'expiryDate', Sort.desc); - }); - } - - QueryBuilder thenByIdToken() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'idToken', Sort.asc); - }); - } - - QueryBuilder thenByIdTokenDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'idToken', Sort.desc); - }); - } - - QueryBuilder thenByIss() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'iss', Sort.asc); - }); - } - - QueryBuilder thenByIssDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'iss', Sort.desc); - }); - } - - QueryBuilder thenByRefreshToken() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'refreshToken', Sort.asc); - }); - } - - QueryBuilder thenByRefreshTokenDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'refreshToken', Sort.desc); - }); - } - - QueryBuilder thenByStudentId() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'studentId', Sort.asc); - }); - } - - QueryBuilder thenByStudentIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'studentId', Sort.desc); - }); - } - - QueryBuilder thenByStudentIdNorm() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'studentIdNorm', Sort.asc); - }); - } - - QueryBuilder thenByStudentIdNormDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'studentIdNorm', Sort.desc); - }); - } -} - -extension TokenModelQueryWhereDistinct - on QueryBuilder { - QueryBuilder distinctByAccessToken( - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'accessToken', caseSensitive: caseSensitive); - }); - } - - QueryBuilder distinctByExpiryDate() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'expiryDate'); - }); - } - - QueryBuilder distinctByIdToken( - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'idToken', caseSensitive: caseSensitive); - }); - } - - QueryBuilder distinctByIss( - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'iss', caseSensitive: caseSensitive); - }); - } - - QueryBuilder distinctByRefreshToken( - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'refreshToken', caseSensitive: caseSensitive); - }); - } - - QueryBuilder distinctByStudentId( - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'studentId', caseSensitive: caseSensitive); - }); - } -} - -extension TokenModelQueryProperty - on QueryBuilder { - QueryBuilder studentIdNormProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'studentIdNorm'); - }); - } - - QueryBuilder accessTokenProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'accessToken'); - }); - } - - QueryBuilder expiryDateProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'expiryDate'); - }); - } - - QueryBuilder idTokenProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'idToken'); - }); - } - - QueryBuilder issProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'iss'); - }); - } - - QueryBuilder refreshTokenProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'refreshToken'); - }); - } - - QueryBuilder studentIdProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'studentId'); - }); - } -} diff --git a/firka_wear/lib/helpers/db/util.dart b/firka_wear/lib/helpers/db/util.dart index 455099b..9981a09 100644 --- a/firka_wear/lib/helpers/db/util.dart +++ b/firka_wear/lib/helpers/db/util.dart @@ -1,7 +1,7 @@ import 'dart:math'; import 'package:intl/intl.dart'; -import 'package:isar/isar.dart'; +import 'package:isar_community/isar.dart'; import '../debug_helper.dart'; diff --git a/firka_wear/lib/l10n b/firka_wear/lib/l10n deleted file mode 120000 index a23aa7d..0000000 --- a/firka_wear/lib/l10n +++ /dev/null @@ -1 +0,0 @@ -../../firka/lib/l10n \ No newline at end of file diff --git a/firka_wear/lib/l10n b/firka_wear/lib/l10n new file mode 160000 index 0000000..3571639 --- /dev/null +++ b/firka_wear/lib/l10n @@ -0,0 +1 @@ +Subproject commit 35716398525509e5dd5d3a90150e3c5678ea0a81 diff --git a/firka_wear/lib/main.dart b/firka_wear/lib/main.dart index c1e3865..7e3d26b 100644 --- a/firka_wear/lib/main.dart +++ b/firka_wear/lib/main.dart @@ -13,10 +13,10 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:isar/isar.dart'; +import 'package:isar_community/isar.dart'; import 'package:path_provider/path_provider.dart'; import 'package:permission_handler/permission_handler.dart'; -import 'package:zear_plus/wear_plus.dart'; +import 'package:wear_plus/wear_plus.dart'; import 'helpers/api/client/kreta_client.dart'; import 'l10n/app_localizations.dart'; diff --git a/firka_wear/lib/ui/wear/screens/home/home_screen.dart b/firka_wear/lib/ui/wear/screens/home/home_screen.dart index 6076c68..040c2a9 100644 --- a/firka_wear/lib/ui/wear/screens/home/home_screen.dart +++ b/firka_wear/lib/ui/wear/screens/home/home_screen.dart @@ -9,7 +9,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_arc_text/flutter_arc_text.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:zear_plus/wear_plus.dart'; +import 'package:wear_plus/wear_plus.dart'; import '../../../../helpers/debug_helper.dart'; import '../../../../l10n/app_localizations.dart'; diff --git a/firka_wear/lib/ui/wear/screens/login/login_screen.dart b/firka_wear/lib/ui/wear/screens/login/login_screen.dart index 2f22255..c4c41d1 100644 --- a/firka_wear/lib/ui/wear/screens/login/login_screen.dart +++ b/firka_wear/lib/ui/wear/screens/login/login_screen.dart @@ -6,7 +6,7 @@ import 'package:firka_wear/helpers/api/client/kreta_client.dart'; import 'package:firka_wear/helpers/extensions.dart'; import 'package:flutter/material.dart'; import 'package:watch_connectivity/watch_connectivity.dart'; -import 'package:zear_plus/wear_plus.dart'; +import 'package:wear_plus/wear_plus.dart'; import '../../../../helpers/db/models/token_model.dart'; import '../../../../main.dart'; diff --git a/firka_wear/pubspec.yaml b/firka_wear/pubspec.yaml index 284333a..b8dfba4 100644 --- a/firka_wear/pubspec.yaml +++ b/firka_wear/pubspec.yaml @@ -21,7 +21,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev version: 1.0.0+1011 environment: - sdk: ">=3.6.0 <=3.9.0" + sdk: ^3.11.0 # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions @@ -37,20 +37,16 @@ dependencies: cupertino_icons: ^1.0.8 flutter_launcher_icons: ^0.14.3 dio: ^5.8.0+1 - isar: - path: vendor/isar - isar_flutter_libs: - path: vendor/isar_flutter_libs + isar_community: 3.3.0 + isar_community_flutter_libs: 3.3.0 build_runner: any path_provider: ^2.1.0 carousel_slider: ^5.0.0 - webview_flutter: ^4.7.0 dart_jsonwebtoken: ^3.2.0 - zear_plus: - path: vendor/wear_plus + wear_plus: ^1.2.4 majesticons_flutter: ^0.0.1 watch_connectivity: ^0.2.1+1 - permission_handler: ^11.4.0 + permission_handler: ^12.0.1 flutter_localizations: sdk: flutter intl: any @@ -64,9 +60,8 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^5.0.0 - isar_generator: - path: vendor/isar_generator + flutter_lints: ^6.0.0 + isar_community_generator: 3.3.0 android_notification_icons: ^0.0.1 integration_test: sdk: flutter diff --git a/firka_wear/vendor/isar b/firka_wear/vendor/isar deleted file mode 120000 index ad88c42..0000000 --- a/firka_wear/vendor/isar +++ /dev/null @@ -1 +0,0 @@ -../../firka/vendor/isar \ No newline at end of file diff --git a/firka_wear/vendor/isar_flutter_libs b/firka_wear/vendor/isar_flutter_libs deleted file mode 120000 index a85581d..0000000 --- a/firka_wear/vendor/isar_flutter_libs +++ /dev/null @@ -1 +0,0 @@ -../../firka/vendor/isar_flutter_libs/ \ No newline at end of file diff --git a/firka_wear/vendor/isar_generator b/firka_wear/vendor/isar_generator deleted file mode 120000 index a393b88..0000000 --- a/firka_wear/vendor/isar_generator +++ /dev/null @@ -1 +0,0 @@ -../../firka/vendor/isar_generator/ \ No newline at end of file diff --git a/firka_wear/vendor/wear_plus b/firka_wear/vendor/wear_plus deleted file mode 160000 index a6fb67b..0000000 --- a/firka_wear/vendor/wear_plus +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a6fb67b23edea4b2657bbd0cbb7150de85b88db6