wip

kee-org · Feb 15, 2024 · b2b780a · b2b780a
1 parent 851809d
commit b2b780a
Show file tree

Hide file tree

Showing 6 changed files with 218 additions and 164 deletions.
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "3.13.9",
+  "flutterSdkVersion": "3.16.5",
   "flavors": {}
 }
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -80,8 +80,17 @@ def nameSuffix = stages[dartEnvironmentVariables.KEEVAULT_STAGE].nameSuffix + ch
 def symbolLevel = channels[dartEnvironmentVariables.KEEVAULT_CHANNEL].symbolLevel
 def chosenSigningConfig = channels[dartEnvironmentVariables.KEEVAULT_CHANNEL].signingConfig
 
+kotlin {
+    jvmToolchain(17)
+}
+
 android {
-    compileSdk 33
+    compileSdk 34
+
+    compileOptions {
+        sourceCompatibility = 17
+        targetCompatibility = 17
+    }
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'

diff --git a/lib/config/route_handlers.dart b/lib/config/route_handlers.dart
@@ -12,10 +12,10 @@ import 'package:keevault/widgets/vault.dart';
 import '../widgets/blocking_overlay.dart';
 import '../widgets/change_email_prefs.dart';
 import '../widgets/change_password.dart';
-import '../widgets/root.dart';
+import '../widgets/root.dart' as kv_root;
 
 var rootHandler = Handler(handlerFunc: (BuildContext? context, Map<String, List<String>> params) {
-  return const RootWidget();
+  return const kv_root.RootWidget();
 });
 
 var vaultHandler = Handler(handlerFunc: (BuildContext? context, Map<String, List<String>> params) {

diff --git a/lib/main.dart b/lib/main.dart
@@ -25,7 +25,7 @@ void main() async {
     () async {
       await Settings.init(cacheProvider: SharePreferenceCache());
       await MatomoTracker.instance.initialize(
-        siteId: 7,
+        siteId: '7',
         url: 'https://matomo.kee.pm/js/',
         dispatchSettings: DispatchSettings.persistent(onLoad: DispatchSettings.whereNotOlderThan(Duration(days: 14))),
       );