Skip to content

Commit

Permalink
Merge pull request ParkGwangBeom#4 from KimTaeHyeong17/add_topgradien…
Browse files Browse the repository at this point in the history 
…tview

sheet 에 topGradientView 추가
  • Loading branch information
@grayjang
grayjang authored Jul 2, 2024
2 parents 1e78a79 + 8aeb7a1 commit 343b0e7
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 10 deletions.
23 changes: 14 additions & 9 deletions Sheet.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
4AEF0F4B2162441200FF034E /* UIEdgeInsets+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AEF0F49216243C000FF034E /* UIEdgeInsets+Extension.swift */; };
4AEF0F4E216244A100FF034E /* Optional+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AEF0F4C2162449F00FF034E /* Optional+Extension.swift */; };
4AEF0F5121624BF400FF034E /* MoveItemViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AEF0F5021624BF400FF034E /* MoveItemViewController.swift */; };
8381AA602C3246F5004D10DD /* SheetGradientView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8381AA5F2C3246F5004D10DD /* SheetGradientView.swift */; };
8933C7851EB5B820000D00A4 /* Sheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8933C7841EB5B820000D00A4 /* Sheet.swift */; };
CE4924A3226FFD9C00033244 /* FullViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4924A2226FFD9C00033244 /* FullViewController.swift */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -105,6 +106,7 @@
4AEF0F4C2162449F00FF034E /* Optional+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Optional+Extension.swift"; sourceTree = "<group>"; };
4AEF0F5021624BF400FF034E /* MoveItemViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoveItemViewController.swift; sourceTree = "<group>"; };
52D6D97C1BEFF229002C0205 /* Sheet.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Sheet.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8381AA5F2C3246F5004D10DD /* SheetGradientView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SheetGradientView.swift; sourceTree = "<group>"; };
8933C7841EB5B820000D00A4 /* Sheet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Sheet.swift; sourceTree = "<group>"; };
8933C7891EB5B82A000D00A4 /* SheetTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SheetTests.swift; sourceTree = "<group>"; };
AD2FAA261CD0B6D800659CF4 /* Sheet.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Sheet.plist; sourceTree = "<group>"; };
Expand Down Expand Up @@ -253,6 +255,7 @@
4AEF0EEA216235F100FF034E /* Animator */,
4AEF0F4F216244CD00FF034E /* Extensions */,
8933C7841EB5B820000D00A4 /* Sheet.swift */,
8381AA5F2C3246F5004D10DD /* SheetGradientView.swift */,
);
path = Sources;
sourceTree = "<group>";
Expand Down Expand Up @@ -344,11 +347,12 @@
TargetAttributes = {
4AEF0F05216236A600FF034E = {
CreatedOnToolsVersion = 9.3;
DevelopmentTeam = SV5LTS7ED5;
DevelopmentTeam = LJV6HBLFS3;
ProvisioningStyle = Automatic;
};
52D6D97B1BEFF229002C0205 = {
CreatedOnToolsVersion = 7.1;
DevelopmentTeam = LJV6HBLFS3;
LastSwiftMigration = 0800;
};
};
Expand Down Expand Up @@ -421,6 +425,7 @@
buildActionMask = 2147483647;
files = (
4AEF0EFE216235F200FF034E /* SheetDecorationView.swift in Sources */,
8381AA602C3246F5004D10DD /* SheetGradientView.swift in Sources */,
4AEF0F4E216244A100FF034E /* Optional+Extension.swift in Sources */,
4AEF0F4521623FDD00FF034E /* SheetLayoutElement.swift in Sources */,
4AEF0F4221623F4600FF034E /* SheetManager.swift in Sources */,
Expand Down Expand Up @@ -465,10 +470,10 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = SV5LTS7ED5;
DEVELOPMENT_TEAM = LJV6HBLFS3;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = Example/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.Gwangbeom.Example;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -494,10 +499,10 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = SV5LTS7ED5;
DEVELOPMENT_TEAM = LJV6HBLFS3;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = Example/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.Gwangbeom.Example;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -626,9 +631,9 @@
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
CODE_SIGN_IDENTITY = "Apple Development";
DEFINES_MODULE = YES;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = LJV6HBLFS3;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
Expand All @@ -652,9 +657,9 @@
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
CODE_SIGN_IDENTITY = "Apple Development";
DEFINES_MODULE = YES;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = LJV6HBLFS3;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
Expand Down
46 changes: 45 additions & 1 deletion Sources/Controller/SheetContentsViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,25 @@
import UIKit

open class SheetContentsViewController: UICollectionViewController, SheetContent {
private var sheetTopGradientView: SheetGradientView?

private var options: SheetOptions {
return SheetManager.shared.options
}

private var layout = SheetContentsLayout()
private var isSheetTopGradientViewAnimating = false

public var topMargin: CGFloat = 0

open var sheetTopGradientViewHeight: CGFloat? {
return nil
}

private var statusBarHeight: CGFloat {
return UIApplication.shared.windows.first { $0.isKeyWindow }?.windowScene?.statusBarManager?.statusBarFrame.height ?? 0
}

public var contentScrollView: UIScrollView {
return collectionView
}
Expand Down Expand Up @@ -72,7 +82,29 @@ open class SheetContentsViewController: UICollectionViewController, SheetContent
}

open override func scrollViewDidScroll(_ scrollView: UIScrollView) {
topMargin = max(layout.settings.topMargin - scrollView.contentOffset.y, 0)
let yOffset = scrollView.contentOffset.y
topMargin = max(layout.settings.topMargin - yOffset, 0)

guard !isSheetTopGradientViewAnimating, let sheetTopGradientView = sheetTopGradientView else { return }
if topMargin < statusBarHeight && sheetTopGradientView.isHidden == true {
isSheetTopGradientViewAnimating = true
sheetTopGradientView.alpha = 0.0
sheetTopGradientView.isHidden = false
UIView.animate(withDuration: 0.2, animations: { [weak self] in
sheetTopGradientView.alpha = 1.0
self?.view.bringSubviewToFront(sheetTopGradientView)
}, completion: { [weak self] _ in
self?.isSheetTopGradientViewAnimating = false
})
} else if topMargin >= statusBarHeight && sheetTopGradientView.isHidden == false {
isSheetTopGradientViewAnimating = true
UIView.animate(withDuration: 0.2, animations: {
sheetTopGradientView.alpha = 0.0
}, completion: { [weak self] _ in
sheetTopGradientView.isHidden = true
self?.isSheetTopGradientViewAnimating = false
})
}
}

open override func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer<CGPoint>) {
Expand Down Expand Up @@ -128,6 +160,18 @@ private extension SheetContentsViewController {
view.backgroundColor = .clear
setupContainerView()
setupDimmingView()
setupTopGradientView()
}

func setupTopGradientView() {
guard let sheetTopGradientViewHeight else { return }
sheetTopGradientView = SheetGradientView(frame: CGRect(x: 0, y: 0, width: view.bounds.width, height: sheetTopGradientViewHeight))
guard let sheetTopGradientView else { return }
let backgroundColor = options.dimmingViewBackgroundColor
sheetTopGradientView.isHidden = true
view.addSubview(sheetTopGradientView)
let topGradientLayer = sheetTopGradientView.layer as? CAGradientLayer
topGradientLayer?.colors = [backgroundColor.cgColor, backgroundColor.cgColor, backgroundColor.withAlphaComponent(0).cgColor]
}

func setupContainerView() {
Expand Down
15 changes: 15 additions & 0 deletions Sources/SheetGradientView.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// SheetGradientView.swift
// Sheet-iOS
//
// Created by taeHyeongKim on 7/1/24.
// Copyright © 2024 Interactive. All rights reserved.
//

import UIKit

class SheetGradientView: UIView {
override final class var layerClass: AnyClass {
return CAGradientLayer.self
}
}

0 comments on commit 343b0e7

Please sign in to comment.