fix: null-safe percentage detection

fix: maybe fixed percentages being calculated into the grade? pls review
update docs
2026-03-05 09:22:28 +01:00 · 2026-03-05 09:22:28 +01:00 · 2026-03-05 09:06:26 +01:00 · 2026-03-05 09:01:11 +01:00 · 2026-03-05 08:40:50 +01:00 · 2026-03-05 08:40:50 +01:00
41 changed files with 530 additions and 1002 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "firka/lib/l10n"]
 	path = firka/lib/l10n
 	url = https://github.com/QwIT-Development/firka-localization
-[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
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,35 +1,19 @@
 # Flutter telepítése

-A firka androidra való lebuildeléséhez kötelező a saját Flutter fork használata, illetve minden más fajta --release buildhez is.
-
 A Flutter telepítéséhez a dokumentáció [itt](https://docs.flutter.dev/get-started/install) található.
-
-A Flutter zip letöltése helyett a custom engine-t cloneold le ([https://git.firka.app/firka/flutter/](https://git.firka.app/firka/flutter/))
-
-# Brotli
-
-A firka brotlival compresseli a libflutter-t buildelés közben ezért szükséges a projekt
-buildeléséhez hogy a brotli a PATH-ben legyen
-
-## Windows
- Töltsd le a `brotli-x64-windows-static.zip`-et a [google/brotli github repoból](https://github.com/google/brotli/releases/latest)
- Csomagold ki valahol (pl. C:\Users\\<username>\dev\brotli)
- Add hozzá a mappát ahova kicsomagoltad (C:\Users\\<username>\dev\brotli) a PATH-hez
- Ne felejtsd el újraindítani az IDE-det illetve parancssorodat utánna hogy frissüljön a PATH
-
-## Linux/MacOS
-Telepítsd fel a brotli packaget a distro-d package managerével
+A projekt jelenleg a 3.41.2-es Flutter SDK-t használja.

 # Keystore

 [Secrets dokumentáció](secrets/README.md)

-# Flutter l10n
+# Fileok generálása

-Flutter l10n fileok generálása
+Flutter l10n és egyéb fileok generálása

 ```shell
-Flutter gen-l10n --template-arb-file app_hu.arb
+$ cd firka # vagy firka_wear
+$ dart run scripts/codegen.dart
 ```

 # Android debug build
@@ -42,20 +26,10 @@ $ Flutter build apk --debug --target-platform android-arm,android-arm64,android-

 # Android release build

-A release buildhez közelező egy keystore használata, illetve a saját Flutter engineünk használata.
+A release buildhez közelező egy keystore használata.

-## Custom Flutter engine setupolása
+## Release appbundle buildelése (firka és firka_wear)

 ```shell
-$ git clone https://git.firka.app/firka/flutter
-$ cd flutter
-$ . dev/tools/envsetup.sh
-$ gclient sync -D
-$ ./dev/tools/build_release.sh
-```
-
-## Release apk buildelése
-
-```shell
-$ ./tools/linux/build_apk.sh main
+$ ./build.sh
 ```
--- a/CONTRIBUTING_en.md
+++ b/CONTRIBUTING_en.md
@@ -1,41 +1,24 @@
-# Installing flutter
+# Installing Flutter

-To build firka you will have to use our custom Flutter fork,
-and to make a release build you will have to use our custom
-flutter engine.
-The documentation for installing flutter can be found [here](https://docs.flutter.dev/get-started/install).
-
-Instead of downloading the regular flutter zip, clone it from ([https://git.firka.app/firka/flutter/](https://git.firka.app/firka/flutter/)).
-
-# Brotli
-
-Firka uses brotli to compress libflutter during the build process to make the app smaller,
-so building Firka requires you to have brotli in your path
-
-## Windows
- Download `brotli-x64-windows-static.zip` from [google/brotli](https://github.com/google/brotli/releases/latest)
- Extract it to somewhere like C:\Users\\<username>\dev\brotli
- Add the directory (ex. C:\Users\\<username>\dev\brotli) to your PATH
- Don't forget to restart your IDE or terminal sessions for the PATH variable to update
-
-## Linux/MacOS
-Install it using your distro's package manager
+Flutter installation documentation can be found [here](https://docs.flutter.dev/get-started/install).
+The project currently uses Flutter SDK 3.41.2.

 # Keystore

-[Secrets docs](secrets/README_en.md)
+[Secrets documentation](secrets/README.md)

-# Flutter l10n
+# Generating files

-Generating flutter l10n files
+Generating Flutter l10n and other files

 ```shell
-flutter gen-l10n --template-arb-file app_hu.arb
+$ cd firka # or firka_wear
+$ dart run scripts/codegen.dart
 ```

 # Android debug build

-The dev build doesn't require using a custom keystore
+The dev build does not require using a keystore
 ```shell
 $ cd firka
 $ flutter build apk --debug --target-platform android-arm,android-arm64,android-x64
@@ -43,20 +26,10 @@ $ flutter build apk --debug --target-platform android-arm,android-arm64,android-

 # Android release build

-The release build requires using a custom keystore and our custom flutter fork
+The release build requires using a keystore.

-## Setting up our flutter engine fork
+## Building the release appbundle (firka and firka_wear)

 ```shell
-$ git clone https://git.firka.app/firka/flutter
-$ cd flutter
-$ . dev/tools/envsetup.sh
-$ gclient sync -D
-$ ./dev/tools/build_release.sh
+$ ./build.sh
 ```
-
-## Building the release apk
-
-```shell
-$ ./tools/linux/build_apk.sh main
-```
--- a/build.ps1
+++ b/build.ps1
@@ -0,0 +1,52 @@
+$ErrorActionPreference = 'Stop'
+
+$ROOT = $PSScriptRoot
+$SHA = (git -C $ROOT rev-parse --short HEAD)
+$COMMIT_COUNT = [int](git -C $ROOT rev-list --count HEAD)
+
+function Build-App {
+  param([string]$App)
+
+  $pubspec = Join-Path $ROOT $App "pubspec.yaml"
+  if (-not (Test-Path $pubspec)) {
+    Write-Error "Not found: $pubspec"
+  }
+
+  $versionLine = Get-Content $pubspec | Select-String -Pattern '^\s*version:\s*' | Select-Object -First 1
+  if (-not $versionLine) {
+    Write-Error "No version line in $pubspec"
+  }
+  $line = $versionLine.Line
+  if ($line -match '^\s*version:\s*([^+\s]+)') {
+    $baseVersion = $Matches[1].Trim()
+  } else {
+    Write-Error "Could not parse version from: $line"
+  }
+
+  $buildName = "${baseVersion}-${SHA}"
+  $versionCode = 2000 + $COMMIT_COUNT
+  if ($App -eq "firka_wear") {
+    $versionCode += 1
+  }
+
+  Write-Host "Building $App : version $buildName (version code: $versionCode)"
+  Push-Location (Join-Path $ROOT $App)
+  try {
+    flutter pub get
+    dart run scripts/codegen.dart
+    flutter build appbundle --build-name="$buildName" --build-number="$versionCode" --verbose
+  } finally {
+    Pop-Location
+  }
+}
+
+$target = if ($args.Count -gt 0) { $args[0] } else { "all" }
+
+switch ($target) {
+  "firka"      { Build-App firka }
+  "firka_wear" { Build-App firka_wear }
+  "all"        { Build-App firka; Build-App firka_wear }
+  default      {
+    Write-Error "Usage: $MyInvocation.MyCommand.Name [firka|firka_wear|all]"
+  }
+}
--- a/build.sh
+++ b/build.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT="$(cd "$(dirname "$0")" && pwd)"
+SHA=$(git -C "$ROOT" rev-parse --short HEAD)
+COMMIT_COUNT=$(git -C "$ROOT" rev-list --count HEAD)
+
+build_app() {
+  local APP="$1"
+  local PUBSPEC="$ROOT/$APP/pubspec.yaml"
+  if [[ ! -f "$PUBSPEC" ]]; then
+    echo "Not found: $PUBSPEC" >&2
+    return 1
+  fi
+
+  local VERSION_LINE BASE_VERSION BUILD_NAME VERSION_CODE
+  VERSION_LINE=$(grep -E '^\s*version:\s*' "$PUBSPEC" | head -1)
+  BASE_VERSION=$(echo "$VERSION_LINE" | sed -E 's/^[[:space:]]*version:[[:space:]]*([^+]+).*/\1/' | tr -d ' ')
+  BUILD_NAME="${BASE_VERSION}-${SHA}"
+
+  VERSION_CODE=$((2000 + COMMIT_COUNT))
+  [[ "$APP" == "firka_wear" ]] && VERSION_CODE=$((VERSION_CODE + 1))
+
+  echo "Building $APP: version $BUILD_NAME (version code: $VERSION_CODE)"
+  cd "$ROOT/$APP"
+
+  flutter pub get
+  dart run scripts/codegen.dart
+
+  flutter build appbundle --build-name="$BUILD_NAME" --build-number="$VERSION_CODE" --verbose
+}
+
+case "${1:-all}" in
+  firka)      build_app firka ;;
+  firka_wear) build_app firka_wear ;;
+  all)        build_app firka && build_app firka_wear ;;
+  *)
+    echo "Usage: $0 [firka|firka_wear|all]" >&2
+    exit 1
+    ;;
+esac
--- a/firka/android/app/proguard-rules.pro
+++ b/firka/android/app/proguard-rules.pro
@@ -1,2 +1 @@
-keep class org.brotli.** { *; }
 -keep class app.firka.naplo.glance.** { *; }
--- a/firka/android/app/src/main/AndroidManifest.xml
+++ b/firka/android/app/src/main/AndroidManifest.xml
@@ -11,7 +11,6 @@
        android:name=".AppMain"
        android:icon="@mipmap/launcher_icon">

-
        <service
            android:name=".WearSyncForegroundService"
            android:exported="false"
--- a/firka/android/app/src/main/java/org/brotli
+++ b/firka/android/app/src/main/java/org/brotli
--- a/firka/codegen-lock.yaml
+++ b/firka/codegen-lock.yaml
@@ -1,15 +1,15 @@
 icons:
  "flutter_launcher_icons.yaml": "c600507ca0df7cebd0f708124842512a14ed3d597b779176200d6ba25b1335b1"
-  "pubspec.yaml": "c84752e36ab6218d2ac824c17ffb0edb5ac4f809ab87784c9c607a0d9f525abb"
+  "pubspec.yaml": "a6ae0bd67a2b6226bec2dfd55437b3db2b7ca4a03f315c1a0a8c2f4b505c7c87"
  "assets/images/logos/colored_logo.webp": "4b4fa99d144fe6694aa4487ba1b26aeecafae41e3c877836cd7da28d61a77983"
  "assets/images/logos/monochrome_logo.png": "188d2b0a64c70323b09bcee721663d6698fb557066f20ddaec97bba6869c1c6c"
  "assets/images/logos/colored_logo_without_mustache.png": "d11cff9f38985885873bfdd2d84e61f8fab03803eada94d4caac1545ef3685f3"
  "assets/images/logos/colored_logo_only_mustache.png": "bad6220c11bdfb1dfe04e5173bd2ebedd3999689d4b3a68fc63dc520c96dd33b"
 l10n:
  "l10n.yml": "a57bc304cac4a2b0235593586f17f400a5165d67fc9aadeaa11893cfa36ee082"
-  "lib/l10n/app_hu.arb": "a7f61bf4452a639d61c350f6674fdb5fd424f9ab31a195a200d446763fa8b396"
-  "lib/l10n/app_de.arb": "55f030b312cc07ff05cdc3d6ee10ef9bdec3243b507225e9a47196444518d955"
-  "lib/l10n/app_en.arb": "efac3f14d8ecc3e278f80a3e5aff599a88e408d2e30ff9e30f889978f465823a"
+  "lib/l10n/app_de.arb": "ecfbf13bd33be9d27a2b54bfd8fb61e46c1a1dce905869d3f30cd05b4aecf258"
+  "lib/l10n/app_en.arb": "8bb0064984deb02eefaec24c13ee019eb38758e115b678ce85335fd4d1b6b6d9"
+  "lib/l10n/app_hu.arb": "2d2c568a3767a5b0bcfde7d27f221fd74b653256bbe41789756c78422a159e4d"
 isar:
  "lib/data/models/app_settings_model.dart": "5eb5af345f1347f104257f0999763650fe2673f9da1754bd12d3f756fe5c9723"
  "lib/data/models/generic_cache_model.dart": "79151d0467fb5d40c532eaaa08ad7c7e24a34304199280fbf49cf6e5adcce6bc"
--- a/firka/ios/Runner.xcodeproj/project.pbxproj
+++ b/firka/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 60;
+	objectVersion = 54;
 	objects = {

 /* Begin PBXBuildFile section */
@@ -816,7 +816,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
+			shellScript = "set -e\nNATIVE_ASSETS_DIR=\"$FLUTTER_APPLICATION_PATH/$FLUTTER_BUILD_DIR/native_assets\"\ncase \"$FLUTTER_BUILD_DIR\" in\n  /*) NATIVE_ASSETS_DIR=\"$FLUTTER_BUILD_DIR/native_assets\" ;;\nesac\nif [ -d \"$FLUTTER_APPLICATION_PATH/.dart_tool/hooks_runner\" ]; then\n  find \"$FLUTTER_APPLICATION_PATH/.dart_tool/hooks_runner\" -exec xattr -c {} \\; 2>/dev/null || true\nfi\nif [ -d \"$NATIVE_ASSETS_DIR\" ]; then\n  find \"$NATIVE_ASSETS_DIR\" -exec xattr -c {} \\; 2>/dev/null || true\nfi\n/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
 		};
 		D576F90540C8E625A9A12317 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -1076,7 +1076,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1101;
+				CURRENT_PROJECT_VERSION = 1102;
 				DEVELOPMENT_TEAM = R9PZGUCNJ3;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -1108,7 +1108,8 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1101;
+				CURRENT_PROJECT_VERSION = 1102;
+				DEVELOPMENT_TEAM = R9PZGUCNJ3;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = app.firka.firka.RunnerTests;
@@ -1127,7 +1128,8 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1101;
+				CURRENT_PROJECT_VERSION = 1102;
+				DEVELOPMENT_TEAM = R9PZGUCNJ3;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = app.firka.firka.RunnerTests;
@@ -1144,7 +1146,8 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1101;
+				CURRENT_PROJECT_VERSION = 1102;
+				DEVELOPMENT_TEAM = R9PZGUCNJ3;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = app.firka.firka.RunnerTests;
@@ -1171,7 +1174,7 @@
 				CODE_SIGN_ENTITLEMENTS = LiveActivityWidget.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1101;
+				CURRENT_PROJECT_VERSION = 1102;
 				DEVELOPMENT_TEAM = R9PZGUCNJ3;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -1222,7 +1225,7 @@
 				CODE_SIGN_ENTITLEMENTS = LiveActivityWidget.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1101;
+				CURRENT_PROJECT_VERSION = 1102;
 				DEVELOPMENT_TEAM = R9PZGUCNJ3;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -1270,7 +1273,7 @@
 				CODE_SIGN_ENTITLEMENTS = LiveActivityWidget.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1101;
+				CURRENT_PROJECT_VERSION = 1102;
 				DEVELOPMENT_TEAM = R9PZGUCNJ3;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -1317,7 +1320,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = FirkaWatchComplicationsExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1101;
+				CURRENT_PROJECT_VERSION = 1102;
 				DEVELOPMENT_TEAM = R9PZGUCNJ3;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -1370,7 +1373,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = FirkaWatchComplicationsExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1101;
+				CURRENT_PROJECT_VERSION = 1102;
 				DEVELOPMENT_TEAM = R9PZGUCNJ3;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -1420,7 +1423,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = FirkaWatchComplicationsExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1101;
+				CURRENT_PROJECT_VERSION = 1102;
 				DEVELOPMENT_TEAM = R9PZGUCNJ3;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -1471,7 +1474,7 @@
 				CODE_SIGN_ENTITLEMENTS = HomeWidgetsExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1101;
+				CURRENT_PROJECT_VERSION = 1102;
 				DEVELOPMENT_TEAM = R9PZGUCNJ3;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -1522,7 +1525,7 @@
 				CODE_SIGN_ENTITLEMENTS = HomeWidgetsExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1101;
+				CURRENT_PROJECT_VERSION = 1102;
 				DEVELOPMENT_TEAM = R9PZGUCNJ3;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -1569,7 +1572,7 @@
 				CODE_SIGN_ENTITLEMENTS = HomeWidgetsExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1101;
+				CURRENT_PROJECT_VERSION = 1102;
 				DEVELOPMENT_TEAM = R9PZGUCNJ3;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -1877,7 +1880,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1101;
+				CURRENT_PROJECT_VERSION = 1102;
 				DEVELOPMENT_TEAM = R9PZGUCNJ3;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -1913,7 +1916,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1101;
+				CURRENT_PROJECT_VERSION = 1102;
 				DEVELOPMENT_TEAM = R9PZGUCNJ3;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
--- a/firka/ios/Runner/Info.plist
+++ b/firka/ios/Runner/Info.plist
@@ -46,7 +46,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1101</string>
+	<string>1102</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
--- a/firka/lib/app/initialization_screen.dart
+++ b/firka/lib/app/initialization_screen.dart
@@ -16,6 +16,7 @@ import 'package:firka/core/bloc/theme_cubit.dart';
 import 'package:firka/core/firka_bundle.dart';
 import 'package:firka/routing/app_router.dart';
 import 'package:firka/services/watch_sync_helper.dart';
+import 'package:firka/ui/theme/style.dart';
 import 'package:firka/ui/phone/pages/extras/main_wear_pair.dart';
 import 'package:firka/l10n/app_localizations.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
@@ -34,6 +35,23 @@ class _InitializationScreenState extends State<InitializationScreen> {
    const Duration(seconds: 20),
  );

+  ThemeData _buildTheme(FirkaStyle style) {
+    return ThemeData(
+      scaffoldBackgroundColor: style.colors.background,
+      canvasColor: style.colors.background,
+      bottomSheetTheme: const BottomSheetThemeData(
+        backgroundColor: Colors.transparent,
+      ),
+      colorScheme: ColorScheme.fromSeed(
+        seedColor: style.colors.accent,
+        brightness: style.isLight ? Brightness.light : Brightness.dark,
+        background: style.colors.background,
+        surface: style.colors.card,
+      ),
+      useMaterial3: false,
+    );
+  }
+
  @override
  Widget build(BuildContext context) {
    return FutureBuilder<AppInitialization>(
@@ -180,40 +198,47 @@ class _InitializationScreenState extends State<InitializationScreen> {
              BlocProvider<ReauthCubit>.value(value: reauthCubit),
              BlocProvider<HomeRefreshCubit>.value(value: homeRefreshCubit),
            ],
-            child: MaterialApp.router(
-              title: 'Firka',
-              key: const ValueKey('firkaApp'),
-              routerConfig: _router!,
-              theme: ThemeData(
-                primarySwatch: Colors.lightGreen,
-                visualDensity: VisualDensity.adaptivePlatformDensity,
-              ),
-              localizationsDelegates: const [
-                AppLocalizations.delegate,
-                GlobalMaterialLocalizations.delegate,
-                GlobalWidgetsLocalizations.delegate,
-              ],
-              supportedLocales: AppLocalizations.supportedLocales,
-              builder: (context, child) {
-                return BlocBuilder<ThemeCubit, ThemeState>(
-                  builder: (context, themeState) {
-                    final isLight = themeState.isLightMode;
-                    final overlay = SystemUiOverlayStyle(
-                      statusBarColor: Colors.transparent,
-                      statusBarIconBrightness: isLight
-                          ? Brightness.dark
-                          : Brightness.light,
-                      statusBarBrightness: isLight
-                          ? Brightness.light
-                          : Brightness.dark,
-                      systemStatusBarContrastEnforced: false,
-                    );
+            child: BlocBuilder<ThemeCubit, ThemeState>(
+              builder: (context, themeState) {
+                final isLight = themeState.isLightMode;
+                final overlay = SystemUiOverlayStyle(
+                  statusBarColor: Colors.transparent,
+                  statusBarIconBrightness:
+                      isLight ? Brightness.dark : Brightness.light,
+                  statusBarBrightness:
+                      isLight ? Brightness.light : Brightness.dark,
+                  systemStatusBarContrastEnforced: false,
+                );

-                    SystemChrome.setSystemUIOverlayStyle(overlay);
+                final themeMode =
+                    isLight ? ThemeMode.light : ThemeMode.dark;

+                final fallbackBg = isLight
+                    ? lightStyle.colors.background
+                    : darkStyle.colors.background;
+
+                SystemChrome.setSystemUIOverlayStyle(overlay);
+
+                return MaterialApp.router(
+                  title: 'Firka',
+                  key: const ValueKey('firkaApp'),
+                  routerConfig: _router!,
+                  theme: _buildTheme(lightStyle),
+                  darkTheme: _buildTheme(darkStyle),
+                  themeMode: themeMode,
+                  localizationsDelegates: const [
+                    AppLocalizations.delegate,
+                    GlobalMaterialLocalizations.delegate,
+                    GlobalWidgetsLocalizations.delegate,
+                  ],
+                  supportedLocales: AppLocalizations.supportedLocales,
+                  builder: (context, child) {
                    return AnnotatedRegion<SystemUiOverlayStyle>(
                      value: overlay,
-                      child: child ?? const SizedBox.shrink(),
+                      child: ColoredBox(
+                        color: fallbackBg,
+                        child: child ?? const SizedBox.shrink(),
+                      ),
                    );
                  },
                );
--- a/firka/lib/core/average_helper.dart
+++ b/firka/lib/core/average_helper.dart
@@ -1,10 +1,17 @@
 import 'package:kreta_api/kreta_api.dart';

+bool _isPercentageGrade(Grade grade) {
+  final name = grade.valueType.name?.toLowerCase() ?? '';
+  return name.contains('szazalek') || name.contains('percent');
+}
+
 double calculateAverage(List<Grade> sortedGrades) {
  double totalWeight = 0.0;
  double weightedSum = 0.0;

  for (final grade in sortedGrades) {
+    if (_isPercentageGrade(grade)) continue;
+
    final value = grade.numericValue;
    final weight = grade.weightPercentage;

--- a/firka/lib/core/firka_bundle.dart
+++ b/firka/lib/core/firka_bundle.dart
@@ -1,62 +1,12 @@
-import 'dart:async';
-import 'dart:convert';
-import 'dart:io';
-
-import 'package:brotli/brotli.dart';
 import 'package:firka/app/app_state.dart';
 import 'package:flutter/services.dart';

 class FirkaBundle extends CachingAssetBundle {
-  // final bool _compressedBundle = !kDebugMode && Platform.isAndroid;
-  final bool _compressedBundle = false;
-
-  Map<String, dynamic>? index;
-
-  Future<Map<String, dynamic>> loadIndex() async {
-    var indexBrotli = await rootBundle.load("assets/firka.i");
-    var indexStr = brotli.decodeToString(indexBrotli.buffer.asInt8List());
-
-    return Future.value(jsonDecode(indexStr));
-  }
-
-  ByteData decode(Codec<List<int>, List<int>> codec, ByteData data) {
-    var dec = codec.decode(data.buffer.asInt8List());
-    var b = ByteData(dec.length);
-    var l = b.buffer.asInt8List();
-
-    for (var i = 0; i < dec.length; i++) {
-      l[i] = dec[i];
-    }
-
-    return b;
-  }
-
  @override
  Future<ByteData> load(String key) async {
-    if (!_compressedBundle) {
-      logger.finest(
-        "Loading asset from root bundle: assets/flutter_assets/$key",
-      );
-      return rootBundle.load(key);
-    } else {
-      index ??= await loadIndex();
-
-      final gzip = GZipCodec();
-
-      logger.finest(
-        "Loading asset from firka bundle: assets/flutter_assets/$key",
-      );
-      switch (index!["assets/flutter_assets/$key"]!) {
-        case "b": // brotli
-          return decode(brotli, await rootBundle.load(key));
-        case "g": // gzip
-          return decode(gzip, await rootBundle.load(key));
-        case "r": // raw
-          return rootBundle.load(key);
-        default:
-          logger.shout("Unknown file format: ${index![key]!}");
-          throw "Unknown file format: ${index![key]!}";
-      }
-    }
+    logger.finest(
+      "Loading asset from root bundle: assets/flutter_assets/$key",
+    );
+    return rootBundle.load(key);
  }
 }
--- a/firka/lib/data/widget.dart
+++ b/firka/lib/data/widget.dart
@@ -322,6 +322,11 @@ class WidgetCacheHelper {
    var sum = 0.0;

    for (var grade in grades) {
+      final name = grade.valueType.name?.toLowerCase() ?? '';
+      final isPercentage =
+          name.contains('szazalek') || name.contains('percent');
+      if (isPercentage) continue;
+
      if (grade.numericValue != null) {
        var weight = (grade.weightPercentage ?? 100) / 100.0;
        weightTotal += weight;
--- a/firka/lib/l10n
+++ b/firka/lib/l10n
--- a/firka/lib/ui/components/common_bottom_sheets.dart
+++ b/firka/lib/ui/components/common_bottom_sheets.dart
@@ -1048,9 +1048,13 @@ class _GradeCalculatorSheetContent extends StatefulWidget {
 class _GradeCalculatorSheetContentState
    extends State<_GradeCalculatorSheetContent> {
  int selectedGrade = 3;
-  int weightPercent = 100;
+  int weightIndex = 1; // 0-based index into _snapPoints
  final List<(int grade, int weight)> entries = [];

+  static const _snapPoints = [50, 100, 200, 300, 500];
+
+  int get weightPercent => _snapPoints[weightIndex];
+
  @override
  Widget build(BuildContext context) {
    return Column(
@@ -1184,11 +1188,12 @@ class _GradeCalculatorSheetContentState
                    trackHeight: 8,
                  ),
                  child: Slider(
-                    value: weightPercent.toDouble(),
-                    min: 1,
-                    max: 500,
-                    divisions: 499,
-                    onChanged: (v) => setState(() => weightPercent = v.round()),
+                    value: weightIndex.toDouble(),
+                    min: 0,
+                    max: (_snapPoints.length - 1).toDouble(),
+                    divisions: _snapPoints.length - 1,
+                    label: '${weightPercent}%',
+                    onChanged: (v) => setState(() => weightIndex = v.round()),
                  ),
                ),
              ),
--- a/firka/lib/ui/phone/pages/home/home_grades.dart
+++ b/firka/lib/ui/phone/pages/home/home_grades.dart
@@ -146,18 +146,6 @@ class _HomeGradesScreen extends FirkaState<HomeGradesScreen> {

        double avg = double.nan;
        if (subjectGrades.isNotEmpty) {
-          for (var grade in subjectGrades) {
-            if (grade.valueType.name == "Szazalekos") {
-              grade.valueType = NameUidDesc(
-                uid: "1,Osztalyzat",
-                name: "Osztalyzat",
-                description: "",
-              );
-              if (grade.numericValue != null) {
-                grade.numericValue = percentageToGrade(grade.numericValue!);
-              }
-            }
-          }
          avg = grades!.response!.getAverageBySubject(subject);
        }

--- a/firka/lib/ui/phone/pages/home/home_main.dart
+++ b/firka/lib/ui/phone/pages/home/home_main.dart
@@ -55,7 +55,7 @@ class _HomeMainScreen extends FirkaState<HomeMainScreen> {
    }
  }

-  Future<void> fetchData({bool cacheOnly = true}) async {
+  Future<void> fetchData({bool cacheOnly = false}) async {
    final midnight = now.getMidnight();

    var lessonsFetched = 0;
--- a/firka/lib/ui/phone/pages/home/home_timetable.dart
+++ b/firka/lib/ui/phone/pages/home/home_timetable.dart
@@ -608,7 +608,6 @@ class _HomeTimetableScreen extends FirkaState<HomeTimetableScreen>
                                "dropdownLeft",
                                size: 24,
                                color: appStyle.colors.accent,
-                                package: 'firka',
                              ),
                            ),
                            onTap: () async {
@@ -673,7 +672,6 @@ class _HomeTimetableScreen extends FirkaState<HomeTimetableScreen>
                                "dropdownRight",
                                size: 24,
                                color: appStyle.colors.accent,
-                                package: 'firka',
                              ),
                            ),
                            onTap: () async {
--- a/firka/lib/ui/phone/pages/home/home_timetable_mo.dart
+++ b/firka/lib/ui/phone/pages/home/home_timetable_mo.dart
@@ -438,7 +438,6 @@ class _HomeTimetableMonthlyScreen
                              "dropdownLeft",
                              size: 24,
                              color: appStyle.colors.accent,
-                              package: 'firka',
                            ),
                          ),
                          onTap: () async {
@@ -468,7 +467,6 @@ class _HomeTimetableMonthlyScreen
                            "dropdownRight",
                            size: 24,
                            color: appStyle.colors.accent,
-                            package: 'firka',
                          ),
                          onTap: () async {
                            var newNow = DateTime(now!.year, now!.month + 1);
--- a/firka/lib/ui/phone/screens/login/login_screen.dart
+++ b/firka/lib/ui/phone/screens/login/login_screen.dart
@@ -4,6 +4,7 @@ import 'dart:math' as math;
 import 'package:carousel_slider/carousel_slider.dart';
 import 'package:firka/core/firka_bundle.dart';
 import 'package:firka/app/app_state.dart';
+import 'package:flutter/foundation.dart';
 import 'package:firka/ui/phone/widgets/login_webview.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
@@ -68,6 +69,7 @@ class _LoginScreenState extends FirkaState<LoginScreen> {
      "assets/images/carousel_dark/slide3.webp",
      "assets/images/carousel_dark/slide4.webp",
      "assets/images/logos/colored_logo.webp",
+      "assets/images/logos/loading.gif",
    ];
    try {
      await ImagePreloader.preloadMultipleAssets(FirkaBundle(), imagePaths);
@@ -569,6 +571,7 @@ class _FloatingCardsSlideState extends State<_FloatingCardsSlide>
  static const double _friction = 0.878;
  static const double _cardHeight =
      45; //not in pixels, idk what unit but it works :p
+  // cap speeds so impacts stay tame
  static const double _maxSpeed = _cardHeight * 1.2;
  static const double _tiltForce = 0.05;
  static const double _bounceDamping = 0.45;
@@ -644,6 +647,7 @@ class _FloatingCardsSlideState extends State<_FloatingCardsSlide>
  Offset? _baseline;
  StreamSubscription<AccelerometerEvent>? _accelerometerSub;
  Duration? _lastTick;
+  AccelerometerEvent? _lastAccelEvent;

  double _sceneWidth = 0;
  double _sceneHeight = 0;
@@ -687,6 +691,7 @@ class _FloatingCardsSlideState extends State<_FloatingCardsSlide>
  }

  void _handleTilt(AccelerometerEvent event) {
+    _lastAccelEvent = event;
    final raw = Offset(event.x, event.y);
    _baseline ??= raw;
    final rel = raw - _baseline!;
@@ -712,6 +717,7 @@ class _FloatingCardsSlideState extends State<_FloatingCardsSlide>
    if (_sceneWidth == 0 || _sceneHeight == 0) return;

    bool collidedThisTick = false;
+    bool wallHitThisTick = false;

    setState(() {
      final slope = Offset(-_tilt.dx, _tilt.dy);
@@ -811,30 +817,50 @@ class _FloatingCardsSlideState extends State<_FloatingCardsSlide>
          double vx = _velocities[i].dx;
          double vy = _velocities[i].dy;

+          // capture incoming velocity components before any bounce damping
+          final double preVx = vx;
+          final double preVy = vy;
+          double impactSpeed = 0.0; // normal to the wall
+
+          bool hit = false;
+
          if (pos.dx < minX) {
            pos = Offset(minX, pos.dy);
            vx = vx.abs() * _bounceDamping;
+            impactSpeed = math.max(impactSpeed, preVx.abs());
+            hit = true;
          } else if (pos.dx > maxX) {
            pos = Offset(maxX, pos.dy);
            vx = -vx.abs() * _bounceDamping;
+            impactSpeed = math.max(impactSpeed, preVx.abs());
+            hit = true;
          }

          if (pos.dy < minY) {
            pos = Offset(pos.dx, minY);
            vy = vy.abs() * _bounceDamping;
+            impactSpeed = math.max(impactSpeed, preVy.abs());
+            hit = true;
          } else if (pos.dy > maxY) {
            pos = Offset(pos.dx, maxY);
            vy = -vy.abs() * _bounceDamping;
+            impactSpeed = math.max(impactSpeed, preVy.abs());
+            hit = true;
          }

          _velocities[i] = _clampVel(Offset(vx, vy));
          _positions[i] = pos;
+
+          // vibrate only when the component toward the wall exceeded threshold
+          if (hit && impactSpeed > _vibrateSpeedThreshold) {
+            wallHitThisTick = true;
+          }
        }
      }
    });

-    // phone mating session
-    if (collidedThisTick) _maybeVibrate();
+    // vibration on collisions (card-card or walls)
+    if (collidedThisTick || wallHitThisTick) _maybeVibrate();
  }

  @override
@@ -896,10 +922,59 @@ class _FloatingCardsSlideState extends State<_FloatingCardsSlide>
              ),
            );
          }),
+          if (kDebugMode) _buildDebugOverlay(center),
        ],
      ),
    );
  }
+
+  Widget _buildDebugOverlay(Offset center) {
+    final firstPos = _positions.isNotEmpty ? _positions.first : Offset.zero;
+    final firstVel = _velocities.isNotEmpty ? _velocities.first : Offset.zero;
+    final accel = _lastAccelEvent;
+    final speed = firstVel.distance;
+
+    String formatOffset(Offset o) =>
+        '(${o.dx.toStringAsFixed(2)}, ${o.dy.toStringAsFixed(2)})';
+
+    return Positioned(
+      left: 12,
+      top: 12,
+      child: Container(
+        padding: const EdgeInsets.all(10),
+        decoration: BoxDecoration(
+          color: Colors.black.withOpacity(0.55),
+          borderRadius: BorderRadius.circular(10),
+        ),
+        width: math.min(260, _sceneWidth - 24),
+        child: DefaultTextStyle(
+          style: appStyle.fonts.B_12R.copyWith(
+            color: Colors.white,
+            height: 1.25,
+          ),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Text('Sim Debug'),
+              const SizedBox(height: 4),
+              Text('tilt: ${formatOffset(_tilt)}'),
+              if (accel != null)
+                Text(
+                  'accel: (${accel.x.toStringAsFixed(2)}, ${accel.y.toStringAsFixed(2)}, ${accel.z.toStringAsFixed(2)})',
+                ),
+              Text('baseline set: ${_baseline != null}'),
+              Text('scene: ${_sceneWidth.toStringAsFixed(0)} x ${_sceneHeight.toStringAsFixed(0)}'),
+              Text('center: ${formatOffset(center)}'),
+              Text('card[0] pos: ${formatOffset(firstPos)}'),
+              Text('card[0] vel: ${formatOffset(firstVel)} | |v|=${speed.toStringAsFixed(2)}'),
+              Text('cards: ${_cards.length}'),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
 }

 // this sucks :3
--- a/firka/lib/ui/phone/screens/settings/settings_screen.dart
+++ b/firka/lib/ui/phone/screens/settings/settings_screen.dart
@@ -948,7 +948,6 @@ class _SettingsScreenState extends FirkaState<SettingsScreen> {
                      FirkaIconType.icons,
                      "group",
                      color: appStyle.colors.accent,
-                      package: 'firka',
                    ),
                    SizedBox(width: 8),
                    Text(
--- a/firka/lib/ui/phone/widgets/grade_chart.dart
+++ b/firka/lib/ui/phone/widgets/grade_chart.dart
@@ -33,6 +33,10 @@ class _GradeChartState extends State<GradeChart> {
    double totalWeight = 0;
    for (final g in grades) {
      if (g.subject.uid != subjectUid) continue;
+      final name = g.valueType.name?.toLowerCase() ?? '';
+      final isPercentage =
+          name.contains('szazalek') || name.contains('percent');
+      if (isPercentage) continue;
      final v = g.numericValue;
      final w = g.weightPercentage;
      if (v != null && w != null) {
@@ -93,6 +97,27 @@ class _GradeChartState extends State<GradeChart> {
    }
  }

+  List<FlSpot> _smoothSpots(List<FlSpot> input) {
+    if (input.length < 3) return input;
+
+    final smoothed = <FlSpot>[];
+    for (var i = 0; i < input.length; i++) {
+      if (i == 0 || i == input.length - 1) {
+        smoothed.add(input[i]);
+        continue;
+      }
+
+      final prev = input[i - 1].y;
+      final curr = input[i].y;
+      final next = input[i + 1].y;
+      final blended = (0.25 * prev) + (0.5 * curr) + (0.25 * next);
+
+      smoothed.add(FlSpot(input[i].x, blended));
+    }
+
+    return smoothed;
+  }
+
  @override
  void didUpdateWidget(covariant GradeChart oldWidget) {
    super.didUpdateWidget(oldWidget);
@@ -213,8 +238,10 @@ class _GradeChartState extends State<GradeChart> {
  }

  LineChartData avgData() {
-    var firstX = spots.first.x;
-    var lastX = spots.last.x;
+    final smoothedSpots = _smoothSpots(spots);
+
+    var firstX = smoothedSpots.first.x;
+    var lastX = smoothedSpots.last.x;
    if (firstX == lastX) {
      lastX = firstX + 1;
    }
@@ -359,12 +386,12 @@ class _GradeChartState extends State<GradeChart> {

      lineBarsData: [
        LineChartBarData(
-          spots: spots,
+          spots: smoothedSpots,
          isCurved: true,
-          curveSmoothness: 0.35,
+          curveSmoothness: 0.5,
          showingIndicators: _touchedIndex != null ? [_touchedIndex!] : [],
          gradient: LinearGradient(
-            colors: [for (final s in spots) colorForY(s.y)],
+            colors: [for (final s in smoothedSpots) colorForY(s.y)],
          ),
          barWidth: 5,
          isStrokeCapRound: true,
@@ -373,7 +400,8 @@ class _GradeChartState extends State<GradeChart> {
            show: true,
            gradient: LinearGradient(
              colors: [
-                for (final s in spots) colorForY(s.y).withValues(alpha: 0.1),
+                for (final s in smoothedSpots)
+                  colorForY(s.y).withValues(alpha: 0.1),
              ],
            ),
          ),
--- a/firka/lib/ui/phone/widgets/home_main_welcome.dart
+++ b/firka/lib/ui/phone/widgets/home_main_welcome.dart
@@ -56,14 +56,12 @@ class _WelcomeWidgetState extends State<WelcomeWidget> {
          FirkaIconType.majesticonsLocal,
          "sunSolid",
          color: appStyle.colors.accent,
-          package: 'firka',
        );
      case Cycle.day:
        return FirkaIconWidget(
          FirkaIconType.majesticonsLocal,
          "parkSolidSchool",
          color: appStyle.colors.accent,
-          package: 'firka',
        );
      case Cycle.afternoon:
        return FirkaIconWidget(
--- a/firka/lib/ui/phone/widgets/homework.dart
+++ b/firka/lib/ui/phone/widgets/homework.dart
@@ -34,7 +34,6 @@ class HomeworkWidget extends StatelessWidget {
                          "homeWithMark",
                          color: appStyle.colors.accent,
                          size: 24,
-                          package: 'firka',
                        )
                      : FirkaIconWidget(
                          FirkaIconType.majesticons,
--- a/firka/lib/ui/phone/widgets/lesson.dart
+++ b/firka/lib/ui/phone/widgets/lesson.dart
@@ -370,7 +370,6 @@ class LessonWidget extends StatelessWidget {
                        'cupFilled',
                        color: appStyle.colors.accent,
                        size: 24,
-                        package: 'firka',
                      ),
                    ),
                  ),
--- a/firka/lib/ui/phone/widgets/lesson_big.dart
+++ b/firka/lib/ui/phone/widgets/lesson_big.dart
@@ -245,7 +245,6 @@ class LessonBigWidget extends StatelessWidget {
                              'cupFilled',
                              color: appStyle.colors.accent,
                              size: 24,
-                              package: 'firka',
                            ),
                          ),
                        ),
@@ -488,7 +487,6 @@ class LessonBigWidget extends StatelessWidget {
                            'cupFilled',
                            color: appStyle.colors.accent,
                            size: 24,
-                            package: 'firka',
                          ),
                        ),
                      ),
--- a/firka/lib/ui/phone/widgets/login_webview.dart
+++ b/firka/lib/ui/phone/widgets/login_webview.dart
@@ -276,15 +276,10 @@ class _LoginWebviewWidgetState extends FirkaState<LoginWebviewWidget>
                            child: Container(
                              color: appStyle.colors.background,
                              child: Center(
-                                child: SizedBox(
-                                  width: 32,
-                                  height: 32,
-                                  child: CircularProgressIndicator(
-                                    strokeWidth: 3,
-                                    valueColor: AlwaysStoppedAnimation<Color>(
-                                      appStyle.colors.accent,
-                                    ),
-                                  ),
+                                child: Image.asset(
+                                  "assets/images/logos/loading.gif",
+                                  width: 50,
+                                  height: 50,
                                ),
                              ),
                            ),
--- a/firka/pubspec.yaml
+++ b/firka/pubspec.yaml
@@ -2,7 +2,7 @@ name: firka
 description: "Firka, Alternatív e-Kréta kliens."
 publish_to: 'none'

-version: 1.1.0+1040
+version: 1.1.1+2001

 environment:
  sdk: ^3.11.0
@@ -38,7 +38,6 @@ dependencies:
  flutter_arc_text: ^0.6.0
  flutter_svg: ^1.1.6
  home_widget: ^0.8.0
-  brotli: ^0.6.0
  crypto: ^3.0.6
  transparent_pointer: ^1.0.1
  flutter_staggered_grid_view: ^0.7.0
@@ -82,6 +81,7 @@ flutter:
    - .env
    - assets/images/logos/colored_logo.webp
    - assets/images/logos/dave.svg
+    - assets/images/logos/loading.gif
    - assets/images/carousel/
    - assets/images/carousel_dark/
    - assets/images/icons/
@@ -90,7 +90,6 @@ flutter:
    - assets/images/bubble.svg
    - assets/icons/
    - assets/majesticons/
-    - assets/firka.i
    - assets/swears/DirtyWords.xml
    - assets/images/cactus_error_screen.png
    - assets/images/logos/dave_error.png
--- a/firka/scripts/codegen.dart
+++ b/firka/scripts/codegen.dart
@@ -13,10 +13,33 @@ void main() async {

  if (_iconsOutOfDate(root)) {
    final inputs = _iconsInputs(root);
-    stdout.writeln('Icons out of date, running flutter_launcher_icons...');
-    await _run('dart', ['run', 'flutter_launcher_icons'], root);
-    _updateLockWithHashes(root, 'icons', _computeHashes(root, inputs));
-    ran = true;
+    final manifestFile = File(p.join(root, 'android/app/src/main/AndroidManifest.xml'));
+    String? manifestBackup;
+    if (manifestFile.existsSync()) {
+      manifestBackup = manifestFile.readAsStringSync();
+    }
+    late ProcessResult iconResult;
+    try {
+      stdout.writeln('Icons out of date, running flutter_launcher_icons...');
+      iconResult = await Process.run(
+        'dart',
+        ['run', 'flutter_launcher_icons'],
+        workingDirectory: root,
+        runInShell: true,
+      );
+      if (iconResult.exitCode == 0) {
+        _updateLockWithHashes(root, 'icons', _computeHashes(root, inputs));
+        ran = true;
+      }
+    } finally {
+      if (manifestBackup != null) {
+        manifestFile.writeAsStringSync(manifestBackup);
+      }
+    }
+    if (iconResult.exitCode != 0) {
+      stderr.write(iconResult.stderr);
+      exit(iconResult.exitCode);
+    }
  }

  if (_l10nOutOfDate(root)) {
@@ -31,11 +54,11 @@ void main() async {
    ran = true;
  }

-  if (_isarOutOfDate(root)) {
+  if (_isarOutOfDate(root) || _isarGeneratedFilesMissing(root)) {
    final inputs = _isarInputs(root);
    final hashes = _computeHashes(root, inputs);
    stdout.writeln(
-      'Isar generated dart files out of date, running build_runner...',
+      'Isar generated dart files out of date or missing, running build_runner...',
    );
    await _run('dart', ['run', 'build_runner', 'build'], root);
    _updateLockWithHashes(root, 'isar', hashes);
@@ -240,6 +263,18 @@ bool _isarOutOfDate(String root) {
  return false;
 }

+bool _isarGeneratedFilesMissing(String root) {
+  final inputs = _isarInputs(root);
+  if (inputs.isEmpty) return false;
+  final modelsDir = p.join(root, 'lib/data/models');
+  for (final dartFile in inputs) {
+    final baseName = p.basenameWithoutExtension(dartFile.path);
+    final gFile = File(p.join(modelsDir, '$baseName.g.dart'));
+    if (!gFile.existsSync()) return true;
+  }
+  return false;
+}
+
 List<File> _splashInputs(String root) {
  final config = File(p.join(root, 'flutter_native_splash.yaml'));
  final splashImage = File(p.join(root, 'assets/images/logos/splash.png'));
--- a/firka/vendor/fmb_dart
+++ b/firka/vendor/fmb_dart
--- a/firka_common/lib/ui/components/grade_helpers.dart
+++ b/firka_common/lib/ui/components/grade_helpers.dart
@@ -86,6 +86,14 @@ extension GradeListExtension on List<Grade> {

    for (var grade in this) {
      if (grade.subject.uid == subject.uid) {
+        final name = grade.valueType.name?.toLowerCase() ?? '';
+        final isPercentage =
+            name.contains('szazalek') || name.contains('percent');
+
+        if (isPercentage) {
+          continue;
+        }
+
        if (grade.numericValue != null) {
          var weight = (grade.weightPercentage ?? 100) / 100.0;
          weightTotal += weight;
@@ -95,6 +103,10 @@ extension GradeListExtension on List<Grade> {
      }
    }

+    if (weightTotal == 0) {
+      return double.nan;
+    }
+
    return sum / weightTotal;
  }
 }
--- a/firka_wear/android/app/build.gradle.kts
+++ b/firka_wear/android/app/build.gradle.kts
@@ -1,15 +1,5 @@
-import org.apache.commons.io.FileUtils
 import java.io.FileInputStream
-import java.security.MessageDigest
 import java.util.Properties
-import java.util.concurrent.Executors
-import java.util.concurrent.Future
-import java.util.concurrent.locks.ReentrantReadWriteLock
-import java.util.zip.ZipEntry
-import java.util.zip.ZipFile
-import java.util.zip.ZipOutputStream
-import java.util.zip.ZipOutputStream.DEFLATED
-import java.util.zip.ZipOutputStream.STORED

 plugins {
    id("com.android.application")
@@ -114,724 +104,3 @@ fun checkReleaseKey() {
        throw Exception("Release keystore not found!")
    }
 }
-
-fun transformApks(debug: Boolean, i : Int = 0) {
-    try {
-        _transformApks(debug)
-    } catch (e: Exception) {
-        if (i < 5) {
-            e.printStackTrace()
-
-            println("Retrying: ${i + 1}")
-            transformApks(debug, i + 1)
-        } else {
-            throw e
-        }
-    }
-}
-
-fun _transformApks(debug: Boolean) {
-    println("Starting APK transformation process...")
-
-    val buildDir = project.buildDir
-    val apkDir = File(buildDir, "outputs/flutter-apk")
-    val apks = getApks(debug)
-    var c = 0
-    apks
-        .forEach { c++; transformAndSignApk(apkDir, it.nameWithoutExtension, debug) }
-
-    println("Transformed: $c apks")
-}
-
-fun transformAndSignApk(apkDir: File, name: String, debug: Boolean) {
-    val originalApk = File(apkDir, "$name.apk")
-    val transformedApk = File(apkDir, "$name-transformed.apk")
-    val finalApk = File(apkDir, "$name-resigned.apk")
-    val finalIdsig = File(apkDir, "$name-resigned.apk.idsig")
-
-    if (!originalApk.exists()) {
-        throw GradleException("Original APK not found at: ${originalApk.absolutePath}")
-    }
-
-    if (transformedApk.exists()) transformedApk.delete()
-    if (finalApk.exists()) finalApk.delete()
-
-    println("Original APK: ${originalApk.absolutePath}")
-
-    try {
-        println("Transforming APK...")
-        transformApk(originalApk, transformedApk, if (debug) { "6" } else {"Z"})
-
-        if (debug) {
-            println("Signing with debug key...")
-            signWithDebugKey(transformedApk, finalApk)
-        } else {
-            println("Signing with release key...")
-            signWithReleaseKey(transformedApk, finalApk)
-        }
-
-        if (finalApk.exists()) {
-            originalApk.delete()
-            finalIdsig.delete()
-            finalApk.renameTo(originalApk)
-            println("APK successfully transformed")
-            println("Final APK: ${originalApk.absolutePath}")
-        }
-
-        transformedApk.delete()
-    } catch (e: Exception) {
-        throw GradleException("Failed to transform and resign APK: ${e.message}", e)
-    }
-}
-
-fun transformApk(input: File, output: File, compressionLevel: String = "Z") {
-    val tempDir = File(project.buildDir, "tmp/apk-transform")
-    val cacheDir = File(project.buildDir, "cache")
-    val optipngCacheDir = File(cacheDir, "optipng")
-    val assetCompressionDir = File(cacheDir, "assets")
-    tempDir.deleteRecursively()
-    tempDir.mkdirs()
-    if (!optipngCacheDir.exists()) optipngCacheDir.mkdirs()
-    if (!assetCompressionDir.exists()) assetCompressionDir.mkdirs()
-
-    val brotli = findToolInPath("brotli")
-        ?: throw Exception("Brotli not found in path")
-    val optipng = findToolInPath("optipng")
-
-    if (optipng == null || optipng.isEmpty()) {
-        println("Optipng was not found in PATH, optimizing images will be skipped.")
-    }
-
-    copy {
-        from(zipTree(input))
-        into(tempDir)
-    }
-
-    val metaInf = File(tempDir, "META-INF")
-    val metaInfFiles = metaInf.listFiles()
-    for (file in metaInfFiles!!) {
-        if (file.name.endsWith("MF") || file.name.endsWith("SF")
-            || file.name.endsWith("RSA")) {
-            file.delete()
-        }
-    }
-
-    val arches = File(tempDir, "lib").listFiles()
-    val compressedLibs = mutableMapOf<String, String>()
-    for (arch in arches!!) {
-        val libFlutter = File(arch, "libflutter.so")
-
-        if (!libFlutter.exists()) continue
-
-        val compressedFlutter = File(arch, "libflutter-br.so")
-
-        compressedLibs["libflutter.so"] = libFlutter.sha256()
-
-        println("Compressing ${arch.name}/libflutter.so with brotli")
-        exec {
-            commandLine(
-                brotli,
-                "-$compressionLevel",
-                libFlutter.absolutePath,
-                "-o", compressedFlutter.absolutePath
-            )
-        }
-        libFlutter.delete()
-
-        val json = groovy.json.JsonBuilder(compressedLibs)
-        File(arch, "index.so").writeText(json.toString())
-    }
-
-    val topDirL = tempDir.absolutePath.length + 1
-    val zos = ZipOutputStream(output.outputStream())
-
-    val coreCount = Runtime.getRuntime().availableProcessors()
-    val flutterResources = tempDir.walkTopDown().filter{f -> f.absolutePath.contains("flutter_assets")}
-    val pngFiles = tempDir.walkTopDown().filter{f -> f.name.endsWith(".png")}
-
-    val assetIndex = mutableMapOf<String, String>()
-    val indexReadWriteLock = ReentrantReadWriteLock()
-
-    if (compressionLevel == "Z") {
-        if (optipng != null) {
-            val executor = Executors.newFixedThreadPool(coreCount)
-            val futures = mutableListOf<Future<*>>()
-
-            pngFiles.forEach { pngFile ->
-                val cacheFile = File(optipngCacheDir, pngFile.sha256())
-
-                if (cacheFile.exists()) {
-                    cacheFile.copyTo(pngFile, true)
-                } else {
-                    val future = executor.submit {
-                        exec {
-                            commandLine(
-                                optipng,
-                                "-zm", "9",
-                                "-zw", "32k",
-                                "-o9",
-                                pngFile.absolutePath
-                            )
-                        }
-
-                        pngFile.copyTo(cacheFile, true)
-                    }
-
-                    futures.add(future)
-                }
-            }
-
-            futures.forEach { it.get() }
-            executor.shutdown()
-        }
-
-        val executor = Executors.newFixedThreadPool(coreCount)
-        val futures = mutableListOf<Future<*>>()
-
-        val blacklist = listOf(
-            // "AssetManifest.bin",
-            "AssetManifest.json",
-            "FontManifest.json",
-            "isolate_snapshot_data",
-            "kernel_blob.bin",
-            "NativeAssetsManifest.json",
-            "NOTICES.Z",
-            "vm_snapshot_data",
-            "fonts",
-            "shaders"
-        )
-
-        flutterResources.forEach { f ->
-            val relName = f.absolutePath.substring(topDirL).replace("\\", "/")
-            if (f.isDirectory) return@forEach
-
-            val cacheFileRaw = File(assetCompressionDir, f.sha256()+".r")
-            val cacheFileGz = File(assetCompressionDir, f.sha256()+".gz")
-            val cacheFileBr = File(assetCompressionDir, f.sha256()+".br")
-
-            if (cacheFileRaw.exists() || cacheFileGz.exists() || cacheFileBr.exists()) {
-                if (cacheFileRaw.exists()) {
-                    cacheFileRaw.copyTo(f, true)
-
-                    indexReadWriteLock.writeLock().lock()
-                    assetIndex[relName] = "r"
-                    indexReadWriteLock.writeLock().unlock()
-                } else if (cacheFileGz.exists()) {
-                    cacheFileGz.copyTo(f, true)
-
-                    indexReadWriteLock.writeLock().lock()
-                    assetIndex[relName] = "g"
-                    indexReadWriteLock.writeLock().unlock()
-                } else {
-                    cacheFileBr.copyTo(f, true)
-
-                    indexReadWriteLock.writeLock().lock()
-                    assetIndex[relName] = "b"
-                    indexReadWriteLock.writeLock().unlock()
-                }
-            } else {
-                val future = executor.submit {
-                    val brTmp = File(f.absolutePath + ".br.tmp")
-                    val gzTmp = File(f.absolutePath + ".gz.tmp")
-
-                    var blacklisted = false
-                    for (f in blacklist) {
-                        if (relName.contains(f)) {
-                            blacklisted = true
-
-                            break
-                        }
-                    }
-
-                    if (!blacklisted) {
-                        println("$relName: Testing with brotli")
-                        exec {
-                            commandLine(
-                                brotli,
-                                "-$compressionLevel",
-                                f.absolutePath,
-                                "-o", brTmp.absolutePath
-                            )
-                        }
-
-                        println("$relName: Testing with gzip")
-                        ant.invokeMethod(
-                            "gzip", mapOf(
-                                "src" to f.absolutePath,
-                                "destfile" to gzTmp.absolutePath,
-                            )
-                        )
-
-                        println("$brTmp: ${brTmp.length()}")
-                        println("$gzTmp: ${gzTmp.length()}")
-                        if (f.length() < gzTmp.length() && f.length() < brTmp.length()) {
-                            println("$relName: Raw file wins")
-
-                            f.copyTo(cacheFileRaw, true)
-
-                            indexReadWriteLock.writeLock().lock()
-                            assetIndex[relName] = "r"
-                            indexReadWriteLock.writeLock().unlock()
-                        } else {
-                            if (brTmp.length() < gzTmp.length()) {
-                                println("$relName: Brotli wins")
-
-                                f.delete()
-                                brTmp.copyTo(f, true)
-                                brTmp.copyTo(cacheFileBr, true)
-
-                                indexReadWriteLock.writeLock().lock()
-                                assetIndex[relName] = "b"
-                                indexReadWriteLock.writeLock().unlock()
-                            } else {
-                                println("$relName: Gzip wins")
-
-                                f.delete()
-                                gzTmp.copyTo(f, true)
-                                gzTmp.copyTo(cacheFileGz, true)
-
-                                indexReadWriteLock.writeLock().lock()
-                                assetIndex[relName] = "g"
-                                indexReadWriteLock.writeLock().unlock()
-                            }
-                        }
-
-                        brTmp.delete()
-                        gzTmp.delete()
-                    }
-                }
-
-                futures.add(future)
-            }
-        }
-
-        futures.forEach { it.get() }
-        executor.shutdown()
-    }
-
-    tempDir.walkTopDown().forEach { f ->
-        if (f.absolutePath == tempDir.absolutePath) return@forEach
-
-        var relName = f.absolutePath.substring(topDirL).replace("\\", "/")
-        if (f.isDirectory && !relName.endsWith("/")) relName += "/"
-
-        if (compressionLevel == "Z") {
-            if (relName == "assets/flutter_assets/assets/firka.i") return@forEach
-        }
-
-        println(relName)
-
-        val compress = !relName.endsWith(".so") && !relName.endsWith(".arsc")
-        zos.setMethod(if (compress) { DEFLATED } else { STORED })
-        val entry = ZipEntry(relName)
-        if (!compress) {
-            entry.size = f.length()
-            entry.crc = FileUtils.checksumCRC32(f)
-        }
-        zos.putNextEntry(entry)
-        if (f.isFile) {
-            zos.write(f.readBytes())
-        }
-        zos.closeEntry()
-    }
-    if (compressionLevel == "Z") {
-        zos.setMethod(DEFLATED)
-        zos.putNextEntry(ZipEntry("assets/flutter_assets/assets/firka.i"))
-
-        val indexUncompressed = File(tempDir, "index.json")
-        indexReadWriteLock.readLock().lock()
-        val json = groovy.json.JsonBuilder(assetIndex)
-        indexReadWriteLock.readLock().unlock()
-        indexUncompressed.writeText(json.toString())
-
-        val indexCompressed = File(tempDir, "index.json.br")
-
-        exec {
-            commandLine(
-                brotli,
-                "-$compressionLevel",
-                indexUncompressed.absolutePath,
-                "-o", indexCompressed.absolutePath
-            )
-        }
-
-        zos.write(indexCompressed.readBytes())
-        indexUncompressed.delete()
-        indexCompressed.delete()
-
-        zos.closeEntry()
-    }
-    zos.close()
-
-    tempDir.deleteRecursively()
-    println("APK transformed successfully")
-}
-
-fun transformAppBundle() {
-    val buildDir = project.buildDir
-    val bundle = File(buildDir, "outputs/bundle/release/app-release.aab")
-    val bundleTmp = File(buildDir, "outputs/bundle/release/tmp.zip")
-
-    val apks = getApks(false)
-    val apkCount = apks.count { it.name.startsWith("app-") && it.name.endsWith("-release.apk") }
-
-    if (!bundle.exists()) {
-        throw Exception("Bundle not found at: $bundle")
-    }
-
-    if (apkCount < 3) {
-        throw Exception("Excepected 3 apks per abi but only found $apkCount")
-    }
-
-    val aabTempDir = File(project.buildDir, "tmp/aab-transform")
-    aabTempDir.deleteRecursively()
-    aabTempDir.mkdirs()
-
-    val apksUnzipped = File(project.buildDir, "tmp/apks-unzipped")
-    apksUnzipped.deleteRecursively()
-
-    val arm32TempDir = File(apksUnzipped, "armeabi-v7a")
-    arm32TempDir.mkdirs()
-    val arm64TempDir = File(apksUnzipped, "arm64-v8a")
-    arm64TempDir.mkdirs()
-    val x86TempDir = File(apksUnzipped, "x86_64")
-    x86TempDir.mkdirs()
-
-    copy {
-        from(zipTree(bundle))
-        into(aabTempDir)
-    }
-    copy {
-        from(zipTree(apks.first { it.name.contains("armeabi-v7a") }))
-        into(arm32TempDir)
-    }
-    copy {
-        from(zipTree(apks.first { it.name.contains("arm64-v8a") }))
-        into(arm64TempDir)
-    }
-    copy {
-        from(zipTree(apks.first { it.name.contains("x86_64") }))
-        into(x86TempDir)
-    }
-
-    val libs = File(aabTempDir, "base/lib").listFiles()!!
-
-    for (dstLibs in libs) {
-        println("Copying lib: ${dstLibs.name}")
-        val srcDir = File(apksUnzipped, dstLibs.name)
-        if (!srcDir.exists()) {
-            continue
-        }
-        val srcLibs = File(srcDir, "lib/${dstLibs.name}/")
-
-        dstLibs.listFiles()!!.forEach { it.delete() }
-        srcLibs.listFiles()!!.forEach { it.copyTo(File(dstLibs, it.name)) }
-    }
-
-    val zos = ZipOutputStream(bundleTmp.outputStream())
-    val bundleZip = ZipFile(bundle)
-    val bundleEntries = bundleZip.entries()
-
-    val brotli = findToolInPath("brotli")
-        ?: throw Exception("Brotli not found in path")
-    val optipng = findToolInPath("optipng")
-        ?: throw Exception("Optipng not found in path")
-
-    val indexReadWriteLock = ReentrantReadWriteLock()
-    val assetIndex = mutableMapOf<String, String>()
-
-    while (bundleEntries.hasMoreElements()) {
-        val entry = bundleEntries.nextElement()
-
-        /*
-if (entry.name == "base/assets/flutter_assets/assets/firka.i") {
-    println("Patching: ${entry.name}")
-    zos.putNextEntry(ZipEntry("assets/flutter_assets/assets/firka.i"))
-
-    val indexUncompressed = File(aabTempDir, "index.json")
-    indexReadWriteLock.readLock().lock()
-    val json = groovy.json.JsonBuilder(assetIndex)
-    indexReadWriteLock.readLock().unlock()
-    indexUncompressed.writeText(json.toString())
-
-    val indexCompressed = File(aabTempDir, "index.json.br")
-
-    exec {
-        commandLine(
-            brotli,
-            "-Z",
-            indexUncompressed.absolutePath,
-            "-o", indexCompressed.absolutePath
-        )
-    }
-
-    zos.write(indexCompressed.readBytes())
-    indexUncompressed.delete()
-    indexCompressed.delete()
-
-    zos.closeEntry()
-    continue
-}
-if (entry.name.startsWith("base/lib")) {
-    println("Patching: ${entry.name}")
-    zos.putNextEntry(ZipEntry(entry.name))
-
-
-
-    zos.closeEntry()
-    continue
-}
-*/
-
-        println("Adding: ${entry.name}")
-
-        zos.putNextEntry(ZipEntry(entry.name))
-
-        if (!entry.isDirectory) {
-            val data = bundleZip.getInputStream(entry).readAllBytes()
-            zos.write(data)
-        }
-        zos.closeEntry()
-    }
-    bundleZip.close()
-    zos.close()
-
-    bundle.delete()
-    signBundle(bundleTmp, bundle)
-    bundleTmp.delete()
-
-    aabTempDir.deleteRecursively()
-    println("AAB transformed successfully")
-
-}
-
-fun File.sha256(): String {
-    val md = MessageDigest.getInstance("SHA-256")
-    val digest = md.digest(this.readBytes())
-    return digest.fold("") { str, it -> str + "%02x".format(it) }
-}
-
-fun getApks(debug: Boolean): List<File> {
-    val buildDir = project.buildDir
-    val apkDir = File(buildDir, "outputs/flutter-apk")
-    val apks = apkDir.listFiles()!!
-    val flavor = if (debug) { "debug" } else { "release" }
-
-    return apks
-        .filter { apk -> apk.name.startsWith("app-") && apk.name.endsWith("-$flavor.apk") }
-        .toList()
-}
-
-fun getDebugKeystorePath(): String {
-    val userHome = System.getProperty("user.home")
-    val debugKeystore = File(userHome, ".android/debug.keystore")
-
-    if (!debugKeystore.exists()) {
-        throw GradleException("Debug keystore not found at: ${debugKeystore.absolutePath}")
-    }
-
-    return debugKeystore.absolutePath
-}
-
-fun getDefaultAndroidSdkPath(): String? {
-    val os = System.getProperty("os.name").lowercase()
-    val userHome = System.getProperty("user.home")
-
-    return when {
-        os.contains("win") ->
-            "$userHome\\AppData\\Local\\Android\\Sdk"
-        os.contains("mac") ->
-            "$userHome/Library/Android/sdk"
-        os.contains("linux") ->
-            "$userHome/Android/Sdk"
-        else -> null
-    }
-}
-
-fun findToolInPath(toolName: String): String? {
-    val pathEnvironment = System.getenv("PATH")
-    val pathDirs = pathEnvironment.split(File.pathSeparator)
-
-    val executableNames = when {
-        System.getProperty("os.name").lowercase().contains("win") ->
-            listOf("$toolName.exe", toolName)
-        else ->
-            listOf(toolName)
-    }
-
-    for (pathDir in pathDirs) {
-        for (execName in executableNames) {
-            val possibleTool = File(pathDir, execName)
-            if (possibleTool.exists() && possibleTool.canExecute()) {
-                return possibleTool.absolutePath
-            }
-        }
-    }
-
-    return null
-}
-
-fun findToolInSdkPath(toolName: String): String? {
-    var androidHome : String? = System.getenv("ANDROID_HOME")
-        ?: System.getenv("ANDROID_SDK_ROOT")
-
-    if (androidHome == null) androidHome = getDefaultAndroidSdkPath()
-
-    if (androidHome != null) {
-        val buildTools = File(androidHome, "build-tools")
-        if (buildTools.exists()) {
-            val latestVersion = buildTools.listFiles()
-                ?.filter { it.isDirectory }
-                ?.filter { it.name != "debian" }
-                ?.maxByOrNull { it.name }
-
-            if (latestVersion != null) {
-                val toolExec = File(latestVersion, toolName)
-                if (toolExec.exists()) {
-                    return toolExec.absolutePath
-                }
-            }
-        }
-    }
-
-    if (!toolName.contains(".exe")) {
-        val exeTool = findToolInSdkPath("$toolName.exe")
-        if (exeTool != null) return exeTool
-    }
-    if (!toolName.contains(".sh")) {
-        val shTool = findToolInSdkPath("$toolName.sh")
-        if (shTool != null) return shTool
-    }
-    if (!toolName.contains(".bat")) {
-        val batTool = findToolInSdkPath("$toolName.bat")
-        if (batTool != null) return batTool
-    }
-
-    return null
-}
-
-fun signWithDebugKey(input: File, output: File) {
-    val debugKeystore = getDebugKeystorePath()
-    val debugKeystorePassword = "android"
-    val debugKeyAlias = "androiddebugkey"
-    val debugKeyPassword = "android"
-
-    val zipAlign: String = findToolInSdkPath("zipalign")
-        ?: throw Exception("Could not find zipalign in ANDROID_SDK")
-    val apksigner: String = findToolInSdkPath("apksigner")
-        ?: throw Exception("Could not find zipalign in ANDROID_SDK")
-
-    exec {
-        commandLine(
-            zipAlign,
-            "-v", "4",
-            input.absolutePath,
-            output.absolutePath
-        )
-    }
-
-    exec {
-        commandLine(
-            apksigner, "sign",
-            "--ks", debugKeystore,
-            "--ks-pass", "pass:$debugKeystorePassword",
-            "--ks-key-alias", debugKeyAlias,
-            "--key-pass", "pass:$debugKeyPassword",
-            output.absolutePath
-        )
-    }
-
-    println("APK signed and aligned successfully")
-}
-
-fun signWithReleaseKey(input: File, output: File) {
-    val secretsDir = File(projectDir.absolutePath, "../../../secrets/")
-    val propsFile = File(secretsDir, "keystore.properties")
-
-    if (!propsFile.exists()) {
-        throw Exception("Release keystore not found!")
-    }
-
-    val props = loadProperties(propsFile)
-
-    val releaseKeystore = File(secretsDir, props["storeFile"].toString())
-    val releaseKeystorePassword = props["storePassword"] as String
-    val releaseKeyAlias = props["keyAlias"] as String
-    val releaseKeyPassword = props["keyPassword"] as String
-
-    val zipAlign: String = findToolInSdkPath("zipalign")
-        ?: throw Exception("Could not find zipalign either in ANDROID_SDK")
-    val apksigner: String = findToolInSdkPath("apksigner")
-        ?: throw Exception("Could not find zipalign either in ANDROID_SDK")
-
-    exec {
-        commandLine(
-            zipAlign,
-            "-v", "4",
-            input.absolutePath,
-            output.absolutePath
-        )
-    }
-
-    exec {
-        commandLine(
-            apksigner, "sign",
-            "--ks", releaseKeystore,
-            "--ks-pass", "pass:$releaseKeystorePassword",
-            "--ks-key-alias", releaseKeyAlias,
-            "--key-pass", "pass:$releaseKeyPassword",
-            output.absolutePath
-        )
-    }
-
-    println("APK signed and aligned successfully")
-}
-
-fun signBundle(input: File, output: File) {
-    val secretsDir = File(projectDir.absolutePath, "../../../secrets/")
-    val propsFile = File(secretsDir, "keystore.properties")
-
-    if (!propsFile.exists()) {
-        throw Exception("Release keystore not found!")
-    }
-
-    val props = loadProperties(propsFile)
-
-    val releaseKeystore = File(secretsDir, props["storeFile"].toString())
-    val releaseKeystorePassword = props["storePassword"] as String
-    val releaseKeyAlias = props["keyAlias"] as String
-    val releaseKeyPassword = props["keyPassword"] as String
-
-    // val zipAlign: String = findToolInSdkPath("zipalign")
-    //     ?: throw Exception("Could not find zipalign in ANDROID_SDK")
-    val jarsigner: String = findToolInPath("jarsigner")
-        ?: throw Exception("Could not find jarsigner in PATH")
-
-    /*
-    exec {
-        commandLine(
-            zipAlign,
-            "-v", "4",
-            input.absolutePath,
-            output.absolutePath
-        )
-    }
-     */
-    input.copyTo(output, true)
-
-    exec {
-        // -keystore $KEYSTORE -storetype $STORETYPE -storepass $STOREPASS -digestalg SHA1 -sigalg SHA256withRSA application.zip $KEYALIAS
-        commandLine(
-            jarsigner,
-            "-verbose",
-            "-sigalg", "SHA256withRSA",
-            "-digestalg", "SHA-256",
-            "-keystore", releaseKeystore,
-            "-storepass", releaseKeystorePassword,
-            output.absolutePath,
-            releaseKeyAlias
-        )
-    }
-
-    println("AAB signed and aligned successfully")
-}
--- a/firka_wear/codegen-lock.yaml
+++ b/firka_wear/codegen-lock.yaml
@@ -1,15 +1,15 @@
 icons:
  "flutter_launcher_icons.yaml": "2c1bf9056dfe8db94333143643d2b46308fa332e08de9eda62046a941e83aaaa"
-  "pubspec.yaml": "6be6ac0844c8554f0e2d3eb4d60adf3debae1b29528b4cfba2023d0ccc5e33bf"
+  "pubspec.yaml": "1948fc1c2c22fbf38f60f1e5b66d71aeefb7637757b26a12619d924c792ed882"
  "assets/images/logos/colored_logo.png": "ff9c3452b1b0ed07ffa9067fa4cf4dae45dad3e46f5cb6ef4a62ac8c05d8c080"
  "assets/images/logos/monochrome_logo.png": "188d2b0a64c70323b09bcee721663d6698fb557066f20ddaec97bba6869c1c6c"
  "assets/images/logos/colored_logo_without_mustache.png": "d11cff9f38985885873bfdd2d84e61f8fab03803eada94d4caac1545ef3685f3"
  "assets/images/logos/colored_logo_only_mustache.png": "bad6220c11bdfb1dfe04e5173bd2ebedd3999689d4b3a68fc63dc520c96dd33b"
 l10n:
  "l10n.yml": "a57bc304cac4a2b0235593586f17f400a5165d67fc9aadeaa11893cfa36ee082"
-  "lib/l10n/app_de.arb": "55f030b312cc07ff05cdc3d6ee10ef9bdec3243b507225e9a47196444518d955"
-  "lib/l10n/app_en.arb": "efac3f14d8ecc3e278f80a3e5aff599a88e408d2e30ff9e30f889978f465823a"
-  "lib/l10n/app_hu.arb": "a7f61bf4452a639d61c350f6674fdb5fd424f9ab31a195a200d446763fa8b396"
+  "lib/l10n/app_de.arb": "4be15b38c7a86bae77d5d44eb2172c687c94255716c7103ef16418d9a3aa2856"
+  "lib/l10n/app_en.arb": "6ee8594c5153a1e1fe714a05ea99ed38e63a42aa74faaa1d610c8ba669d7cbbb"
+  "lib/l10n/app_hu.arb": "9acbf3245d9b286c6b7b20d84750313e49e9c09689e1fe60ad5623877cdbf7a6"
 isar:
  "lib/data/models/app_settings_model.dart": "2bf4d089ccfcb73edbca5b2d5757e1e698ddde2b8783d212a870aac3157fbb5b"
  "lib/data/models/generic_cache_model.dart": "dd9979a4f0ba37ce5fd733bf0966088a759b5f356d97ea09c65eefffe8984639"
--- a/firka_wear/lib/app/app_state.dart
+++ b/firka_wear/lib/app/app_state.dart
@@ -9,6 +9,10 @@ import 'package:firka_wear/services/wear_sync_store.dart';
 late final Logger logger;

 final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
+
+/// When non-null, the app should show [WearErrorScreen] with this error.
+final ValueNotifier<FlutterErrorDetails?> globalErrorNotifier =
+    ValueNotifier<FlutterErrorDetails?>(null);
 late WearAppInitialization initData;
 bool initDone = false;

--- a/firka_wear/lib/app/initialization_screen.dart
+++ b/firka_wear/lib/app/initialization_screen.dart
@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:wear_plus/wear_plus.dart';

 import 'package:firka_wear/app/app_state.dart';
 import 'package:firka_wear/app/initialization.dart';
 import 'package:firka_wear/core/bloc/wear_sync_cubit.dart';
 import 'package:firka_wear/l10n/app_localizations.dart';
 import 'package:firka_wear/ui/theme/style.dart';
+import 'package:firka_wear/ui/wear/screens/error/error_screen.dart';
 import 'package:firka_wear/ui/wear/screens/home/home_screen.dart';
 import 'package:firka_wear/ui/wear/screens/login/login_screen.dart';

@@ -25,25 +25,7 @@ class WearInitializationScreen extends StatelessWidget {
          if (snapshot.hasError) {
            return MaterialApp(
              key: ValueKey('firkaErrorPage'),
-              home: Scaffold(
-                body: Center(
-                  child: WatchShape(
-                    builder: (context, shape, child) {
-                      return Column(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: <Widget>[
-                          Text(
-                            'Error initializing app: ${snapshot.error}',
-                            style: TextStyle(color: Colors.red),
-                          ),
-                          child!,
-                        ],
-                      );
-                    },
-                    child: SizedBox(),
-                  ),
-                ),
-              ),
+              home: WearErrorScreen(exception: snapshot.error!),
            );
          }

--- a/firka_wear/lib/main.dart
+++ b/firka_wear/lib/main.dart
@@ -1,7 +1,9 @@
+import 'dart:async';
 import 'dart:io';

 import 'package:firka_wear/app/app_state.dart';
 import 'package:firka_wear/app/initialization_screen.dart';
+import 'package:firka_wear/ui/wear/screens/error/error_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:logging/logging.dart';
@@ -26,5 +28,49 @@ void main() async {

  await ScreenUtil.ensureScreenSize();

-  runApp(WearInitializationScreen());
+  FlutterError.onError = (FlutterErrorDetails details) {
+    FlutterError.presentError(details);
+    if (_isFatalError(details.exception)) {
+      globalErrorNotifier.value = details;
+    }
+  };
+
+  runZonedGuarded(() => runApp(const _WearAppWrapper()), (
+    Object error,
+    StackTrace stackTrace,
+  ) {
+    if (_isFatalError(error)) {
+      globalErrorNotifier.value = FlutterErrorDetails(
+        exception: error,
+        stack: stackTrace,
+        library: 'firka_wear',
+      );
+    }
+  });
+}
+
+bool _isFatalError(Object error) {
+  return error is! AssertionError;
+}
+
+class _WearAppWrapper extends StatelessWidget {
+  const _WearAppWrapper();
+
+  @override
+  Widget build(BuildContext context) {
+    return ValueListenableBuilder<FlutterErrorDetails?>(
+      valueListenable: globalErrorNotifier,
+      builder: (context, error, _) {
+        if (error != null) {
+          return MaterialApp(
+            home: WearErrorScreen(
+              exception: error.exception,
+              stackTrace: error.stack,
+            ),
+          );
+        }
+        return WearInitializationScreen();
+      },
+    );
+  }
 }
--- a/firka_wear/lib/ui/wear/screens/error/error_screen.dart
+++ b/firka_wear/lib/ui/wear/screens/error/error_screen.dart
@@ -0,0 +1,65 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:qr_flutter/qr_flutter.dart';
+import 'package:wear_plus/wear_plus.dart';
+
+import 'package:firka_wear/ui/theme/style.dart';
+
+final int _kMaxQrPayloadChars = 410;
+
+String errorPayload(Object exception, [StackTrace? stackTrace]) {
+  final buffer = StringBuffer();
+  buffer.writeln(exception.toString());
+  if (stackTrace != null) buffer.write(stackTrace.toString());
+  final s = buffer.toString();
+  return s.length > _kMaxQrPayloadChars
+      ? s.substring(0, _kMaxQrPayloadChars)
+      : s;
+}
+
+/// Full-screen error UI: encodes [exception] (and [stackTrace]) into a QR code
+/// scaled to fit the watch's circular display so it is not clipped.
+class WearErrorScreen extends StatelessWidget {
+  final Object exception;
+  final StackTrace? stackTrace;
+
+  const WearErrorScreen({super.key, required this.exception, this.stackTrace});
+
+  @override
+  Widget build(BuildContext context) {
+    ScreenUtil.init(context);
+
+    final payload = errorPayload(exception, stackTrace);
+    return Scaffold(
+      backgroundColor: wearStyle.colors.background,
+      body: LayoutBuilder(
+        builder: (context, constraints) {
+          return Center(
+            child: WatchShape(
+              builder: (context, shape, child) {
+                return SizedBox(
+                  width: 350.w,
+                  height: 350.h,
+                  child: QrImageView(
+                    data: payload,
+                    version: 13,
+                    backgroundColor: wearStyle.colors.background,
+                    eyeStyle: QrEyeStyle(
+                      eyeShape: QrEyeShape.square,
+                      color: wearStyle.colors.textPrimary,
+                    ),
+                    dataModuleStyle: QrDataModuleStyle(
+                      dataModuleShape: QrDataModuleShape.square,
+                      color: wearStyle.colors.textPrimary,
+                    ),
+                  ),
+                );
+              },
+              child: const SizedBox.shrink(),
+            ),
+          );
+        },
+      ),
+    );
+  }
+}
--- a/firka_wear/pubspec.yaml
+++ b/firka_wear/pubspec.yaml
@@ -18,7 +18,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.0+1011
+version: 1.1.1+2000

 environment:
  sdk: ^3.11.0
@@ -62,6 +62,7 @@ dependencies:
  flutter_svg: ^1.1.6
  logging: ^1.3.0
  flutter_bloc: ^9.0.0
+  qr_flutter: ^4.1.0

 dev_dependencies:
  build_runner: any
--- a/firka_wear/scripts/codegen.dart
+++ b/firka_wear/scripts/codegen.dart
@@ -30,11 +30,11 @@ void main() async {
    ran = true;
  }

-  if (_isarOutOfDate(root)) {
+  if (_isarOutOfDate(root) || _isarGeneratedFilesMissing(root)) {
    final inputs = _isarInputs(root);
    final hashes = _computeHashes(root, inputs);
    stdout.writeln(
-      'Isar generated dart files out of date, running build_runner...',
+      'Isar generated dart files out of date or missing, running build_runner...',
    );
    await _run('dart', ['run', 'build_runner', 'build'], root);
    _updateLockWithHashes(root, 'isar', hashes);
@@ -228,6 +228,18 @@ bool _isarOutOfDate(String root) {
  return false;
 }

+bool _isarGeneratedFilesMissing(String root) {
+  final inputs = _isarInputs(root);
+  if (inputs.isEmpty) return false;
+  final modelsDir = p.join(root, 'lib/data/models');
+  for (final dartFile in inputs) {
+    final baseName = p.basenameWithoutExtension(dartFile.path);
+    final gFile = File(p.join(modelsDir, '$baseName.g.dart'));
+    if (!gFile.existsSync()) return true;
+  }
+  return false;
+}
+
 Future<bool> _run(
  String executable,
  List<String> args,
Author	SHA1	Message	Date
zypherift	f953dbd49f	fix: null-safe percentage detection	2026-03-05 09:22:28 +01:00
zypherift	01e7e559ba	fix: maybe fixed percentages being calculated into the grade? pls review	2026-03-05 09:22:28 +01:00
Armand	b6bfef7715	update docs	2026-03-05 09:06:26 +01:00
Armand	bf75f72bcd	update codegen lock	2026-03-05 09:01:11 +01:00
zypherift	b0cb020d76	feat: smoother graph using 3 weighted avarages :O	2026-03-05 08:40:50 +01:00
zypherift	4239ffa00c	chore: stream home data cache-first then refresh	2026-03-05 08:40:50 +01:00
zypherift	427b6f8086	fix: snap grade calculator weights to common percentages	2026-03-05 08:40:50 +01:00
zypherift	fbd2351073	fix: flashbang on new screen pushes	2026-03-05 08:40:50 +01:00
zypherift	150e90d19b	edit: replace spinner with dave	2026-03-05 08:40:50 +01:00
zypherift	a6cf8b13c6	edit: fine tune wall collision vibration	2026-03-05 08:40:50 +01:00
zypherift	d8ae8471ab	edit: l10n	2026-03-05 08:40:45 +01:00
zypherift	0e65f8e68c	add: debug screen for acc	2026-03-04 23:02:25 +01:00
zypherift	3912ad593b	edit: l10n	2026-03-04 23:02:25 +01:00
zypherift	1f6eaaeccc	add: icons	2026-03-04 23:02:25 +01:00
Armand	40f188c2e2	codegen(firka): restore AndroidManifest.xml flutter_launcher_icons replaces every icon inside the AndroidManifest.xml which isn't ideal when having multiple app icons	2026-03-04 21:34:27 +01:00
Armand	0aae3801b7	chore: update l10n for firka_wear	2026-03-04 21:17:17 +01:00
Armand	26902b7616	add build script for windows	2026-03-04 21:10:09 +01:00
Armand	ffaf2c77e0	bump version string to 1.1.1	2026-03-04 18:51:55 +01:00
Armand	23f7f7cd48	firka_wear: add error screen Closes #12	2026-03-04 15:20:15 +01:00
Armand	c2879766eb	build: run pub get and codegen	2026-03-04 10:55:40 +01:00
Armand	01cc08d5f3	codegen: generate missing .g.dart files	2026-03-04 09:56:52 +01:00
Armand	c386e1194b	auto generate version code	2026-03-04 09:35:17 +01:00
Armand	67ed4e03eb	firka: remov brotli again	2026-03-04 06:38:01 +01:00
4831c0	c7d1f80e79	Merge pull request 'IOS Build fix' (#10 ) from devbeni/firka:dev into dev Reviewed-on: firka/firka#10	2026-03-04 06:29:07 +01:00
b3ni15	7531e58114	Update project version to 1102 in Info.plist and project.pbxproj	2026-03-04 00:23:15 +01:00
b3ni15	c1e329cb5a	Update subproject commit reference in l10n directory	2026-03-03 23:49:35 +01:00
b3ni15	dad52bf20e	Merge branch 'dev' of https://git.firka.app/devbeni/firka into dev	2026-03-03 23:46:38 +01:00
b3ni15	5fb6d03d9c	Remove Brotli subproject from Android app directory	2026-03-03 23:46:37 +01:00
devbeni	1ef757d10f	merge upstream	2026-03-03 23:46:10 +01:00
b3ni15	444abb83c2	Remove fmb_dart subproject from vendor directory	2026-03-03 23:44:24 +01:00
Armand	e835dcf6b1	firka: fix app icon changing Closes: #9	2026-03-03 23:26:02 +01:00
b3ni15	e61a19fbbf	Merge branch 'dev' of https://git.firka.app/devbeni/firka into dev	2026-03-03 23:23:30 +01:00
b3ni15	a937b854cd	Update localization files and enhance build script for native assets handling	2026-03-03 23:22:43 +01:00
b3ni15	6d8f17ac00	Update object version and set development team for RunnerTests configuration	2026-03-03 23:11:25 +01:00
devbeni	78dd4239cc	merge upstream	2026-03-03 23:10:56 +01:00
Armand	39c5ca357e	firka: remove package: 'firka' Closes: #5	2026-03-03 23:08:45 +01:00
Armand	8249dbf03e	remove dependency on brotli	2026-03-03 23:05:40 +01:00
Armand	e79de0326c	bump version codes for firka and firka_wear	2026-03-03 21:43:20 +01:00
Armand	de335af3c1	add build script	2026-03-03 20:29:56 +01:00
Armand	4be0bcd813	bump version to 1.1.0 and version code to 1100	2026-03-03 20:28:31 +01:00