From 7b94b98a6ac41905e6c18712ee3ad42c9f203917 Mon Sep 17 00:00:00 2001 From: "Omer I.S." Date: Sun, 15 Feb 2026 17:48:39 +0200 Subject: [PATCH 1/6] Fix Gradle build error: unresolved FilterType reference - Import FilterConfiguration.FilterType.* instead of VariantOutputConfiguration.FilterType.* - Simplify FilterType.ABI reference to use imported type - Fixes build failure on line 136 of build.gradle.kts --- android/app/build.gradle.kts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 5a8ba661..228198e4 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -1,7 +1,6 @@ import java.io.FileInputStream import java.util.Properties import com.android.build.api.variant.FilterConfiguration.FilterType.* -import com.android.build.gradle.internal.api.ApkVariantOutputImpl plugins { id("com.android.application") @@ -133,7 +132,7 @@ androidComponents { onVariants { variant -> variant.outputs.forEach { output -> val abiFilter = output.filters.find { - it.filterType == com.android.build.api.variant.VariantOutputConfiguration.FilterType.ABI + it.filterType == FilterType.ABI } val abiVersionCode = abiFilter?.identifier?.let { abiCodes[it] } From 27e4f5a1535d9dc88b56326a5526c0fbf0f966a0 Mon Sep 17 00:00:00 2001 From: "Omer I.S." Date: Sun, 15 Feb 2026 20:37:44 +0200 Subject: [PATCH 2/6] Fix FilterType reference: use fully qualified class name - Remove problematic import and use full qualified name - Use com.android.build.api.variant.FilterConfiguration.FilterType.ABI - Fixes unresolved reference error on line 135 --- android/app/build.gradle.kts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 228198e4..d6bee972 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -1,6 +1,5 @@ import java.io.FileInputStream import java.util.Properties -import com.android.build.api.variant.FilterConfiguration.FilterType.* plugins { id("com.android.application") @@ -132,7 +131,7 @@ androidComponents { onVariants { variant -> variant.outputs.forEach { output -> val abiFilter = output.filters.find { - it.filterType == FilterType.ABI + it.filterType == com.android.build.api.variant.FilterConfiguration.FilterType.ABI } val abiVersionCode = abiFilter?.identifier?.let { abiCodes[it] } From dae579401fecc5342b227e783734d5e1005ac327 Mon Sep 17 00:00:00 2001 From: "Omer I.S." Date: Sun, 15 Feb 2026 20:54:27 +0200 Subject: [PATCH 3/6] Fix multiple syntax and compilation errors - Add missing dart:math import for math.max usage - Fix duplicate Positioned.fill widgets in apps.dart - Remove incorrect 'label' parameters, use 'child' instead - Move refresh() method outside build() method - Fix bracket mismatches and syntax errors - Resolve AppsFilter class and openAppById method issues --- lib/pages/apps.dart | 61 +++++++++++++++--------------------- lib/pages/import_export.dart | 6 ++-- 2 files changed, 29 insertions(+), 38 deletions(-) diff --git a/lib/pages/apps.dart b/lib/pages/apps.dart index 967ee6fa..cd6a59a4 100644 --- a/lib/pages/apps.dart +++ b/lib/pages/apps.dart @@ -1,5 +1,6 @@ import 'package:animations/animations.dart'; import 'dart:convert'; +import 'dart:math' as math; import 'package:flutter/material.dart'; import 'package:easy_localization/easy_localization.dart'; @@ -178,30 +179,30 @@ class AppsPageState extends State { var sourceProvider = SourceProvider(); + refresh() { + HapticFeedback.lightImpact(); + setState(() { + refreshingSince = DateTime.now(); + }); + return appsProvider + .checkUpdates() + .catchError((e) { + showError(e is Map ? e['errors'] : e, context); + return []; + }) + .whenComplete(() { + setState(() { + refreshingSince = null; + }); + }); + } + @override Widget build(BuildContext context) { var appsProvider = context.watch(); var settingsProvider = context.watch(); var listedApps = appsProvider.getAppValues().toList(); - refresh() { - HapticFeedback.lightImpact(); - setState(() { - refreshingSince = DateTime.now(); - }); - return appsProvider - .checkUpdates() - .catchError((e) { - showError(e is Map ? e['errors'] : e, context); - return []; - }) - .whenComplete(() { - setState(() { - refreshingSince = null; - }); - }); - } - if (!appsProvider.loadingApps && appsProvider.apps.isNotEmpty && settingsProvider.checkJustStarted() && @@ -981,25 +982,15 @@ class AppsPageState extends State { borderRadius: BorderRadius.circular(12), color: Colors.black45, ), - const SizedBox(height: 16), - ], - ), - if (listedApps[index].downloadProgress != null) - Positioned.fill( - child: Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(12), - color: Colors.black45, - ), - child: Center( - child: CircularProgressIndicator( - value: listedApps[index].downloadProgress! >= 0 - ? listedApps[index].downloadProgress! / 100 - : null, - ), + child: Center( + child: CircularProgressIndicator( + value: listedApps[index].downloadProgress! >= 0 + ? listedApps[index].downloadProgress! / 100 + : null, ), ), - ), + ), + ), ), ); diff --git a/lib/pages/import_export.dart b/lib/pages/import_export.dart index 723ecdd1..4ceb9873 100644 --- a/lib/pages/import_export.dart +++ b/lib/pages/import_export.dart @@ -530,7 +530,7 @@ class _ImportExportPageState extends State { runSourceSearch(searchSource[0]); } }, - label: Text( + child: Text( tr( 'searchX', args: [lowerCaseIfEnglish(tr('source'))], @@ -927,7 +927,7 @@ class _SelectionModalState extends State { onPressed: () { Navigator.of(context).pop(); }, - label: Text(tr('cancel')), + child: Text(tr('cancel')), ), AppTextButton( onPressed: entrySelections.values.where((b) => b).isEmpty @@ -940,7 +940,7 @@ class _SelectionModalState extends State { .toList(), ); }, - label: Text( + child: Text( widget.onlyOneSelectionAllowed ? tr('pick') : tr( From 0b4fe23aea5111df863a7257c737c382e935c93e Mon Sep 17 00:00:00 2001 From: "Omer I.S." <137101815+omeritzics@users.noreply.github.com> Date: Sun, 15 Feb 2026 19:01:01 +0200 Subject: [PATCH 4/6] Update android/app/build.gradle.kts Co-authored-by: qodo-code-review[bot] <151058649+qodo-code-review[bot]@users.noreply.github.com> --- android/app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index d6bee972..25b588a4 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -131,7 +131,7 @@ androidComponents { onVariants { variant -> variant.outputs.forEach { output -> val abiFilter = output.filters.find { - it.filterType == com.android.build.api.variant.FilterConfiguration.FilterType.ABI + it.filterType.name == "ABI" } val abiVersionCode = abiFilter?.identifier?.let { abiCodes[it] } From ba3c67bceb1b0952ba30b60086ca3765fbb2c401 Mon Sep 17 00:00:00 2001 From: "Omer I.S." <137101815+omeritzics@users.noreply.github.com> Date: Sun, 15 Feb 2026 19:02:57 +0200 Subject: [PATCH 5/6] Update lib/pages/apps.dart Co-authored-by: qodo-code-review[bot] <151058649+qodo-code-review[bot]@users.noreply.github.com> --- lib/pages/apps.dart | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/lib/pages/apps.dart b/lib/pages/apps.dart index cd6a59a4..a5110b74 100644 --- a/lib/pages/apps.dart +++ b/lib/pages/apps.dart @@ -179,22 +179,25 @@ class AppsPageState extends State { var sourceProvider = SourceProvider(); - refresh() { + Future> refresh() async { HapticFeedback.lightImpact(); + if (!mounted) return []; + setState(() { refreshingSince = DateTime.now(); }); - return appsProvider - .checkUpdates() - .catchError((e) { - showError(e is Map ? e['errors'] : e, context); - return []; - }) - .whenComplete(() { - setState(() { - refreshingSince = null; - }); - }); + + try { + return await context.read().checkUpdates(); + } catch (e) { + showError(e is Map ? e['errors'] : e, context); + return []; + } finally { + if (!mounted) return; + setState(() { + refreshingSince = null; + }); + } } @override From 886da3e73dba9af7840ed1be2f1317ba1400210c Mon Sep 17 00:00:00 2001 From: "Omer I.S." <137101815+omeritzics@users.noreply.github.com> Date: Sun, 15 Feb 2026 20:13:35 +0200 Subject: [PATCH 6/6] Update lib/pages/apps.dart Co-authored-by: qodo-code-review[bot] <151058649+qodo-code-review[bot]@users.noreply.github.com> --- lib/pages/apps.dart | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/pages/apps.dart b/lib/pages/apps.dart index a5110b74..099de410 100644 --- a/lib/pages/apps.dart +++ b/lib/pages/apps.dart @@ -985,12 +985,16 @@ class AppsPageState extends State { borderRadius: BorderRadius.circular(12), color: Colors.black45, ), - child: Center( - child: CircularProgressIndicator( - value: listedApps[index].downloadProgress! >= 0 - ? listedApps[index].downloadProgress! / 100 - : null, - ), + child: Builder( + builder: (_) { + final progress = listedApps[index].downloadProgress; + if (progress == null) return const SizedBox.shrink(); + return Center( + child: CircularProgressIndicator( + value: progress >= 0 ? progress / 100 : null, + ), + ); + }, ), ), ),