firka_wear: make it buildable again

.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

firka_wear/.gitignore

@@ -44,4 +44,7 @@ app.*.map.json
 /android/app/profile
 /android/app/release
 
-coverage
+coverage
+
+# Generated files
+*.g.dart

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")

firka_wear/android/app/proguard-rules.pro

@@ -1 +0,0 @@
--keep class org.brotli.** { *; }

firka_wear/android/app/src/main/java/org/brotli

@@ -1 +0,0 @@
-../../../../../../../firka/android/app/src/main/java/org/brotli

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() {
+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)
-        }
-    }
-
-}

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"
             }
         }

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

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("com.android.application") version "8.9.1" apply false
-    id("org.jetbrains.kotlin.android") version "1.8.22" apply false
+    id("org.jetbrains.kotlin.android") version "2.1.0" apply false
 }
 
 include(":app")

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';

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';
 

firka_wear/lib/helpers/db/models/app_settings_model.g.dart

@@ -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<AppSettingsModel> 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<int> offsets,
-  Map<Type, List<int>> 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<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  writer.writeString(offsets[0], object.customHost);
-  writer.writeBool(offsets[1], object.useCustomHost);
-}
-
-AppSettingsModel _appSettingsModelDeserialize(
-  Id id,
-  IsarReader reader,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  final object = AppSettingsModel();
-  object.customHost = reader.readStringOrNull(offsets[0]);
-  object.id = id;
-  object.useCustomHost = reader.readBoolOrNull(offsets[1]);
-  return object;
-}
-
-P _appSettingsModelDeserializeProp<P>(
-  IsarReader reader,
-  int propertyId,
-  int offset,
-  Map<Type, List<int>> 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<IsarLinkBase<dynamic>> _appSettingsModelGetLinks(AppSettingsModel object) {
-  return [];
-}
-
-void _appSettingsModelAttach(
-    IsarCollection<dynamic> col, Id id, AppSettingsModel object) {
-  object.id = id;
-}
-
-extension AppSettingsModelQueryWhereSort
-    on QueryBuilder<AppSettingsModel, AppSettingsModel, QWhere> {
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterWhere> anyId() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(const IdWhereClause.any());
-    });
-  }
-}
-
-extension AppSettingsModelQueryWhere
-    on QueryBuilder<AppSettingsModel, AppSettingsModel, QWhereClause> {
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterWhereClause> idEqualTo(
-      Id id) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(IdWhereClause.between(
-        lower: id,
-        upper: id,
-      ));
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterWhereClause>
-      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<AppSettingsModel, AppSettingsModel, QAfterWhereClause>
-      idGreaterThan(Id id, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.greaterThan(lower: id, includeLower: include),
-      );
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterWhereClause>
-      idLessThan(Id id, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.lessThan(upper: id, includeUpper: include),
-      );
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterWhereClause> 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<AppSettingsModel, AppSettingsModel, QFilterCondition> {
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterFilterCondition>
-      customHostIsNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(const FilterCondition.isNull(
-        property: r'customHost',
-      ));
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterFilterCondition>
-      customHostIsNotNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(const FilterCondition.isNotNull(
-        property: r'customHost',
-      ));
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterFilterCondition>
-      customHostEqualTo(
-    String? value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'customHost',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterFilterCondition>
-      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<AppSettingsModel, AppSettingsModel, QAfterFilterCondition>
-      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<AppSettingsModel, AppSettingsModel, QAfterFilterCondition>
-      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<AppSettingsModel, AppSettingsModel, QAfterFilterCondition>
-      customHostStartsWith(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'customHost',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterFilterCondition>
-      customHostEndsWith(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'customHost',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterFilterCondition>
-      customHostContains(String value, {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.contains(
-        property: r'customHost',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterFilterCondition>
-      customHostMatches(String pattern, {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.matches(
-        property: r'customHost',
-        wildcard: pattern,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterFilterCondition>
-      customHostIsEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'customHost',
-        value: '',
-      ));
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterFilterCondition>
-      customHostIsNotEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'customHost',
-        value: '',
-      ));
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterFilterCondition>
-      idIsNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(const FilterCondition.isNull(
-        property: r'id',
-      ));
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterFilterCondition>
-      idIsNotNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(const FilterCondition.isNotNull(
-        property: r'id',
-      ));
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterFilterCondition>
-      idEqualTo(Id? value) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'id',
-        value: value,
-      ));
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterFilterCondition>
-      idGreaterThan(
-    Id? value, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.greaterThan(
-        include: include,
-        property: r'id',
-        value: value,
-      ));
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterFilterCondition>
-      idLessThan(
-    Id? value, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.lessThan(
-        include: include,
-        property: r'id',
-        value: value,
-      ));
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterFilterCondition>
-      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<AppSettingsModel, AppSettingsModel, QAfterFilterCondition>
-      useCustomHostIsNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(const FilterCondition.isNull(
-        property: r'useCustomHost',
-      ));
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterFilterCondition>
-      useCustomHostIsNotNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(const FilterCondition.isNotNull(
-        property: r'useCustomHost',
-      ));
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterFilterCondition>
-      useCustomHostEqualTo(bool? value) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'useCustomHost',
-        value: value,
-      ));
-    });
-  }
-}
-
-extension AppSettingsModelQueryObject
-    on QueryBuilder<AppSettingsModel, AppSettingsModel, QFilterCondition> {}
-
-extension AppSettingsModelQueryLinks
-    on QueryBuilder<AppSettingsModel, AppSettingsModel, QFilterCondition> {}
-
-extension AppSettingsModelQuerySortBy
-    on QueryBuilder<AppSettingsModel, AppSettingsModel, QSortBy> {
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterSortBy>
-      sortByCustomHost() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'customHost', Sort.asc);
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterSortBy>
-      sortByCustomHostDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'customHost', Sort.desc);
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterSortBy>
-      sortByUseCustomHost() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'useCustomHost', Sort.asc);
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterSortBy>
-      sortByUseCustomHostDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'useCustomHost', Sort.desc);
-    });
-  }
-}
-
-extension AppSettingsModelQuerySortThenBy
-    on QueryBuilder<AppSettingsModel, AppSettingsModel, QSortThenBy> {
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterSortBy>
-      thenByCustomHost() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'customHost', Sort.asc);
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterSortBy>
-      thenByCustomHostDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'customHost', Sort.desc);
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterSortBy> thenById() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'id', Sort.asc);
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterSortBy>
-      thenByIdDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'id', Sort.desc);
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterSortBy>
-      thenByUseCustomHost() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'useCustomHost', Sort.asc);
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QAfterSortBy>
-      thenByUseCustomHostDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'useCustomHost', Sort.desc);
-    });
-  }
-}
-
-extension AppSettingsModelQueryWhereDistinct
-    on QueryBuilder<AppSettingsModel, AppSettingsModel, QDistinct> {
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QDistinct>
-      distinctByCustomHost({bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'customHost', caseSensitive: caseSensitive);
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, AppSettingsModel, QDistinct>
-      distinctByUseCustomHost() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'useCustomHost');
-    });
-  }
-}
-
-extension AppSettingsModelQueryProperty
-    on QueryBuilder<AppSettingsModel, AppSettingsModel, QQueryProperty> {
-  QueryBuilder<AppSettingsModel, int, QQueryOperations> idProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'id');
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, String?, QQueryOperations>
-      customHostProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'customHost');
-    });
-  }
-
-  QueryBuilder<AppSettingsModel, bool?, QQueryOperations>
-      useCustomHostProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'useCustomHost');
-    });
-  }
-}

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';
 

