Merge branch 'main' into iOS-18

This commit is contained in:
Thomas Ricouard 2024-06-26 11:06:39 +02:00
commit 440f2ac795
5 changed files with 13 additions and 12 deletions

View file

@ -1254,7 +1254,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 730;
DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)";
GCC_C_LANGUAGE_STANDARD = gnu17; GCC_C_LANGUAGE_STANDARD = gnu17;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
@ -1267,7 +1267,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.0; MARKETING_VERSION = 1.10.43;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesAppWidgetsExtension"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesAppWidgetsExtension";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos; SDKROOT = iphoneos;
@ -1290,7 +1290,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 730;
DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)";
GCC_C_LANGUAGE_STANDARD = gnu17; GCC_C_LANGUAGE_STANDARD = gnu17;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
@ -1303,7 +1303,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.0; MARKETING_VERSION = 1.10.43;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesAppWidgetsExtension"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesAppWidgetsExtension";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos; SDKROOT = iphoneos;
@ -1391,7 +1391,7 @@
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = NO;
CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@ -1457,7 +1457,7 @@
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = NO;
CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";

View file

@ -5,7 +5,7 @@ struct AppShortcuts: AppShortcutsProvider {
AppShortcut( AppShortcut(
intent: PostIntent(), intent: PostIntent(),
phrases: [ phrases: [
"Post \(\.$content) in \(.applicationName)", "Post in \(.applicationName)",
"Post a status on Mastodon with \(.applicationName)", "Post a status on Mastodon with \(.applicationName)",
], ],
shortTitle: "Compose a post", shortTitle: "Compose a post",
@ -23,7 +23,6 @@ struct AppShortcuts: AppShortcutsProvider {
AppShortcut( AppShortcut(
intent: TabIntent(), intent: TabIntent(),
phrases: [ phrases: [
"Open \(\.$tab) in \(.applicationName)",
"Open \(.applicationName)", "Open \(.applicationName)",
], ],
shortTitle: "Open Ice Cubes", shortTitle: "Open Ice Cubes",
@ -32,8 +31,10 @@ struct AppShortcuts: AppShortcutsProvider {
AppShortcut( AppShortcut(
intent: PostImageIntent(), intent: PostImageIntent(),
phrases: [ phrases: [
"Post images images in \(.applicationName)", "Post images in \(.applicationName)",
"Post an image in \(.applicationName)",
"Send photos with \(.applicationName)", "Send photos with \(.applicationName)",
"Send a photo with \(.applicationName)",
], ],
shortTitle: "Post a status with an image", shortTitle: "Post a status with an image",
systemImageName: "photo" systemImageName: "photo"

View file

@ -2,7 +2,7 @@ import AppIntents
import WidgetKit import WidgetKit
struct AccountWidgetConfiguration: WidgetConfigurationIntent { struct AccountWidgetConfiguration: WidgetConfigurationIntent {
static let title: LocalizedStringResource = "Account Widget Configuration" static let title: LocalizedStringResource = "Accoutn Widget Configuration"
static let description = IntentDescription("Choose the account for this widget") static let description = IntentDescription("Choose the account for this widget")
@Parameter(title: "Account") @Parameter(title: "Account")

View file

@ -2,7 +2,7 @@ import AppIntents
import WidgetKit import WidgetKit
struct HashtagPostsWidgetConfiguration: WidgetConfigurationIntent { struct HashtagPostsWidgetConfiguration: WidgetConfigurationIntent {
static let title: LocalizedStringResource = "Widget Configuration" static let title: LocalizedStringResource = "Hashtag Widget Configuration"
static let description = IntentDescription("Choose the account and hashtag for this widget") static let description = IntentDescription("Choose the account and hashtag for this widget")
@Parameter(title: "Account") @Parameter(title: "Account")

View file

@ -2,7 +2,7 @@ import AppIntents
import WidgetKit import WidgetKit
struct LatestPostsWidgetConfiguration: WidgetConfigurationIntent { struct LatestPostsWidgetConfiguration: WidgetConfigurationIntent {
static let title: LocalizedStringResource = "Configuration" static let title: LocalizedStringResource = "Timeline Widget Configuration"
static let description = IntentDescription("Choose the account and timeline for this widget") static let description = IntentDescription("Choose the account and timeline for this widget")
@Parameter(title: "Account") @Parameter(title: "Account")