Skip to content

Commit 1c19b41

Browse files
mgolovkomgolovko
committed
Merge branch 'release-hotfix-40.1'
2 parents d819ffb + d9f6d7c commit 1c19b41

File tree

9 files changed

+100
-38
lines changed

9 files changed

+100
-38
lines changed

‎Anytype.xcodeproj/project.pbxproj‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,7 +1051,7 @@
10511051
"$(inherited)",
10521052
"@executable_path/Frameworks",
10531053
);
1054-
MARKETING_VERSION = 0.40.0;
1054+
MARKETING_VERSION = 0.40.1;
10551055
OTHER_LDFLAGS = "-ObjC";
10561056
OTHER_SWIFT_FLAGS = "-enable-upcoming-feature ConciseMagicFile";
10571057
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.dev;
@@ -1096,7 +1096,7 @@
10961096
"$(inherited)",
10971097
"@executable_path/Frameworks",
10981098
);
1099-
MARKETING_VERSION = 0.40.0;
1099+
MARKETING_VERSION = 0.40.1;
11001100
OTHER_LDFLAGS = "-ObjC";
11011101
OTHER_SWIFT_FLAGS = "-enable-upcoming-feature ConciseMagicFile";
11021102
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app;
@@ -1125,7 +1125,7 @@
11251125
"@executable_path/Frameworks",
11261126
"@loader_path/Frameworks",
11271127
);
1128-
MARKETING_VERSION = 0.40.0;
1128+
MARKETING_VERSION = 0.40.1;
11291129
PRODUCT_BUNDLE_IDENTIFIER = com.AnytypeTests;
11301130
PRODUCT_NAME = "$(TARGET_NAME)";
11311131
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1151,7 +1151,7 @@
11511151
"@executable_path/Frameworks",
11521152
"@loader_path/Frameworks",
11531153
);
1154-
MARKETING_VERSION = 0.40.0;
1154+
MARKETING_VERSION = 0.40.1;
11551155
PRODUCT_BUNDLE_IDENTIFIER = com.AnytypeTests;
11561156
PRODUCT_NAME = "$(TARGET_NAME)";
11571157
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1268,7 +1268,7 @@
12681268
"$(inherited)",
12691269
"@executable_path/Frameworks",
12701270
);
1271-
MARKETING_VERSION = 0.40.0;
1271+
MARKETING_VERSION = 0.40.1;
12721272
OTHER_LDFLAGS = "-ObjC";
12731273
OTHER_SWIFT_FLAGS = "-enable-upcoming-feature ConciseMagicFile";
12741274
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.dev;
@@ -1297,7 +1297,7 @@
12971297
"@executable_path/Frameworks",
12981298
"@loader_path/Frameworks",
12991299
);
1300-
MARKETING_VERSION = 0.40.0;
1300+
MARKETING_VERSION = 0.40.1;
13011301
PRODUCT_BUNDLE_IDENTIFIER = com.AnytypeTests;
13021302
PRODUCT_NAME = "$(TARGET_NAME)";
13031303
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1337,7 +1337,7 @@
13371337
"@executable_path/../../Frameworks",
13381338
);
13391339
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
1340-
MARKETING_VERSION = 0.40.0;
1340+
MARKETING_VERSION = 0.40.1;
13411341
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.dev.AnytypeNotificationExtension;
13421342
PRODUCT_NAME = "$(TARGET_NAME)";
13431343
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1412,7 +1412,7 @@
14121412
"@executable_path/../../Frameworks",
14131413
);
14141414
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
1415-
MARKETING_VERSION = 0.40.0;
1415+
MARKETING_VERSION = 0.40.1;
14161416
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.AnytypeNotificationExtension;
14171417
PRODUCT_NAME = "$(TARGET_NAME)";
14181418
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1489,7 +1489,7 @@
14891489
"@executable_path/../../Frameworks",
14901490
);
14911491
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
1492-
MARKETING_VERSION = 0.40.0;
1492+
MARKETING_VERSION = 0.40.1;
14931493
PRODUCT_BUNDLE_IDENTIFIER = org.any.app.AnytypeNotificationExtension;
14941494
PRODUCT_NAME = "$(TARGET_NAME)";
14951495
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1566,7 +1566,7 @@
15661566
"@executable_path/../../Frameworks",
15671567
);
15681568
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
1569-
MARKETING_VERSION = 0.40.0;
1569+
MARKETING_VERSION = 0.40.1;
15701570
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.dev.AnytypeNotificationExtension;
15711571
PRODUCT_NAME = "$(TARGET_NAME)";
15721572
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1687,7 +1687,7 @@
16871687
"$(inherited)",
16881688
"@executable_path/Frameworks",
16891689
);
1690-
MARKETING_VERSION = 0.40.0;
1690+
MARKETING_VERSION = 0.40.1;
16911691
OTHER_LDFLAGS = "-ObjC";
16921692
OTHER_SWIFT_FLAGS = "-enable-upcoming-feature ConciseMagicFile";
16931693
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app;
@@ -1715,7 +1715,7 @@
17151715
"@executable_path/Frameworks",
17161716
"@loader_path/Frameworks",
17171717
);
1718-
MARKETING_VERSION = 0.40.0;
1718+
MARKETING_VERSION = 0.40.1;
17191719
PRODUCT_BUNDLE_IDENTIFIER = com.AnytypeTests;
17201720
PRODUCT_NAME = "$(TARGET_NAME)";
17211721
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1748,7 +1748,7 @@
17481748
"@executable_path/Frameworks",
17491749
"@executable_path/../../Frameworks",
17501750
);
1751-
MARKETING_VERSION = 0.40.0;
1751+
MARKETING_VERSION = 0.40.1;
17521752
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.homewidget;
17531753
PRODUCT_NAME = "$(TARGET_NAME)";
17541754
PROVISIONING_PROFILE_SPECIFIER = "match Development io.anytype.app.homewidget";
@@ -1780,7 +1780,7 @@
17801780
"@executable_path/Frameworks",
17811781
"@executable_path/../../Frameworks",
17821782
);
1783-
MARKETING_VERSION = 0.40.0;
1783+
MARKETING_VERSION = 0.40.1;
17841784
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.AnytypeShareExtension;
17851785
PRODUCT_NAME = "$(TARGET_NAME)";
17861786
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1855,7 +1855,7 @@
18551855
"@executable_path/../../Frameworks",
18561856
);
18571857
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
1858-
MARKETING_VERSION = 0.40.0;
1858+
MARKETING_VERSION = 0.40.1;
18591859
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.AnytypeNotificationExtension;
18601860
PRODUCT_NAME = "$(TARGET_NAME)";
18611861
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1976,7 +1976,7 @@
19761976
"$(inherited)",
19771977
"@executable_path/Frameworks",
19781978
);
1979-
MARKETING_VERSION = 0.40.0;
1979+
MARKETING_VERSION = 0.40.1;
19801980
OTHER_LDFLAGS = "-ObjC";
19811981
OTHER_SWIFT_FLAGS = "-enable-upcoming-feature ConciseMagicFile";
19821982
PRODUCT_BUNDLE_IDENTIFIER = org.any.app;
@@ -2004,7 +2004,7 @@
20042004
"@executable_path/Frameworks",
20052005
"@loader_path/Frameworks",
20062006
);
2007-
MARKETING_VERSION = 0.40.0;
2007+
MARKETING_VERSION = 0.40.1;
20082008
PRODUCT_BUNDLE_IDENTIFIER = com.AnytypeTests;
20092009
PRODUCT_NAME = "$(TARGET_NAME)";
20102010
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2037,7 +2037,7 @@
20372037
"@executable_path/Frameworks",
20382038
"@executable_path/../../Frameworks",
20392039
);
2040-
MARKETING_VERSION = 0.40.0;
2040+
MARKETING_VERSION = 0.40.1;
20412041
PRODUCT_BUNDLE_IDENTIFIER = org.any.app.homewidget;
20422042
PRODUCT_NAME = "$(TARGET_NAME)";
20432043
PROVISIONING_PROFILE_SPECIFIER = "match Development org.any.app.homewidget";
@@ -2069,7 +2069,7 @@
20692069
"@executable_path/Frameworks",
20702070
"@executable_path/../../Frameworks",
20712071
);
2072-
MARKETING_VERSION = 0.40.0;
2072+
MARKETING_VERSION = 0.40.1;
20732073
PRODUCT_BUNDLE_IDENTIFIER = org.any.app.AnytypeShareExtension;
20742074
PRODUCT_NAME = "$(TARGET_NAME)";
20752075
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2144,7 +2144,7 @@
21442144
"@executable_path/../../Frameworks",
21452145
);
21462146
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
2147-
MARKETING_VERSION = 0.40.0;
2147+
MARKETING_VERSION = 0.40.1;
21482148
PRODUCT_BUNDLE_IDENTIFIER = org.any.app.AnytypeNotificationExtension;
21492149
PRODUCT_NAME = "$(TARGET_NAME)";
21502150
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2263,7 +2263,7 @@
22632263
"$(inherited)",
22642264
"@executable_path/Frameworks",
22652265
);
2266-
MARKETING_VERSION = 0.40.0;
2266+
MARKETING_VERSION = 0.40.1;
22672267
OTHER_LDFLAGS = "-ObjC";
22682268
OTHER_SWIFT_FLAGS = "-enable-upcoming-feature ConciseMagicFile";
22692269
PRODUCT_BUNDLE_IDENTIFIER = org.any.app;
@@ -2292,7 +2292,7 @@
22922292
"@executable_path/Frameworks",
22932293
"@loader_path/Frameworks",
22942294
);
2295-
MARKETING_VERSION = 0.40.0;
2295+
MARKETING_VERSION = 0.40.1;
22962296
PRODUCT_BUNDLE_IDENTIFIER = com.AnytypeTests;
22972297
PRODUCT_NAME = "$(TARGET_NAME)";
22982298
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2325,7 +2325,7 @@
23252325
"@executable_path/Frameworks",
23262326
"@executable_path/../../Frameworks",
23272327
);
2328-
MARKETING_VERSION = 0.40.0;
2328+
MARKETING_VERSION = 0.40.1;
23292329
PRODUCT_BUNDLE_IDENTIFIER = org.any.app.homewidget;
23302330
PRODUCT_NAME = "$(TARGET_NAME)";
23312331
PROVISIONING_PROFILE_SPECIFIER = "match AppStore org.any.app.homewidget";
@@ -2356,7 +2356,7 @@
23562356
"@executable_path/Frameworks",
23572357
"@executable_path/../../Frameworks",
23582358
);
2359-
MARKETING_VERSION = 0.40.0;
2359+
MARKETING_VERSION = 0.40.1;
23602360
PRODUCT_BUNDLE_IDENTIFIER = org.any.app.AnytypeShareExtension;
23612361
PRODUCT_NAME = "$(TARGET_NAME)";
23622362
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2387,7 +2387,7 @@
23872387
"@executable_path/Frameworks",
23882388
"@executable_path/../../Frameworks",
23892389
);
2390-
MARKETING_VERSION = 0.40.0;
2390+
MARKETING_VERSION = 0.40.1;
23912391
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.dev.AnytypeShareExtension;
23922392
PRODUCT_NAME = "$(TARGET_NAME)";
23932393
PROVISIONING_PROFILE_SPECIFIER = "match Development io.anytype.app.dev.AnytypeShareExtension";
@@ -2417,7 +2417,7 @@
24172417
"@executable_path/Frameworks",
24182418
"@executable_path/../../Frameworks",
24192419
);
2420-
MARKETING_VERSION = 0.40.0;
2420+
MARKETING_VERSION = 0.40.1;
24212421
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.AnytypeShareExtension;
24222422
PRODUCT_NAME = "$(TARGET_NAME)";
24232423
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2448,7 +2448,7 @@
24482448
"@executable_path/Frameworks",
24492449
"@executable_path/../../Frameworks",
24502450
);
2451-
MARKETING_VERSION = 0.40.0;
2451+
MARKETING_VERSION = 0.40.1;
24522452
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.dev.AnytypeShareExtension;
24532453
PRODUCT_NAME = "$(TARGET_NAME)";
24542454
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2480,7 +2480,7 @@
24802480
"@executable_path/Frameworks",
24812481
"@executable_path/../../Frameworks",
24822482
);
2483-
MARKETING_VERSION = 0.40.0;
2483+
MARKETING_VERSION = 0.40.1;
24842484
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.dev.homewidget;
24852485
PRODUCT_NAME = "$(TARGET_NAME)";
24862486
PROVISIONING_PROFILE_SPECIFIER = "match Development io.anytype.app.dev.homewidget";
@@ -2512,7 +2512,7 @@
25122512
"@executable_path/Frameworks",
25132513
"@executable_path/../../Frameworks",
25142514
);
2515-
MARKETING_VERSION = 0.40.0;
2515+
MARKETING_VERSION = 0.40.1;
25162516
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.homewidget;
25172517
PRODUCT_NAME = "$(TARGET_NAME)";
25182518
PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.anytype.app.homewidget";
@@ -2544,7 +2544,7 @@
25442544
"@executable_path/Frameworks",
25452545
"@executable_path/../../Frameworks",
25462546
);
2547-
MARKETING_VERSION = 0.40.0;
2547+
MARKETING_VERSION = 0.40.1;
25482548
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.dev.homewidget;
25492549
PRODUCT_NAME = "$(TARGET_NAME)";
25502550
PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.anytype.app.dev.homewidget";

