Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ABW-1750] MFA: list and create securitystructures from settings #580

Merged
merged 16 commits into from
Jun 13, 2023
Merged

[ABW-1750] MFA: list and create securitystructures from settings #580

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d9a2398
WIP
CyonAlexRDX Jun 12, 2023
dbfd1f6
WIP
CyonAlexRDX Jun 12, 2023
9d649e2
WIP
CyonAlexRDX Jun 12, 2023
5e8444b
WIP
CyonAlexRDX Jun 12, 2023
3e23ea7
WIP
CyonAlexRDX Jun 12, 2023
41b0793
WIP
CyonAlexRDX Jun 12, 2023
37bac1f
WIP
CyonAlexRDX Jun 12, 2023
25dc654
WIP
CyonAlexRDX Jun 12, 2023
8e83716
WIP
CyonAlexRDX Jun 12, 2023
df8aafe
WIP
CyonAlexRDX Jun 13, 2023
e860ef4
WIP
CyonAlexRDX Jun 13, 2023
5f7784a
WIP
CyonAlexRDX Jun 13, 2023
92f5288
Merge branch 'MFA/ABW-1750_list_and_create_securitystructures_from_se…
CyonAlexRDX Jun 13, 2023
13b287c
Merge branch 'main' into MFA/ABW-1750_list_and_create_securitystructu…
CyonAlexRDX Jun 13, 2023
9d6e665
WIP
CyonAlexRDX Jun 13, 2023
078614b
WIP
CyonAlexRDX Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Sources/Core/DesignSystem/JSONView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public struct JSONView: SwiftUI.View {
public var body: some View {
#if canImport(UIKit)
UIKitJSONView(jsonString: jsonString)
.padding([.leading], -60) // we hide the "line number" view on the left which eats up precious widdth,zoo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no need for brackets, it's an OptionSet

#else
Text("`\(jsonString)`")
#endif
Expand All @@ -27,8 +28,7 @@ struct UIKitJSONView: UIViewRepresentable {
let jsonPreview: JSONPreview
init(jsonString: String) {
let jsonPreview = JSONPreview()
var style = HighlightStyle.default
jsonPreview.preview(jsonString, style: style)
jsonPreview.preview(jsonString, style: .default)
self.jsonPreview = jsonPreview
}

Expand Down
8 changes: 1 addition & 7 deletions Sources/Features/DebugInspectProfile/DebugInspectProfile+View.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,9 @@ extension DebugInspectProfile {

public var body: some SwiftUI.View {
WithViewStore(store, observe: \.viewState, send: { .view($0) }) { viewStore in
GeometryReader { geoProxy in
ZStack {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the ZStack affect the layout? It shouldn't be needed otherwise, since if let ... else is a legitimate view builder pattern.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Screenshot 2023-06-13 at 11 47 56

Resolved using Group instead. I was 50-50 between both. Don't know if there is any advantage with the one over the other..? Group is probably more performant/lightweight? not sure if it has drawbacks

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aha, didn't see the .toolbar, then it makes sense. I would prefer Group since we're not using z here. Or put the main bit in a func core(viewStore: ...).

if let json = viewStore.json, viewStore.mode == .rawJSON {
let xOffset: CGFloat = 50
JSONView(jsonString: json)
.frame(
width: geoProxy.frame(in: .global).width + xOffset,
height: geoProxy.frame(in: .global).height
)
.offset(x: -xOffset)
} else {
ProfileView(profile: viewStore.profile)
}
Expand Down
1 change: 1 addition & 0 deletions ...t/Children/SecurityStructureConfigurationRow/SecurityStructureConfigurationRow+View.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ extension SecurityStructureConfigurationRow {
.textStyle(.secondaryHeader)
.padding(.bottom, .small1)

// FIXME: Strings
LabelledDate(label: "Created", date: viewStore.createdOn)
CyonAlexRDX marked this conversation as resolved.
Show resolved Hide resolved
.padding(.bottom, .small3)
}
Expand Down