Skip to content

Commit df29704

Browse files
DimillianDimillian
committed
chore: merge main into feature/ptbr-improve-strings
2 parents da6145f + 7b9d406 commit df29704

27 files changed

+56612
-56105
lines changed

‎IceCubesApp.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@
719719
"@executable_path/Frameworks",
720720
"@executable_path/../../Frameworks",
721721
);
722-
MARKETING_VERSION = 2.0.5;
722+
MARKETING_VERSION = 2.0.10;
723723
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesNotifications";
724724
PRODUCT_NAME = "$(TARGET_NAME)";
725725
SDKROOT = iphoneos;
@@ -755,7 +755,7 @@
755755
"@executable_path/Frameworks",
756756
"@executable_path/../../Frameworks",
757757
);
758-
MARKETING_VERSION = 2.0.5;
758+
MARKETING_VERSION = 2.0.10;
759759
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesNotifications";
760760
PRODUCT_NAME = "$(TARGET_NAME)";
761761
SDKROOT = iphoneos;
@@ -794,7 +794,7 @@
794794
"@executable_path/Frameworks",
795795
"@executable_path/../../Frameworks",
796796
);
797-
MARKETING_VERSION = 2.0.5;
797+
MARKETING_VERSION = 2.0.10;
798798
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesAppWidgetsExtension";
799799
PRODUCT_NAME = "$(TARGET_NAME)";
800800
SDKROOT = iphoneos;
@@ -830,7 +830,7 @@
830830
"@executable_path/Frameworks",
831831
"@executable_path/../../Frameworks",
832832
);
833-
MARKETING_VERSION = 2.0.5;
833+
MARKETING_VERSION = 2.0.10;
834834
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesAppWidgetsExtension";
835835
PRODUCT_NAME = "$(TARGET_NAME)";
836836
SDKROOT = iphoneos;
@@ -863,7 +863,7 @@
863863
"@executable_path/Frameworks",
864864
"@executable_path/../../Frameworks",
865865
);
866-
MARKETING_VERSION = 2.0.5;
866+
MARKETING_VERSION = 2.0.10;
867867
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesShareExtension";
868868
PRODUCT_NAME = "$(TARGET_NAME)";
869869
SDKROOT = iphoneos;
@@ -897,7 +897,7 @@
897897
"@executable_path/Frameworks",
898898
"@executable_path/../../Frameworks",
899899
);
900-
MARKETING_VERSION = 2.0.5;
900+
MARKETING_VERSION = 2.0.10;
901901
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesShareExtension";
902902
PRODUCT_NAME = "$(TARGET_NAME)";
903903
SDKROOT = iphoneos;
@@ -1084,7 +1084,7 @@
10841084
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
10851085
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
10861086
MACOSX_DEPLOYMENT_TARGET = 13.0;
1087-
MARKETING_VERSION = 2.0.5;
1087+
MARKETING_VERSION = 2.0.10;
10881088
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp";
10891089
PRODUCT_NAME = "Ice Cubes";
10901090
SDKROOT = auto;
@@ -1153,7 +1153,7 @@
11531153
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
11541154
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
11551155
MACOSX_DEPLOYMENT_TARGET = 13.0;
1156-
MARKETING_VERSION = 2.0.5;
1156+
MARKETING_VERSION = 2.0.10;
11571157
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp";
11581158
PRODUCT_NAME = "Ice Cubes";
11591159
SDKROOT = auto;
@@ -1200,7 +1200,7 @@
12001200
"@executable_path/Frameworks",
12011201
"@executable_path/../../Frameworks",
12021202
);
1203-
MARKETING_VERSION = 2.0.5;
1203+
MARKETING_VERSION = 2.0.10;
12041204
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesActionExtension";
12051205
PRODUCT_NAME = "$(TARGET_NAME)";
12061206
SDKROOT = iphoneos;
@@ -1235,7 +1235,7 @@
12351235
"@executable_path/Frameworks",
12361236
"@executable_path/../../Frameworks",
12371237
);
1238-
MARKETING_VERSION = 2.0.5;
1238+
MARKETING_VERSION = 2.0.10;
12391239
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesActionExtension";
12401240
PRODUCT_NAME = "$(TARGET_NAME)";
12411241
SDKROOT = iphoneos;

