1
0
forked from firka/firka

18 Commits

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
b6bfef7715 update docs 2026-03-05 09:06:26 +01:00
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
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
0aae3801b7 chore: update l10n for firka_wear 2026-03-04 21:17:17 +01:00
26902b7616 add build script for windows 2026-03-04 21:10:09 +01:00
ffaf2c77e0 bump version string to 1.1.1 2026-03-04 18:51:55 +01:00
19 changed files with 361 additions and 198 deletions

View File

@@ -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
```

View File

@@ -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
```

52
build.ps1 Normal file
View File

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

View File

@@ -40,7 +40,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_ace"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_ace_round" >
<intent-filter>
@@ -54,7 +54,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_ace_f"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_ace_f_round" >
<intent-filter>
@@ -68,7 +68,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_bi"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_bi_round" >
<intent-filter>
@@ -82,7 +82,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_bi_f"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_bi_f_round" >
<intent-filter>
@@ -96,7 +96,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_cactus"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_cactus_round" >
<intent-filter>
@@ -110,7 +110,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_cc"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_cc_round" >
<intent-filter>
@@ -124,7 +124,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_enby"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_enby_round" >
<intent-filter>
@@ -138,7 +138,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_enby_f"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_enby_f_round" >
<intent-filter>
@@ -152,7 +152,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_fidesz"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_fidesz_round" >
<intent-filter>
@@ -166,7 +166,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_filc"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_filc_round" >
<intent-filter>
@@ -180,7 +180,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_filco"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_filco_round" >
<intent-filter>
@@ -194,7 +194,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_galaxy"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_galaxy_round" >
<intent-filter>
@@ -208,7 +208,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_gay"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_gay_round" >
<intent-filter>
@@ -222,7 +222,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_gay_f"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_gay_f_round" >
<intent-filter>
@@ -236,7 +236,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_half_firka_2"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_half_firka_2_round" >
<intent-filter>
@@ -250,7 +250,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_kreta"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_kreta_round" >
<intent-filter>
@@ -264,7 +264,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_lesb"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_lesb_round" >
<intent-filter>
@@ -278,7 +278,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_lesb_f"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_lesb_f_round" >
<intent-filter>
@@ -292,7 +292,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_lgbtq"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_lgbtq_round" >
<intent-filter>
@@ -306,7 +306,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_lgbtq_f"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_lgbtq_f_round" >
<intent-filter>
@@ -320,7 +320,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_lgbtqp"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_lgbtqp_round" >
<intent-filter>
@@ -334,7 +334,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_lgbtqp_f"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_lgbtqp_f_round" >
<intent-filter>
@@ -348,7 +348,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_lidl"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_lidl_round" >
<intent-filter>
@@ -362,7 +362,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_mkkp"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_mkkp_round" >
<intent-filter>
@@ -376,7 +376,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_nuke"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_nuke_round" >
<intent-filter>
@@ -390,7 +390,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_modern"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_modern_round" >
<intent-filter>
@@ -404,7 +404,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_o1g"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_o1g_round" >
<intent-filter>
@@ -418,7 +418,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_old"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_old_round" >
<intent-filter>
@@ -432,7 +432,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_paper"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_paper_round" >
<intent-filter>
@@ -446,7 +446,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_pear"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_pear_round" >
<intent-filter>
@@ -460,7 +460,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_pixel"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_pixel_round" >
<intent-filter>
@@ -474,7 +474,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_pixelized"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_pixelized_round" >
<intent-filter>
@@ -488,7 +488,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_pride"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_pride_round" >
<intent-filter>
@@ -502,7 +502,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_proto"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_proto_round" >
<intent-filter>
@@ -516,7 +516,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_refilc"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_refilc_round" >
<intent-filter>
@@ -530,7 +530,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_refulc"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_refulc_round" >
<intent-filter>
@@ -544,7 +544,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_repont"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_repont_round" >
<intent-filter>
@@ -558,7 +558,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_szivacs"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_szivacs_round" >
<intent-filter>
@@ -572,7 +572,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_tisza"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_tisza_round" >
<intent-filter>
@@ -586,7 +586,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_trans"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_trans_round" >
<intent-filter>
@@ -600,7 +600,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_trans_f"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_trans_f_round" >
<intent-filter>
@@ -614,7 +614,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_void_icon"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_void_icon_round" >
<intent-filter>
@@ -628,7 +628,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_xmas1"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_xmas1_round" >
<intent-filter>
@@ -642,7 +642,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_xmas2"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_xmas2_round" >
<intent-filter>
@@ -656,7 +656,7 @@
android:targetActivity=".MainActivity"
android:exported="true"
android:enabled="false"
android:icon="@mipmap/ic_xmas3"
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/ic_xmas3_round" >
<intent-filter>

View File

@@ -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_de.arb": "9cd5913be1e3bc3ed6c088ef448d5ce2924a6290b7dd6006d1af624c5e9a2503"
"lib/l10n/app_hu.arb": "17077ec76b68ed03796a264b99e4dba9e6ddd532e27a92d8fb237ea6f211f757"
"lib/l10n/app_en.arb": "cbad6dd2485a983e399cce97371c19089b9110d30536488c14a7ea709c7b6ead"
"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"

View File

@@ -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(),
),
);
},
);

View File

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

View File

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

View File

@@ -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()),
),
),
),

View File

@@ -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);
}

View File

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

View File

@@ -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

View File

@@ -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),
],
),
),

View File

@@ -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,
),
),
),

View File

@@ -2,7 +2,7 @@ name: firka
description: "Firka, Alternatív e-Kréta kliens."
publish_to: 'none'
version: 1.1.0+2001
version: 1.1.1+2001
environment:
sdk: ^3.11.0
@@ -81,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/

View File

@@ -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)) {

View File

@@ -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;
}
}

View File

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

View File

@@ -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.1.0+2000
version: 1.1.1+2000
environment:
sdk: ^3.11.0