From 33dafd40cad081599e7842bc28fae495c6d7d558 Mon Sep 17 00:00:00 2001 From: b3ni15 Date: Sun, 31 Aug 2025 22:36:31 +0200 Subject: [PATCH] fix: update settings for developer label and remove unused imports --- firka/ios/Runner.xcodeproj/project.pbxproj | 15 +++++++++------ firka/lib/helpers/settings/setting.dart | 10 +++++----- firka/lib/l10n | 2 +- firka/lib/ui/phone/pages/home/home_grades.dart | 1 - firka/lib/ui/phone/pages/home/home_timetable.dart | 1 - .../ui/phone/pages/home/home_timetable_mo.dart | 1 - firka/lib/ui/phone/screens/home/home_screen.dart | 10 ++++------ 7 files changed, 19 insertions(+), 21 deletions(-) diff --git a/firka/ios/Runner.xcodeproj/project.pbxproj b/firka/ios/Runner.xcodeproj/project.pbxproj index 43e42bd..feca441 100644 --- a/firka/ios/Runner.xcodeproj/project.pbxproj +++ b/firka/ios/Runner.xcodeproj/project.pbxproj @@ -453,6 +453,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -461,6 +462,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = R9PZGUCNJ3; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -486,9 +488,9 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = R9PZGUCNJ3; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Firka; @@ -514,7 +516,6 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = R9PZGUCNJ3; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = app.firka.firka.RunnerTests; @@ -533,7 +534,6 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = R9PZGUCNJ3; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = app.firka.firka.RunnerTests; @@ -550,7 +550,6 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = R9PZGUCNJ3; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = app.firka.firka.RunnerTests; @@ -584,6 +583,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -592,6 +592,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; + DEVELOPMENT_TEAM = R9PZGUCNJ3; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -641,6 +642,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -649,6 +651,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = R9PZGUCNJ3; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -676,9 +679,9 @@ baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = R9PZGUCNJ3; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Firka; @@ -703,9 +706,9 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = R9PZGUCNJ3; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Firka; diff --git a/firka/lib/helpers/settings/setting.dart b/firka/lib/helpers/settings/setting.dart index e200dc2..89e80a2 100644 --- a/firka/lib/helpers/settings/setting.dart +++ b/firka/lib/helpers/settings/setting.dart @@ -246,11 +246,11 @@ class SettingsStore { "settings_other_padding": SettingsPadding(0, 20, never), "settings_other_header": SettingsHeaderSmall(0, "Egyéb", never), - "developer": SettingsSubGroup( - 0, - FirkaIconType.majesticonsLocal, - "wrenchSolid", - l10n.s_developer, + "developer": SettingsSubGroup( + 0, + FirkaIconType.majesticonsLocal, + "wrenchSolid", + 'Developer', LinkedHashMap.of({ "stats_for_nerds": SettingsBoolean( statsForNerds, diff --git a/firka/lib/l10n b/firka/lib/l10n index 1e557de..4557640 160000 --- a/firka/lib/l10n +++ b/firka/lib/l10n @@ -1 +1 @@ -Subproject commit 1e557de406de390f443e804caea8202f3d7e435f +Subproject commit 45576403397d46c575e0aaff88ecf0d510b069ab diff --git a/firka/lib/ui/phone/pages/home/home_grades.dart b/firka/lib/ui/phone/pages/home/home_grades.dart index 1e482ca..b234308 100644 --- a/firka/lib/ui/phone/pages/home/home_grades.dart +++ b/firka/lib/ui/phone/pages/home/home_grades.dart @@ -2,7 +2,6 @@ import 'package:firka/helpers/api/client/kreta_client.dart'; import 'package:firka/helpers/api/model/generic.dart'; import 'package:firka/helpers/ui/firka_card.dart'; import 'package:firka/helpers/ui/grade_helpers.dart'; -import 'package:firka/ui/phone/screens/home/home_screen.dart'; import 'package:firka/ui/widget/grade_small_card.dart'; import 'package:flutter/material.dart'; diff --git a/firka/lib/ui/phone/pages/home/home_timetable.dart b/firka/lib/ui/phone/pages/home/home_timetable.dart index f6cd52a..25644e7 100644 --- a/firka/lib/ui/phone/pages/home/home_timetable.dart +++ b/firka/lib/ui/phone/pages/home/home_timetable.dart @@ -15,7 +15,6 @@ import '../../../../helpers/api/consts.dart'; import '../../../../helpers/update_notifier.dart'; import '../../../../main.dart'; import '../../../widget/firka_icon.dart'; -import '../../screens/home/home_screen.dart'; import '../../widgets/bottom_tt_icon.dart'; import '../../widgets/tt_day.dart'; diff --git a/firka/lib/ui/phone/pages/home/home_timetable_mo.dart b/firka/lib/ui/phone/pages/home/home_timetable_mo.dart index ca3b146..f2c772a 100644 --- a/firka/lib/ui/phone/pages/home/home_timetable_mo.dart +++ b/firka/lib/ui/phone/pages/home/home_timetable_mo.dart @@ -14,7 +14,6 @@ import '../../../../helpers/api/model/test.dart'; import '../../../../helpers/update_notifier.dart'; import '../../../../main.dart'; import '../../../widget/firka_icon.dart'; -import '../../screens/home/home_screen.dart'; import '../../screens/settings/settings_screen.dart'; class HomeTimetableMonthlyScreen extends StatefulWidget { diff --git a/firka/lib/ui/phone/screens/home/home_screen.dart b/firka/lib/ui/phone/screens/home/home_screen.dart index ddea507..214db22 100644 --- a/firka/lib/ui/phone/screens/home/home_screen.dart +++ b/firka/lib/ui/phone/screens/home/home_screen.dart @@ -429,19 +429,19 @@ class _HomeScreenState extends State { widget.data, widget.updateNotifier, widget.updateFinishedNotifier, - _pageController), + ), HomeSubPage( HomePage.grades, widget.data, widget.updateNotifier, widget.updateFinishedNotifier, - _pageController), + ), HomeSubPage( HomePage.timetable, widget.data, widget.updateNotifier, widget.updateFinishedNotifier, - _pageController), + ), ], ), ), @@ -577,11 +577,9 @@ class HomeSubPage extends StatelessWidget { final AppInitialization data; final UpdateNotifier _updateNotifier; final UpdateNotifier _updateFinishNotifier; - final PageController _pageController; const HomeSubPage(this.page, this.data, this._updateNotifier, - this._updateFinishNotifier, this._pageController, - {super.key}); + this._updateFinishNotifier, {super.key}); @override Widget build(BuildContext context) {