Skip to content

Commit

Permalink
Update application UI (#58)
Browse files Browse the repository at this point in the history 
* chore: Update swift version to 5.10

* feat: Update application UI.

* chore: Update xcode version on CI
  • Loading branch information
@fummicc1
fummicc1 authored Sep 23, 2024
1 parent bd4a038 commit 3eb4c7b
Show file tree
Hide file tree
Showing 5 changed files with 212 additions and 209 deletions.
155 changes: 54 additions & 101 deletions Csv2ImageApp/Csv2ImageApp/Views/GenerateOutputView/GenerateOutputView+iOS.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,125 +24,78 @@ import SwiftUI
]

var body: some View {
NavigationStack {
loadedContent.id(model.state.isLoading)
.toolbar {
ToolbarItem(placement: .primaryAction) {
Button("Save") {
succeedSavingOutput = model.save()
}
}
}
.toolbar {
ToolbarItem(placement: .topBarLeading) {
Button("Back") {
backToPreviousPage = true
}
}
}
.alert("Complete Saving!", isPresented: $succeedSavingOutput) {
CButton.labeled("Back") {
withAnimation {
backToPreviousPage = true
}
NavigationView {
Form {
Section(header: Text("Export Settings")) {
Picker("Export Type", selection: Binding(
get: { model.state.exportType },
set: { model.update(keyPath: \.exportType, value: $0) }
)) {
Text("PDF").tag(Csv.ExportType.pdf)
Text("PNG").tag(Csv.ExportType.png)
}
if let savedURL = model.savedURL, Application.shared.canOpenURL(savedURL) {
CButton.labeled("Open") {
Application.shared.open(savedURL)
}
}
}
}
}
.pickerStyle(SegmentedPickerStyle())

var loadedContent: some View {
VStack {
List {
Section("Export Type") {
Picker(
selection: Binding(
get: {
model.state.exportType
},
set: { exportType in
model.update(keyPath: \.exportType, value: exportType)
})
) {
CText("PDF")
.tag(Csv.ExportType.pdf)
CText("PNG")
.tag(Csv.ExportType.png)
} label: {
EmptyView()
}
.pickerStyle(.segmented)
}
Section("Encoding") {
Menu(model.state.encoding.description) {
Picker("Encoding", selection: Binding(
get: { model.state.encoding },
set: { model.update(keyPath: \.encoding, value: $0) }
)) {
ForEach(availableEncodingType, id: \.self) { encoding in
Button {
model.update(keyPath: \.encoding, value: encoding)
} label: {
Text(encoding.description)
}
Text(encoding.description).tag(encoding)
}
}
.fixedSize()
}
Section("PDF Size") {
Menu(model.state.size.rawValue) {
ForEach(PdfSize.allCases.indices, id: \.self) { index in
let size = PdfSize.allCases[index]
Button {
model.update(keyPath: \.size, value: size)
} label: {
Text(size.rawValue)
}

Picker("PDF Size", selection: Binding(
get: { model.state.size },
set: { model.update(keyPath: \.size, value: $0) }
)) {
ForEach(PdfSize.allCases, id: \.self) { size in
Text(size.rawValue).tag(size)
}
}
.fixedSize()
}
Section("PDF Orientation") {
Menu(model.state.orientation.rawValue) {
ForEach(PdfSize.Orientation.allCases.indices, id: \.self) { index in
let orientation = PdfSize.Orientation.allCases[index]
Button {
model.update(keyPath: \.orientation, value: orientation)
} label: {
Text(orientation.rawValue)
}

Picker("PDF Orientation", selection: Binding(
get: { model.state.orientation },
set: { model.update(keyPath: \.orientation, value: $0) }
)) {
ForEach(PdfSize.Orientation.allCases, id: \.self) { orientation in
Text(orientation.rawValue).tag(orientation)
}
}
.fixedSize()
}
}
.background(Asset.lightAccentColor.swiftUIColor)
.frame(maxHeight: 200)

GeometryReader { proxy in
VStack(alignment: .center) {
Section(header: Text("Preview")) {
GeneratePreviewView(
model: model,
size: .constant(
CGSize(
width: proxy.size.width,
height: proxy.size.height
)
)
size: .constant(CGSize(width: UIScreen.main.bounds.width - 32, height: 300))
)
.frame(height: 300)
.background(Asset.lightAccentColor.swiftUIColor)
.cornerRadius(8)
}

}
.background(Asset.lightAccentColor.swiftUIColor)
.navigationBarTitle("Generate Output", displayMode: .inline)
.navigationBarItems(
leading: Button("Back") { backToPreviousPage = true },
trailing: Button("Save") { succeedSavingOutput = model.save() }
)
}
}

var loadingContent: some View {
ProgressView {
CText("Loading...", font: .largeTitle)
.alert(isPresented: $succeedSavingOutput) {
Alert(
title: Text("Complete Saving!"),
message: nil,
primaryButton: .default(Text("Back")) {
withAnimation {
backToPreviousPage = true
}
},
secondaryButton: .default(Text("Open")) {
if let savedURL = model.savedURL, Application.shared.canOpenURL(savedURL) {
Application.shared.open(savedURL)
}
}
)
}
.padding()
.progressViewStyle(.linear)
}
}
#endif
57 changes: 44 additions & 13 deletions Csv2ImageApp/Csv2ImageApp/Views/GenerateOutputView/GenerateOutputView+macOS.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,56 @@ import SwiftUI
@Environment(\.dismiss) var dismiss

var body: some View {
VStack {
GeneratePreviewView(
model: model,
size: .constant(
.init(
width: 320,
height: 240
NavigationView {
HSplitView {
List {
Section("Settings") {
Picker("Encoding", selection: $model.encoding) {
ForEach(availableEncodingType, id: \.self) { encoding in
Text(encoding.description).tag(encoding)
}
}
// Add more settings here as needed
}
}
.listStyle(SidebarListStyle())
.frame(minWidth: 200, idealWidth: 250, maxWidth: 300)

VStack {
GeneratePreviewView(
model: model,
size: .constant(
.init(
width: 480,
height: 360
)
)
)
)
)
.frame(maxWidth: .infinity, maxHeight: .infinity)

HStack {
Button("Generate") {
// Add generation logic here
}
.keyboardShortcut(.defaultAction)

Button("Save As...") {
// Add save logic here
}
}
.padding()
}
}
}
.navigationTitle("Generate Output")
.toolbar {
CButton.labeled(
"cancel",
onPressed: {
ToolbarItem(placement: .cancellationAction) {
Button("Cancel") {
dismiss()
}
)
}
}
.frame(minWidth: 800, minHeight: 600)
}
}

Expand Down
60 changes: 29 additions & 31 deletions Csv2ImageApp/Csv2ImageApp/Views/GenerateOutputView/GeneratePreviewView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,43 +20,41 @@ struct GeneratePreviewView: View {

#if os(iOS)
var body: some View {
Group {
if let cgImage = model.state.cgImage, model.state.exportType == .png {
let image = UIImage(cgImage: cgImage)
ScrollView {
ScrollView(
.horizontal,
content: {
Image(uiImage: image)
.resizable()
.aspectRatio(contentMode: .fit)
})
GeometryReader { geometry in
Group {
if let cgImage = model.state.cgImage, model.state.exportType == .png {
let image = UIImage(cgImage: cgImage)
ScrollView([.vertical, .horizontal], showsIndicators: true) {
Image(uiImage: image)
.resizable()
.aspectRatio(contentMode: .fit)
.frame(width: geometry.size.width, height: geometry.size.height)
}
} else if let document = model.state.pdfDocument, model.state.exportType == .pdf {
PdfDocumentView(document: document, size: $size)
}
.frame(width: size.width, height: size.height)
} else if let document = model.state.pdfDocument, model.state.exportType == .pdf {
PdfDocumentView(document: document, size: _size)
}
}
.edgesIgnoringSafeArea(.all)
}
#elseif os(macOS)
var body: some View {
Group {
if let cgImage = model.state.cgImage, model.state.exportType == .png {
let image = NSImage(
cgImage: cgImage,
size: CGSize(width: cgImage.width, height: cgImage.height)
)
ScrollView(content: {
ScrollView(
.horizontal,
content: {
Image(nsImage: image)
.resizable()
.aspectRatio(contentMode: .fit)
})
})
} else if let document = model.state.pdfDocument, model.state.exportType == .pdf {
PdfDocumentView(document: document, size: _size)
GeometryReader { geometry in
Group {
if let cgImage = model.state.cgImage, model.state.exportType == .png {
let image = NSImage(
cgImage: cgImage,
size: CGSize(width: cgImage.width, height: cgImage.height)
)
ScrollView([.vertical, .horizontal], showsIndicators: true) {
Image(nsImage: image)
.resizable()
.aspectRatio(contentMode: .fit)
.frame(width: geometry.size.width, height: geometry.size.height)
}
} else if let document = model.state.pdfDocument, model.state.exportType == .pdf {
PdfDocumentView(document: document, size: $size)
}
}
}
}
Expand Down
53 changes: 29 additions & 24 deletions Csv2ImageApp/Csv2ImageApp/Views/SelectCsvView/SelectCsvView+iOS.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,41 +13,46 @@ import SwiftUI
@StateObject var model: SelectCsvModel

var body: some View {
BrandingFrameView {
VStack {
Spacer()
CButton.labeled("Select Csv File") {
Task {
await model.selectFileOnDisk()
NavigationView {
Form {
Section(header: Text("Select CSV File")) {
Button(action: {
Task {
await model.selectFileOnDisk()
}
}) {
Label("Choose File", systemImage: "doc")
}
}
Divider().padding()
CText("Alternately, please input csv file url on the Internet.")
HStack {
TextField("example: https://bit.ly/3c2leMC", text: $model.networkUrlText)
.textFieldStyle(.roundedBorder)
Spacer()
if !model.networkUrlText.isEmpty {
CButton.icon(systemName: "xmark") {
model.networkUrlText = ""

Section(header: Text("Or Enter URL")) {
HStack {
TextField("https://example.com/file.csv", text: $model.networkUrlText)
if !model.networkUrlText.isEmpty {
Button(action: {
model.networkUrlText = ""
}) {
Image(systemName: "xmark.circle.fill")
.foregroundColor(.secondary)
}
}
}
CButton.labeled("OK") {
Button("Load from URL") {
Task {
await model.selectFileOnTheInternet()
}
}
Spacer().frame(width: 16)
}
Spacer()
Divider()
CText("Saved data is stored in Folder App.", isBold: true)
CButton.labeled("Open Folder App") {
model.openFolderApp()

Section(footer: Text("Saved data is stored in Folder App.").font(.footnote)) {
Button(action: {
model.openFolderApp()
}) {
Label("Open Folder App", systemImage: "folder")
}
}
Spacer().frame(height: 40)
}
.padding()
.navigationTitle("Select CSV")
}
.alert(
"Error", isPresented: $model.error.isNotNil(),
Expand Down
Loading

0 comments on commit 3eb4c7b

Please sign in to comment.