‎IceCubesApp.xcodeproj/xcshareddata/xcschemes/IceCubesActionExtension.xcscheme‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
savedToolIdentifier = ""
7474
useCustomWorkingDirectory = "NO"
7575
debugDocumentVersioning = "YES"
76-
askForAppToLaunch = "Yes"
7776
launchAutomaticallySubstyle = "2">
7877
<BuildableProductRunnable
7978
runnableDebuggingMode = "0">

‎IceCubesApp.xcodeproj/xcshareddata/xcschemes/IceCubesAppWidgetsExtensionExtension.xcscheme‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
savedToolIdentifier = ""
9292
useCustomWorkingDirectory = "NO"
9393
debugDocumentVersioning = "YES"
94-
askForAppToLaunch = "Yes"
9594
launchAutomaticallySubstyle = "2">
9695
<BuildableProductRunnable
9796
runnableDebuggingMode = "0">

‎IceCubesApp.xcodeproj/xcshareddata/xcschemes/IceCubesNotifications.xcscheme‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
savedToolIdentifier = ""
7878
useCustomWorkingDirectory = "NO"
7979
debugDocumentVersioning = "YES"
80-
askForAppToLaunch = "Yes"
8180
launchAutomaticallySubstyle = "2">
8281
<BuildableProductRunnable
8382
runnableDebuggingMode = "0">

‎IceCubesApp.xcodeproj/xcshareddata/xcschemes/IceCubesShareExtension.xcscheme‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
savedToolIdentifier = ""
7474
useCustomWorkingDirectory = "NO"
7575
debugDocumentVersioning = "YES"
76-
askForAppToLaunch = "Yes"
7776
launchAutomaticallySubstyle = "2">
7877
<BuildableProductRunnable
7978
runnableDebuggingMode = "0">

‎IceCubesApp/App/Main/IceCubesApp.swift‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,10 @@ struct IceCubesApp: App {
3838

3939
init() {
4040
#if DEBUG
41-
// Enable "GraphReuseLogging" for debugging purpose
42-
// subsystem: "com.apple.SwiftUI" category: "GraphReuse"
43-
UserDefaults.standard.register(defaults: ["com.apple.SwiftUI.GraphReuseLogging": true])
41+
UserDefaults.standard.register(defaults: [
42+
"com.apple.SwiftUI.GraphReuseLogging": true, // Enable "GraphReuseLogging" by default. The log can be found via - subsystem: "com.apple.SwiftUI" category: "GraphReuse"
43+
"LogForEachSlowPath": true, // Enable "LogForEachSlowPath" by default. The log can be found via - subsystem: "com.apple.SwiftUI" category: "Invalid Configuration"
44+
])
4445
#endif
4546
}
4647

‎IceCubesApp/App/Tabs/Settings/SettingsTab.swift‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,12 @@ struct SettingsTabs: View {
235235
Label("Stream home timeline", systemImage: "antenna.radiowaves.left.and.right")
236236
.symbolVariant(preferences.streamHomeTimeline ? .none : .slash)
237237
}
238+
Toggle(isOn: $preferences.fullTimelineFetch) {
239+
Label("Full timeline fetch", systemImage: "arrow.triangle.2.circlepath")
240+
.symbolVariant(preferences.fullTimelineFetch ? .none : .slash)
241+
}
238242
} header: {
239243
Text("settings.section.other")
240-
} footer: {
241-
Text("settings.section.other.footer")
242244
}
243245
#if !os(visionOS)
244246
.listRowBackground(theme.primaryBackgroundColor)

0 commit comments

Comments
 (0)