firka_wear/lib/helpers/db/models/generic_cache_model.g.dart

@@ -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<GenericCacheModel> 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<int> offsets,
-  Map<Type, List<int>> 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<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  writer.writeString(offsets[0], object.cacheData);
-}
-
-GenericCacheModel _genericCacheModelDeserialize(
-  Id id,
-  IsarReader reader,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  final object = GenericCacheModel();
-  object.cacheData = reader.readStringOrNull(offsets[0]);
-  object.cacheKey = id;
-  return object;
-}
-
-P _genericCacheModelDeserializeProp<P>(
-  IsarReader reader,
-  int propertyId,
-  int offset,
-  Map<Type, List<int>> 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<IsarLinkBase<dynamic>> _genericCacheModelGetLinks(
-    GenericCacheModel object) {
-  return [];
-}
-
-void _genericCacheModelAttach(
-    IsarCollection<dynamic> col, Id id, GenericCacheModel object) {
-  object.cacheKey = id;
-}
-
-extension GenericCacheModelQueryWhereSort
-    on QueryBuilder<GenericCacheModel, GenericCacheModel, QWhere> {
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterWhere>
-      anyCacheKey() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(const IdWhereClause.any());
-    });
-  }
-}
-
-extension GenericCacheModelQueryWhere
-    on QueryBuilder<GenericCacheModel, GenericCacheModel, QWhereClause> {
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterWhereClause>
-      cacheKeyEqualTo(Id cacheKey) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(IdWhereClause.between(
-        lower: cacheKey,
-        upper: cacheKey,
-      ));
-    });
-  }
-
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterWhereClause>
-      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<GenericCacheModel, GenericCacheModel, QAfterWhereClause>
-      cacheKeyGreaterThan(Id cacheKey, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.greaterThan(lower: cacheKey, includeLower: include),
-      );
-    });
-  }
-
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterWhereClause>
-      cacheKeyLessThan(Id cacheKey, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.lessThan(upper: cacheKey, includeUpper: include),
-      );
-    });
-  }
-
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterWhereClause>
-      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<GenericCacheModel, GenericCacheModel, QFilterCondition> {
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterFilterCondition>
-      cacheDataIsNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(const FilterCondition.isNull(
-        property: r'cacheData',
-      ));
-    });
-  }
-
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterFilterCondition>
-      cacheDataIsNotNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(const FilterCondition.isNotNull(
-        property: r'cacheData',
-      ));
-    });
-  }
-
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterFilterCondition>
-      cacheDataEqualTo(
-    String? value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'cacheData',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterFilterCondition>
-      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<GenericCacheModel, GenericCacheModel, QAfterFilterCondition>
-      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<GenericCacheModel, GenericCacheModel, QAfterFilterCondition>
-      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<GenericCacheModel, GenericCacheModel, QAfterFilterCondition>
-      cacheDataStartsWith(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'cacheData',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterFilterCondition>
-      cacheDataEndsWith(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'cacheData',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterFilterCondition>
-      cacheDataContains(String value, {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.contains(
-        property: r'cacheData',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterFilterCondition>
-      cacheDataMatches(String pattern, {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.matches(
-        property: r'cacheData',
-        wildcard: pattern,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterFilterCondition>
-      cacheDataIsEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'cacheData',
-        value: '',
-      ));
-    });
-  }
-
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterFilterCondition>
-      cacheDataIsNotEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'cacheData',
-        value: '',
-      ));
-    });
-  }
-
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterFilterCondition>
-      cacheKeyIsNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(const FilterCondition.isNull(
-        property: r'cacheKey',
-      ));
-    });
-  }
-
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterFilterCondition>
-      cacheKeyIsNotNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(const FilterCondition.isNotNull(
-        property: r'cacheKey',
-      ));
-    });
-  }
-
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterFilterCondition>
-      cacheKeyEqualTo(Id? value) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'cacheKey',
-        value: value,
-      ));
-    });
-  }
-
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterFilterCondition>
-      cacheKeyGreaterThan(
-    Id? value, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.greaterThan(
-        include: include,
-        property: r'cacheKey',
-        value: value,
-      ));
-    });
-  }
-
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterFilterCondition>
-      cacheKeyLessThan(
-    Id? value, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.lessThan(
-        include: include,
-        property: r'cacheKey',
-        value: value,
-      ));
-    });
-  }
-
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterFilterCondition>
-      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<GenericCacheModel, GenericCacheModel, QFilterCondition> {}
-
-extension GenericCacheModelQueryLinks
-    on QueryBuilder<GenericCacheModel, GenericCacheModel, QFilterCondition> {}
-
-extension GenericCacheModelQuerySortBy
-    on QueryBuilder<GenericCacheModel, GenericCacheModel, QSortBy> {
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterSortBy>
-      sortByCacheData() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'cacheData', Sort.asc);
-    });
-  }
-
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterSortBy>
-      sortByCacheDataDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'cacheData', Sort.desc);
-    });
-  }
-}
-
-extension GenericCacheModelQuerySortThenBy
-    on QueryBuilder<GenericCacheModel, GenericCacheModel, QSortThenBy> {
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterSortBy>
-      thenByCacheData() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'cacheData', Sort.asc);
-    });
-  }
-
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterSortBy>
-      thenByCacheDataDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'cacheData', Sort.desc);
-    });
-  }
-
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterSortBy>
-      thenByCacheKey() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'cacheKey', Sort.asc);
-    });
-  }
-
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QAfterSortBy>
-      thenByCacheKeyDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'cacheKey', Sort.desc);
-    });
-  }
-}
-
-extension GenericCacheModelQueryWhereDistinct
-    on QueryBuilder<GenericCacheModel, GenericCacheModel, QDistinct> {
-  QueryBuilder<GenericCacheModel, GenericCacheModel, QDistinct>
-      distinctByCacheData({bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'cacheData', caseSensitive: caseSensitive);
-    });
-  }
-}
-
-extension GenericCacheModelQueryProperty
-    on QueryBuilder<GenericCacheModel, GenericCacheModel, QQueryProperty> {
-  QueryBuilder<GenericCacheModel, int, QQueryOperations> cacheKeyProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'cacheKey');
-    });
-  }
-
-  QueryBuilder<GenericCacheModel, String?, QQueryOperations>
-      cacheDataProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'cacheData');
-    });
-  }
-}

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';

