From 9d052e04cae105bfb3289964235fc9c3e81de2bc Mon Sep 17 00:00:00 2001 From: Aleksandr Mineev Date: Mon, 20 Jul 2026 23:04:03 +0300 Subject: [PATCH] Fix ios --- ios/Flutter/Debug.xcconfig | 1 + ios/Flutter/Release.xcconfig | 1 + ios/Podfile | 43 ++++++ ios/Podfile.lock | 22 +++ ios/Runner.xcodeproj/project.pbxproj | 125 +++++++++++++++++- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../contents.xcworkspacedata | 3 + lib/src/app/router/app_router.dart | 4 +- .../parsing_settings_controller.dart | 4 +- lib/src/shared/widgets/app_bottom_nav.dart | 5 + lib/src/shared/widgets/app_scaffold.dart | 4 +- .../application/inbox_resweep_test.dart | 6 +- .../parsing_pipeline_per_app_test.dart | 4 + .../parsing_pipeline_self_merchant_test.dart | 4 + .../parsing_worker_ai_retry_test.dart | 4 + .../parsing_worker_allowlist_test.dart | 4 + .../transfer_pairing_pipeline_test.dart | 4 + .../ai_processing_integration_test.dart | 16 +++ 18 files changed, 247 insertions(+), 9 deletions(-) create mode 100644 ios/Podfile create mode 100644 ios/Podfile.lock diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig index 592ceee..ec97fc6 100644 --- a/ios/Flutter/Debug.xcconfig +++ b/ios/Flutter/Debug.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig index 592ceee..c4855bf 100644 --- a/ios/Flutter/Release.xcconfig +++ b/ios/Flutter/Release.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" diff --git a/ios/Podfile b/ios/Podfile new file mode 100644 index 0000000..620e46e --- /dev/null +++ b/ios/Podfile @@ -0,0 +1,43 @@ +# Uncomment this line to define a global platform for your project +# platform :ios, '13.0' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_ios_podfile_setup + +target 'Runner' do + use_frameworks! + + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) + end +end diff --git a/ios/Podfile.lock b/ios/Podfile.lock new file mode 100644 index 0000000..bc01c41 --- /dev/null +++ b/ios/Podfile.lock @@ -0,0 +1,22 @@ +PODS: + - Flutter (1.0.0) + - flutter_secure_storage (6.0.0): + - Flutter + +DEPENDENCIES: + - Flutter (from `Flutter`) + - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`) + +EXTERNAL SOURCES: + Flutter: + :path: Flutter + flutter_secure_storage: + :path: ".symlinks/plugins/flutter_secure_storage/ios" + +SPEC CHECKSUMS: + Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 + flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13 + +PODFILE CHECKSUM: 3c63482e143d1b91d2d2560aee9fb04ecc74ac7e + +COCOAPODS: 1.16.2 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 6486ffd..ab01470 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -16,6 +16,8 @@ 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + B4B5DA83C06439AC30B96E4F /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E9FB75016188BD26986075E /* Pods_Runner.framework */; }; + CC1E27C3012A852838A324B2 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7918F2DDFDCA07ECF1F3672F /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -44,14 +46,20 @@ /* Begin PBXFileReference section */ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 1E9FB75016188BD26986075E /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 4D99F13FCC72F5F91174660C /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 4E0C6F5BA47FD62B73CA3652 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 70E2B3A7C846965FF0EC7E6D /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7884E8672EC3CC0400C636F2 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = ""; }; + 7918F2DDFDCA07ECF1F3672F /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 850C091E3B51F4331485A8B8 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -59,14 +67,25 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + A3286B960BA4F84BA1BF9E67 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + ED6CA756DD2DB9C881427CFF /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 356B1FF7005CAD771372F1A7 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + CC1E27C3012A852838A324B2 /* Pods_RunnerTests.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 97C146EB1CF9000F007C117D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, + B4B5DA83C06439AC30B96E4F /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -100,6 +119,8 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, + F15B7D84EAFCEC9FCF2483EF /* Pods */, + AFC943AAE88DBF5F95C044A1 /* Frameworks */, ); sourceTree = ""; }; @@ -128,6 +149,29 @@ path = Runner; sourceTree = ""; }; + AFC943AAE88DBF5F95C044A1 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 1E9FB75016188BD26986075E /* Pods_Runner.framework */, + 7918F2DDFDCA07ECF1F3672F /* Pods_RunnerTests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + F15B7D84EAFCEC9FCF2483EF /* Pods */ = { + isa = PBXGroup; + children = ( + 4D99F13FCC72F5F91174660C /* Pods-Runner.debug.xcconfig */, + 4E0C6F5BA47FD62B73CA3652 /* Pods-Runner.release.xcconfig */, + 850C091E3B51F4331485A8B8 /* Pods-Runner.profile.xcconfig */, + A3286B960BA4F84BA1BF9E67 /* Pods-RunnerTests.debug.xcconfig */, + 70E2B3A7C846965FF0EC7E6D /* Pods-RunnerTests.release.xcconfig */, + ED6CA756DD2DB9C881427CFF /* Pods-RunnerTests.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -135,8 +179,10 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( + 18D3DB167AF96E122ADEC896 /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, 331C807F294A63A400263BE5 /* Resources */, + 356B1FF7005CAD771372F1A7 /* Frameworks */, ); buildRules = ( ); @@ -152,12 +198,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( + 69DAEC0C781524F8F0CAB14D /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + 120A2C7F8921D28CEB1E4978 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -201,7 +249,7 @@ ); mainGroup = 97C146E51CF9000F007C117D; packageReferences = ( - 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */, + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; @@ -235,6 +283,45 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 120A2C7F8921D28CEB1E4978 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + 18D3DB167AF96E122ADEC896 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -251,6 +338,28 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; + 69DAEC0C781524F8F0CAB14D /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -341,6 +450,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; @@ -363,6 +473,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + STRING_CATALOG_GENERATE_SYMBOLS = YES; SUPPORTED_PLATFORMS = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; @@ -376,6 +487,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = 94MZYD86FZ; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -392,6 +504,7 @@ }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = A3286B960BA4F84BA1BF9E67 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -409,6 +522,7 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 70E2B3A7C846965FF0EC7E6D /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -424,6 +538,7 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; + baseConfigurationReference = ED6CA756DD2DB9C881427CFF /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -461,6 +576,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; @@ -490,6 +606,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; + STRING_CATALOG_GENERATE_SYMBOLS = YES; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -518,6 +635,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; @@ -540,6 +658,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + STRING_CATALOG_GENERATE_SYMBOLS = YES; SUPPORTED_PLATFORMS = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; @@ -555,6 +674,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = 94MZYD86FZ; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -577,6 +697,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = 94MZYD86FZ; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -627,7 +748,7 @@ /* End XCConfigurationList section */ /* Begin XCLocalSwiftPackageReference section */ - 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = { + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = { isa = XCLocalSwiftPackageReference; relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; }; diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c3fedb2..95d6e55 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,7 +1,7 @@ + version = "1.7"> diff --git a/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata index 1d526a1..21a3cc1 100644 --- a/ios/Runner.xcworkspace/contents.xcworkspacedata +++ b/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -4,4 +4,7 @@ + + diff --git a/lib/src/app/router/app_router.dart b/lib/src/app/router/app_router.dart index 8fd2ab2..6f3fe90 100644 --- a/lib/src/app/router/app_router.dart +++ b/lib/src/app/router/app_router.dart @@ -57,10 +57,10 @@ GoRouter appRouter(Ref ref) { final atOnboarding = state.matchedLocation == AppRoutes.onboarding; if (!hasUser) return atOnboarding ? null : AppRoutes.onboarding; if (atOnboarding) return AppRoutes.home; - // `?? true` — тот же дефолт, что у ParsingSettings.enabled, чтобы кадр + // `?? false` — тот же дефолт, что у ParsingSettings.enabled, чтобы кадр // первой загрузки не расходился с видимостью вкладки в AppBottomNav. final parsingEnabled = - ref.read(parsingSettingsControllerProvider).value?.enabled ?? true; + ref.read(parsingSettingsControllerProvider).value?.enabled ?? false; if (!parsingEnabled && state.matchedLocation == AppRoutes.inbox) { return AppRoutes.home; } diff --git a/lib/src/features/notification_parsing/application/parsing_settings_controller.dart b/lib/src/features/notification_parsing/application/parsing_settings_controller.dart index e3af515..e8e2b34 100644 --- a/lib/src/features/notification_parsing/application/parsing_settings_controller.dart +++ b/lib/src/features/notification_parsing/application/parsing_settings_controller.dart @@ -92,7 +92,9 @@ const _kDiagnosticMode = 'parsing_diagnostic_mode'; const kDefaultAiModel = 'deepseek-chat'; const _defaultSettings = ParsingSettings( - enabled: true, + // Выключено по умолчанию: фича требует доступа к уведомлениям, включать её + // должен сам пользователь в настройках парсинга. + enabled: false, autoApplyEnabled: true, transferPairingEnabled: true, aiConsentGiven: false, diff --git a/lib/src/shared/widgets/app_bottom_nav.dart b/lib/src/shared/widgets/app_bottom_nav.dart index 933a80d..cb8d7ff 100644 --- a/lib/src/shared/widgets/app_bottom_nav.dart +++ b/lib/src/shared/widgets/app_bottom_nav.dart @@ -132,8 +132,13 @@ class _NavTab extends StatelessWidget { const SizedBox(height: 3), Text( item.label, + maxLines: 1, + overflow: TextOverflow.ellipsis, style: TextStyle( fontSize: 10, + // Явный height: на iOS системный шрифт даёт большую высоту + // строки, чем на Android, и колонка вылезала на ~1px. + height: 1.1, fontWeight: active ? FontWeight.w600 : FontWeight.w400, color: color, ), diff --git a/lib/src/shared/widgets/app_scaffold.dart b/lib/src/shared/widgets/app_scaffold.dart index 20c4e9c..41583ea 100644 --- a/lib/src/shared/widgets/app_scaffold.dart +++ b/lib/src/shared/widgets/app_scaffold.dart @@ -30,10 +30,10 @@ class AppScaffold extends ConsumerWidget { } } - // `?? true` совпадает с дефолтом ParsingSettings.enabled — без мигания + // `?? false` совпадает с дефолтом ParsingSettings.enabled — без мигания // вкладки на кадре первой загрузки настроек (см. redirect в app_router). final showInbox = - ref.watch(parsingSettingsControllerProvider).value?.enabled ?? true; + ref.watch(parsingSettingsControllerProvider).value?.enabled ?? false; // Watch на уровне шелла заодно держит autoDispose-стрим счётчика живым // на всех вкладках (раньше это делал колокольчик в MonthHeader). final inboxCount = userId == null diff --git a/test/features/notification_parsing/application/inbox_resweep_test.dart b/test/features/notification_parsing/application/inbox_resweep_test.dart index 04df4c0..10f58af 100644 --- a/test/features/notification_parsing/application/inbox_resweep_test.dart +++ b/test/features/notification_parsing/application/inbox_resweep_test.dart @@ -89,8 +89,12 @@ void main() { (ref) async => _fakeAiParser(merchantRaw: 'LENTA', amount: 1700)), ]); repo = container.read(rawMessagesRepositoryProvider); - // Прогреваем настройки (enabled/autoApplyEnabled = true по умолчанию). + // Прогреваем настройки (autoApplyEnabled = true по умолчанию). await container.read(parsingSettingsControllerProvider.future); + // Парсинг выключен по умолчанию — включаем явно. + await container + .read(parsingSettingsControllerProvider.notifier) + .setEnabled(true); } tearDown(() async { diff --git a/test/features/notification_parsing/application/parsing_pipeline_per_app_test.dart b/test/features/notification_parsing/application/parsing_pipeline_per_app_test.dart index bb17a06..48d69b4 100644 --- a/test/features/notification_parsing/application/parsing_pipeline_per_app_test.dart +++ b/test/features/notification_parsing/application/parsing_pipeline_per_app_test.dart @@ -123,6 +123,10 @@ void main() { repo = container.read(rawMessagesRepositoryProvider); final settings = container.read(parsingSettingsControllerProvider.notifier); await container.read(parsingSettingsControllerProvider.future); + // Парсинг выключен по умолчанию — включаем явно. + await container + .read(parsingSettingsControllerProvider.notifier) + .setEnabled(true); await settings.setAiConsent(true); await container .read(accountRepositoryProvider) diff --git a/test/features/notification_parsing/application/parsing_pipeline_self_merchant_test.dart b/test/features/notification_parsing/application/parsing_pipeline_self_merchant_test.dart index 081d9e5..17618ed 100644 --- a/test/features/notification_parsing/application/parsing_pipeline_self_merchant_test.dart +++ b/test/features/notification_parsing/application/parsing_pipeline_self_merchant_test.dart @@ -131,6 +131,10 @@ void main() { repo = container.read(rawMessagesRepositoryProvider); final settings = container.read(parsingSettingsControllerProvider.notifier); await container.read(parsingSettingsControllerProvider.future); + // Парсинг выключен по умолчанию — включаем явно. + await container + .read(parsingSettingsControllerProvider.notifier) + .setEnabled(true); await settings.setAiConsent(true); // Глобальный дефолт — чтобы счёт резолвился (gate всё равно не пройдёт без // merchant-правила, но сообщение доходит до построения suggestion). diff --git a/test/features/notification_parsing/application/parsing_worker_ai_retry_test.dart b/test/features/notification_parsing/application/parsing_worker_ai_retry_test.dart index 9901f82..b56bb4f 100644 --- a/test/features/notification_parsing/application/parsing_worker_ai_retry_test.dart +++ b/test/features/notification_parsing/application/parsing_worker_ai_retry_test.dart @@ -79,6 +79,10 @@ Future _seed(AppDatabase db) async { Future _enableAi(ProviderContainer c) async { final settings = c.read(parsingSettingsControllerProvider.notifier); await c.read(parsingSettingsControllerProvider.future); + // Парсинг выключен по умолчанию — включаем явно. + await c + .read(parsingSettingsControllerProvider.notifier) + .setEnabled(true); await settings.setAiConsent(true); } diff --git a/test/features/notification_parsing/application/parsing_worker_allowlist_test.dart b/test/features/notification_parsing/application/parsing_worker_allowlist_test.dart index 3db68cb..734353e 100644 --- a/test/features/notification_parsing/application/parsing_worker_allowlist_test.dart +++ b/test/features/notification_parsing/application/parsing_worker_allowlist_test.dart @@ -111,6 +111,10 @@ void main() { Future enableAi(ProviderContainer c) async { final settings = c.read(parsingSettingsControllerProvider.notifier); await c.read(parsingSettingsControllerProvider.future); + // Парсинг выключен по умолчанию — включаем явно. + await c + .read(parsingSettingsControllerProvider.notifier) + .setEnabled(true); await settings.setAiConsent(true); } diff --git a/test/features/notification_parsing/application/transfer_pairing_pipeline_test.dart b/test/features/notification_parsing/application/transfer_pairing_pipeline_test.dart index cfadaf9..4ea6538 100644 --- a/test/features/notification_parsing/application/transfer_pairing_pipeline_test.dart +++ b/test/features/notification_parsing/application/transfer_pairing_pipeline_test.dart @@ -140,6 +140,10 @@ void main() { repo = container.read(rawMessagesRepositoryProvider); final settings = container.read(parsingSettingsControllerProvider.notifier); await container.read(parsingSettingsControllerProvider.future); + // Парсинг выключен по умолчанию — включаем явно. + await container + .read(parsingSettingsControllerProvider.notifier) + .setEnabled(true); await settings.setAiConsent(true); // Дефолтные счета приложений: bankA → accA, bankB → accB (resolver #2, // trusted). diff --git a/test/features/notification_parsing/integration/ai_processing_integration_test.dart b/test/features/notification_parsing/integration/ai_processing_integration_test.dart index a68a7e9..546cb2b 100644 --- a/test/features/notification_parsing/integration/ai_processing_integration_test.dart +++ b/test/features/notification_parsing/integration/ai_processing_integration_test.dart @@ -156,6 +156,10 @@ void main() { // dart-define/дефолта приложения. final settings = container.read(parsingSettingsControllerProvider.notifier); await container.read(parsingSettingsControllerProvider.future); + // Парсинг выключен по умолчанию — включаем явно. + await container + .read(parsingSettingsControllerProvider.notifier) + .setEnabled(true); await settings.setAiConsent(true); await settings.setAiModel(_model); }); @@ -197,6 +201,10 @@ void main() { // Токены учтены в дневном счётчике. final settings = await container.read(parsingSettingsControllerProvider.future); + // Парсинг выключен по умолчанию — включаем явно. + await container + .read(parsingSettingsControllerProvider.notifier) + .setEnabled(true); expect(settings.tokensUsedToday, greaterThan(0)); }, timeout: netTimeout, @@ -273,6 +281,10 @@ void main() { repo = container.read(rawMessagesRepositoryProvider); final settings = container.read(parsingSettingsControllerProvider.notifier); await container.read(parsingSettingsControllerProvider.future); + // Парсинг выключен по умолчанию — включаем явно. + await container + .read(parsingSettingsControllerProvider.notifier) + .setEnabled(true); await settings.setAiConsent(true); await settings.setAiModel(_model); }); @@ -299,6 +311,10 @@ void main() { final settings = await container.read(parsingSettingsControllerProvider.future); + // Парсинг выключен по умолчанию — включаем явно. + await container + .read(parsingSettingsControllerProvider.notifier) + .setEnabled(true); expect(settings.aiConsentGiven, isFalse, reason: 'auth failure must disable AI consent'); },