diff --git a/Xcodes/Frontend/InfoPane/CompatibilityView.swift b/Xcodes/Frontend/InfoPane/CompatibilityView.swift index 9e23e35..9b60998 100644 --- a/Xcodes/Frontend/InfoPane/CompatibilityView.swift +++ b/Xcodes/Frontend/InfoPane/CompatibilityView.swift @@ -50,7 +50,6 @@ private struct WrapperView: View { Text("Is Nil?") } } - .animation(.default) .frame(width: 200, height: 100) .padding() } diff --git a/Xcodes/Frontend/InfoPane/CompilersView.swift b/Xcodes/Frontend/InfoPane/CompilersView.swift index 68d2f52..cfa7df0 100644 --- a/Xcodes/Frontend/InfoPane/CompilersView.swift +++ b/Xcodes/Frontend/InfoPane/CompilersView.swift @@ -65,16 +65,13 @@ private struct WrapperView: View { var body: some View { VStack { - HStack { - CompilersView(compilers: compilers) - .border(.red) - } + CompilersView(compilers: compilers) + .border(.red) Spacer() Toggle(isOn: $isNil) { Text("Is Nil?") } } - .animation(.default) .frame(width: 200, height: 100) .padding() } diff --git a/Xcodes/Frontend/InfoPane/IconView.swift b/Xcodes/Frontend/InfoPane/IconView.swift index e7328d2..f32aef5 100644 --- a/Xcodes/Frontend/InfoPane/IconView.swift +++ b/Xcodes/Frontend/InfoPane/IconView.swift @@ -42,22 +42,19 @@ private struct WrapperView: View { @State var isIcon = false var state: XcodeInstallState { isIcon - ? XcodeInstallState.notInstalled - : XcodeInstallState.installed(Path("/Applications/Xcode.app")!) + ? XcodeInstallState.installed(Path("/Applications/Xcode.app")!) + : XcodeInstallState.notInstalled } var body: some View { VStack { - HStack { - IconView(installState: state) - .border(.red) - } + IconView(installState: state) + .border(.red) Spacer() Toggle(isOn: $isIcon) { - Text("Is an Icon?") + Text("Icon?") } } - .animation(.default) .frame(width: 300, height: 100) .padding() } diff --git a/Xcodes/Frontend/InfoPane/IdenticalBuildView.swift b/Xcodes/Frontend/InfoPane/IdenticalBuildView.swift index 3c78eb0..ad3fcd9 100644 --- a/Xcodes/Frontend/InfoPane/IdenticalBuildView.swift +++ b/Xcodes/Frontend/InfoPane/IdenticalBuildView.swift @@ -33,7 +33,6 @@ struct IdenticalBuildsView: View { .font(.subheadline) } } - .frame(maxWidth: .infinity, alignment: .leading) .accessibilityElement() .accessibility(label: Text("IdenticalBuilds")) .accessibility(value: Text(accessibilityDescription)) @@ -67,16 +66,13 @@ private struct WrapperView: View { var body: some View { VStack { - HStack { - IdenticalBuildsView(builds: builds) + IdenticalBuildsView(builds: builds) .border(.red) - } Spacer() Toggle(isOn: $isEmpty) { - Text("Is Empty?") + Text("No Builds?") } } - .animation(.default) .frame(width: 300, height: 100) .padding() } diff --git a/Xcodes/Frontend/InfoPane/InfoPane.swift b/Xcodes/Frontend/InfoPane/InfoPane.swift index e242bcd..a1c6716 100644 --- a/Xcodes/Frontend/InfoPane/InfoPane.swift +++ b/Xcodes/Frontend/InfoPane/InfoPane.swift @@ -27,7 +27,6 @@ struct InfoPane: View { ) case let .installing(installationStep): InstallationStepDetailView(installationStep: installationStep) - .fixedSize(horizontal: false, vertical: true) CancelInstallButton(xcode: xcode) case .installed: InstalledStateButtons(xcode: xcode) @@ -38,7 +37,6 @@ struct InfoPane: View { Group { ReleaseNotesView(url: xcode.releaseNotesURL) ReleaseDateView(date: xcode.releaseDate) - .frame(maxWidth: .infinity, alignment: .leading) IdenticalBuildsView(builds: xcode.identicalBuilds) CompatibilityView(requiredMacOSVersion: xcode.requiredMacOSVersion) SDKsView(sdks: xcode.sdks) @@ -54,23 +52,6 @@ struct InfoPane: View { UnselectedView() } } - - @ViewBuilder - private func downloadFileSize(for xcode: Xcode) -> some View { - // if we've downloaded it no need to show the download size - if let downloadFileSize = xcode.downloadFileSizeString, case .notInstalled = xcode.installState { - VStack(alignment: .leading) { - Text("DownloadSize") - .font(.headline) - .frame(maxWidth: .infinity, alignment: .leading) - Text("\(downloadFileSize)") - .font(.subheadline) - .frame(maxWidth: .infinity, alignment: .leading) - } - } else { - EmptyView() - } - } } struct InfoPane_Previews: PreviewProvider { diff --git a/Xcodes/Frontend/InfoPane/InstallationStepDetailView.swift b/Xcodes/Frontend/InfoPane/InstallationStepDetailView.swift index 863f204..7c16066 100644 --- a/Xcodes/Frontend/InfoPane/InstallationStepDetailView.swift +++ b/Xcodes/Frontend/InfoPane/InstallationStepDetailView.swift @@ -39,10 +39,11 @@ struct InstallDetailView_Previews: PreviewProvider { } ) ) - + InstallationStepDetailView( installationStep: .unarchiving ) } + .padding() } } diff --git a/Xcodes/Frontend/InfoPane/InstalledStateButtons.swift b/Xcodes/Frontend/InfoPane/InstalledStateButtons.swift index de1c73c..241920f 100644 --- a/Xcodes/Frontend/InfoPane/InstalledStateButtons.swift +++ b/Xcodes/Frontend/InfoPane/InstalledStateButtons.swift @@ -38,7 +38,6 @@ struct InstalledStateButtons: View { Spacer() UninstallButton(xcode: xcode) } - } } } diff --git a/Xcodes/Frontend/InfoPane/NotInstalledStateButtons.swift b/Xcodes/Frontend/InfoPane/NotInstalledStateButtons.swift index db81d9d..a0d09ef 100644 --- a/Xcodes/Frontend/InfoPane/NotInstalledStateButtons.swift +++ b/Xcodes/Frontend/InfoPane/NotInstalledStateButtons.swift @@ -22,8 +22,8 @@ struct NotInstalledStateButtons: View { } label: { Text("Install") .help("Install") } + if let size = downloadFileSizeString { - Text("DownloadSize") .font(.headline) Text(size) diff --git a/Xcodes/Frontend/InfoPane/ReleaseDateView.swift b/Xcodes/Frontend/InfoPane/ReleaseDateView.swift index 0695f4d..2c78b70 100644 --- a/Xcodes/Frontend/InfoPane/ReleaseDateView.swift +++ b/Xcodes/Frontend/InfoPane/ReleaseDateView.swift @@ -14,7 +14,7 @@ struct ReleaseDateView: View { var body: some View { if let date = date { VStack(alignment: .leading) { - Text("ReleaseDate (old version)") + Text("ReleaseDate") .font(.headline) Text("\(date, style: .date)") .font(.subheadline) @@ -41,16 +41,13 @@ private struct WrapperView: View { var body: some View { VStack { - HStack { - ReleaseDateView(date: date) - .border(.red) - } + ReleaseDateView(date: date) + .border(.red) Spacer() Toggle(isOn: $isNil) { Text("Is Nil?") } } - .animation(.default) .frame(width: 300, height: 100) .padding() } diff --git a/Xcodes/Frontend/InfoPane/ReleaseNotesView.swift b/Xcodes/Frontend/InfoPane/ReleaseNotesView.swift index a9aa3c1..14e86e8 100644 --- a/Xcodes/Frontend/InfoPane/ReleaseNotesView.swift +++ b/Xcodes/Frontend/InfoPane/ReleaseNotesView.swift @@ -46,16 +46,12 @@ private struct WrapperView: View { var body: some View { VStack { - HStack { - ReleaseNotesView(url: url) - .border(.red) - } + ReleaseNotesView(url: url).border(.red) Spacer() Toggle(isOn: $hasURL) { Text("Has URL?") } } - .animation(.default) .frame(width: 300, height: 100) .padding() } diff --git a/Xcodes/Frontend/InfoPane/SDKsView.swift b/Xcodes/Frontend/InfoPane/SDKsView.swift index f2d3ed9..5d229cb 100644 --- a/Xcodes/Frontend/InfoPane/SDKsView.swift +++ b/Xcodes/Frontend/InfoPane/SDKsView.swift @@ -65,16 +65,12 @@ private struct WrapperView: View { var body: some View { VStack { - HStack { - SDKsView(sdks: sdks) - .border(.red) - } + SDKsView(sdks: sdks).border(.red) Spacer() Toggle(isOn: $isNil) { Text("Is Nil?") } } - .animation(.default) .frame(width: 200, height: 100) .padding() }