Skip to content

Commit

Permalink
Merge branch 'develop' into setting/#198
Browse files Browse the repository at this point in the history
  • Loading branch information
@mini-min
mini-min committed Sep 28, 2024
2 parents ade5a42 + 3580308 commit 3001619
Show file tree
Hide file tree
Showing 15 changed files with 464 additions and 90 deletions.
50 changes: 50 additions & 0 deletions TOASTER-iOS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,17 @@
3913B0B02BCECFC80031A3EB /* UpdateAlertType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3913B0AF2BCECFC80031A3EB /* UpdateAlertType.swift */; };
391908422B56CFE4006F978A /* PatchEditPriorityCategoryRequestDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 391908412B56CFE4006F978A /* PatchEditPriorityCategoryRequestDTO.swift */; };
391908442B56D027006F978A /* PatchEditNameCategoryRequestDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 391908432B56D027006F978A /* PatchEditNameCategoryRequestDTO.swift */; };
396DCDF42CA19EC600FEF7C8 /* PatchPopupHiddenResponseDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 396DCDF32CA19EC600FEF7C8 /* PatchPopupHiddenResponseDTO.swift */; };
396DCDF52CA19EC600FEF7C8 /* PatchPopupHiddenResponseDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 396DCDF32CA19EC600FEF7C8 /* PatchPopupHiddenResponseDTO.swift */; };
396DCDF72CA19EFD00FEF7C8 /* PopupAPIService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 396DCDF62CA19EFD00FEF7C8 /* PopupAPIService.swift */; };
396DCDF82CA19EFD00FEF7C8 /* PopupAPIService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 396DCDF62CA19EFD00FEF7C8 /* PopupAPIService.swift */; };
396DCDFA2CA19F2000FEF7C8 /* PopupTargetType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 396DCDF92CA19F2000FEF7C8 /* PopupTargetType.swift */; };
396DCDFB2CA19F2000FEF7C8 /* PopupTargetType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 396DCDF92CA19F2000FEF7C8 /* PopupTargetType.swift */; };
396DCDFD2CA19F4500FEF7C8 /* PatchPopupHiddenRequestDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 396DCDFC2CA19F4500FEF7C8 /* PatchPopupHiddenRequestDTO.swift */; };
396DCDFE2CA19F4500FEF7C8 /* PatchPopupHiddenRequestDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 396DCDFC2CA19F4500FEF7C8 /* PatchPopupHiddenRequestDTO.swift */; };
396DCE002CA19F5C00FEF7C8 /* GetPopupInfoResponseDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 396DCDFF2CA19F5C00FEF7C8 /* GetPopupInfoResponseDTO.swift */; };
396DCE012CA19F5C00FEF7C8 /* GetPopupInfoResponseDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 396DCDFF2CA19F5C00FEF7C8 /* GetPopupInfoResponseDTO.swift */; };
396DCE032CA26C6600FEF7C8 /* PopupInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 396DCE022CA26C6600FEF7C8 /* PopupInfoModel.swift */; };
398ACFDC2B5E77FA00D5EE77 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 398ACFDB2B5E77FA00D5EE77 /* Colors.xcassets */; };
398BE7F32B456367001595E0 /* ToasterToastMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 398BE7F22B456367001595E0 /* ToasterToastMessageView.swift */; };
398BE7F62B456AF9001595E0 /* BottomType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 398BE7F52B456AF9001595E0 /* BottomType.swift */; };
Expand Down Expand Up @@ -323,6 +334,12 @@
3913B0AF2BCECFC80031A3EB /* UpdateAlertType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateAlertType.swift; sourceTree = "<group>"; };
391908412B56CFE4006F978A /* PatchEditPriorityCategoryRequestDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PatchEditPriorityCategoryRequestDTO.swift; sourceTree = "<group>"; };
391908432B56D027006F978A /* PatchEditNameCategoryRequestDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PatchEditNameCategoryRequestDTO.swift; sourceTree = "<group>"; };
396DCDF32CA19EC600FEF7C8 /* PatchPopupHiddenResponseDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PatchPopupHiddenResponseDTO.swift; sourceTree = "<group>"; };
396DCDF62CA19EFD00FEF7C8 /* PopupAPIService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopupAPIService.swift; sourceTree = "<group>"; };
396DCDF92CA19F2000FEF7C8 /* PopupTargetType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopupTargetType.swift; sourceTree = "<group>"; };
396DCDFC2CA19F4500FEF7C8 /* PatchPopupHiddenRequestDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PatchPopupHiddenRequestDTO.swift; sourceTree = "<group>"; };
396DCDFF2CA19F5C00FEF7C8 /* GetPopupInfoResponseDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetPopupInfoResponseDTO.swift; sourceTree = "<group>"; };
396DCE022CA26C6600FEF7C8 /* PopupInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopupInfoModel.swift; sourceTree = "<group>"; };
398ACFDB2B5E77FA00D5EE77 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = "<group>"; };
398BE7F22B456367001595E0 /* ToasterToastMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToasterToastMessageView.swift; sourceTree = "<group>"; };
398BE7F52B456AF9001595E0 /* BottomType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomType.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -601,6 +618,26 @@
path = UpdateAlert;
sourceTree = "<group>";
};
396DCDE22CA199E800FEF7C8 /* Popup */ = {
isa = PBXGroup;
children = (
396DCDE32CA19A0400FEF7C8 /* DTO */,
396DCDF92CA19F2000FEF7C8 /* PopupTargetType.swift */,
396DCDF62CA19EFD00FEF7C8 /* PopupAPIService.swift */,
);
path = Popup;
sourceTree = "<group>";
};
396DCDE32CA19A0400FEF7C8 /* DTO */ = {
isa = PBXGroup;
children = (
396DCDFF2CA19F5C00FEF7C8 /* GetPopupInfoResponseDTO.swift */,
396DCDFC2CA19F4500FEF7C8 /* PatchPopupHiddenRequestDTO.swift */,
396DCDF32CA19EC600FEF7C8 /* PatchPopupHiddenResponseDTO.swift */,
);
path = DTO;
sourceTree = "<group>";
};
398ACFDA2B5E77C500D5EE77 /* Assets */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -965,6 +1002,7 @@
6BE6DA792B5456FE008B06FA /* Toaster */,
6BE6DA8D2B546EE2008B06FA /* Timer */,
6BE6DAA92B547978008B06FA /* Search */,
396DCDE22CA199E800FEF7C8 /* Popup */,
);
path = Network;
sourceTree = "<group>";
Expand Down Expand Up @@ -1531,6 +1569,7 @@
8305179C2B4D3701009FFB60 /* MainInfoModel.swift */,
83CFC3362B564F1100A2EB2B /* WeeklyLinkModel.swift */,
83CFC3382B568BE700A2EB2B /* RecommendSiteModel.swift */,
396DCE022CA26C6600FEF7C8 /* PopupInfoModel.swift */,
);
path = Model;
sourceTree = "<group>";
Expand Down Expand Up @@ -1770,6 +1809,7 @@
buildActionMask = 2147483647;
files = (
3F3ED28A2BA1A456004E79F0 /* AuthTargetType.swift in Sources */,
396DCDFD2CA19F4500FEF7C8 /* PatchPopupHiddenRequestDTO.swift in Sources */,
3F3ED28B2BA1A456004E79F0 /* PostSocialLoginResponseDTO.swift in Sources */,
3F1F261D2BAA98C8004F75CE /* RemindClipModel.swift in Sources */,
3F3ED28C2BA1A456004E79F0 /* PostRefreshTokenResponseDTO.swift in Sources */,
Expand All @@ -1794,10 +1834,12 @@
3F3ED2922BA1A45F004E79F0 /* GetSettingPageResponseDTO.swift in Sources */,
3F3ED2932BA1A45F004E79F0 /* GetMyPageResponseDTO.swift in Sources */,
3F3ED2B62BA1D6C8004E79F0 /* UILabel+.swift in Sources */,
396DCDF42CA19EC600FEF7C8 /* PatchPopupHiddenResponseDTO.swift in Sources */,
3FE00F0B2BC6328900CC821E /* MoyaPlugin.swift in Sources */,
3F1F261B2BAA9820004F75CE /* RemindSelectClipCollectionViewCell.swift in Sources */,
83474A6C2BED072A009B9C48 /* ToasterAPIService.swift in Sources */,
3F3ED29E2BA1A478004E79F0 /* TimerAPIService.swift in Sources */,
396DCE002CA19F5C00FEF7C8 /* GetPopupInfoResponseDTO.swift in Sources */,
3F3ED29F2BA1A478004E79F0 /* GetTimerMainpageResponseDTO.swift in Sources */,
3F3ED2A02BA1A478004E79F0 /* TimerTargetType.swift in Sources */,
3F3ED2AA2BA1AAB7004E79F0 /* FontLiterals.swift in Sources */,
Expand All @@ -1821,11 +1863,13 @@
3F3ED2A92BA1AAB4004E79F0 /* StringLiterals.swift in Sources */,
3F3ED2A22BA1A47E004E79F0 /* GetMainPageSearchResponseDTO.swift in Sources */,
3F3ED2A32BA1A47E004E79F0 /* SearchTargetType.swift in Sources */,
396DCDFB2CA19F2000FEF7C8 /* PopupTargetType.swift in Sources */,
3F3ED2A42BA1A47E004E79F0 /* GetRecommendSiteResponseDTO.swift in Sources */,
3F3ED2A52BA1A47E004E79F0 /* SearchAPIService.swift in Sources */,
3F3ED2962BA1A46B004E79F0 /* PostSaveLinkRequestDTO.swift in Sources */,
3F3ED2882BA1A400004E79F0 /* PatchEditPriorityCategoryRequestDTO.swift in Sources */,
3FE00F082BC5076200CC821E /* PostTokenHealthResponseDTO.swift in Sources */,
396DCDF72CA19EFD00FEF7C8 /* PopupAPIService.swift in Sources */,
3F3ED2842BA1A3FD004E79F0 /* GetCheckCategoryResponseDTO.swift in Sources */,
3F3ED2852BA1A3FD004E79F0 /* GetDetailCategoryResponseDTO.swift in Sources */,
3F3ED2802BA1A2B0004E79F0 /* APIInterceptor.swift in Sources */,
Expand All @@ -1847,9 +1891,11 @@
6BE6D9E22B4E9B58008B06FA /* CompleteTimerCollectionViewCell.swift in Sources */,
3F2FA1792B45C46F00EDBF95 /* KakaoAuthenticateAdapter.swift in Sources */,
6BE6DA342B50594B008B06FA /* MoyaPlugin.swift in Sources */,
396DCDFA2CA19F2000FEF7C8 /* PopupTargetType.swift in Sources */,
6BE6D9D82B4E8A03008B06FA /* RemindAlarmOffViewType.swift in Sources */,
398BE7F62B456AF9001595E0 /* BottomType.swift in Sources */,
8364220C2BE7BFB2005C4085 /* PatchEditLinkTitleResponseDTO.swift in Sources */,
396DCDF82CA19EFD00FEF7C8 /* PopupAPIService.swift in Sources */,
3913B0B02BCECFC80031A3EB /* UpdateAlertType.swift in Sources */,
6BE6DA5B2B50B46F008B06FA /* GetMainPageResponseDTO.swift in Sources */,
3F2FA1772B45C3E000EDBF95 /* AuthenticationAdapterProtocol.swift in Sources */,
Expand Down Expand Up @@ -1886,6 +1932,7 @@
830517652B42D996009FFB60 /* StringLiterals.swift in Sources */,
8305178C2B4D1E64009FFB60 /* WeeklyLinkCollectionViewCell.swift in Sources */,
8315CD842B501BC70061F377 /* UserClipEmptyCollectionViewCell.swift in Sources */,
396DCE032CA26C6600FEF7C8 /* PopupInfoModel.swift in Sources */,
6BC493812B4D88E200544249 /* SearchViewModel.swift in Sources */,
6BE6DA942B546FCB008B06FA /* PostCreateTimerRequestDTO.swift in Sources */,
6BE6DA042B4F2AF5008B06FA /* RemindSelectClipCollectionViewCell.swift in Sources */,
Expand Down Expand Up @@ -1954,7 +2001,9 @@
6BE6DA9A2B54747B008B06FA /* TimerAPIService.swift in Sources */,
6BE6DA882B546B24008B06FA /* PatchOpenLinkResponseDTO.swift in Sources */,
6BE6DA752B50C373008B06FA /* GetCheckCategoryResponseDTO.swift in Sources */,
396DCE012CA19F5C00FEF7C8 /* GetPopupInfoResponseDTO.swift in Sources */,
6BE6D9EF2B4EE98D008B06FA /* RemindModel.swift in Sources */,
396DCDFE2CA19F4500FEF7C8 /* PatchPopupHiddenRequestDTO.swift in Sources */,
6BE6DA6B2B50BFED008B06FA /* NoneDataResponseDTO.swift in Sources */,
391908422B56CFE4006F978A /* PatchEditPriorityCategoryRequestDTO.swift in Sources */,
6BE6DA732B50C33A008B06FA /* GetAllCategoryResponseDTO.swift in Sources */,
Expand Down Expand Up @@ -1984,6 +2033,7 @@
6BE6DAAD2B547A77008B06FA /* SearchTargetType.swift in Sources */,
6B6AE6512B3FF101000E2366 /* SceneDelegate.swift in Sources */,
3FACF9B82B4FE306007E5A8F /* KeyChainService.swift in Sources */,
396DCDF52CA19EC600FEF7C8 /* PatchPopupHiddenResponseDTO.swift in Sources */,
3F2FA1812B4A32A200EDBF95 /* LogoutUseCase.swift in Sources */,
6BE6D9D62B4E8935008B06FA /* RemindAlarmOffView.swift in Sources */,
3FA56CD72B85C76B00B9FCFE /* OnboardingViewController.swift in Sources */,
Expand Down
11 changes: 7 additions & 4 deletions TOASTER-iOS/Application/SceneDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,13 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {

if let pasteboardString = UIPasteboard.general.url {
if appDelegate.isLogin {
if let rootViewController = window?.rootViewController as? ToasterNavigationController {
let addLinkViewController = AddLinkViewController()
rootViewController.pushViewController(addLinkViewController, animated: true)
addLinkViewController.embedURL(url: UIPasteboard.general.string ?? "")
guard let rootVC = window?.rootViewController as? ToasterNavigationController else { return }
let addLinkViewController = AddLinkViewController()
rootVC.pushViewController(addLinkViewController, animated: true)
addLinkViewController.embedURL(url: UIPasteboard.general.string ?? "")

if let presentedVC = rootVC.presentedViewController {
presentedVC.dismiss(animated: false)
}
}
}
Expand Down
Loading

0 comments on commit 3001619

Please sign in to comment.