Skip to content

Commit 90a4919

Browse files
committed
IOS-5399 Delete toggle
1 parent da734dc commit 90a4919

File tree

6 files changed

+12
-43
lines changed

6 files changed

+12
-43
lines changed

Anytype/Sources/ApplicationLayer/AppCoordinator/ApplicationCoordinatorView.swift

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -44,31 +44,14 @@ struct ApplicationCoordinatorView: View {
4444
switch model.applicationState {
4545
case .initial:
4646
InitialCoordinatorView()
47-
.if(!FeatureFlags.brandNewAuthFlow) {
48-
$0.overrideDefaultInterfaceStyle(.dark)
49-
}
5047
case .auth:
51-
if FeatureFlags.brandNewAuthFlow {
52-
AuthCoordinatorView()
53-
} else {
54-
model.authView()
55-
.overrideDefaultInterfaceStyle(.dark)
56-
}
48+
AuthCoordinatorView()
5749
case .login:
5850
LaunchView()
59-
.if(!FeatureFlags.brandNewAuthFlow) {
60-
$0.overrideDefaultInterfaceStyle(.dark)
61-
}
6251
case .home:
6352
SpaceHubCoordinatorView()
64-
.if(!FeatureFlags.brandNewAuthFlow) {
65-
$0.overrideDefaultInterfaceStyle(nil)
66-
}
6753
case .delete:
68-
model.deleteAccount()?
69-
.if(!FeatureFlags.brandNewAuthFlow) {
70-
$0.overrideDefaultInterfaceStyle(nil)
71-
}
54+
model.deleteAccount()
7255
}
7356
}
7457
}

Anytype/Sources/PresentationLayer/Auth/PhraseTextView/UIPhraseTextView.swift

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,10 @@ class UIPhraseTextView: UITextView, UITextViewDelegate {
1010
private lazy var placeholderLabel: UILabel = {
1111
let label = UILabel()
1212
label.text = Loc.Auth.LoginFlow.Textfield.placeholder
13-
label.textColor = FeatureFlags.brandNewAuthFlow ? UIColor.Text.tertiary : UIColor.Text.primary
13+
label.textColor = UIColor.Text.tertiary
1414
label.font = self.font
1515
label.textAlignment = self.textAlignment
1616
label.numberOfLines = 0
17-
if !FeatureFlags.brandNewAuthFlow {
18-
label.layer.opacity = 0.3
19-
}
2017
return label
2118
}()
2219

@@ -61,10 +58,10 @@ class UIPhraseTextView: UITextView, UITextViewDelegate {
6158
autocapitalizationType = .none
6259
showsVerticalScrollIndicator = false
6360
showsHorizontalScrollIndicator = false
64-
font = FeatureFlags.brandNewAuthFlow ? AnytypeFont.previewTitle1Regular.uiKitFont : AnytypeFont.authInput.uiKitFont
65-
tintColor = FeatureFlags.brandNewAuthFlow ? UIColor.Control.accent100 : UIColor.Auth.inputText
61+
font = AnytypeFont.previewTitle1Regular.uiKitFont
62+
tintColor = UIColor.Control.accent100
6663
textContainer.lineFragmentPadding = 0.0
67-
backgroundColor = FeatureFlags.brandNewAuthFlow ? UIColor.Shape.transperentSecondary : UIColor.Shape.transperentSecondary.withAlphaComponent(0.14)
64+
backgroundColor = UIColor.Shape.transperentSecondary
6865
layer.cornerRadius = 16
6966
layer.cornerCurve = .continuous
7067
textContentType = .password
@@ -108,9 +105,9 @@ class UIPhraseTextView: UITextView, UITextViewDelegate {
108105
extension UIPhraseTextView {
109106

110107
private func configureAttributedString(from text: String, hidden: Bool) -> NSAttributedString {
111-
112-
let foregroundColor = FeatureFlags.brandNewAuthFlow ? UIColor.Text.primary : UIColor.Control.white
113-
let anytypeFont: AnytypeFont = FeatureFlags.brandNewAuthFlow ? AnytypeFont.previewTitle1Regular : AnytypeFont.authInput
108+
109+
let foregroundColor = UIColor.Text.primary
110+
let anytypeFont: AnytypeFont = AnytypeFont.previewTitle1Regular
114111
let style = NSMutableParagraphStyle()
115112
style.lineSpacing = anytypeFont.config.lineHeight
116113
let attributes = [

Anytype/Sources/PresentationLayer/AuthNew/Join/JoinView/EmailCollectionView/EmailCollectionView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ struct EmailCollectionView: View {
3737
Loc.Auth.JoinFlow.Email.description,
3838
style: .bodyRegular
3939
)
40-
.foregroundColor(FeatureFlags.brandNewAuthFlow ? .Text.secondary : .Text.primary)
40+
.foregroundColor(.Text.secondary)
4141
.multilineTextAlignment(.center)
4242
.padding(.horizontal, 20)
4343

@@ -91,7 +91,7 @@ struct EmailCollectionView: View {
9191
if FeatureFlags.skipOnboardingEmailCollection {
9292
StandardButton(
9393
Loc.skip,
94-
style: FeatureFlags.brandNewAuthFlow ? .linkLarge : .secondaryLarge,
94+
style: .linkLarge,
9595
action: {
9696
model.onSkipAction()
9797
}

Anytype/Sources/PresentationLayer/Modules/ServerConfiguration/ServerConfigurationView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ struct ServerConfigurationView: View {
3737

3838
StandardButton(
3939
Loc.Server.addButton,
40-
style: FeatureFlags.brandNewAuthFlow ? .secondaryLarge : .secondaryMedium)
40+
style: .secondaryLarge)
4141
{
4242
model.onTapAddServer()
4343
}

Modules/AnytypeCore/AnytypeCore/Generated/FeatureFlags+Flags.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ public extension FeatureFlags {
3838
value(for: .vaultBackToRoots)
3939
}
4040

41-
static var brandNewAuthFlow: Bool {
42-
value(for: .brandNewAuthFlow)
43-
}
44-
4541
static var showAllButtonInWidgets: Bool {
4642
value(for: .showAllButtonInWidgets)
4743
}
@@ -144,7 +140,6 @@ public extension FeatureFlags {
144140
.fixCollectionViewReuseCrashInEditor,
145141
.loadAttachmentsOnHomePlusMenu,
146142
.vaultBackToRoots,
147-
.brandNewAuthFlow,
148143
.showAllButtonInWidgets,
149144
.turnOffAutomaticWidgetOpening,
150145
.channelTypeSwitcher,

Modules/AnytypeCore/AnytypeCore/Utils/FeatureFlags/FeatureDescription+Flags.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@ public extension FeatureDescription {
5151
type: .feature(author: "vova@anytype.io", releaseVersion: "13"),
5252
defaultValue: true
5353
)
54-
55-
static let brandNewAuthFlow = FeatureDescription(
56-
title: "New auth flow",
57-
type: .feature(author: "joe_pusya@anytype.io", releaseVersion: "13"),
58-
defaultValue: true
59-
)
6054

6155
static let showAllButtonInWidgets = FeatureDescription(
6256
title: "See all as the last point in the widget - IOS-4945",

0 commit comments

Comments
 (0)