Mastodon/IceCubes
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-12-23 13:28:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Basic splitView on iPad + Disable macOS for now

Browse Source
This commit is contained in:
Thomas Ricouard 2023-01-04 12:50:57 +01:00
parent aada2e2cd3
commit 73f3fef738
5 changed files with 71 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IceCubesApp.xcodeproj/project.pbxproj
View File

@ -446,7 +446,9 @@
PRODUCT_BUNDLE_IDENTIFIER = com.thomasricouard.IceCubesApp;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
@ -492,7 +494,9 @@
PRODUCT_BUNDLE_IDENTIFIER = com.thomasricouard.IceCubesApp;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";

79
IceCubesApp/App/IceCubesApp.swift
View File

@ -17,33 +17,16 @@ struct IceCubesApp: App {
@StateObject private var quickLook = QuickLook()
@StateObject private var theme = Theme()
@State private var selectedTab: Tab = .timeline
@State private var selectedTab: Tab? = .timeline
@State private var popToRootTab: Tab = .other
private var availableTabs: [Tab] {
appAccountsManager.currentClient.isAuth ? Tab.loggedInTabs() : Tab.loggedOutTab()
}
var body: some Scene {
WindowGroup {
TabView(selection: .init(get: {
selectedTab
}, set: { newTab in
if newTab == selectedTab {
/// Stupid hack to trigger onChange binding in tab views.
popToRootTab = .other
DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) {
popToRootTab = selectedTab
}
}
selectedTab = newTab
})) {
ForEach(appAccountsManager.currentClient.isAuth ? Tab.loggedInTabs() : Tab.loggedOutTab()) { tab in
tab.makeContentView(popToRootTab: $popToRootTab)
.tabItem {
tab.label
}
.tag(tab)
.badge(tab == .notifications ? watcher.unreadNotificationsCount : 0)
.toolbarBackground(theme.primaryBackgroundColor.opacity(0.50), for: .tabBar)
}
}
appView
.tint(theme.tintColor)
.onAppear {
setNewClientsInEnv(client: appAccountsManager.currentClient)
@ -73,6 +56,56 @@ struct IceCubesApp: App {
}
}
@ViewBuilder
private var appView: some View {
if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac {
splitView
} else {
tabBarView
}
}
private var tabBarView: some View {
TabView(selection: .init(get: {
selectedTab
}, set: { newTab in
if newTab == selectedTab {
/// Stupid hack to trigger onChange binding in tab views.
popToRootTab = .other
DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) {
if let selectedTab {
popToRootTab = selectedTab
}
}
}
selectedTab = newTab
})) {
ForEach(availableTabs) { tab in
tab.makeContentView(popToRootTab: $popToRootTab)
.tabItem {
tab.label
}
.tag(tab)
.badge(tab == .notifications ? watcher.unreadNotificationsCount : 0)
.toolbarBackground(theme.primaryBackgroundColor.opacity(0.50), for: .tabBar)
}
}
}
private var splitView: some View {
NavigationSplitView {
List(availableTabs, selection: $selectedTab) { tab in
NavigationLink(value: tab) {
tab.label
}
}
.scrollContentBackground(.hidden)
.background(theme.secondaryBackgroundColor)
} detail: {
selectedTab?.makeContentView(popToRootTab: $popToRootTab)
}
}
private func setNewClientsInEnv(client: Client) {
currentAccount.setClient(client: client)
currentInstance.setClient(client: client)

2
IceCubesApp/App/Tabs/Settings/SettingsTab.swift
View File

@ -18,7 +18,7 @@ struct SettingsTabs: View {
@State private var isThemeSelectorPresented = false
var body: some View {
NavigationStack {
NavigationStack(path: $routeurPath.path) {
Form {
appSection
accountsSection

2
IceCubesApp/App/Tabs/Tabs.swift
View File

@ -4,7 +4,7 @@ import Account
import Explore
import SwiftUI
enum Tab: Int, Identifiable {
enum Tab: Int, Identifiable, Hashable {
case timeline, notifications, explore, account, settings, other
var id: Int {

9
Packages/Status/Sources/Status/Row/StatusMediaPreviewView.swift
View File

@ -104,7 +104,9 @@ public struct StatusMediaPreviewView: View {
private func makeFeaturedImagePreview(attachement: MediaAttachement) -> some View {
switch attachement.supportedType {
case .image:
if let size = size(for: attachement) {
if let size = size(for: attachement),
UIDevice.current.userInterfaceIdiom != .pad,
UIDevice.current.userInterfaceIdiom != .mac {
let avatarColumnWidth = theme.avatarPosition == .leading ? AvatarView.Size.status.size.width + .statusColumnsSpacing : 0
let availableWidth = UIScreen.main.bounds.width - (.layoutPadding * 2) - avatarColumnWidth
let newSize = imageSize(from: size,
@ -142,12 +144,15 @@ public struct StatusMediaPreviewView: View {
image
.resizable()
.aspectRatio(contentMode: .fill)
.frame(maxHeight: imageMaxHeight)
.frame(maxWidth: imageMaxHeight)
.cornerRadius(4)
},
placeholder: {
RoundedRectangle(cornerRadius: 4)
.fill(Color.gray)
.frame(height: imageMaxHeight)
.frame(maxHeight: imageMaxHeight)
.frame(maxWidth: imageMaxHeight)
.shimmering()
})
}