firka_wear/lib/helpers/db/models/homework_cache_model.g.dart

@@ -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<HomeworkCacheModel> 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<int> offsets,
-  Map<Type, List<int>> 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<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  writer.writeStringList(offsets[0], object.values);
-}
-
-HomeworkCacheModel _homeworkCacheModelDeserialize(
-  Id id,
-  IsarReader reader,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  final object = HomeworkCacheModel();
-  object.cacheKey = id;
-  object.values = reader.readStringList(offsets[0]);
-  return object;
-}
-
-P _homeworkCacheModelDeserializeProp<P>(
-  IsarReader reader,
-  int propertyId,
-  int offset,
-  Map<Type, List<int>> 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<IsarLinkBase<dynamic>> _homeworkCacheModelGetLinks(
-    HomeworkCacheModel object) {
-  return [];
-}
-
-void _homeworkCacheModelAttach(
-    IsarCollection<dynamic> col, Id id, HomeworkCacheModel object) {
-  object.cacheKey = id;
-}
-
-extension HomeworkCacheModelQueryWhereSort
-    on QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QWhere> {
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterWhere>
-      anyCacheKey() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(const IdWhereClause.any());
-    });
-  }
-}
-
-extension HomeworkCacheModelQueryWhere
-    on QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QWhereClause> {
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterWhereClause>
-      cacheKeyEqualTo(Id cacheKey) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(IdWhereClause.between(
-        lower: cacheKey,
-        upper: cacheKey,
-      ));
-    });
-  }
-
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterWhereClause>
-      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<HomeworkCacheModel, HomeworkCacheModel, QAfterWhereClause>
-      cacheKeyGreaterThan(Id cacheKey, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.greaterThan(lower: cacheKey, includeLower: include),
-      );
-    });
-  }
-
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterWhereClause>
-      cacheKeyLessThan(Id cacheKey, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.lessThan(upper: cacheKey, includeUpper: include),
-      );
-    });
-  }
-
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterWhereClause>
-      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<HomeworkCacheModel, HomeworkCacheModel, QFilterCondition> {
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterFilterCondition>
-      cacheKeyIsNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(const FilterCondition.isNull(
-        property: r'cacheKey',
-      ));
-    });
-  }
-
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterFilterCondition>
-      cacheKeyIsNotNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(const FilterCondition.isNotNull(
-        property: r'cacheKey',
-      ));
-    });
-  }
-
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterFilterCondition>
-      cacheKeyEqualTo(Id? value) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'cacheKey',
-        value: value,
-      ));
-    });
-  }
-
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterFilterCondition>
-      cacheKeyGreaterThan(
-    Id? value, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.greaterThan(
-        include: include,
-        property: r'cacheKey',
-        value: value,
-      ));
-    });
-  }
-
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterFilterCondition>
-      cacheKeyLessThan(
-    Id? value, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.lessThan(
-        include: include,
-        property: r'cacheKey',
-        value: value,
-      ));
-    });
-  }
-
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterFilterCondition>
-      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<HomeworkCacheModel, HomeworkCacheModel, QAfterFilterCondition>
-      valuesIsNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(const FilterCondition.isNull(
-        property: r'values',
-      ));
-    });
-  }
-
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterFilterCondition>
-      valuesIsNotNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(const FilterCondition.isNotNull(
-        property: r'values',
-      ));
-    });
-  }
-
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterFilterCondition>
-      valuesElementEqualTo(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'values',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterFilterCondition>
-      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<HomeworkCacheModel, HomeworkCacheModel, QAfterFilterCondition>
-      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<HomeworkCacheModel, HomeworkCacheModel, QAfterFilterCondition>
-      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<HomeworkCacheModel, HomeworkCacheModel, QAfterFilterCondition>
-      valuesElementStartsWith(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'values',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterFilterCondition>
-      valuesElementEndsWith(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'values',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterFilterCondition>
-      valuesElementContains(String value, {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.contains(
-        property: r'values',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterFilterCondition>
-      valuesElementMatches(String pattern, {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.matches(
-        property: r'values',
-        wildcard: pattern,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterFilterCondition>
-      valuesElementIsEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'values',
-        value: '',
-      ));
-    });
-  }
-
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterFilterCondition>
-      valuesElementIsNotEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'values',
-        value: '',
-      ));
-    });
-  }
-
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterFilterCondition>
-      valuesLengthEqualTo(int length) {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(
-        r'values',
-        length,
-        true,
-        length,
-        true,
-      );
-    });
-  }
-
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterFilterCondition>
-      valuesIsEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(
-        r'values',
-        0,
-        true,
-        0,
-        true,
-      );
-    });
-  }
-
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterFilterCondition>
-      valuesIsNotEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(
-        r'values',
-        0,
-        false,
-        999999,
-        true,
-      );
-    });
-  }
-
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterFilterCondition>
-      valuesLengthLessThan(
-    int length, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(
-        r'values',
-        0,
-        true,
-        length,
-        include,
-      );
-    });
-  }
-
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterFilterCondition>
-      valuesLengthGreaterThan(
-    int length, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(
-        r'values',
-        length,
-        include,
-        999999,
-        true,
-      );
-    });
-  }
-
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterFilterCondition>
-      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<HomeworkCacheModel, HomeworkCacheModel, QFilterCondition> {}
-
-extension HomeworkCacheModelQueryLinks
-    on QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QFilterCondition> {}
-
-extension HomeworkCacheModelQuerySortBy
-    on QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QSortBy> {}
-
-extension HomeworkCacheModelQuerySortThenBy
-    on QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QSortThenBy> {
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterSortBy>
-      thenByCacheKey() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'cacheKey', Sort.asc);
-    });
-  }
-
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QAfterSortBy>
-      thenByCacheKeyDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'cacheKey', Sort.desc);
-    });
-  }
-}
-
-extension HomeworkCacheModelQueryWhereDistinct
-    on QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QDistinct> {
-  QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QDistinct>
-      distinctByValues() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'values');
-    });
-  }
-}
-
-extension HomeworkCacheModelQueryProperty
-    on QueryBuilder<HomeworkCacheModel, HomeworkCacheModel, QQueryProperty> {
-  QueryBuilder<HomeworkCacheModel, int, QQueryOperations> cacheKeyProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'cacheKey');
-    });
-  }
-
-  QueryBuilder<HomeworkCacheModel, List<String>?, QQueryOperations>
-      valuesProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'values');
-    });
-  }
-}

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';

