Fixed bottom sheet rubber band effect (#113)

hhru · Jan 29, 2024 · bf745d9 · bf745d9
1 parent 3a10209
commit bf745d9
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 12 deletions.
diff --git a/Nivelir.xcodeproj/project.pbxproj b/Nivelir.xcodeproj/project.pbxproj
@@ -2444,8 +2444,9 @@
 		C057F00523CB8EEB00C2D895 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1130;
-				LastUpgradeCheck = 1400;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = HeadHunter;
 				TargetAttributes = {
 					C057F00D23CB8EEB00C2D895 = {
@@ -3380,6 +3381,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				INFOPLIST_FILE = Sources/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -3388,6 +3390,8 @@
 					"@loader_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.6.3;
+				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
+				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
 				PRODUCT_BUNDLE_IDENTIFIER = ru.hh.Nivelir;
 				PRODUCT_NAME = Nivelir;
 				SKIP_INSTALL = YES;
@@ -3408,6 +3412,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				INFOPLIST_FILE = Sources/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -3416,6 +3421,8 @@
 					"@loader_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.6.3;
+				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
+				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
 				PRODUCT_BUNDLE_IDENTIFIER = ru.hh.Nivelir;
 				PRODUCT_NAME = Nivelir;
 				SKIP_INSTALL = YES;
@@ -3473,6 +3480,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				INFOPLIST_FILE = Sources/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -3481,6 +3489,8 @@
 					"@loader_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.6.3;
+				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
+				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
 				PRODUCT_BUNDLE_IDENTIFIER = ru.hh.Nivelir;
 				PRODUCT_NAME = Nivelir;
 				SDKROOT = appletvos;
@@ -3502,6 +3512,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				INFOPLIST_FILE = Sources/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -3510,6 +3521,8 @@
 					"@loader_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.6.3;
+				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
+				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
 				PRODUCT_BUNDLE_IDENTIFIER = ru.hh.Nivelir;
 				PRODUCT_NAME = Nivelir;
 				SDKROOT = appletvos;

diff --git a/Nivelir.xcodeproj/xcshareddata/xcschemes/Nivelir iOS.xcscheme b/Nivelir.xcodeproj/xcshareddata/xcschemes/Nivelir iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Nivelir.xcodeproj/xcshareddata/xcschemes/Nivelir tvOS.xcscheme b/Nivelir.xcodeproj/xcshareddata/xcschemes/Nivelir tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Sources/Addons/BottomSheet/BottomSheet.swift b/Sources/Addons/BottomSheet/BottomSheet.swift
@@ -17,12 +17,12 @@ public struct BottomSheet {
     public let prefersWidthFollowsPreferredContentSize: Bool
     public let prefersEdgeAttachedInCompactHeight: Bool
 
+    public let rubberBandEffect: BottomSheetRubberBandEffect?
+
     public let changesAnimationOptions: BottomSheetAnimationOptions
     public let presentAnimationOptions: BottomSheetAnimationOptions
     public let dismissAnimationOptions: BottomSheetAnimationOptions
 
-    public let rubberBandEffect: BottomSheetRubberBandEffect?
-
     public let canEndEditing: (() -> Bool)?
     public let shouldDismiss: (() -> Bool)?
 
@@ -43,10 +43,10 @@ public struct BottomSheet {
         prefersScrollingExpandsHeight: Bool = true,
         prefersWidthFollowsPreferredContentSize: Bool = false,
         prefersEdgeAttachedInCompactHeight: Bool = false,
+        rubberBandEffect: BottomSheetRubberBandEffect? = .default,
         changesAnimationOptions: BottomSheetAnimationOptions = .changes,
         presentAnimationOptions: BottomSheetAnimationOptions = .transition,
         dismissAnimationOptions: BottomSheetAnimationOptions = .transition,
-        rubberBandEffect: BottomSheetRubberBandEffect? = .default,
         canEndEditing: (() -> Bool)? = nil,
         shouldDismiss: (() -> Bool)? = nil,
         didAttemptToDismiss: (() -> Void)? = nil,
@@ -66,12 +66,12 @@ public struct BottomSheet {
         self.prefersWidthFollowsPreferredContentSize = prefersWidthFollowsPreferredContentSize
         self.prefersEdgeAttachedInCompactHeight = prefersEdgeAttachedInCompactHeight
 
+        self.rubberBandEffect = rubberBandEffect
+
         self.changesAnimationOptions = changesAnimationOptions
         self.presentAnimationOptions = presentAnimationOptions
         self.dismissAnimationOptions = dismissAnimationOptions
 
-        self.rubberBandEffect = rubberBandEffect
-
         self.canEndEditing = canEndEditing
         self.shouldDismiss = shouldDismiss
 

diff --git a/Sources/Addons/BottomSheet/BottomSheetController.swift b/Sources/Addons/BottomSheet/BottomSheetController.swift
@@ -77,6 +77,10 @@ public class BottomSheetController: NSObject {
         }
     }
 
+    public var rubberBandEffect: BottomSheetRubberBandEffect? {
+        didSet { presentation?.rubberBandEffect = rubberBandEffect }
+    }
+
     public var changesAnimationOptions: BottomSheetAnimationOptions {
         didSet {
             if presentation?.changesAnimationOptions != changesAnimationOptions {
@@ -88,8 +92,6 @@ public class BottomSheetController: NSObject {
     public var presentAnimationOptions: BottomSheetAnimationOptions
     public var dismissAnimationOptions: BottomSheetAnimationOptions
 
-    public var rubberBandEffect: BottomSheetRubberBandEffect?
-
     public var canEndEditing: (() -> Bool)?
     public var shouldDismiss: (() -> Bool)?
 

diff --git a/Sources/Addons/BottomSheet/Presentation/BottomSheetPresentationController.swift b/Sources/Addons/BottomSheet/Presentation/BottomSheetPresentationController.swift
@@ -93,12 +93,17 @@ internal final class BottomSheetPresentationController: UIPresentationController
         }
     }
 
+    internal var rubberBandEffect: BottomSheetRubberBandEffect? = .default {
+        didSet {
+            layoutTransitionSubviews()
+            updateDimmingViewRatio()
+        }
+    }
+
     internal var changesAnimationOptions: BottomSheetAnimationOptions = .changes {
         didSet { transition.completionCurve = changesAnimationOptions.curve }
     }
 
-    internal var rubberBandEffect: BottomSheetRubberBandEffect? = .default
-
     internal var isEdgeAttached: Bool {
         prefersEdgeAttachedInCompactHeight || (traitCollection.verticalSizeClass != .compact)
     }