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
1 change: 0 additions & 1 deletion iOSClient/Activity/NCActivity.swift
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ class NCActivity: UIViewController, NCSharePagingContent {
tableView.separatorColor = UIColor.clear
tableView.contentInset = insets
tableView.backgroundColor = usesGroupedBackground ? .systemGroupedBackground : .systemBackground
tableView.hideTopScrollEdgeEffect()

if showComments {
setupComments()
Expand Down
2 changes: 1 addition & 1 deletion iOSClient/Albums/AlbumsViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ class AlbumsViewController: UIViewController {
}
}
.store(in: &cancellables)
let content = AnyView(rootView.id(account).environment(\.localAccount, account).hideTopScrollEdgeEffect())
let content = AnyView(rootView.id(account).environment(\.localAccount, account))

if let hostingController {
hostingController.rootView = content
Expand Down
8 changes: 0 additions & 8 deletions iOSClient/Extensions/UIView+Extension.swift
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,3 @@ extension UIView {
}
}
}

extension UIScrollView {
func hideTopScrollEdgeEffect() {
if #available(iOS 27.0, *) {
topEdgeEffect.isHidden = true
}
}
}
9 changes: 0 additions & 9 deletions iOSClient/Extensions/View+Extension.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,6 @@ extension View {
isHidden ? AnyView(self.hidden()) : AnyView(self)
}

@ViewBuilder
func hideTopScrollEdgeEffect() -> some View {
if #available(iOS 27.0, *) {
scrollEdgeEffectHidden(for: .top)
} else {
self
}
}

/// Applies the given transform if the given condition evaluates to `true`.
/// - Parameters:
/// - condition: The condition to evaluate.
Expand Down
1 change: 0 additions & 1 deletion iOSClient/GUI/ViewOnAppear.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ struct DefaultViewModifier<ViewModel: ViewOnAppearHandling>: ViewModifier {

func body(content: Content) -> some View {
content
.hideTopScrollEdgeEffect()
.onAppear {
viewModel.onViewAppear() // Call onViewAppear on view appearance
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ class NCCollectionViewCommon: UIViewController, NCAccountSettingsModelDelegate,
self.navigationController?.presentationController?.delegate = self
collectionView.alwaysBounceVertical = true
collectionView.accessibilityIdentifier = "NCCollectionViewCommon"
collectionView.hideTopScrollEdgeEffect()

view.backgroundColor = .systemBackground
collectionView.backgroundColor = .systemBackground
Expand Down
1 change: 0 additions & 1 deletion iOSClient/Notification/NCNotification.swift
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ class NCNotification: UITableViewController, NCNotificationCellDelegate {
tableView.rowHeight = UITableView.automaticDimension
tableView.estimatedRowHeight = 50.0
tableView.backgroundColor = .systemBackground
tableView.hideTopScrollEdgeEffect()

refreshControl?.action(for: .valueChanged) { _ in
Task {
Expand Down
1 change: 0 additions & 1 deletion iOSClient/Select/NCSelect.swift
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, UIAdaptivePresent

view.backgroundColor = .systemBackground
collectionView.backgroundColor = .systemBackground
collectionView.hideTopScrollEdgeEffect()

selectCommandViewSelect?.separatorView.backgroundColor = .separator

Expand Down
1 change: 0 additions & 1 deletion iOSClient/Settings/AutoUpload/NCAutoUploadView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ struct NCAutoUploadView: View {
noPermissionsView
}
}
.hideTopScrollEdgeEffect()
.navigationBarTitle(NSLocalizedString("_auto_upload_folder_", comment: ""))
.navigationBarTitleDisplayMode(.inline)
.toolbar {
Expand Down
1 change: 0 additions & 1 deletion iOSClient/Settings/Helpers/NCAcknowledgementsView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ struct NCAcknowledgementsView: View {
}
}
}
.hideTopScrollEdgeEffect()
.navigationBarTitle(Text(NSLocalizedString("_autoupload_description_", comment: "")), displayMode: .inline)
.onAppear {
loadRTF()
Expand Down
1 change: 0 additions & 1 deletion iOSClient/Settings/SelectAlbum/SelectAlbumView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ struct SelectAlbumView: View {
AlbumView(model: model, selectedAlbums: $selectedAlbums, albums: model.userAlbums, sectionTitle: "_albums_")
}
}
.hideTopScrollEdgeEffect()
.safeAreaInset(edge: .bottom, content: {
Spacer().frame(height: 30)
})
Expand Down
2 changes: 0 additions & 2 deletions iOSClient/Trash/NCTrash.swift
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ class NCTrash: UIViewController, NCTrashListCellDelegate, NCTrashGridCellDelegat
collectionView.alwaysBounceVertical = true
collectionView.backgroundColor = .systemBackground

collectionView.hideTopScrollEdgeEffect()

listLayout = NCListLayout()
gridLayout = NCGridLayout()

Expand Down
Loading