Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 12 additions & 2 deletions NextcloudTalk/Chat/BaseChatViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,12 @@ import SwiftUI
self?.tableView?.slk_scrollToBottom(animated: true)
})

button.backgroundColor = .secondarySystemBackground
if #available(iOS 26.0, *) {
button.configuration = .glass()
} else {
button.backgroundColor = .secondarySystemBackground
}

button.tintColor = .systemBlue
button.layer.cornerRadius = 8
button.clipsToBounds = true
Expand All @@ -181,7 +186,12 @@ import SwiftUI
private lazy var voiceRecordingLockButton: UIButton = {
let button = UIButton(frame: .init(x: 0, y: 0, width: 44, height: 44))

button.backgroundColor = .secondarySystemBackground
if #available(iOS 26.0, *) {
button.configuration = .glass()
} else {
button.backgroundColor = .secondarySystemBackground
}

button.tintColor = .systemBlue
button.layer.cornerRadius = button.frame.size.height / 2
button.clipsToBounds = true
Expand Down
29 changes: 25 additions & 4 deletions NextcloudTalk/Chat/Chat views/OutOfOfficeView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,32 @@ import SwiftyAttributes
addSubview(contentView)
contentView.frame = frame
contentView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
contentView.backgroundColor = .systemBackground

leftIndicator.backgroundColor = NCAppBranding.themeColor()
backgroundView.backgroundColor = NCAppBranding.themeColor().withAlphaComponent(0.3)
wrapperView.backgroundColor = .systemBackground
if #available(iOS 26.0, *) {
let effectView = UIVisualEffectView()
wrapperView.insertSubview(effectView, at: 0)

let glassEffect = UIGlassEffect(style: .regular)
effectView.effect = glassEffect
effectView.translatesAutoresizingMaskIntoConstraints = false

NSLayoutConstraint.activate([
effectView.leftAnchor.constraint(equalTo: wrapperView.leftAnchor),
effectView.rightAnchor.constraint(equalTo: wrapperView.rightAnchor),
effectView.topAnchor.constraint(equalTo: wrapperView.topAnchor),
effectView.bottomAnchor.constraint(equalTo: wrapperView.bottomAnchor)
])

contentView.backgroundColor = .clear
backgroundView.backgroundColor = .clear
wrapperView.backgroundColor = .clear
} else {
contentView.backgroundColor = .systemBackground
backgroundView.backgroundColor = NCAppBranding.elementColorBackground()
wrapperView.backgroundColor = .systemBackground
}

leftIndicator.backgroundColor = NCAppBranding.elementColor()
wrapperView.layer.cornerRadius = 8
wrapperView.layer.masksToBounds = true

Expand Down
10 changes: 5 additions & 5 deletions NextcloudTalk/Chat/Chat views/OutOfOfficeView.xib
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="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="24128" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24063"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand All @@ -27,13 +27,13 @@
<rect key="frame" x="0.0" y="0.0" width="592" height="291"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7a4-gY-YTH" userLabel="UIMenu Button">
<button opaque="NO" alpha="0.0" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7a4-gY-YTH" userLabel="UIMenu Button">
<rect key="frame" x="0.0" y="259" width="592" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="frJ-v3-j3R"/>
</constraints>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="plain" title="Button"/>
<buttonConfiguration key="configuration" style="plain"/>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NAY-L9-7WT" userLabel="WrapperView">
<rect key="frame" x="8" y="8" width="576" height="275"/>
Expand Down Expand Up @@ -119,7 +119,7 @@
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
<systemColor name="systemBlueColor">
<color red="0.0" green="0.47843137254901963" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
</resources>
</document>
Loading