diff --git a/firka/android/app/src/main/java/org/brotli b/firka/android/app/src/main/java/org/brotli new file mode 160000 index 0000000..da8f329 --- /dev/null +++ b/firka/android/app/src/main/java/org/brotli @@ -0,0 +1 @@ +Subproject commit da8f329432ff3e7deaedb4a60026138db2920a3a diff --git a/firka/codegen-lock.yaml b/firka/codegen-lock.yaml index 7d8399a..e576eb6 100644 --- a/firka/codegen-lock.yaml +++ b/firka/codegen-lock.yaml @@ -7,9 +7,9 @@ icons: "assets/images/logos/colored_logo_only_mustache.png": "bad6220c11bdfb1dfe04e5173bd2ebedd3999689d4b3a68fc63dc520c96dd33b" l10n: "l10n.yml": "a57bc304cac4a2b0235593586f17f400a5165d67fc9aadeaa11893cfa36ee082" - "lib/l10n/app_de.arb": "55f030b312cc07ff05cdc3d6ee10ef9bdec3243b507225e9a47196444518d955" - "lib/l10n/app_en.arb": "cbad6dd2485a983e399cce97371c19089b9110d30536488c14a7ea709c7b6ead" + "lib/l10n/app_de.arb": "9cd5913be1e3bc3ed6c088ef448d5ce2924a6290b7dd6006d1af624c5e9a2503" "lib/l10n/app_hu.arb": "17077ec76b68ed03796a264b99e4dba9e6ddd532e27a92d8fb237ea6f211f757" + "lib/l10n/app_en.arb": "cbad6dd2485a983e399cce97371c19089b9110d30536488c14a7ea709c7b6ead" isar: "lib/data/models/app_settings_model.dart": "5eb5af345f1347f104257f0999763650fe2673f9da1754bd12d3f756fe5c9723" "lib/data/models/generic_cache_model.dart": "79151d0467fb5d40c532eaaa08ad7c7e24a34304199280fbf49cf6e5adcce6bc" diff --git a/firka/ios/FirkaWatch Watch App/FirkaWatch Watch App.entitlements b/firka/ios/FirkaWatch Watch App/FirkaWatch Watch App.entitlements index b76b3da..bf7c6f4 100644 --- a/firka/ios/FirkaWatch Watch App/FirkaWatch Watch App.entitlements +++ b/firka/ios/FirkaWatch Watch App/FirkaWatch Watch App.entitlements @@ -2,15 +2,15 @@ + com.apple.developer.ubiquity-kvstore-identifier + $(TeamIdentifierPrefix)app.firka.firka com.apple.security.application-groups - group.app.firka.firkaa + group.app.firka.firka keychain-access-groups $(AppIdentifierPrefix)app.firka.shared - com.apple.developer.ubiquity-kvstore-identifier - $(TeamIdentifierPrefix)app.firka.firkaa diff --git a/firka/ios/FirkaWatch Watch App/Localization/WatchL10n.swift b/firka/ios/FirkaWatch Watch App/Localization/WatchL10n.swift index 5d7be8f..ffd136a 100644 --- a/firka/ios/FirkaWatch Watch App/Localization/WatchL10n.swift +++ b/firka/ios/FirkaWatch Watch App/Localization/WatchL10n.swift @@ -31,7 +31,7 @@ class WatchL10n { private let languageKey = "watch_language" private let syncWithiPhoneKey = "watch_sync_language_with_iphone" private let lastAppliedSharedLanguageVersionKey = "watch_last_applied_shared_language_version" - private static let appGroupID = "group.app.firka.firkaa" + private static let appGroupID = "group.app.firka.firka" private var appGroupDefaults: UserDefaults? { UserDefaults(suiteName: Self.appGroupID) } diff --git a/firka/ios/FirkaWatch Watch App/Services/DataStore.swift b/firka/ios/FirkaWatch Watch App/Services/DataStore.swift index f0ffe21..5ab8f70 100644 --- a/firka/ios/FirkaWatch Watch App/Services/DataStore.swift +++ b/firka/ios/FirkaWatch Watch App/Services/DataStore.swift @@ -30,7 +30,7 @@ class DataStore { (error == "token_expired" || error == "no_token") && recoveryAttempted && !isRecoveringToken } - private let appGroupID = "group.app.firka.firkaa" + private let appGroupID = "group.app.firka.firka" private let cacheFileName = "watch_data.json" private let lastHandledSessionStateVersionKey = "firka.watch.last_handled_session_state_version" private let lastHandledSessionActiveStudentIdNormKey = "firka.watch.last_handled_session_active_student_id_norm" diff --git a/firka/ios/FirkaWatchComplications/FirkaComplications.swift b/firka/ios/FirkaWatchComplications/FirkaComplications.swift index efcec27..1eca6f7 100644 --- a/firka/ios/FirkaWatchComplications/FirkaComplications.swift +++ b/firka/ios/FirkaWatchComplications/FirkaComplications.swift @@ -5,7 +5,7 @@ import SwiftUI // MARK: - Complication Localization Helper private struct ComplicationL10n { - private static let appGroupID = "group.app.firka.firkaa" + private static let appGroupID = "group.app.firka.firka" enum Language: String { case hungarian = "hu" @@ -63,7 +63,7 @@ private struct ComplicationL10n { // MARK: - Watch Cache Loader private struct WatchCacheLoader { - private static let appGroupID = "group.app.firka.firkaa" + private static let appGroupID = "group.app.firka.firka" private static let cacheFileName = "watch_data.json" static func loadWidgetData() -> WidgetData? { diff --git a/firka/ios/FirkaWatchComplicationsExtension.entitlements b/firka/ios/FirkaWatchComplicationsExtension.entitlements index a96138b..ec3585b 100644 --- a/firka/ios/FirkaWatchComplicationsExtension.entitlements +++ b/firka/ios/FirkaWatchComplicationsExtension.entitlements @@ -2,11 +2,11 @@ + com.apple.developer.ubiquity-kvstore-identifier + $(TeamIdentifierPrefix)app.firka.firka com.apple.security.application-groups - group.app.firka.firkaa + group.app.firka.firka - com.apple.developer.ubiquity-kvstore-identifier - $(TeamIdentifierPrefix)app.firka.firkaa diff --git a/firka/ios/HomeWidgetsExtension.entitlements b/firka/ios/HomeWidgetsExtension.entitlements index af013c5..5f9512f 100644 --- a/firka/ios/HomeWidgetsExtension.entitlements +++ b/firka/ios/HomeWidgetsExtension.entitlements @@ -2,11 +2,11 @@ - com.apple.security.application-groups - - group.app.firka.firkaa - com.apple.developer.ubiquity-kvstore-identifier $(TeamIdentifierPrefix)$(CFBundleIdentifier) + com.apple.security.application-groups + + group.app.firka.firka + diff --git a/firka/ios/HomeWidgetsExtension/Controls/AppControls.swift b/firka/ios/HomeWidgetsExtension/Controls/AppControls.swift index d42de9e..7aa1acd 100644 --- a/firka/ios/HomeWidgetsExtension/Controls/AppControls.swift +++ b/firka/ios/HomeWidgetsExtension/Controls/AppControls.swift @@ -2,7 +2,7 @@ import WidgetKit import SwiftUI import AppIntents -private let appGroup = "group.app.firka.firkaa" +private let appGroup = "group.app.firka.firka" // MARK: - Navigation Intents (iOS 16+, used by Controls and Shortcuts) @@ -46,7 +46,7 @@ struct OpenTimetableIntent: AppIntent { @available(iOS 18.0, *) struct HomeControl: ControlWidget { - static let kind = "app.firka.firkaa.control.home" + static let kind = "app.firka.firka.control.home" var body: some ControlWidgetConfiguration { StaticControlConfiguration(kind: Self.kind) { @@ -63,7 +63,7 @@ struct HomeControl: ControlWidget { @available(iOS 18.0, *) struct GradesControl: ControlWidget { - static let kind = "app.firka.firkaa.control.grades" + static let kind = "app.firka.firka.control.grades" var body: some ControlWidgetConfiguration { StaticControlConfiguration(kind: Self.kind) { @@ -80,7 +80,7 @@ struct GradesControl: ControlWidget { @available(iOS 18.0, *) struct TimetableControl: ControlWidget { - static let kind = "app.firka.firkaa.control.timetable" + static let kind = "app.firka.firka.control.timetable" var body: some ControlWidgetConfiguration { StaticControlConfiguration(kind: Self.kind) { diff --git a/firka/ios/LiveActivityWidget.entitlements b/firka/ios/LiveActivityWidget.entitlements index 95a6893..0648e4d 100644 --- a/firka/ios/LiveActivityWidget.entitlements +++ b/firka/ios/LiveActivityWidget.entitlements @@ -4,11 +4,11 @@ aps-environment development - com.apple.security.application-groups - - group.app.firka.firkaa - com.apple.developer.ubiquity-kvstore-identifier $(TeamIdentifierPrefix)$(CFBundleIdentifier) + com.apple.security.application-groups + + group.app.firka.firka + diff --git a/firka/ios/Runner.xcodeproj/project.pbxproj b/firka/ios/Runner.xcodeproj/project.pbxproj index ff512d5..dd17533 100644 --- a/firka/ios/Runner.xcodeproj/project.pbxproj +++ b/firka/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 70; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -222,35 +222,35 @@ /* End PBXFileReference section */ /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ - 4F0EA0512F2BD2A2003CC89E /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { + 4F0EA0512F2BD2A2003CC89E /* Exceptions for "HomeWidgetsExtension" folder in "Runner" target */ = { isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( Controls/AppControls.swift, ); target = 97C146ED1CF9000F007C117D /* Runner */; }; - 4F4E70D02EF565FF00C90AD1 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { + 4F4E70D02EF565FF00C90AD1 /* Exceptions for "LiveActivityWidget" folder in "Runner" target */ = { isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( ActivityAttributes.swift, ); target = 97C146ED1CF9000F007C117D /* Runner */; }; - 4F5966082F2F0EB100A3DB03 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { + 4F5966082F2F0EB100A3DB03 /* Exceptions for "FirkaWatchComplications" folder in "FirkaWatchComplicationsExtension" target */ = { isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( Info.plist, ); target = 4F5965FC2F2F0EAF00A3DB03 /* FirkaWatchComplicationsExtension */; }; - 4F6C1D3E2ECD3FBD00F819D7 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { + 4F6C1D3E2ECD3FBD00F819D7 /* Exceptions for "LiveActivityWidget" folder in "LiveActivityWidget" target */ = { isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( Info.plist, ); target = 4F30C7642E8FBF9D008BB46C /* LiveActivityWidget */; }; - 4FE64E472F27B07B006F9205 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { + 4FE64E472F27B07B006F9205 /* Exceptions for "HomeWidgetsExtension" folder in "HomeWidgetsExtension" target */ = { isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( Info.plist, @@ -260,10 +260,55 @@ /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */ /* Begin PBXFileSystemSynchronizedRootGroup section */ - 4F30C76A2E8FBF9D008BB46C /* LiveActivityWidget */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (4F4E70D02EF565FF00C90AD1 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, 4F6C1D3E2ECD3FBD00F819D7 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = LiveActivityWidget; sourceTree = ""; }; - 4F5966002F2F0EAF00A3DB03 /* FirkaWatchComplications */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (4F5966082F2F0EB100A3DB03 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = FirkaWatchComplications; sourceTree = ""; }; - 4FE64E362F27B07A006F9205 /* HomeWidgetsExtension */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (4F0EA0512F2BD2A2003CC89E /* PBXFileSystemSynchronizedBuildFileExceptionSet */, 4FE64E472F27B07B006F9205 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = HomeWidgetsExtension; sourceTree = ""; }; - 4FF81B7B2F2EB4C100E95BA0 /* FirkaWatch Watch App */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = "FirkaWatch Watch App"; sourceTree = ""; }; + 4F30C76A2E8FBF9D008BB46C /* LiveActivityWidget */ = { + isa = PBXFileSystemSynchronizedRootGroup; + exceptions = ( + 4F4E70D02EF565FF00C90AD1 /* Exceptions for "LiveActivityWidget" folder in "Runner" target */, + 4F6C1D3E2ECD3FBD00F819D7 /* Exceptions for "LiveActivityWidget" folder in "LiveActivityWidget" target */, + ); + explicitFileTypes = { + }; + explicitFolders = ( + ); + path = LiveActivityWidget; + sourceTree = ""; + }; + 4F5966002F2F0EAF00A3DB03 /* FirkaWatchComplications */ = { + isa = PBXFileSystemSynchronizedRootGroup; + exceptions = ( + 4F5966082F2F0EB100A3DB03 /* Exceptions for "FirkaWatchComplications" folder in "FirkaWatchComplicationsExtension" target */, + ); + explicitFileTypes = { + }; + explicitFolders = ( + ); + path = FirkaWatchComplications; + sourceTree = ""; + }; + 4FE64E362F27B07A006F9205 /* HomeWidgetsExtension */ = { + isa = PBXFileSystemSynchronizedRootGroup; + exceptions = ( + 4F0EA0512F2BD2A2003CC89E /* Exceptions for "HomeWidgetsExtension" folder in "Runner" target */, + 4FE64E472F27B07B006F9205 /* Exceptions for "HomeWidgetsExtension" folder in "HomeWidgetsExtension" target */, + ); + explicitFileTypes = { + }; + explicitFolders = ( + ); + path = HomeWidgetsExtension; + sourceTree = ""; + }; + 4FF81B7B2F2EB4C100E95BA0 /* FirkaWatch Watch App */ = { + isa = PBXFileSystemSynchronizedRootGroup; + exceptions = ( + ); + explicitFileTypes = { + }; + explicitFolders = ( + ); + path = "FirkaWatch Watch App"; + sourceTree = ""; + }; /* End PBXFileSystemSynchronizedRootGroup section */ /* Begin PBXFrameworksBuildPhase section */ @@ -711,14 +756,10 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - ); name = "[CP] Copy Pods Resources"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", ); - outputPaths = ( - ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; @@ -775,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; @@ -807,14 +848,10 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); - outputPaths = ( - ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; @@ -1030,27 +1067,27 @@ }; name = Profile; }; - 249021D4217E4FDB00AE95B9 /* Profile */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - buildSettings = { + 249021D4217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1101; - DEVELOPMENT_TEAM = UT7MSP4GWZ; + CURRENT_PROJECT_VERSION = 1102; + DEVELOPMENT_TEAM = R9PZGUCNJ3; ENABLE_BITCODE = NO; - INFOPLIST_FILE = Runner/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = "Firka Testing"; - INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education"; + INFOPLIST_FILE = Runner/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = Firka; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0.9; - PRODUCT_BUNDLE_IDENTIFIER = app.firka.firkaa; + PRODUCT_BUNDLE_IDENTIFIER = app.firka.firka; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1071,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; @@ -1090,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; @@ -1107,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; @@ -1134,8 +1174,8 @@ CODE_SIGN_ENTITLEMENTS = LiveActivityWidget.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1101; - DEVELOPMENT_TEAM = UT7MSP4GWZ; + CURRENT_PROJECT_VERSION = 1102; + DEVELOPMENT_TEAM = R9PZGUCNJ3; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; @@ -1153,7 +1193,7 @@ MARKETING_VERSION = "$(FLUTTER_BUILD_NAME)"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = app.firka.firkaa.LiveActivityWidget; + PRODUCT_BUNDLE_IDENTIFIER = app.firka.firka.LiveActivityWidget; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; @@ -1185,8 +1225,8 @@ CODE_SIGN_ENTITLEMENTS = LiveActivityWidget.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1101; - DEVELOPMENT_TEAM = UT7MSP4GWZ; + CURRENT_PROJECT_VERSION = 1102; + DEVELOPMENT_TEAM = R9PZGUCNJ3; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; @@ -1203,7 +1243,7 @@ LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MARKETING_VERSION = "$(FLUTTER_BUILD_NAME)"; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = app.firka.firkaa.LiveActivityWidget; + PRODUCT_BUNDLE_IDENTIFIER = app.firka.firka.LiveActivityWidget; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; @@ -1233,8 +1273,8 @@ CODE_SIGN_ENTITLEMENTS = LiveActivityWidget.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1101; - DEVELOPMENT_TEAM = UT7MSP4GWZ; + CURRENT_PROJECT_VERSION = 1102; + DEVELOPMENT_TEAM = R9PZGUCNJ3; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; @@ -1251,7 +1291,7 @@ LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MARKETING_VERSION = "$(FLUTTER_BUILD_NAME)"; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = app.firka.firkaa.LiveActivityWidget; + PRODUCT_BUNDLE_IDENTIFIER = app.firka.firka.LiveActivityWidget; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; @@ -1280,8 +1320,8 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = FirkaWatchComplicationsExtension.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1101; - DEVELOPMENT_TEAM = UT7MSP4GWZ; + CURRENT_PROJECT_VERSION = 1102; + DEVELOPMENT_TEAM = R9PZGUCNJ3; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; @@ -1301,7 +1341,7 @@ MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ""; - PRODUCT_BUNDLE_IDENTIFIER = app.firka.firkaa.watchkitapp.complications; + PRODUCT_BUNDLE_IDENTIFIER = app.firka.firka.watchkitapp.complications; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = watchos; SKIP_INSTALL = YES; @@ -1333,8 +1373,8 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = FirkaWatchComplicationsExtension.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1101; - DEVELOPMENT_TEAM = UT7MSP4GWZ; + CURRENT_PROJECT_VERSION = 1102; + DEVELOPMENT_TEAM = R9PZGUCNJ3; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; @@ -1352,7 +1392,7 @@ MARKETING_VERSION = 1.0; MTL_FAST_MATH = YES; OTHER_LDFLAGS = ""; - PRODUCT_BUNDLE_IDENTIFIER = app.firka.firkaa.watchkitapp.complications; + PRODUCT_BUNDLE_IDENTIFIER = app.firka.firka.watchkitapp.complications; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = watchos; SKIP_INSTALL = YES; @@ -1383,8 +1423,8 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = FirkaWatchComplicationsExtension.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1101; - DEVELOPMENT_TEAM = UT7MSP4GWZ; + CURRENT_PROJECT_VERSION = 1102; + DEVELOPMENT_TEAM = R9PZGUCNJ3; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; @@ -1402,7 +1442,7 @@ MARKETING_VERSION = 1.0; MTL_FAST_MATH = YES; OTHER_LDFLAGS = ""; - PRODUCT_BUNDLE_IDENTIFIER = app.firka.firkaa.watchkitapp.complications; + PRODUCT_BUNDLE_IDENTIFIER = app.firka.firka.watchkitapp.complications; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = watchos; SKIP_INSTALL = YES; @@ -1434,8 +1474,8 @@ CODE_SIGN_ENTITLEMENTS = HomeWidgetsExtension.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1101; - DEVELOPMENT_TEAM = UT7MSP4GWZ; + CURRENT_PROJECT_VERSION = 1102; + DEVELOPMENT_TEAM = R9PZGUCNJ3; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; @@ -1454,7 +1494,7 @@ MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; - PRODUCT_BUNDLE_IDENTIFIER = app.firka.firkaa.HomeWidgetsExtension; + PRODUCT_BUNDLE_IDENTIFIER = app.firka.firka.HomeWidgetsExtension; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; @@ -1485,8 +1525,8 @@ CODE_SIGN_ENTITLEMENTS = HomeWidgetsExtension.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1101; - DEVELOPMENT_TEAM = UT7MSP4GWZ; + CURRENT_PROJECT_VERSION = 1102; + DEVELOPMENT_TEAM = R9PZGUCNJ3; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; @@ -1503,7 +1543,7 @@ LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MARKETING_VERSION = "$(FLUTTER_BUILD_NAME)"; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = app.firka.firkaa.HomeWidgetsExtension; + PRODUCT_BUNDLE_IDENTIFIER = app.firka.firka.HomeWidgetsExtension; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; @@ -1532,8 +1572,8 @@ CODE_SIGN_ENTITLEMENTS = HomeWidgetsExtension.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1101; - DEVELOPMENT_TEAM = UT7MSP4GWZ; + CURRENT_PROJECT_VERSION = 1102; + DEVELOPMENT_TEAM = R9PZGUCNJ3; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; @@ -1550,7 +1590,7 @@ LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MARKETING_VERSION = "$(FLUTTER_BUILD_NAME)"; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = app.firka.firkaa.HomeWidgetsExtension; + PRODUCT_BUNDLE_IDENTIFIER = app.firka.firka.HomeWidgetsExtension; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; @@ -1563,9 +1603,9 @@ }; name = Profile; }; - 4FF81B9C2F2EB4C300E95BA0 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { + 4FF81B9C2F2EB4C300E95BA0 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { ARCHS = "$(ARCHS_STANDARD)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon; @@ -1579,14 +1619,15 @@ CODE_SIGN_ENTITLEMENTS = "FirkaWatch Watch App/FirkaWatch Watch App.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = UT7MSP4GWZ; + DEVELOPMENT_TEAM = R9PZGUCNJ3; ENABLE_PREVIEWS = YES; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_CFBundleDisplayName = FirkaWatch; - INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; - INFOPLIST_KEY_WKCompanionAppBundleIdentifier = app.firka.firkaa; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_CFBundleDisplayName = FirkaWatch; + INFOPLIST_KEY_NSSupportsLiveActivities = YES; + INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; + INFOPLIST_KEY_WKCompanionAppBundleIdentifier = app.firka.firka; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1596,7 +1637,7 @@ MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; - PRODUCT_BUNDLE_IDENTIFIER = app.firka.firkaa.watchkitapp; + PRODUCT_BUNDLE_IDENTIFIER = app.firka.firka.watchkitapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = watchos; @@ -1615,9 +1656,9 @@ }; name = Debug; }; - 4FF81B9D2F2EB4C300E95BA0 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { + 4FF81B9D2F2EB4C300E95BA0 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { ARCHS = "$(ARCHS_STANDARD)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon; @@ -1631,14 +1672,15 @@ CODE_SIGN_ENTITLEMENTS = "FirkaWatch Watch App/FirkaWatch Watch App.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = UT7MSP4GWZ; + DEVELOPMENT_TEAM = R9PZGUCNJ3; ENABLE_PREVIEWS = YES; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_CFBundleDisplayName = FirkaWatch; - INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; - INFOPLIST_KEY_WKCompanionAppBundleIdentifier = app.firka.firkaa; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_CFBundleDisplayName = FirkaWatch; + INFOPLIST_KEY_NSSupportsLiveActivities = YES; + INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; + INFOPLIST_KEY_WKCompanionAppBundleIdentifier = app.firka.firka; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1646,7 +1688,7 @@ LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MARKETING_VERSION = 1.0; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = app.firka.firkaa.watchkitapp; + PRODUCT_BUNDLE_IDENTIFIER = app.firka.firka.watchkitapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = watchos; @@ -1664,9 +1706,9 @@ }; name = Release; }; - 4FF81B9E2F2EB4C300E95BA0 /* Profile */ = { - isa = XCBuildConfiguration; - buildSettings = { + 4FF81B9E2F2EB4C300E95BA0 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { ARCHS = "$(ARCHS_STANDARD)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon; @@ -1680,14 +1722,15 @@ CODE_SIGN_ENTITLEMENTS = "FirkaWatch Watch App/FirkaWatch Watch App.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = UT7MSP4GWZ; + DEVELOPMENT_TEAM = R9PZGUCNJ3; ENABLE_PREVIEWS = YES; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_CFBundleDisplayName = FirkaWatch; - INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; - INFOPLIST_KEY_WKCompanionAppBundleIdentifier = app.firka.firkaa; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_CFBundleDisplayName = FirkaWatch; + INFOPLIST_KEY_NSSupportsLiveActivities = YES; + INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; + INFOPLIST_KEY_WKCompanionAppBundleIdentifier = app.firka.firka; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1695,7 +1738,7 @@ LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MARKETING_VERSION = 1.0; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = app.firka.firkaa.watchkitapp; + PRODUCT_BUNDLE_IDENTIFIER = app.firka.firka.watchkitapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = watchos; @@ -1828,27 +1871,27 @@ }; name = Release; }; - 97C147061CF9000F007C117D /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; - buildSettings = { + 97C147061CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1101; - DEVELOPMENT_TEAM = UT7MSP4GWZ; + CURRENT_PROJECT_VERSION = 1102; + DEVELOPMENT_TEAM = R9PZGUCNJ3; ENABLE_BITCODE = NO; - INFOPLIST_FILE = Runner/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = "Firka Testing"; - INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education"; + INFOPLIST_FILE = Runner/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = Firka; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0.9; - PRODUCT_BUNDLE_IDENTIFIER = app.firka.firkaa; + PRODUCT_BUNDLE_IDENTIFIER = app.firka.firka; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1864,27 +1907,27 @@ }; name = Debug; }; - 97C147071CF9000F007C117D /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - buildSettings = { + 97C147071CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1101; - DEVELOPMENT_TEAM = UT7MSP4GWZ; + CURRENT_PROJECT_VERSION = 1102; + DEVELOPMENT_TEAM = R9PZGUCNJ3; ENABLE_BITCODE = NO; - INFOPLIST_FILE = Runner/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = "Firka Testing"; - INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education"; + INFOPLIST_FILE = Runner/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = Firka; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0.9; - PRODUCT_BUNDLE_IDENTIFIER = app.firka.firkaa; + PRODUCT_BUNDLE_IDENTIFIER = app.firka.firka; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; diff --git a/firka/ios/Runner/AppDelegate.swift b/firka/ios/Runner/AppDelegate.swift index 64d6f1f..bafb8af 100644 --- a/firka/ios/Runner/AppDelegate.swift +++ b/firka/ios/Runner/AppDelegate.swift @@ -30,8 +30,8 @@ import BackgroundTasks widgetDeepLinkChannel = FlutterMethodChannel(name: "firka.app/widget_deep_link", binaryMessenger: controller.binaryMessenger) widgetDeepLinkChannel?.setMethodCallHandler { [weak self] (call: FlutterMethodCall, result: @escaping FlutterResult) in if call.method == "getPendingDeepLink" { - if let controlNav = UserDefaults(suiteName: "group.app.firka.firkaa")?.string(forKey: "controlNavigation") { - UserDefaults(suiteName: "group.app.firka.firkaa")?.removeObject(forKey: "controlNavigation") + if let controlNav = UserDefaults(suiteName: "group.app.firka.firka")?.string(forKey: "controlNavigation") { + UserDefaults(suiteName: "group.app.firka.firka")?.removeObject(forKey: "controlNavigation") result(controlNav) } else if let link = self?.pendingWidgetDeepLink { self?.pendingWidgetDeepLink = nil diff --git a/firka/ios/Runner/HomeWidgetMethodChannel.swift b/firka/ios/Runner/HomeWidgetMethodChannel.swift index bb21cb5..5bfddcb 100644 --- a/firka/ios/Runner/HomeWidgetMethodChannel.swift +++ b/firka/ios/Runner/HomeWidgetMethodChannel.swift @@ -11,7 +11,7 @@ class HomeWidgetMethodChannel { switch call.method { case "getAppGroupDirectory": if let containerURL = FileManager.default.containerURL( - forSecurityApplicationGroupIdentifier: "group.app.firka.firkaa" + forSecurityApplicationGroupIdentifier: "group.app.firka.firka" ) { result(containerURL.path) } else { diff --git a/firka/ios/Runner/Info.plist b/firka/ios/Runner/Info.plist index 55b3158..51a46d4 100644 --- a/firka/ios/Runner/Info.plist +++ b/firka/ios/Runner/Info.plist @@ -1,89 +1,89 @@ - - BGTaskSchedulerPermittedIdentifiers - - app.firka.timetable.refresh - - CADisableMinimumFrameDurationOnPhone - - CFBundleAllowMixedLocalizations - - CFBundleDevelopmentRegion + + BGTaskSchedulerPermittedIdentifiers + + app.firka.timetable.refresh + + CADisableMinimumFrameDurationOnPhone + + CFBundleAllowMixedLocalizations + + CFBundleDevelopmentRegion + en + CFBundleDisplayName + Firka Testing + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleLocalizations + en - CFBundleLocalizations - - en - hu - de - - CFBundleDisplayName - Firka Testing - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - firka - CFBundlePackageType - APPL - CFBundleShortVersionString - $(FLUTTER_BUILD_NAME) - CFBundleSignature - ???? - CFBundleURLTypes - - - CFBundleURLName - app.firka.firkaa - CFBundleURLSchemes - - firka - - - - CFBundleVersion - 1101 - LSRequiresIPhoneOS - - NSAppTransportSecurity + hu + de + + CFBundleName + firka + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleURLTypes + - NSAllowsArbitraryLoads - + CFBundleURLName + app.firka.firka + CFBundleURLSchemes + + firka + - NSSupportsLiveActivities + + CFBundleVersion + 1102 + LSRequiresIPhoneOS + + NSAppTransportSecurity + + NSAllowsArbitraryLoads - NSSupportsLiveActivitiesFrequentUpdates - - UIApplicationSupportsIndirectInputEvents - - UIBackgroundModes - - remote-notification - fetch - processing - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UIStatusBarHidden - + NSSupportsLiveActivities + + NSSupportsLiveActivitiesFrequentUpdates + + UIApplicationSupportsIndirectInputEvents + + UIBackgroundModes + + remote-notification + fetch + processing + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIStatusBarHidden + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + diff --git a/firka/ios/Runner/Runner.entitlements b/firka/ios/Runner/Runner.entitlements index 60b320e..6c5dfba 100644 --- a/firka/ios/Runner/Runner.entitlements +++ b/firka/ios/Runner/Runner.entitlements @@ -4,17 +4,17 @@ aps-environment development + com.apple.developer.ubiquity-kvstore-identifier + $(TeamIdentifierPrefix)app.firka.firka com.apple.developer.usernotifications.time-sensitive com.apple.security.application-groups - group.app.firka.firkaa + group.app.firka.firka keychain-access-groups $(AppIdentifierPrefix)app.firka.shared - com.apple.developer.ubiquity-kvstore-identifier - $(TeamIdentifierPrefix)app.firka.firkaa diff --git a/firka/ios/Shared/API/TokenManager.swift b/firka/ios/Shared/API/TokenManager.swift index 90f9d4f..ed9b33f 100644 --- a/firka/ios/Shared/API/TokenManager.swift +++ b/firka/ios/Shared/API/TokenManager.swift @@ -32,7 +32,7 @@ enum TokenError: Error { class TokenManager { static let shared = TokenManager() - private let appGroupID = "group.app.firka.firkaa" + private let appGroupID = "group.app.firka.firka" private let tokenFileName = "watch_token.json" private static let keychainService = "app.firka.watch.token" diff --git a/firka/ios/Shared/Models/WidgetData.swift b/firka/ios/Shared/Models/WidgetData.swift index 3ff9d52..c0ec6f1 100644 --- a/firka/ios/Shared/Models/WidgetData.swift +++ b/firka/ios/Shared/Models/WidgetData.swift @@ -12,7 +12,7 @@ struct WidgetData: Codable { static func load() -> WidgetData? { guard let containerURL = FileManager.default.containerURL( - forSecurityApplicationGroupIdentifier: "group.app.firka.firkaa" + forSecurityApplicationGroupIdentifier: "group.app.firka.firka" ) else { lastError = "No App Group container" return nil diff --git a/firka/lib/l10n b/firka/lib/l10n index 2ac00c3..8287ed0 160000 --- a/firka/lib/l10n +++ b/firka/lib/l10n @@ -1 +1 @@ -Subproject commit 2ac00c3bea85db999c961eabf02dd8515f08e75f +Subproject commit 8287ed0936a1ff3b5ad92babd0900684b2b13942 diff --git a/firka/vendor/fmb_dart b/firka/vendor/fmb_dart deleted file mode 160000 index fb711c8..0000000 --- a/firka/vendor/fmb_dart +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fb711c8c407b0efc326516829b8a5ede83321dc2