Skip to content
Snippets Groups Projects
Commit 2973ee67 authored by Tormod Mork Müller's avatar Tormod Mork Müller :computer:
Browse files

Added loading symbol when getting data and fixed syntax and removed unused code

parent e04fea68
No related branches found
No related tags found
1 merge request!110Made changes for the Mobile application
Hide whitespace changes
Inline Side-by-side
stillasMobileApplication/stillasMobileApplication/Views/Model/ProjectData.swift
+ 12
− 6
View file @ 2973ee67
......@@ -8,22 +8,28 @@
import SwiftUI
import Foundation
/**
ProjectData responsible for loading/decoding the project information from the API
To update views when data changes, you make your data model classes observable objects.
*/
class ProjectData: ObservableObject {
@Published var projects = [Project]()
@Published private var _isLoading: Bool = false
var isLoading: Bool {
get { return _isLoading}
}
func loadData(completion:@escaping ([Project]) -> ()) async {
guard let url = URL(string: "http://10.212.138.205:8080/stillastracking/v1/api/project") else {
_isLoading = true
print("One = \(_isLoading)")
guard let url = URL(string: "http://10.212.138.205:8080/stillastracking/v1/api/project?scaffolding=true") else {
print("Invalid url...")
return
}
URLSession.shared.dataTask(with: url) { data, response, error in
URLSession.shared.dataTask(with: url) { [self] data, response, error in
let projects = try! JSONDecoder().decode([Project].self, from: data!)
DispatchQueue.main.async {
completion(projects)
self._isLoading = false
print("Two = \(self._isLoading)")
}
}.resume()
}
......
stillasMobileApplication/stillasMobileApplication/Views/ProjectView/ProjectView/ProjectListView.swift
+ 81
− 116
View file @ 2973ee67
......@@ -7,27 +7,7 @@
import SwiftUI
import UIKit
/*
struct BookMark: Identifiable {
let id = UUID()
let name: String
let icon: String
var items: [BookMark]?
}
struct ProjectView1: View {
let items: [BookMark] = [.example1, .example2, .example3]
var body: some View {
Section(header: Text("Second List")) {
List(items, children: \.items) { row in
Image(systemName: row.icon)
Text(row.name)
}
}
}
}*/
enum FilterType {
case none,
period,
......@@ -59,20 +39,9 @@ struct ProjectRow: View {
}
}
/*
extension BookMark {
static let apple = BookMark(name: "Apple", icon: "1.circle")
static let bbc = BookMark(name: "BBC", icon: "square.and.pencil")
static let swift = BookMark(name: "Swfit", icon: "bolt.fill")
static let twitter = BookMark(name: "Twitter", icon: "mic")
static let example1 = BookMark(name: "Favorites", icon: "star", items: [BookMark.apple, BookMark.bbc, BookMark.swift, BookMark.twitter])
static let example2 = BookMark(name: "Recent", icon: "timer", items: [BookMark.apple, BookMark.bbc, BookMark.swift, BookMark.twitter])
static let example3 = BookMark(name: "Recommended", icon: "hand.thumbsup", items: [BookMark.apple, BookMark.bbc, BookMark.swift, BookMark.twitter])
}
*/
struct ProjectListView: View {
@ObservedObject var projectData: ProjectData = ProjectData()
@State var searchQuery = ""
@State var hasFetchedData = false
@State var projects = [Project]()
......@@ -95,86 +64,94 @@ struct ProjectListView: View {
@State private var isLoading = true
var body: some View {
VStack {
NavigationView {
Form {
Section(header: Text("Alle Prosjekter")) {
/*List(searchResults, id: \.projectID) { project in
NavigationLink(destination: ProjectDetailView(project: project), label: {
ProjectRow(project: project) }
)
NavigationView {
ZStack {
if projectData.isLoading {
Spacer().frame(height:100)
ProgressView("Laster inn...")
.progressViewStyle(CircularProgressViewStyle(tint: .gray))
.scaleEffect(x: 1.2, y: 1.2, anchor: .center)
} else {
Form {
Section(header: Text("Alle Prosjekter")) {
List(searchResults, id: \.projectID) { project in
NavigationLink(destination: ProjectInfoView(projects: projects, project: project), label: {
ProjectRow(project: project) }
)
}
.navigationTitle("Prosjekter")
}
}
.listStyle(.grouped)
.toolbar {
ToolbarItemGroup(placement: .navigationBarLeading) {
Button(action: {
print("Filter tapped!")
self.showFilterModalView.toggle()
}) {
Label("Filter", systemImage: "line.3.horizontal.decrease.circle")
}
}
ToolbarItemGroup(placement: .navigationBarTrailing) {
Button(action: {
print("Add project tapped!")
self.showAddProjectModalView.toggle()
}) {
Label("Legg til", systemImage: "plus.circle")
}
}
}
}
.navigationTitle("Projects")*/
List(searchResults, id: \.projectID) { project in
NavigationLink(destination: ProjectInfoView(projects: projects, project: project), label: {
ProjectRow(project: project) }
)
}
.navigationTitle("Prosjekter")
//.listStyle(.grouped)
}
}
.listStyle(.grouped)
.toolbar {
ToolbarItemGroup(placement: .navigationBarLeading) {
Button(action: {
print("Filter tapped!")
self.showFilterModalView.toggle()
}) {
Label("Filter", systemImage: "line.3.horizontal.decrease.circle")
}
.task {
await projectData.loadData { (projects) in
self.projects = projects
}
ToolbarItemGroup(placement: .navigationBarTrailing) {
Button(action: {
print("Add project tapped!")
self.showAddProjectModalView.toggle()
}) {
Label("Legg til", systemImage: "plus.circle")
}
}
}
}
.task {
await ProjectData().loadData { (projects) in
self.projects = projects
}
}
.sheet(isPresented: $showFilterModalView,
onDismiss: didDismiss) {
FilterView(selStartDateBind: $projectStartDate, selEndDateBind: $projectEndDate, projectArea: $projectCounty, projectSize: $projectSize, projectStatus: $projectState, minProjectSize: $minProjectSize, maxProjectSize: $maxProjectSize, sizeSortType: $sizeSortType, filterArr: $filterArr, filterArrArea: $filterArrArea)
.onChange(of: filterArr) { filterVal in
if filterArr.contains("period") {
filter = .period
}
if filterArr.contains("area") {
filter = .county
}
if filterArr.contains("size") && sizeSortType == "Mellom" {
filter = .sizeBetween
} else if filterArr.contains("size") && sizeSortType == "Mindre enn" {
filter = .sizeLessThan
} else if filterArr.contains("size") && sizeSortType == "Større enn" {
filter = .sizeGreaterThan
}
if filterArr.contains("status") {
filter = .state
}
if filterArr.isEmpty {
filter = .none
.sheet(isPresented: $showFilterModalView,
onDismiss: didDismiss) {
FilterView(selStartDateBind: $projectStartDate, selEndDateBind: $projectEndDate, projectArea: $projectCounty, projectSize: $projectSize, projectStatus: $projectState, minProjectSize: $minProjectSize, maxProjectSize: $maxProjectSize, sizeSortType: $sizeSortType, filterArr: $filterArr, filterArrArea: $filterArrArea)
.onChange(of: filterArr) { filterVal in
if filterArr.contains("period") {
filter = .period
}
if filterArr.contains("area") {
filter = .county
}
if filterArr.contains("size") && sizeSortType == "Mellom" {
filter = .sizeBetween
} else if filterArr.contains("size") && sizeSortType == "Mindre enn" {
filter = .sizeLessThan
} else if filterArr.contains("size") && sizeSortType == "Større enn" {
filter = .sizeGreaterThan
}
if filterArr.contains("status") {
filter = .state
}
if filterArr.isEmpty {
filter = .none
}
}
}
.navigationViewStyle(.stack)
.searchable(text: $searchQuery, placement: .navigationBarDrawer(displayMode: .always))
.refreshable {
await projectData.loadData { (projects) in
self.projects = projects
}
print("Refreshed")
}
}
.navigationViewStyle(.stack)
.searchable(text: $searchQuery, placement: .navigationBarDrawer(displayMode: .always))
.refreshable {
print("Refreshed")
// TODO: Add action here (retrieve from API again or something)
}
//ProjectView1()
.sheet(isPresented: $showAddProjectModalView, onDismiss: didDismiss){
Text("501")
.font(.system(size: 40).bold())
Text("Not Implemented")
.font(.system(size: 30).bold())
}
}
// TODO: Add support for search of filtered items
var searchResults: [Project] {
if searchQuery.isEmpty {
return filteredProjects.sorted { $0.projectName < $1.projectName }
......@@ -225,22 +202,10 @@ struct ProjectListView: View {
}
}
struct ActivityIndicator: UIViewRepresentable {
@Binding var isAnimating: Bool
let style: UIActivityIndicatorView.Style
func makeUIView(context: UIViewRepresentableContext<ActivityIndicator>) -> UIActivityIndicatorView {
return UIActivityIndicatorView(style: style)
}
func updateUIView(_ uiView: UIActivityIndicatorView, context: UIViewRepresentableContext<ActivityIndicator>) {
isAnimating ? uiView.startAnimating() : uiView.stopAnimating()
}
}
/*
struct Project_Previews: PreviewProvider {
static var previews: some View {
ProjectListView()
}
}
*/
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment