Skip to content

Commit 12ff5b7

Browse files
authored
Merge pull request #645 from jvallori/fix/remove-uiviewlayoutregion-xcode16
fix(ios): Remove undeclared UIViewLayoutRegion for iOS 18/Xcode 16 compatibility
2 parents f876c1f + 8867016 commit 12ff5b7

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Objective-C/TOCropViewController/TOCropViewController.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,11 +274,13 @@ - (CGRect)frameForToolbarWithVerticalLayout:(BOOL)verticalLayout {
274274
// fix: On iOS 26, overlay with iPadOS windowingControl area.
275275
if (@available(iOS 26.0, *)) {
276276
if (!verticalLayout) {
277+
#if __IPHONE_OS_VERSION_MAX_ALLOWED < 180000
277278
UIViewLayoutRegion *layoutRegion = [UIViewLayoutRegion safeAreaLayoutRegionWithCornerAdaptation: UIViewLayoutRegionAdaptivityAxisVertical];
278279
UIEdgeInsets edgeInsets = [self.view edgeInsetsForLayoutRegion:layoutRegion];
279280
insets.top = edgeInsets.top;
280281
insets.left = edgeInsets.left;
281282
insets.bottom = edgeInsets.bottom;
283+
#endif
282284
}
283285
}
284286

Objective-C/TOCropViewController/Views/TOCropToolbar.m

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ - (void)setup {
126126
if (@available(iOS 26.0, *)) {
127127
#if !TARGET_OS_VISION
128128
UIButtonConfiguration *configuration = [UIButtonConfiguration prominentGlassButtonConfiguration];
129-
configuration.baseForegroundColor = [UIColor blackColor];
129+
configuration.baseForegroundColor = [UIColor labelColor];
130130
#else
131131
UIButtonConfiguration *configuration = [UIButtonConfiguration filledButtonConfiguration];
132132
#endif
@@ -156,7 +156,9 @@ - (void)setup {
156156
#if defined(__IPHONE_26_0)
157157
if (@available(iOS 26.0, *)) {
158158
#if !TARGET_OS_VISION
159-
_cancelIconButton.configuration = [UIButtonConfiguration clearGlassButtonConfiguration];
159+
UIButtonConfiguration *cancelConfiguration = [UIButtonConfiguration clearGlassButtonConfiguration];
160+
cancelConfiguration.baseForegroundColor = [UIColor labelColor];
161+
_cancelIconButton.configuration = cancelConfiguration;
160162
#else
161163
_cancelIconButton.configuration = [UIButtonConfiguration filledButtonConfiguration];
162164
#endif

0 commit comments

Comments
 (0)