hendrik-hog/Nextcloud-Cookbook-iOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MacOS support using Mac Catalyst

Browse Source
This commit is contained in:
Vicnet
2023-11-10 15:10:32 +01:00
parent 1d3b936e99
commit 3d3165c6b9
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Nextcloud Cookbook iOS Client.xcodeproj/project.pbxproj
View File

@@ -600,12 +600,13 @@
IPHONEOS_DEPLOYMENT_TARGET = 16.4; IPHONEOS_DEPLOYMENT_TARGET = 16.4;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 13.0; MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 1.4; MARKETING_VERSION = 1.4;
PRODUCT_BUNDLE_IDENTIFIER = "VincentMeilinger.Nextcloud-Cookbook-iOS-Client"; PRODUCT_BUNDLE_IDENTIFIER = "VincentMeilinger.Nextcloud-Cookbook-iOS-Client";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto; SDKROOT = auto;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = YES;
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
@@ -641,12 +642,13 @@
IPHONEOS_DEPLOYMENT_TARGET = 16.4; IPHONEOS_DEPLOYMENT_TARGET = 16.4;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 13.0; MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 1.4; MARKETING_VERSION = 1.4;
PRODUCT_BUNDLE_IDENTIFIER = "VincentMeilinger.Nextcloud-Cookbook-iOS-Client"; PRODUCT_BUNDLE_IDENTIFIER = "VincentMeilinger.Nextcloud-Cookbook-iOS-Client";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto; SDKROOT = auto;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = YES;
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";

4
Nextcloud Cookbook iOS Client/ViewModels/MainViewModel.swift
View File

@@ -6,8 +6,10 @@
// //
import Foundation import Foundation
import UIKit
import SwiftUI import SwiftUI
#if !os(macOS)
import UIKit
#endif
@MainActor class MainViewModel: ObservableObject { @MainActor class MainViewModel: ObservableObject {
@Published var categories: [Category] = [] @Published var categories: [Category] = []

1
Nextcloud Cookbook iOS Client/Views/CategoryDetailView.swift
View File

@@ -33,6 +33,7 @@ struct CategoryDetailView: View {
.navigationTitle(categoryName == "*" ? "Other" : categoryName) .navigationTitle(categoryName == "*" ? "Other" : categoryName)
.toolbar { .toolbar {
ToolbarItem(placement: .topBarTrailing) { ToolbarItem(placement: .topBarTrailing) {
Menu { Menu {
Button { Button {
print("Add new recipe") print("Add new recipe")

4
Nextcloud Cookbook iOS Client/Views/RecipeEditView.swift
View File

@@ -367,13 +367,17 @@ fileprivate struct DurationPicker: View {
Text(title) Text(title)
Spacer() Spacer()
TextField("00", text: $duration.hourComponent) TextField("00", text: $duration.hourComponent)
#if !os(macOS)
.keyboardType(.decimalPad) .keyboardType(.decimalPad)
#endif
.textFieldStyle(.roundedBorder) .textFieldStyle(.roundedBorder)
.multilineTextAlignment(.trailing) .multilineTextAlignment(.trailing)
.frame(maxWidth: 40) .frame(maxWidth: 40)
Text(":") Text(":")
TextField("00", text: $duration.minuteComponent) TextField("00", text: $duration.minuteComponent)
#if !os(macOS)
.keyboardType(.decimalPad) .keyboardType(.decimalPad)
#endif
.textFieldStyle(.roundedBorder) .textFieldStyle(.roundedBorder)
.frame(maxWidth: 40) .frame(maxWidth: 40)
} }