firka_wear/lib/helpers/db/models/timetable_cache_model.g.dart

@@ -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<TimetableCacheModel> 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<int> offsets,
-  Map<Type, List<int>> 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<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  writer.writeStringList(offsets[0], object.values);
-}
-
-TimetableCacheModel _timetableCacheModelDeserialize(
-  Id id,
-  IsarReader reader,
-  List<int> offsets,
-  Map<Type, List<int>> allOffsets,
-) {
-  final object = TimetableCacheModel();
-  object.cacheKey = id;
-  object.values = reader.readStringList(offsets[0]);
-  return object;
-}
-
-P _timetableCacheModelDeserializeProp<P>(
-  IsarReader reader,
-  int propertyId,
-  int offset,
-  Map<Type, List<int>> 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<IsarLinkBase<dynamic>> _timetableCacheModelGetLinks(
-    TimetableCacheModel object) {
-  return [];
-}
-
-void _timetableCacheModelAttach(
-    IsarCollection<dynamic> col, Id id, TimetableCacheModel object) {
-  object.cacheKey = id;
-}
-
-extension TimetableCacheModelQueryWhereSort
-    on QueryBuilder<TimetableCacheModel, TimetableCacheModel, QWhere> {
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterWhere>
-      anyCacheKey() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(const IdWhereClause.any());
-    });
-  }
-}
-
-extension TimetableCacheModelQueryWhere
-    on QueryBuilder<TimetableCacheModel, TimetableCacheModel, QWhereClause> {
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterWhereClause>
-      cacheKeyEqualTo(Id cacheKey) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(IdWhereClause.between(
-        lower: cacheKey,
-        upper: cacheKey,
-      ));
-    });
-  }
-
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterWhereClause>
-      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<TimetableCacheModel, TimetableCacheModel, QAfterWhereClause>
-      cacheKeyGreaterThan(Id cacheKey, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.greaterThan(lower: cacheKey, includeLower: include),
-      );
-    });
-  }
-
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterWhereClause>
-      cacheKeyLessThan(Id cacheKey, {bool include = false}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(
-        IdWhereClause.lessThan(upper: cacheKey, includeUpper: include),
-      );
-    });
-  }
-
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterWhereClause>
-      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<TimetableCacheModel,
-    TimetableCacheModel, QFilterCondition> {
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterFilterCondition>
-      cacheKeyIsNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(const FilterCondition.isNull(
-        property: r'cacheKey',
-      ));
-    });
-  }
-
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterFilterCondition>
-      cacheKeyIsNotNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(const FilterCondition.isNotNull(
-        property: r'cacheKey',
-      ));
-    });
-  }
-
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterFilterCondition>
-      cacheKeyEqualTo(Id? value) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'cacheKey',
-        value: value,
-      ));
-    });
-  }
-
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterFilterCondition>
-      cacheKeyGreaterThan(
-    Id? value, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.greaterThan(
-        include: include,
-        property: r'cacheKey',
-        value: value,
-      ));
-    });
-  }
-
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterFilterCondition>
-      cacheKeyLessThan(
-    Id? value, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.lessThan(
-        include: include,
-        property: r'cacheKey',
-        value: value,
-      ));
-    });
-  }
-
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterFilterCondition>
-      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<TimetableCacheModel, TimetableCacheModel, QAfterFilterCondition>
-      valuesIsNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(const FilterCondition.isNull(
-        property: r'values',
-      ));
-    });
-  }
-
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterFilterCondition>
-      valuesIsNotNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(const FilterCondition.isNotNull(
-        property: r'values',
-      ));
-    });
-  }
-
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterFilterCondition>
-      valuesElementEqualTo(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'values',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterFilterCondition>
-      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<TimetableCacheModel, TimetableCacheModel, QAfterFilterCondition>
-      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<TimetableCacheModel, TimetableCacheModel, QAfterFilterCondition>
-      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<TimetableCacheModel, TimetableCacheModel, QAfterFilterCondition>
-      valuesElementStartsWith(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'values',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterFilterCondition>
-      valuesElementEndsWith(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'values',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterFilterCondition>
-      valuesElementContains(String value, {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.contains(
-        property: r'values',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterFilterCondition>
-      valuesElementMatches(String pattern, {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.matches(
-        property: r'values',
-        wildcard: pattern,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterFilterCondition>
-      valuesElementIsEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'values',
-        value: '',
-      ));
-    });
-  }
-
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterFilterCondition>
-      valuesElementIsNotEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'values',
-        value: '',
-      ));
-    });
-  }
-
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterFilterCondition>
-      valuesLengthEqualTo(int length) {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(
-        r'values',
-        length,
-        true,
-        length,
-        true,
-      );
-    });
-  }
-
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterFilterCondition>
-      valuesIsEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(
-        r'values',
-        0,
-        true,
-        0,
-        true,
-      );
-    });
-  }
-
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterFilterCondition>
-      valuesIsNotEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(
-        r'values',
-        0,
-        false,
-        999999,
-        true,
-      );
-    });
-  }
-
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterFilterCondition>
-      valuesLengthLessThan(
-    int length, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(
-        r'values',
-        0,
-        true,
-        length,
-        include,
-      );
-    });
-  }
-
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterFilterCondition>
-      valuesLengthGreaterThan(
-    int length, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.listLength(
-        r'values',
-        length,
-        include,
-        999999,
-        true,
-      );
-    });
-  }
-
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterFilterCondition>
-      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<TimetableCacheModel,
-    TimetableCacheModel, QFilterCondition> {}
-
-extension TimetableCacheModelQueryLinks on QueryBuilder<TimetableCacheModel,
-    TimetableCacheModel, QFilterCondition> {}
-
-extension TimetableCacheModelQuerySortBy
-    on QueryBuilder<TimetableCacheModel, TimetableCacheModel, QSortBy> {}
-
-extension TimetableCacheModelQuerySortThenBy
-    on QueryBuilder<TimetableCacheModel, TimetableCacheModel, QSortThenBy> {
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterSortBy>
-      thenByCacheKey() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'cacheKey', Sort.asc);
-    });
-  }
-
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QAfterSortBy>
-      thenByCacheKeyDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'cacheKey', Sort.desc);
-    });
-  }
-}
-
-extension TimetableCacheModelQueryWhereDistinct
-    on QueryBuilder<TimetableCacheModel, TimetableCacheModel, QDistinct> {
-  QueryBuilder<TimetableCacheModel, TimetableCacheModel, QDistinct>
-      distinctByValues() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'values');
-    });
-  }
-}
-
-extension TimetableCacheModelQueryProperty
-    on QueryBuilder<TimetableCacheModel, TimetableCacheModel, QQueryProperty> {
-  QueryBuilder<TimetableCacheModel, int, QQueryOperations> cacheKeyProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'cacheKey');
-    });
-  }
-
-  QueryBuilder<TimetableCacheModel, List<String>?, QQueryOperations>
-      valuesProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'values');
-    });
-  }
-}

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';

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';
 

firka_wear/lib/l10n

@@ -1 +0,0 @@
-../../firka/lib/l10n

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';

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';

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';

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:
+  isar_community: 3.3.0
-    path: vendor/isar
+  isar_community_flutter_libs: 3.3.0
-  isar_flutter_libs:
-    path: vendor/isar_flutter_libs
   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:
+  wear_plus: ^1.2.4
-    path: vendor/wear_plus
   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
+  flutter_lints: ^6.0.0
-  isar_generator:
+  isar_community_generator: 3.3.0
-    path: vendor/isar_generator
   android_notification_icons: ^0.0.1
   integration_test:
     sdk: flutter

firka_wear/vendor/isar

@@ -1 +0,0 @@
-../../firka/vendor/isar

firka_wear/vendor/isar_flutter_libs

@@ -1 +0,0 @@
-../../firka/vendor/isar_flutter_libs/

firka_wear/vendor/isar_generator

@@ -1 +0,0 @@
-../../firka/vendor/isar_generator/