‎Anytype/Sources/ApplicationLayer/AppSceneHandler/AppSceneUrlHandlerModifierModel.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ final class AppSceneUrlHandlerModifierModel: ObservableObject {
2828
return true
2929
}
3030

31-
if urlWithScheme.host() == AppLinks.storeHost {
31+
if urlWithScheme.host == AppLinks.storeHost {
3232
return false
3333
}
3434

‎Anytype/Sources/PresentationLayer/Modules/SpaceHub/SpaceHubView.swift‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@ struct SpaceHubView: View {
6767
VStack(spacing: FeatureFlags.vaultBackToRoots ? 8 : 0) {
6868
HomeUpdateSubmoduleView().padding(8)
6969

70+
if #available(iOS 17.0, *) {
71+
} else {
72+
UpdateAppBanner()
73+
}
74+
7075
if #available(iOS 17.0, *) {
7176
if FeatureFlags.anyAppBetaTip {
7277
HomeAnyAppWidgetTipView()

‎Anytype/Sources/PresentationLayer/Modules/SpaceHub/Subviews/UpdateAppBanner.swift‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
import SwiftUI
2+
import DesignKit
3+
4+
struct UpdateAppBanner: View {
5+
6+
@StateObject private var model = UpdateAppBannerModel()
7+
8+
var body: some View {
9+
VStack(spacing: 12) {
10+
Text(model.text)
11+
}
12+
.padding(16)
13+
.background {
14+
LinearGradient(
15+
colors: [
16+
Color(light: Color(hex: "#FEE7E0"), dark: Color(hex: "#74321E")),
17+
Color(light: Color(hex: "#FFF6F3"), dark: Color(hex: "#4B251A"))
18+
],
19+
startPoint: .top,
20+
endPoint: .bottom
21+
)
22+
}
23+
.cornerRadius(16)
24+
.padding(.horizontal, 16)
25+
}
26+
}
27+
28+
final class UpdateAppBannerModel: ObservableObject {
29+
30+
let text: AttributedString
31+
32+
init() {
33+
var title = AttributedString("iOS 16 Support Ends Soon\n")
34+
title.font = AnytypeFontBuilder.font(anytypeFont: .uxTitle2Regular).bold()
35+
36+
var description = AttributedString("We’re ending iOS 16 support to improve performance & features. Update to iOS 17+ to keep getting updates. Can’t upgrade and have a membership? ")
37+
description.font = AnytypeFontBuilder.font(anytypeFont: .uxTitle2Regular)
38+
39+
var link = AttributedString("Request a refund.")
40+
link.link = URL(string: "mailto:[email protected]")
41+
link.underlineStyle = .single
42+
link.font = AnytypeFontBuilder.font(anytypeFont: .uxTitle2Regular)
43+
44+
var text = title + description + link
45+
text.foregroundColor = .Text.primary
46+
self.text = text
47+
}
48+
}

‎Anytype/Sources/PresentationLayer/Settings/Appearance/AppIcon/AppIcon.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ enum AppIcon: CaseIterable {
66
case standart
77
case eggo
88

9-
var avaliableIcons: [AppIcon] {
9+
static var avaliableIcons: [AppIcon] {
1010
#if DEBUG || RELEASE_NIGHTLY
1111
[.smile, .standart, .eggo]
1212
#else

‎Anytype/Sources/PresentationLayer/Settings/Appearance/SettingsAppearanceView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ struct SettingsAppearanceView: View {
8282
AnytypeText(Loc.applicationIcon, style: .caption1Medium)
8383
.foregroundColor(.Text.secondary).padding(.bottom, 6)
8484
HStack {
85-
ForEach(AppIcon.allCases, id: \.self) { icon in
85+
ForEach(AppIcon.avaliableIcons, id: \.self) { icon in
8686
appIcon(icon)
8787
}
8888
}

‎Libraryfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
MIDDLE_VERSION=v0.44.1
1+
MIDDLE_VERSION=v0.44.5

‎Modules/Services/Sources/Generated/BundledPropertyKey+internalKeys.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public extension BundledPropertyKey {
2020
.restrictions,
2121
.syncDate,
2222
.syncStatus,
23-
.myParticipantStatus,
2423
.syncError,
2524
]
2625
}

0 commit comments

Comments
 (0)