selim/AutoCat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: selim:b1f5f6464d8b1cf27d584ac85f18afa140d7dc73
Branches Tags
selim:master
...
compare: selim:23cf2018ff5445b32de057a78299377c779a9afc
Branches Tags
selim:master

3 Commits
b1f5f6464d ... 23cf2018ff

Author SHA1 Message Date
Selim Mustafaev
23cf2018ff Merge remote-tracking branch 'refs/remotes/pluto/master' 
#Conflicts:
#	AutoCat.xcodeproj/project.pbxproj
 2025-10-14 17:25:45 +03:00
Selim Mustafaev
356338d89e Version bump 2025-10-14 17:17:20 +03:00
Selim Mustafaev
cc836bcd77 Fix tab bar for iOS 26 2025-10-14 17:16:34 +03:00
3 changed files with 17 additions and 17 deletions
Show Stats Expand all files Collapse all files

8
AutoCat.xcodeproj/project.pbxproj
View File

@ -1721,7 +1721,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements; CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 171; CURRENT_PROJECT_VERSION = 172;
DEVELOPMENT_TEAM = 46DTTB8X4S; DEVELOPMENT_TEAM = 46DTTB8X4S;
INFOPLIST_FILE = AutoCat/Info.plist; INFOPLIST_FILE = AutoCat/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = AutoCat; INFOPLIST_KEY_CFBundleDisplayName = AutoCat;
@ -1750,7 +1750,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements; CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 171; CURRENT_PROJECT_VERSION = 172;
DEVELOPMENT_TEAM = 46DTTB8X4S; DEVELOPMENT_TEAM = 46DTTB8X4S;
INFOPLIST_FILE = AutoCat/Info.plist; INFOPLIST_FILE = AutoCat/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = AutoCat; INFOPLIST_KEY_CFBundleDisplayName = AutoCat;
@ -2014,7 +2014,7 @@
repositoryURL = "https://github.com/realm/realm-swift.git"; repositoryURL = "https://github.com/realm/realm-swift.git";
requirement = { requirement = {
kind = upToNextMajorVersion; kind = upToNextMajorVersion;
minimumVersion = 10.36.0; minimumVersion = 20.0.0;
}; };
}; };
7A386A492DAC35F10051676A /* XCRemoteSwiftPackageReference "ClusterMap" */ = { 7A386A492DAC35F10051676A /* XCRemoteSwiftPackageReference "ClusterMap" */ = {
@ -2038,7 +2038,7 @@
repositoryURL = "https://github.com/siteline/swiftui-introspect"; repositoryURL = "https://github.com/siteline/swiftui-introspect";
requirement = { requirement = {
kind = upToNextMajorVersion; kind = upToNextMajorVersion;
minimumVersion = 1.3.0; minimumVersion = 26.0.0;
}; };
}; };
7ACBB91C2CB9B155005A5168 /* XCRemoteSwiftPackageReference "Mockable" */ = { 7ACBB91C2CB9B155005A5168 /* XCRemoteSwiftPackageReference "Mockable" */ = {

24
AutoCat.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@ -15,8 +15,8 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/Kolos65/Mockable", "location" : "https://github.com/Kolos65/Mockable",
"state" : { "state" : {
"revision" : "ee133a696dce312da292b00d0944aafaa808eaca", "revision" : "0a822d53fa7516abe659b44a9c508b8eb9b666bd",
"version" : "0.4.0" "version" : "0.4.1"
} }
}, },
{ {
@ -24,8 +24,8 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/realm/realm-core.git", "location" : "https://github.com/realm/realm-core.git",
"state" : { "state" : {
"revision" : "cccb3ca9e26ec452a29f2f0d4050d1e38b8a3d43", "revision" : "15493076ad9fef22c16cc64cbfbf9e5b65c385f9",
"version" : "14.14.0" "version" : "20.1.0"
} }
}, },
{ {
@ -33,8 +33,8 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/realm/realm-swift.git", "location" : "https://github.com/realm/realm-swift.git",
"state" : { "state" : {
"revision" : "54eebd2b5e7a4a8055a7a8b55ac859a48462d722", "revision" : "6260534683132eb981338c7c39fd5e69205876e6",
"version" : "10.54.5" "version" : "20.0.3"
} }
}, },
{ {
@ -42,8 +42,8 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/swiftlang/swift-syntax.git", "location" : "https://github.com/swiftlang/swift-syntax.git",
"state" : { "state" : {
"revision" : "f99ae8aa18f0cf0d53481901f88a0991dc3bd4a2", "revision" : "4799286537280063c85a32f09884cfbca301b1a1",
"version" : "601.0.1" "version" : "602.0.0"
} }
}, },
{ {
@ -69,8 +69,8 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/siteline/swiftui-introspect", "location" : "https://github.com/siteline/swiftui-introspect",
"state" : { "state" : {
"revision" : "807f73ce09a9b9723f12385e592b4e0aaebd3336", "revision" : "a08b87f96b41055577721a6e397562b21ad52454",
"version" : "1.3.0" "version" : "26.0.0"
} }
}, },
{ {
@ -78,8 +78,8 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/xctest-dynamic-overlay", "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
"state" : { "state" : {
"revision" : "39de59b2d47f7ef3ca88a039dff3084688fe27f4", "revision" : "4c27acf5394b645b70d8ba19dc249c0472d5f618",
"version" : "1.5.2" "version" : "1.7.0"
} }
} }
], ],

2
AutoCat/Screens/MainScreen/MainTabScreen.swift
View File

@ -92,7 +92,7 @@ struct MainTabScreen: View {
.tag(SideBarItem.settings) .tag(SideBarItem.settings)
} }
#if !os(macOS) #if !os(macOS)
.introspect(.tabView, on: .iOS(.v17, .v18)) { controller in .introspect(.tabView, on: .iOS(.v17, .v18, .v26)) { controller in
controller.delegate = TabBarControllerDelegate.shared controller.delegate = TabBarControllerDelegate.shared
TabBarControllerDelegate.shared.action = { TabBarControllerDelegate.shared.action = {
checkNumberSheetOpened = true checkNumberSheetOpened = true