Skip to content

Commit

Permalink
feat(button): lint and resolve button borders
Browse files Browse the repository at this point in the history
  • Loading branch information
@jamie-brannan
jamie-brannan committed Oct 27, 2020
1 parent 5e476f4 commit af7407c
Showing 1 changed file with 192 additions and 154 deletions.
346 changes: 192 additions & 154 deletions Pipeliner/ContentView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,174 +9,212 @@ import SwiftUI
import WidgetKit

struct ContentView: View {
internal let pipelinerService: PipelinerService = PipelinerService()
static let serviceTypes = ServiceType.allCases.map { $0.rawValue }
@State private var serviceType = 0
@State private var projectId = ""
@State private var token = ""
@State private var baseUrl = ""
@State private var savedBaseUrl = ""
@State private var pipelines: [PipelineResult]
@State private var configurations: [Config]

@State private var selection: ServiceType = .GITLAB

@Environment(\.colorScheme) var colorScheme
internal let pipelinerService: PipelinerService = PipelinerService()
static let serviceTypes = ServiceType.allCases.map { $0.rawValue }
@State private var serviceType = 0
@State private var projectId = ""
@State private var token = ""
@State private var baseUrl = ""
@State private var savedBaseUrl = ""
@State private var pipelines: [PipelineResult]
@State private var configurations: [Config]

let windowBackground = (dark: NSColor.darkGray, light: NSColor.white)
let headerIcon = (dark: Color.white, light: Color.purple)
let headerText = (dark: Color.gray, light: Color.black)
let miniIcon = (dark: Color.blue, light: Color.purple)
let formTitle = (dark: Color.white, light: Color.black)
let projectTitle = (dark: Color.white, light: Color.black)
let projectSubtitle = Color.gray
@State private var selection: ServiceType = .GITLAB

init() {
_pipelines = State(initialValue: pipelinerService.getPipelines(pipelineCount: 10))
_configurations = State(initialValue: ConfigurationService.getConfigurations())
@Environment(\.colorScheme) var colorScheme

let windowBackground = (dark: NSColor.darkGray, light: NSColor.white)
let headerIcon = (dark: Color.white, light: Color.purple)
let headerText = (dark: Color.gray, light: Color.black)
let miniIcon = (dark: Color.blue, light: Color.purple)
let formTitle = (dark: Color.white, light: Color.black)
let projectTitle = (dark: Color.white, light: Color.black)
let projectSubtitle = Color.gray

init() {
_pipelines = State(initialValue: pipelinerService.getPipelines(pipelineCount: 10))
_configurations = State(initialValue: ConfigurationService.getConfigurations())
}


private func isFormValid() -> Bool {
if projectId.isEmpty {
return false
}


private func isFormValid() -> Bool {
if projectId.isEmpty {
return false
}

if baseUrl.isEmpty {
return false
}

if token.isEmpty {
return false
}

return true
if baseUrl.isEmpty {
return false
}
var body: some View {

if token.isEmpty {
return false
}
return true
}

var body: some View {
ZStack {
Color(colorScheme == .dark ? windowBackground.dark: windowBackground.light).opacity(0.15).edgesIgnoringSafeArea(/*@START_MENU_TOKEN@*/.all/*@END_MENU_TOKEN@*/)
HStack(content: {
VStack(alignment: /*@START_MENU_TOKEN@*/.center/*@END_MENU_TOKEN@*/, content: {
Image(systemName: "gear")
.font(.system(size: 40))
.foregroundColor(colorScheme == .dark ? headerIcon.dark: headerIcon.light)
.padding(.bottom, 6)
Text("Add Configuration")
.font(.title2)
.multilineTextAlignment(.center)
.foregroundColor(colorScheme == .dark ? headerText.dark: headerText.light)
Divider()
Picker("Service", selection: $selection.animation()) {
ForEach(ServiceType.allCases, id: \.self) {
Text($0.rawValue).tag($0)
}
HStack(content: {
VStack(alignment: /*@START_MENU_TOKEN@*/.center/*@END_MENU_TOKEN@*/, content: {
Image(systemName: "gear")
.font(.system(size: 40))
.foregroundColor(colorScheme == .dark ? headerIcon.dark: headerIcon.light)
.padding(.bottom, 6)
Text("Add Configuration")
.font(.title2)
.multilineTextAlignment(.center)
.foregroundColor(colorScheme == .dark ? headerText.dark: headerText.light)
Divider()
Form {
Section{

Section{
Text("Base Url")
.font(.title3)
.padding(.horizontal)
TextField("http://gitlab.com",text: $baseUrl)
.cornerRadius(5)
.padding(.horizontal)
}
.padding(.bottom, 2)

Section{
Text("Project ID")
.font(.title3)
.padding(.horizontal)
TextField("1234",text: $projectId)
.cornerRadius(5)
.padding(.horizontal)
}
.padding(.bottom, 2)

HStack {
Text("Private Access Token")
.font(.title3)
.cornerRadius(15)
.padding(.leading)
Link(destination: URL(string: "https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html#creating-a-personal-access-token")!) {
Image(systemName: "questionmark.circle").font(.title3).foregroundColor(colorScheme == .dark ? miniIcon.dark: miniIcon.light)
}
.pickerStyle(DefaultPickerStyle())
}
TextField("your-secret-token",text: $token)
.cornerRadius(5)
.padding(.horizontal)
.padding(EdgeInsets(top: 8, leading: 0, bottom: 8, trailing: 0))
Form {
Section{
Section{
Text("Base Url")
.font(.title3)
.padding(.horizontal)
TextField(selection.urlPlaceholder()text: $baseUrl)
.cornerRadius(5)
.padding(.horizontal)
}.padding(.bottom, 2)
if selection != .GITHUB {
Section{
Text("Project ID")
.font(.title3)
.padding(.horizontal)
TextField("1234",text: $projectId)
.cornerRadius(5)
.padding(.horizontal)
}.padding(.bottom, 2)
}
HStack {
Text("Private Access Token")
.font(.title3)
.cornerRadius(15)
.padding(.leading)
Link(destination: selection.tokenDescriptionLink()) {
Image(systemName: "questionmark.circle").font(.title3).foregroundColor(colorScheme == .dark ? miniIcon.dark: miniIcon.light)
}
}
TextField("your-secret-token",text: $token)
.cornerRadius(5)
.padding(.horizontal)
}
}
Button(action: {
if let projectName = pipelinerService.getProjectName(baseUrl: baseUrl, projectId: projectId, token: token) {
configurations = ConfigurationService.addConfiguration(config: Config(id: UUID().uuidString, baseUrl: baseUrl, projectId: projectId, token: token, repositoryName: projectName))
pipelines = pipelinerService.getPipelines(pipelineCount: 10)
WidgetCenter.shared.reloadAllTimelines()

} else {
savedBaseUrl = "not found"
}
}) {
HStack {
Image(systemName: "plus").font(.system(size: 16)).foregroundColor(.white)
Text("Save").font(.system(size: 12)).fontWeight(.semibold).foregroundColor(.white)
}
}
.disabled(!self.isFormValid())
.background(colorScheme == .dark ? miniIcon.dark: miniIcon.light)
.buttonStyle(BorderedButtonStyle())
.cornerRadius(/*@START_MENU_TOKEN@*/3.0/*@END_MENU_TOKEN@*/)
.padding()
VStack {
Image(systemName: "square.and.arrow.down.on.square").font(.system(size: 40)).foregroundColor(colorScheme == .dark ? headerIcon.dark: headerIcon.light).padding(.bottom, 6)
Text("Saved Configuration").font(.title2).multilineTextAlignment(.center).foregroundColor(colorScheme == .dark ? headerText.dark: headerText.light)
Divider()
VStack {
ForEach(configurations, id: \.self){ configuration in
HStack(content: {
VStack(alignment: .leading, content: {
Text(configuration.repositoryName.uppercased())
Text(configuration.baseUrl).foregroundColor(projectSubtitle)
})
Spacer()
VStack(alignment: .leading, content: {
Button(action: {
configurations = ConfigurationService.deleteConfiguration(id: configuration.id)
pipelines = pipelinerService.getPipelines(pipelineCount: 10)
WidgetCenter.shared.reloadAllTimelines()
}) {
Image(systemName: "minus.circle").font(.system(size: 24)).foregroundColor(colorScheme == .dark ? miniIcon.dark: miniIcon.light)
}
})
}).foregroundColor(projectTitle.dark).padding(.horizontal).buttonStyle(BorderlessButtonStyle())
}
}.padding(.bottom)
}.padding(.top)
Spacer()
}).padding()
}
}

Button(action: {
if let projectName = pipelinerService.getProjectName(baseUrl: baseUrl, projectId: projectId, token: token) {
configurations = ConfigurationService.addConfiguration(config: Config(id: UUID().uuidString, baseUrl: baseUrl, projectId: projectId, token: token, repositoryName: projectName))
pipelines = pipelinerService.getPipelines(pipelineCount: 10)
WidgetCenter.shared.reloadAllTimelines()

} else {
savedBaseUrl = "not found"
}
}) {

HStack {
Image(systemName: "plus")
.font(.system(size: 16))
.foregroundColor(.white)
Text("Save")
.font(.system(size: 12))
.fontWeight(.semibold)
.foregroundColor(.white)
}
}
.disabled(!self.isFormValid())
.background(
RoundedRectangle(cornerRadius: 8, style: .continuous)
.fill(colorScheme == .dark ? miniIcon.dark: miniIcon.light)
)
.padding()

VStack {

Image(systemName: "square.and.arrow.down.on.square")
.font(.system(size: 40))
.foregroundColor(colorScheme == .dark ? headerIcon.dark: headerIcon.light)
.padding(.bottom, 6)

Text("Saved Configuration")
.font(.title2)
.multilineTextAlignment(.center)
.foregroundColor(colorScheme == .dark ? headerText.dark: headerText.light)

Divider()

VStack {
Image(systemName: "waveform.path.ecg").font(.system(size: 40)).foregroundColor(colorScheme == .dark ? headerIcon.dark: headerIcon.light).padding(.bottom, 6)
Text("Pipelines").font(.title2).multilineTextAlignment(.center).foregroundColor(colorScheme == .dark ? headerText.dark: headerText.light)
Divider()
if(pipelines.count != 0) {
ForEach(0..<pipelines.count){ index in
PipelineDetailView(pipeline: pipelines[index], isLastRow: index == pipelines.count - 1 ? true : false)
}

}
Spacer()
ForEach(configurations, id: \.self){ configuration in
HStack(content: {
VStack(alignment: .leading, content: {
Text(configuration.repositoryName.uppercased())
Text(configuration.baseUrl)
.foregroundColor(projectSubtitle)
})

Spacer()

VStack(alignment: .leading, content: {
Button(action: {
configurations = ConfigurationService.deleteConfiguration(id: configuration.id)
pipelines = pipelinerService.getPipelines(pipelineCount: 10)
WidgetCenter.shared.reloadAllTimelines()
}) {
Image(systemName: "minus.circle").font(.system(size: 24)).foregroundColor(colorScheme == .dark ? miniIcon.dark: miniIcon.light)
}
})
})
.foregroundColor(projectTitle.dark)
.padding(.horizontal)
.buttonStyle(BorderlessButtonStyle())
}
}
.padding(.bottom)
}
.padding(.top)

Spacer()
})
.padding()

Divider()

VStack {

Image(systemName: "waveform.path.ecg")
.font(.system(size: 40))
.foregroundColor(colorScheme == .dark ? headerIcon.dark: headerIcon.light)
.padding(.bottom, 6)

Text("Pipelines").font(.title2).multilineTextAlignment(.center).foregroundColor(colorScheme == .dark ? headerText.dark: headerText.light)

Divider()

if(pipelines.count != 0) {
ForEach(0..<pipelines.count){ index in
PipelineDetailView(pipeline: pipelines[index], isLastRow: index == pipelines.count - 1 ? true : false)
}

}).foregroundColor(colorScheme == .dark ? formTitle.dark: formTitle.light).padding()
Spacer()
}.padding(.bottom)
}
}

Spacer()
}

})
.foregroundColor(colorScheme == .dark ? formTitle.dark: formTitle.light)
.padding()

Spacer()
}
.padding(.bottom)
}
}

struct ContentView_Previews: PreviewProvider {
static var previews: some View {
ContentView()
}
static var previews: some View {
ContentView()
}
}

0 comments on commit af7407c

Please sign in to comment.