wulkanowy/wulkanowy-ios
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Changes in navigation

Browse source
This commit is contained in:
Pengwius 2021-03-04 10:25:04 +01:00
parent 1b3b563af6
commit 0a0ce1c55d
8 changed files with 53 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
wulkanowy.xcodeproj/project.pbxproj
View file

@ -14,11 +14,11 @@
5C1794CD25E90DBD007AD91A /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = 5C1794CC25E90DBD007AD91A /* KeychainAccess */; };
5C1CFA7A25EA32AE0047286F /* ghImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C1CFA7925EA32AE0047286F /* ghImage.swift */; };
5C2D331025E64F3C000253AC /* grades.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C2D330F25E64F3C000253AC /* grades.swift */; };
5C2D331425E650EC000253AC /* exams.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C2D331325E650EC000253AC /* exams.swift */; };
5C2D331825E651C4000253AC /* homework.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C2D331725E651C4000253AC /* homework.swift */; };
5C2D331C25E651FB000253AC /* more.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C2D331B25E651FB000253AC /* more.swift */; };
5C2D331425E650EC000253AC /* calendar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C2D331325E650EC000253AC /* calendar.swift */; };
5C42E2A225EE656E0048DDCD /* SwiftyJSON in Frameworks */ = {isa = PBXBuildFile; productRef = 5C42E2A125EE656E0048DDCD /* SwiftyJSON */; };
5C478F3525DC742100ABEFB7 /* VulcanStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C478F3425DC742100ABEFB7 /* VulcanStore.swift */; };
5C5162D825F0DCDE00EF0777 /* more.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C5162D725F0DCDE00EF0777 /* more.swift */; };
5C5162DC25F0DD9200EF0777 /* attendance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C5162DB25F0DD9200EF0777 /* attendance.swift */; };
5C75212125EF814400D75CE3 /* CustomButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C75212025EF814400D75CE3 /* CustomButtonView.swift */; };
5C89C8F525EA6AA4000B5816 /* licenses.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C89C8F425EA6AA4000B5816 /* licenses.swift */; };
5C89C90625EA7996000B5816 /* SwiftUIEKtensions in Frameworks */ = {isa = PBXBuildFile; productRef = 5C89C90525EA7996000B5816 /* SwiftUIEKtensions */; };
@ -85,10 +85,10 @@
5C1794BF25E8FE27007AD91A /* about.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = about.swift; sourceTree = "<group>"; };
5C1CFA7925EA32AE0047286F /* ghImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ghImage.swift; sourceTree = "<group>"; };
5C2D330F25E64F3C000253AC /* grades.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = grades.swift; sourceTree = "<group>"; };
5C2D331325E650EC000253AC /* exams.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = exams.swift; sourceTree = "<group>"; };
5C2D331725E651C4000253AC /* homework.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = homework.swift; sourceTree = "<group>"; };
5C2D331B25E651FB000253AC /* more.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = more.swift; sourceTree = "<group>"; };
5C2D331325E650EC000253AC /* calendar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = calendar.swift; sourceTree = "<group>"; };
5C478F3425DC742100ABEFB7 /* VulcanStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VulcanStore.swift; sourceTree = "<group>"; };
5C5162D725F0DCDE00EF0777 /* more.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = more.swift; sourceTree = "<group>"; };
5C5162DB25F0DD9200EF0777 /* attendance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = attendance.swift; sourceTree = "<group>"; };
5C75212025EF814400D75CE3 /* CustomButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomButtonView.swift; sourceTree = "<group>"; };
5C89C8F425EA6AA4000B5816 /* licenses.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = licenses.swift; sourceTree = "<group>"; };
5C9B6E4925D6ADFB00C3F5F5 /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NetworkExtension.framework; path = System/Library/Frameworks/NetworkExtension.framework; sourceTree = SDKROOT; };
@ -211,15 +211,15 @@
children = (
5CC2EAA425E516F100B6183E /* dashboard.swift */,
5C2D330F25E64F3C000253AC /* grades.swift */,
5C2D331325E650EC000253AC /* exams.swift */,
5C2D331725E651C4000253AC /* homework.swift */,
5C2D331B25E651FB000253AC /* more.swift */,
5C2D331325E650EC000253AC /* calendar.swift */,
5C1794B325E8FDFB007AD91A /* messages.swift */,
5C1794B725E8FE08007AD91A /* notes.swift */,
5C1794BB25E8FE19007AD91A /* settings.swift */,
5C1794BF25E8FE27007AD91A /* about.swift */,
5C89C8F425EA6AA4000B5816 /* licenses.swift */,
5CF095AC25F053B10068F2C6 /* accountManager.swift */,
5C5162D725F0DCDE00EF0777 /* more.swift */,
5C5162DB25F0DD9200EF0777 /* attendance.swift */,
);
path = Content;
sourceTree = "<group>";
@ -440,7 +440,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5C2D331425E650EC000253AC /* exams.swift in Sources */,
5C2D331425E650EC000253AC /* calendar.swift in Sources */,
5C478F3525DC742100ABEFB7 /* VulcanStore.swift in Sources */,
5C1CFA7A25EA32AE0047286F /* ghImage.swift in Sources */,
5CCB276325EF9C4A00482F4A /* OnboardingView.swift in Sources */,
@ -448,17 +448,17 @@
5C1794BC25E8FE19007AD91A /* settings.swift in Sources */,
5C2D331025E64F3C000253AC /* grades.swift in Sources */,
5CF6695F25EEE2FD00AC0A86 /* chooseStudent.swift in Sources */,
5C2D331C25E651FB000253AC /* more.swift in Sources */,
5C1794C025E8FE27007AD91A /* about.swift in Sources */,
F4C6D90A2544E17400F8903A /* LoginView.swift in Sources */,
5C89C8F525EA6AA4000B5816 /* licenses.swift in Sources */,
5CC2EAAE25E526B500B6183E /* navigation.swift in Sources */,
5C5162D825F0DCDE00EF0777 /* more.swift in Sources */,
5CF095AD25F053B10068F2C6 /* accountManager.swift in Sources */,
5C2D331825E651C4000253AC /* homework.swift in Sources */,
5C1794B425E8FDFB007AD91A /* messages.swift in Sources */,
5CC2EAA525E516F100B6183E /* dashboard.swift in Sources */,
5C1794B825E8FE08007AD91A /* notes.swift in Sources */,
F4C6D9082544E17400F8903A /* wulkanowyApp.swift in Sources */,
5C5162DC25F0DD9200EF0777 /* attendance.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

4
wulkanowy/Resources/en.lproj/Localizable.strings
View file

@ -22,8 +22,8 @@
//NAVIGATION
"dashboardButton" = "Dashboard";
"gradesButton" = "Grades";
"examsButton" = "Exams";
"homeworkButton" = "Homework";
"calendarButton" = "Calendar";
"attendanceButton" = "Attendance";
"moreButton" = "More";
//MORE

4
wulkanowy/Resources/pl-PL.lproj/Localizable.strings
View file

@ -22,8 +22,8 @@
//NAVIGATION
"dashboardButton" = "Start";
"gradesButton" = "Oceny";
"examsButton" = "Sprawdziany";
"homeworkButton" = "Zadania";
"calendarButton" = "Kalendarz";
"attendanceButton" = "Frekwencja";
"moreButton" = "Więcej";
//MORE

14
wulkanowy/Views/Content/homework.swift → wulkanowy/Views/Content/attendance.swift
View file

@ -1,15 +1,13 @@
//
// homework.swift
// attendance.swift
// wulkanowy
//
// Created by Tomasz on 24/02/2021.
// Created by Tomasz on 04/03/2021.
//
import SwiftUI
import KeychainAccess
import Sdk
struct HomeworksView: View {
struct AttendanceView: View {
@State private var showModal = false
@AppStorage("isLogged") private var isLogged: Bool = false
@ -25,17 +23,17 @@ struct HomeworksView: View {
}
}.padding()
} else {
Text("Here is homeworks (in my imagination)")
Text("Here is attendance (in my imagination)")
}
}
}
struct HomeworksView_Previews: PreviewProvider {
struct AttendanceView_Previews: PreviewProvider {
static var previews: some View {
Group {
HomeworksView()
AttendanceView()
}
.preferredColorScheme(.dark)
}

8
wulkanowy/Views/Content/exams.swift → wulkanowy/Views/Content/calendar.swift
View file

@ -9,7 +9,7 @@ import SwiftUI
import KeychainAccess
import Sdk
struct ExamsView: View {
struct CalendarView: View {
@State private var showModal = false
@AppStorage("isLogged") private var isLogged: Bool = false
@ -25,17 +25,17 @@ struct ExamsView: View {
}
}.padding()
} else {
Text("Here is exams (in my imagination)")
Text("Here is calendar (in my imagination)")
}
}
}
struct ExamsView_Previews: PreviewProvider {
struct CalendarView_Previews: PreviewProvider {
static var previews: some View {
Group {
ExamsView()
CalendarView()
}
.preferredColorScheme(.dark)
}

26
wulkanowy/Views/Content/messages.swift
View file

@ -12,20 +12,18 @@ struct MessagesView: View {
@AppStorage("isLogged") private var isLogged: Bool = false
var body: some View {
NavigationView {
if(isLogged == false){
VStack {
Text("You are not logged in (messages)")
Button("Log in") {self.showModal = true}
.sheet(isPresented: $showModal, onDismiss: {
print(self.showModal)
}) {
LoginView()
}
}.padding()
} else {
Text("Here are messages (in my imagination)")
}
if(isLogged == false){
VStack {
Text("You are not logged in")
Button("Log in") {self.showModal = true}
.sheet(isPresented: $showModal, onDismiss: {
print(self.showModal)
}) {
LoginView()
}
}.padding()
} else {
Text("Here is messages (in my imagination)")
}
}
}

7
wulkanowy/Views/Content/more.swift
View file

@ -4,7 +4,6 @@
//
// Created by Tomasz on 24/02/2021.
//
import SwiftUI
struct MoreView: View {
@ -12,9 +11,9 @@ struct MoreView: View {
NavigationView {
Form {
Section {
NavigationLink(destination: MessagesView()) {
Label("messagesButton", systemImage: "envelope")
.accessibility(label: Text("messagesButton"))
NavigationLink(destination: AttendanceView()) {
Label("attendanceButton", systemImage: "chart.bar.doc.horizontal")
.accessibility(label: Text("attendanceButton"))
}
NavigationLink(destination: NotesView()) {
Label("notesButton", systemImage: "graduationcap")

19
wulkanowy/Views/Navigation/navigation.swift
View file

@ -5,6 +5,12 @@
// Created by Tomasz on 23/02/2021.
//
//
// navigation.swift
// wulkanowy
//
// Created by Tomasz on 23/02/2021.
//
import SwiftUI
struct NavigationBarView: View {
@ -33,25 +39,25 @@ struct NavigationBarView: View {
}
NavigationView {
ExamsView()
CalendarView()
.navigationBarItems(trailing: NavigationLink(destination: AccountManagerView()) {
Image(systemName: "person.circle")
})
}
.tabItem {
Label("examsButton", systemImage: "calendar")
.accessibility(label: Text("examsButton"))
Label("calendarButton", systemImage: "calendar")
.accessibility(label: Text("calendarButton"))
}
NavigationView {
HomeworksView()
MessagesView()
.navigationBarItems(trailing: NavigationLink(destination: AccountManagerView()) {
Image(systemName: "person.circle")
})
}
.tabItem {
Label("homeworkButton", systemImage: "note.text")
.accessibility(label: Text("homeworkButton"))
Label("messagesButton", systemImage: "envelope")
.accessibility(label: Text("messagesButton"))
}
MoreView()
@ -72,4 +78,3 @@ struct NavigationBarView_Previews: PreviewProvider {
.preferredColorScheme(.dark)
}
}