Skip to content

Commit

Permalink
bump min version to iOS15
Browse files Browse the repository at this point in the history
  • Loading branch information
@rachaelblue
rachaelblue committed Nov 25, 2024
1 parent 0b1dda9 commit 7f367ba
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 70 deletions.
66 changes: 27 additions & 39 deletions godtools.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -813,8 +813,8 @@
459BF7812AFEE0320053BA09 /* ToolScreenShareTutorialViewsRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 459BF77D2AFEE0320053BA09 /* ToolScreenShareTutorialViewsRepository.swift */; };
459C526F289418EB00DA9E95 /* TranslationManifestFileDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 459C526E289418EB00DA9E95 /* TranslationManifestFileDataModel.swift */; };
459C527128941A5B00DA9E95 /* TranslationFilesDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 459C527028941A5B00DA9E95 /* TranslationFilesDataModel.swift */; };
459C56D225FF954F00F15967 /* BuildFile in Sources */ = {isa = PBXBuildFile; };
459C56D325FF954F00F15967 /* BuildFile in Sources */ = {isa = PBXBuildFile; };
459C56D225FF954F00F15967 /* (null) in Sources */ = {isa = PBXBuildFile; };
459C56D325FF954F00F15967 /* (null) in Sources */ = {isa = PBXBuildFile; };
459E27FA2AD8280D008275B3 /* DeleteUserCountersUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 459E27F92AD8280D008275B3 /* DeleteUserCountersUseCase.swift */; };
459E3A062A30BC2600070934 /* MenuItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 459E3A032A30BC2600070934 /* MenuItemView.swift */; };
459E3A072A30BC2600070934 /* MenuSectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 459E3A042A30BC2600070934 /* MenuSectionView.swift */; };
Expand Down Expand Up @@ -1040,15 +1040,15 @@
45B54C572A2641FE0042CD0E /* RealmDatabase+Read.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45B54C542A2641FE0042CD0E /* RealmDatabase+Read.swift */; };
45B54C582A2641FE0042CD0E /* RealmDatabase+Write.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45B54C552A2641FE0042CD0E /* RealmDatabase+Write.swift */; };
45B54C592A2641FE0042CD0E /* RealmDatabase+Delete.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45B54C562A2641FE0042CD0E /* RealmDatabase+Delete.swift */; };
45B6480925E581660098BAF1 /* BuildFile in Sources */ = {isa = PBXBuildFile; };
45B6480A25E581660098BAF1 /* BuildFile in Resources */ = {isa = PBXBuildFile; };
45B6480B25E581660098BAF1 /* BuildFile in Sources */ = {isa = PBXBuildFile; };
45B6480C25E581660098BAF1 /* BuildFile in Sources */ = {isa = PBXBuildFile; };
45B6481625E58ECC0098BAF1 /* BuildFile in Sources */ = {isa = PBXBuildFile; };
45B6482025E58EE70098BAF1 /* BuildFile in Sources */ = {isa = PBXBuildFile; };
45B6482825E593110098BAF1 /* BuildFile in Sources */ = {isa = PBXBuildFile; };
45B6482925E593110098BAF1 /* BuildFile in Resources */ = {isa = PBXBuildFile; };
45B6482A25E593110098BAF1 /* BuildFile in Sources */ = {isa = PBXBuildFile; };
45B6480925E581660098BAF1 /* (null) in Sources */ = {isa = PBXBuildFile; };
45B6480A25E581660098BAF1 /* (null) in Resources */ = {isa = PBXBuildFile; };
45B6480B25E581660098BAF1 /* (null) in Sources */ = {isa = PBXBuildFile; };
45B6480C25E581660098BAF1 /* (null) in Sources */ = {isa = PBXBuildFile; };
45B6481625E58ECC0098BAF1 /* (null) in Sources */ = {isa = PBXBuildFile; };
45B6482025E58EE70098BAF1 /* (null) in Sources */ = {isa = PBXBuildFile; };
45B6482825E593110098BAF1 /* (null) in Sources */ = {isa = PBXBuildFile; };
45B6482925E593110098BAF1 /* (null) in Resources */ = {isa = PBXBuildFile; };
45B6482A25E593110098BAF1 /* (null) in Sources */ = {isa = PBXBuildFile; };
45B6FF2A2BAA39660037B240 /* ViewToolFilterLanguagesUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45B6FF282BAA39660037B240 /* ViewToolFilterLanguagesUseCase.swift */; };
45B6FF2B2BAA39660037B240 /* ViewToolFilterCategoriesUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45B6FF292BAA39660037B240 /* ViewToolFilterCategoriesUseCase.swift */; };
45B6FF302BAA39720037B240 /* SearchToolFilterLanguagesRepositoryInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45B6FF2C2BAA39710037B240 /* SearchToolFilterLanguagesRepositoryInterface.swift */; };
Expand Down Expand Up @@ -1535,7 +1535,6 @@
D4960CC82CC6DEAE0090B114 /* UserLessonProgressDomainModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4960CC72CC6DEAE0090B114 /* UserLessonProgressDomainModel.swift */; };
D4960CCC2CCC2C290090B114 /* MobileContentPagesInitialPageConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4960CCB2CCC2C290090B114 /* MobileContentPagesInitialPageConfig.swift */; };
D4960CCE2CD177980090B114 /* ResumeLessonProgressModal.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4960CCD2CD177980090B114 /* ResumeLessonProgressModal.swift */; };
D4960CD02CE429D80090B114 /* VisualEffectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4960CCF2CE429D80090B114 /* VisualEffectView.swift */; };
D4960CD32CE688140090B114 /* GetResumeLessonProgressModalInterfaceStringsRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4960CD22CE688140090B114 /* GetResumeLessonProgressModalInterfaceStringsRepository.swift */; };
D4960CD52CE6886B0090B114 /* ResumeLessonProgressModalInterfaceStringsDomainModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4960CD42CE6886B0090B114 /* ResumeLessonProgressModalInterfaceStringsDomainModel.swift */; };
D4960CD82CE6934E0090B114 /* ResumeLessonProgressModalViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4960CD72CE6934E0090B114 /* ResumeLessonProgressModalViewModel.swift */; };
Expand Down Expand Up @@ -3244,7 +3243,6 @@
D4960CC72CC6DEAE0090B114 /* UserLessonProgressDomainModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserLessonProgressDomainModel.swift; sourceTree = "<group>"; };
D4960CCB2CCC2C290090B114 /* MobileContentPagesInitialPageConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MobileContentPagesInitialPageConfig.swift; sourceTree = "<group>"; };
D4960CCD2CD177980090B114 /* ResumeLessonProgressModal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResumeLessonProgressModal.swift; sourceTree = "<group>"; };
D4960CCF2CE429D80090B114 /* VisualEffectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VisualEffectView.swift; sourceTree = "<group>"; };
D4960CD22CE688140090B114 /* GetResumeLessonProgressModalInterfaceStringsRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetResumeLessonProgressModalInterfaceStringsRepository.swift; sourceTree = "<group>"; };
D4960CD42CE6886B0090B114 /* ResumeLessonProgressModalInterfaceStringsDomainModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResumeLessonProgressModalInterfaceStringsDomainModel.swift; sourceTree = "<group>"; };
D4960CD72CE6934E0090B114 /* ResumeLessonProgressModalViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResumeLessonProgressModalViewModel.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -11386,7 +11384,6 @@
45E3478F2A49C04B0014CCD1 /* SeparatorView */,
45325F20285CF8B40078D932 /* TextWithLinks */,
45325F1D285CF8B40078D932 /* VideoView */,
D4960CD12CE42A280090B114 /* VisualEffectView */,
);
path = "SwiftUI Views";
sourceTree = "<group>";
Expand Down Expand Up @@ -11532,14 +11529,6 @@
path = GetTranslatedPercentage;
sourceTree = "<group>";
};
D4960CD12CE42A280090B114 /* VisualEffectView */ = {
isa = PBXGroup;
children = (
D4960CCF2CE429D80090B114 /* VisualEffectView.swift */,
);
path = VisualEffectView;
sourceTree = "<group>";
};
D4960CD62CE693320090B114 /* ResumeLessonProgressModal */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -12253,7 +12242,7 @@
451A17522756C10400D35D78 /* tutorial_screenshare.json in Resources */,
D4B522D929D761B700D85213 /* Localizable.stringsdict in Resources */,
1737DFDF22FDB48000223CB0 /* GoogleService-Info.plist in Resources */,
45B6482925E593110098BAF1 /* BuildFile in Resources */,
45B6482925E593110098BAF1 /* (null) in Resources */,
458CFE9329D4E0B9007B423C /* ArticlesErrorMessageView.xib in Resources */,
455583FC269F2DA500C3FF14 /* MobileContentInputView.xib in Resources */,
451A17542756C10400D35D78 /* tutorial_tooltip.json in Resources */,
Expand Down Expand Up @@ -12286,7 +12275,7 @@
D19EB5E0259BB75900685156 /* training_tip_tips.json in Resources */,
458CFE9129D4E0B9007B423C /* ArticleWebView.xib in Resources */,
4555840F269F2DA500C3FF14 /* MobileContentTextView.xib in Resources */,
45B6480A25E581660098BAF1 /* BuildFile in Resources */,
45B6480A25E581660098BAF1 /* (null) in Resources */,
45F7162E290A12D70019B715 /* WebContentView.xib in Resources */,
45DEF22E2576A6A20007AC64 /* learn_to_share_tool_with_anyone.json in Resources */,
45BE4A7D2AF28788004021DA /* SF-Pro-Display-Regular.otf in Resources */,
Expand Down Expand Up @@ -12505,7 +12494,7 @@
45D63E56288F67F8009B4610 /* IgnoreCacheSession.swift in Sources */,
458B91C32B7D676900785C6F /* ViewFavoritesDomainModel.swift in Sources */,
459E86DD28EDA86C00E197A5 /* DeepLinkUrlParserType.swift in Sources */,
459C56D225FF954F00F15967 /* BuildFile in Sources */,
459C56D225FF954F00F15967 /* (null) in Sources */,
45D63E86288F75B0009B4610 /* RealmAttachment.swift in Sources */,
45C649C22B31E212000249E0 /* GetShareToolInterfaceStringsRepositoryInterface.swift in Sources */,
45A8BDE32ACC9F47007A1EBB /* LessonsViewModel.swift in Sources */,
Expand Down Expand Up @@ -12540,7 +12529,7 @@
45AC9DED2B28A9CD00DEEBFE /* LanguageDownloadIcon.swift in Sources */,
459E86EE28EDA86C00E197A5 /* DeepLinkingParserManifestUrl.swift in Sources */,
45D00A1A2B1FD0E3007D2B65 /* String+ParseUrls.swift in Sources */,
45B6481625E58ECC0098BAF1 /* BuildFile in Sources */,
45B6481625E58ECC0098BAF1 /* (null) in Sources */,
45F3AF062B5EC0A600CE8D41 /* PageNavigationCollectionViewFlowLayout.swift in Sources */,
45CBDA042BA38F200007DEC8 /* LaunchCountCache.swift in Sources */,
45F71629290A12D70019B715 /* WebContentType.swift in Sources */,
Expand Down Expand Up @@ -12604,7 +12593,7 @@
45B3382F2AF42A6400D18C63 /* TutorialInterfaceStringsDomainModel.swift in Sources */,
D4E7EE262CA5E62B00F75DA6 /* StoreUserLessonProgressRepository.swift in Sources */,
D4E7EE1A2CA345DD00F75DA6 /* UserLessonProgressRepository.swift in Sources */,
45B6480B25E581660098BAF1 /* BuildFile in Sources */,
45B6480B25E581660098BAF1 /* (null) in Sources */,
458B91B12B7D5D6800785C6F /* ConfirmRemoveToolFromFavoritesAlertViewModel.swift in Sources */,
4512D4D32B29127C00DFAFB3 /* GetToolSettingsToolLanguagesListInterfaceStringsRepository.swift in Sources */,
4534F93B2AE9B11600A7A071 /* RealmLessonEvaluation.swift in Sources */,
Expand Down Expand Up @@ -12712,7 +12701,7 @@
459BF77E2AFEE0320053BA09 /* ToolScreenShareTutorialViewDataModel.swift in Sources */,
45EB9B7229F16CF200CA74A8 /* UILabel+AttributedString.swift in Sources */,
45B54C572A2641FE0042CD0E /* RealmDatabase+Read.swift in Sources */,
45B6482025E58EE70098BAF1 /* BuildFile in Sources */,
45B6482025E58EE70098BAF1 /* (null) in Sources */,
45645C162AFE774900BD233D /* GetShareToolScreenShareSessionInterfaceStringsRepository.swift in Sources */,
45AD1BD925938A4F00A096A0 /* AlertMessageView.swift in Sources */,
4512D4DD2B29129100DFAFB3 /* ToolSettingsToolLanguagesListItemView.swift in Sources */,
Expand Down Expand Up @@ -12785,7 +12774,6 @@
4534F91E2AE99EAA00A7A071 /* GetLessonEvaluationInterfaceStringsRepositoryInterface.swift in Sources */,
458B91AF2B7D5D6800785C6F /* YourFavoriteToolsHeaderView.swift in Sources */,
D455F3FE29805BF0009D5F93 /* GetUserActivityBadgeUseCase.swift in Sources */,
D4960CD02CE429D80090B114 /* VisualEffectView.swift in Sources */,
4534F9282AE9A15E00A7A071 /* LessonEvaluationInterfaceStringsDomainModel.swift in Sources */,
45880D812BD2BA97008F021C /* ShareGodToolsView.swift in Sources */,
456BD2CC27020C75004D7B19 /* MobileContentViewHeightConstraintType.swift in Sources */,
Expand Down Expand Up @@ -12881,7 +12869,7 @@
45C8835D2A93EDDF00F33E6D /* DashboardTabBarItemView.swift in Sources */,
4504BA282AF3EE67001151E5 /* GetTutorialUseCase.swift in Sources */,
459F86862AC51A9A00B4E5CA /* ChooseAppLanguageNavigationFlow.swift in Sources */,
45B6480925E581660098BAF1 /* BuildFile in Sources */,
45B6480925E581660098BAF1 /* (null) in Sources */,
45EB9B8329F16CF200CA74A8 /* Color+RGB.swift in Sources */,
45558407269F2DA500C3FF14 /* MobileContentPagesViewModel.swift in Sources */,
45ACCA582CD2BFBB00567AE6 /* AppMessagingInterface.swift in Sources */,
Expand Down Expand Up @@ -13098,7 +13086,7 @@
45BE4A812AF287D2004021DA /* ConfirmAppLanguageViewModel.swift in Sources */,
45AE975527C97A9500C2CB33 /* Input+MobileContentRenderableModel.swift in Sources */,
452D355A2A8FB9EB00BC4F97 /* FavoritedResourceDataModel.swift in Sources */,
459C56D325FF954F00F15967 /* BuildFile in Sources */,
459C56D325FF954F00F15967 /* (null) in Sources */,
451CCF1427A9AA4700E8D2D3 /* MobileContentViewPositionState.swift in Sources */,
45F71623290A12D70019B715 /* WebContentViewModel.swift in Sources */,
458B91AB2B7D5D6800785C6F /* FavoritesView.swift in Sources */,
Expand Down Expand Up @@ -13174,7 +13162,7 @@
45AAC2AB2BB30F0A000AE690 /* MobileContentGlobalAnalyticsDecodable.swift in Sources */,
45EB9B7329F16CF200CA74A8 /* UIButton+ImageColor.swift in Sources */,
45F378FC2B23642600EEF039 /* GetLearnToShareToolTutorialItemsRepository.swift in Sources */,
45B6482A25E593110098BAF1 /* BuildFile in Sources */,
45B6482A25E593110098BAF1 /* (null) in Sources */,
D42FEBD62875D8D50002FAD9 /* GetOptInOnboardingTutorialAvailableUseCase.swift in Sources */,
4534F92C2AE9A99200A7A071 /* TrackLessonFeedbackDomainModel.swift in Sources */,
D40D77BF2AB36766008D3642 /* SearchBarViewModel.swift in Sources */,
Expand Down Expand Up @@ -13256,7 +13244,7 @@
458B91B02B7D5D6800785C6F /* YourFavoriteToolsView.swift in Sources */,
452DFB372B7FAAE5003A4A59 /* GetToolListItemInterfaceStringsRepository.swift in Sources */,
45369AD72AFA7FA500BD10F0 /* ToolScreenShareTutorialView.swift in Sources */,
45B6480C25E581660098BAF1 /* BuildFile in Sources */,
45B6480C25E581660098BAF1 /* (null) in Sources */,
45723DF72ABA24CE00C697E6 /* MobileContentApiErrorCodableCode.swift in Sources */,
45369AD42AFA7FA500BD10F0 /* ToolScreenShareTutorialPageDomainModel.swift in Sources */,
455582E5269F2C1000C3FF14 /* TrainingTipView.swift in Sources */,
Expand Down Expand Up @@ -13393,7 +13381,7 @@
4585BF662AC391F100A6D720 /* SetUserPreferredAppLanguageRepositoryInterface.swift in Sources */,
45F378FF2B23642600EEF039 /* LearnToShareToolDataLayerDependencies.swift in Sources */,
45B3F44A2AC3A86100D61BFD /* UserAppLanguageRepository.swift in Sources */,
45B6482825E593110098BAF1 /* BuildFile in Sources */,
45B6482825E593110098BAF1 /* (null) in Sources */,
45A835102AD1A40D004F5593 /* GetToolDetailsMediaUseCase.swift in Sources */,
4534F9462AE9B8E700A7A071 /* GetLessonEvaluatedUseCase.swift in Sources */,
45F378FD2B23642600EEF039 /* LearnToShareToolDomainLayerDependencies.swift in Sources */,
Expand Down Expand Up @@ -14257,7 +14245,7 @@
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = DQ48D9BF2V;
DISPLAY_NAME = "GT-Analytics";
INFOPLIST_FILE = godtools/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -14459,7 +14447,7 @@
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = DQ48D9BF2V;
DISPLAY_NAME = "GT-Stage";
INFOPLIST_FILE = godtools/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -14660,7 +14648,7 @@
DEVELOPMENT_TEAM = DQ48D9BF2V;
DISPLAY_NAME = "GT-Debug";
INFOPLIST_FILE = godtools/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -14861,7 +14849,7 @@
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = DQ48D9BF2V;
DISPLAY_NAME = "GT-Production";
INFOPLIST_FILE = godtools/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -15098,7 +15086,7 @@
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = DQ48D9BF2V;
DISPLAY_NAME = GodTools;
INFOPLIST_FILE = godtools/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
11 changes: 3 additions & 8 deletions ...UserLessonProgress/Presentation/ResumeLessonProgressModal/ResumeLessonProgressModal.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,9 @@ struct ResumeLessonProgressModal: View {
let buttonWidth = (modalWidth - totalSpaceAroundButtons) / 2

ZStack {
if #available(iOS 15.0, *) {
Color.clear
.edgesIgnoringSafeArea(.all)
.background(.ultraThinMaterial)
} else {
VisualEffectView(effect: UIBlurEffect(style: .systemUltraThinMaterial))
.edgesIgnoringSafeArea(.all)
}
Color.clear
.edgesIgnoringSafeArea(.all)
.background(.ultraThinMaterial)

VStack(spacing: 0) {
Text(viewModel.interfaceStringsDomainModel.title)
Expand Down
23 changes: 0 additions & 23 deletions godtools/App/Share/SwiftUI Views/VisualEffectView/VisualEffectView.swift
View file

This file was deleted.

0 comments on commit 7f367ba

Please sign in to comment.