Skip to content

Simpler iOS 26 look #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nighthawk merged 7 commits into from
Dec 10, 2025
Merged

Simpler iOS 26 look #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6fad9a5
So far so good
nighthawk Dec 4, 2025
6356b01
Fine intermediate
nighthawk Dec 4, 2025
793cf5f
Fix the scroll don't tap issue
nighthawk Dec 4, 2025
49cdc4d
Add SECURITY.md (#24)
MarianoTucat Nov 16, 2025
a3749d3
Merge branch 'main' into simpler-ios26
nighthawk Dec 4, 2025
9e03d26
Add visual effect view behind header view, manged by TGCardVC
nighthawk Dec 4, 2025
7ce0cd9
Fix push/pop animations on iOS 26
nighthawk Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
235 changes: 79 additions & 156 deletions Sources/TGCardViewController/TGCardViewController.swift
View file
Open in desktop

Large diffs are not rendered by default.

112 changes: 59 additions & 53 deletions Sources/TGCardViewController/TGCardViewController.xib
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Sources/TGCardViewController/cards/TGPageCardView.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="24123.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24062"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand All @@ -13,7 +13,7 @@
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" directionalLockEnabled="YES" pagingEnabled="YES" showsHorizontalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="M2M-B9-req">
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" pagingEnabled="YES" translatesAutoresizingMaskIntoConstraints="NO" id="M2M-B9-req">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<subviews>
<view contentMode="scaleToFill" placeholderIntrinsicWidth="375" placeholderIntrinsicHeight="infinite" translatesAutoresizingMaskIntoConstraints="NO" id="rn6-Dh-JCt" userLabel="Content View">
Expand Down
9 changes: 0 additions & 9 deletions Sources/TGCardViewController/cards/TGPageHeaderView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ public class TGPageHeaderView: TGHeaderView {
@IBOutlet weak var accessoryWrapperView: UIView!
@IBOutlet weak var accessoryWrapperHeightConstraint: NSLayoutConstraint!

@IBOutlet weak var accessoryLeadingConstraint: NSLayoutConstraint!
@IBOutlet weak var accessoryTrailingConstraint: NSLayoutConstraint!
@IBOutlet weak var buttonTrailingConstraint: NSLayoutConstraint!

Expand All @@ -27,14 +26,6 @@ public class TGPageHeaderView: TGHeaderView {
override public func awakeFromNib() {
super.awakeFromNib()

if #available(iOS 26.0, *) {
accessoryLeadingConstraint.constant = 0
accessoryTrailingConstraint.constant = 0
} else {
accessoryLeadingConstraint.constant = 8
accessoryTrailingConstraint.constant = 8
}

rightButton?.isHidden = true
accessoryWrapperView.isHidden = true
preferredStatusBarStyle = .default
Expand Down
13 changes: 6 additions & 7 deletions Sources/TGCardViewController/cards/TGPageHeaderView.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="24118.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="24412" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24059"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24405"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand All @@ -14,14 +14,14 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" placeholderIntrinsicWidth="200" placeholderIntrinsicHeight="44" translatesAutoresizingMaskIntoConstraints="NO" id="OCh-my-Dlb">
<rect key="frame" x="8" y="0.0" width="359" height="45"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="45"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" priority="999" constant="44" id="0l9-rR-FKT"/>
</constraints>
</view>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="252" verticalHuggingPriority="252" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Pyb-jC-raq">
<rect key="frame" x="375" y="0.5" width="46" height="44"/>
<rect key="frame" x="383" y="0.5" width="46" height="44"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="44" id="6JN-fE-ZuQ"/>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="44" id="gHy-ly-PZq"/>
Expand All @@ -34,18 +34,17 @@
</subviews>
<constraints>
<constraint firstItem="Pyb-jC-raq" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="OCh-my-Dlb" secondAttribute="trailing" constant="8" id="5Qb-fu-D1X"/>
<constraint firstAttribute="trailing" secondItem="OCh-my-Dlb" secondAttribute="trailing" constant="8" id="QJG-5Z-I6Z"/>
<constraint firstAttribute="trailing" secondItem="OCh-my-Dlb" secondAttribute="trailing" id="QJG-5Z-I6Z"/>
<constraint firstItem="OCh-my-Dlb" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" priority="750" id="QQf-ys-52l"/>
<constraint firstItem="Pyb-jC-raq" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="TgX-Dl-BGD"/>
<constraint firstItem="OCh-my-Dlb" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="aN7-j2-ag0"/>
<constraint firstItem="OCh-my-Dlb" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="iN0-l3-epB" secondAttribute="leading" constant="8" id="bei-eH-bzY"/>
<constraint firstItem="OCh-my-Dlb" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="iN0-l3-epB" secondAttribute="leading" id="bei-eH-bzY"/>
<constraint firstAttribute="bottom" secondItem="OCh-my-Dlb" secondAttribute="bottom" id="ra6-e8-MxP"/>
<constraint firstAttribute="trailing" secondItem="Pyb-jC-raq" secondAttribute="trailing" priority="250" constant="8" id="yTg-vg-Ckc"/>
</constraints>
<simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<connections>
<outlet property="accessoryLeadingConstraint" destination="bei-eH-bzY" id="0zr-w8-Dni"/>
<outlet property="accessoryTrailingConstraint" destination="QJG-5Z-I6Z" id="hbD-rl-CNm"/>
<outlet property="accessoryWrapperHeightConstraint" destination="0l9-rR-FKT" id="Y6r-2G-EG1"/>
<outlet property="accessoryWrapperView" destination="OCh-my-Dlb" id="3ch-WX-uOk"/>
Expand Down
Empty file removed Sources/TGCardViewController/cards/TGScrollHostingCard.swift
View file
Open in desktop
Empty file.
6 changes: 3 additions & 3 deletions Sources/TGCardViewController/style/TGCornerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ public class TGCornerView: UIView {
override public func layoutSubviews() {
super.layoutSubviews()

if Self.roundedCorners {
if Self.roundedCorners, false {
let radius: CGFloat
if #available(iOS 26.0, *) {
if #available(iOS 26.0, *), false {
radius = 44
} else {
radius = 16
radius = 12
}
let path = UIBezierPath(roundedRect: self.bounds,
byRoundingCorners: [.topLeft, .topRight],
Expand Down
Loading