mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-06-02 21:39:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into Implement-Apple-Translate

Browse source
This commit is contained in:
Paul Schuetz 2024-05-13 09:38:20 +02:00
parent 37b14bfb0d a8039df22d
commit 8f06719b23
No known key found for this signature in database
GPG key ID: 4FDE1FB89050039E
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
IceCubesApp/App/SafariRouter.swift
View file

@ -13,6 +13,7 @@ extension View {
@MainActor
private struct SafariRouter: ViewModifier {
@Environment(\.isSecondaryColumn) private var isSecondaryColumn: Bool
@Environment(Theme.self) private var theme
@Environment(UserPreferences.self) private var preferences
@Environment(RouterPath.self) private var routerPath
@ -25,10 +26,12 @@ private struct SafariRouter: ViewModifier {
content
.environment(\.openURL, OpenURLAction { url in
// Open internal URL.
routerPath.handle(url: url)
guard !isSecondaryColumn else { return .discarded }
return routerPath.handle(url: url)
})
.onOpenURL { url in
// Open external URL (from icecubesapp://)
guard !isSecondaryColumn else { return }
let urlString = url.absoluteString.replacingOccurrences(of: AppInfo.scheme, with: "https://")
guard let url = URL(string: urlString), url.host != nil else { return }
_ = routerPath.handleDeepLink(url: url)

3
IceCubesApp/App/SideBarView.swift
View file

@ -111,7 +111,8 @@ struct SideBarView<Content: View>: View {
isInSettings: false),
isParentPresented: .constant(false))
}
if showBadge,
if !userPreferences.isSidebarExpanded,
showBadge,
let token = account.oauthToken,
let notificationsCount = userPreferences.notificationsCount[token],
notificationsCount > 0