From 23224eb2bf1018647fb5bb9fbf1d4ba47c8cc830 Mon Sep 17 00:00:00 2001 From: Selim Mustafaev Date: Mon, 5 May 2025 10:45:47 +0300 Subject: [PATCH] Fixes for macOS version --- AutoCat.xcodeproj/project.pbxproj | 2 +- AutoCat/Info.plist | 4 ++-- AutoCat/Screens/MainScreen/MainTabScreen.swift | 2 ++ AutoCat/Screens/ReportScreen/ReportScreen.swift | 1 + AutoCat/Screens/SettingsScreen/SettingsScreen.swift | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/AutoCat.xcodeproj/project.pbxproj b/AutoCat.xcodeproj/project.pbxproj index cb002a9..6ce9b9f 100644 --- a/AutoCat.xcodeproj/project.pbxproj +++ b/AutoCat.xcodeproj/project.pbxproj @@ -101,7 +101,7 @@ 7A91CE982DC243AD00DBA953 /* TitleModeInlineModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A91CE972DC243AD00DBA953 /* TitleModeInlineModifier.swift */; }; 7A91CE9A2DC2470F00DBA953 /* TextFieldDumbModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A91CE992DC2470F00DBA953 /* TextFieldDumbModifier.swift */; }; 7A91CE9D2DC26B8E00DBA953 /* SwiftUIIntrospect in Frameworks */ = {isa = PBXBuildFile; productRef = 7A91CE9C2DC26B8E00DBA953 /* SwiftUIIntrospect */; }; - 7A91CE9F2DC26BC300DBA953 /* TabBarControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A91CE9E2DC26BC300DBA953 /* TabBarControllerDelegate.swift */; }; + 7A91CE9F2DC26BC300DBA953 /* TabBarControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A91CE9E2DC26BC300DBA953 /* TabBarControllerDelegate.swift */; platformFilter = ios; }; 7A9519792D80B3E800E69883 /* AudioRecordService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A9519782D80B3E800E69883 /* AudioRecordService.swift */; }; 7A95197B2D80B41600E69883 /* AudioRecordServiceProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A95197A2D80B41600E69883 /* AudioRecordServiceProtocol.swift */; }; 7A95197D2D80B43D00E69883 /* AudioRecordError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A95197C2D80B43D00E69883 /* AudioRecordError.swift */; }; diff --git a/AutoCat/Info.plist b/AutoCat/Info.plist index b4aa811..fbbac78 100644 --- a/AutoCat/Info.plist +++ b/AutoCat/Info.plist @@ -2,6 +2,8 @@ + ATSApplicationFontsPath + . CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleExecutable @@ -78,8 +80,6 @@ UISceneConfigurationName Default Configuration - UISceneDelegateClassName - $(PRODUCT_MODULE_NAME).SceneDelegate diff --git a/AutoCat/Screens/MainScreen/MainTabScreen.swift b/AutoCat/Screens/MainScreen/MainTabScreen.swift index a8ac94e..1ab1345 100644 --- a/AutoCat/Screens/MainScreen/MainTabScreen.swift +++ b/AutoCat/Screens/MainScreen/MainTabScreen.swift @@ -91,12 +91,14 @@ struct MainTabScreen: View { } .tag(SideBarItem.settings) } +#if !os(macOS) .introspect(.tabView, on: .iOS(.v17, .v18)) { controller in controller.delegate = TabBarControllerDelegate.shared TabBarControllerDelegate.shared.action = { checkNumberSheetOpened = true } } +#endif } var numberEditSheet: some View { diff --git a/AutoCat/Screens/ReportScreen/ReportScreen.swift b/AutoCat/Screens/ReportScreen/ReportScreen.swift index 0328172..2caaff8 100644 --- a/AutoCat/Screens/ReportScreen/ReportScreen.swift +++ b/AutoCat/Screens/ReportScreen/ReportScreen.swift @@ -123,6 +123,7 @@ struct ReportScreen: View { } } } + .formStyle(.grouped) .onAppear { Task { await viewModel.onAppear() } } diff --git a/AutoCat/Screens/SettingsScreen/SettingsScreen.swift b/AutoCat/Screens/SettingsScreen/SettingsScreen.swift index 7fe5364..c92423d 100644 --- a/AutoCat/Screens/SettingsScreen/SettingsScreen.swift +++ b/AutoCat/Screens/SettingsScreen/SettingsScreen.swift @@ -79,6 +79,7 @@ struct SettingsScreen: View { toggle: $viewModel.settingService.showDebugInfo) } } + .formStyle(.grouped) .navigationTitle("Settings") .titleModeInline() .confirmationDialog(viewModel.googleUsername ?? "",