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

Fixes on branch

Browse source
This commit is contained in:
Pengwius 2021-03-02 11:27:02 +01:00
parent 08c27510ce
commit f1dcc9016d
7 changed files with 97 additions and 213 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
.DS_Store vendored
View file

Binary file not shown.

46
wulkanowy.xcodeproj/project.pbxproj
View file

@ -21,6 +21,8 @@
5C89C8F525EA6AA4000B5816 /* licenses.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C89C8F425EA6AA4000B5816 /* licenses.swift */; }; 5C89C8F525EA6AA4000B5816 /* licenses.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C89C8F425EA6AA4000B5816 /* licenses.swift */; };
5C89C90625EA7996000B5816 /* SwiftUIEKtensions in Frameworks */ = {isa = PBXBuildFile; productRef = 5C89C90525EA7996000B5816 /* SwiftUIEKtensions */; }; 5C89C90625EA7996000B5816 /* SwiftUIEKtensions in Frameworks */ = {isa = PBXBuildFile; productRef = 5C89C90525EA7996000B5816 /* SwiftUIEKtensions */; };
5C9B6F4925D6C08D00C3F5F5 /* Sdk in Frameworks */ = {isa = PBXBuildFile; productRef = 5C9B6F4825D6C08D00C3F5F5 /* Sdk */; }; 5C9B6F4925D6C08D00C3F5F5 /* Sdk in Frameworks */ = {isa = PBXBuildFile; productRef = 5C9B6F4825D6C08D00C3F5F5 /* Sdk */; };
5CB9907225EE4A3200AA405C /* CustomButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CB9907125EE4A3200AA405C /* CustomButtonView.swift */; };
5CB9907625EE4A3B00AA405C /* OnboardingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CB9907525EE4A3B00AA405C /* OnboardingView.swift */; };
5CC2EAA525E516F100B6183E /* dashboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC2EAA425E516F100B6183E /* dashboard.swift */; }; 5CC2EAA525E516F100B6183E /* dashboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC2EAA425E516F100B6183E /* dashboard.swift */; };
5CC2EAAE25E526B500B6183E /* navigation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC2EAAD25E526B500B6183E /* navigation.swift */; }; 5CC2EAAE25E526B500B6183E /* navigation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC2EAAD25E526B500B6183E /* navigation.swift */; };
5CCAE31625DA4CDD00D87580 /* OpenSSL in Frameworks */ = {isa = PBXBuildFile; productRef = 5CCAE31525DA4CDD00D87580 /* OpenSSL */; }; 5CCAE31625DA4CDD00D87580 /* OpenSSL in Frameworks */ = {isa = PBXBuildFile; productRef = 5CCAE31525DA4CDD00D87580 /* OpenSSL */; };
@ -87,6 +89,8 @@
5C89C8F425EA6AA4000B5816 /* licenses.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = licenses.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; }; 5C9B6E4925D6ADFB00C3F5F5 /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NetworkExtension.framework; path = System/Library/Frameworks/NetworkExtension.framework; sourceTree = SDKROOT; };
5C9B6F4525D6C06D00C3F5F5 /* Sdk */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Sdk; sourceTree = "<group>"; }; 5C9B6F4525D6C06D00C3F5F5 /* Sdk */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Sdk; sourceTree = "<group>"; };
5CB9907125EE4A3200AA405C /* CustomButtonView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CustomButtonView.swift; path = ../../../../../../Shared/CustomButtonView.swift; sourceTree = "<group>"; };
5CB9907525EE4A3B00AA405C /* OnboardingView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OnboardingView.swift; path = ../../../../../../Onboarding/OnboardingView.swift; sourceTree = "<group>"; };
5CC2EAA425E516F100B6183E /* dashboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = dashboard.swift; sourceTree = "<group>"; }; 5CC2EAA425E516F100B6183E /* dashboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = dashboard.swift; sourceTree = "<group>"; };
5CC2EAAD25E526B500B6183E /* navigation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = navigation.swift; sourceTree = "<group>"; }; 5CC2EAAD25E526B500B6183E /* navigation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = navigation.swift; sourceTree = "<group>"; };
5CEA516C25D540B900DB45BD /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; }; 5CEA516C25D540B900DB45BD /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
@ -145,6 +149,8 @@
5C1B848925E1B6910074F29D /* Views */ = { 5C1B848925E1B6910074F29D /* Views */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
5CB9907025EE4A2400AA405C /* Shared */,
5CB9906F25EE4A1C00AA405C /* Onboarding */,
5CC2EAAC25E5269E00B6183E /* Navigation */, 5CC2EAAC25E5269E00B6183E /* Navigation */,
5CC2EAA325E516DD00B6183E /* Content */, 5CC2EAA325E516DD00B6183E /* Content */,
5C1B849F25E1B7A30074F29D /* Login */, 5C1B849F25E1B7A30074F29D /* Login */,
@ -177,6 +183,22 @@
name = Frameworks; name = Frameworks;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
5CB9906F25EE4A1C00AA405C /* Onboarding */ = {
isa = PBXGroup;
children = (
5CB9907525EE4A3B00AA405C /* OnboardingView.swift */,
);
path = Onboarding;
sourceTree = "<group>";
};
5CB9907025EE4A2400AA405C /* Shared */ = {
isa = PBXGroup;
children = (
5CB9907125EE4A3200AA405C /* CustomButtonView.swift */,
);
path = Shared;
sourceTree = "<group>";
};
5CC2EAA325E516DD00B6183E /* Content */ = { 5CC2EAA325E516DD00B6183E /* Content */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
@ -408,11 +430,23 @@
isa = PBXSourcesBuildPhase; isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
5C2D331425E650EC000253AC /* exams.swift in Sources */,
5C478F3525DC742100ABEFB7 /* VulcanStore.swift in Sources */,
5C1CFA7A25EA32AE0047286F /* ghImage.swift in Sources */,
5CB9907225EE4A3200AA405C /* CustomButtonView.swift in Sources */,
5C1794BC25E8FE19007AD91A /* settings.swift in Sources */,
5C2D331025E64F3C000253AC /* grades.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 */,
5C2D331825E651C4000253AC /* homework.swift in Sources */,
5C1794B425E8FDFB007AD91A /* messages.swift in Sources */,
5CC2EAA525E516F100B6183E /* dashboard.swift in Sources */,
5C1794B825E8FE08007AD91A /* notes.swift in Sources */,
5CB9907625EE4A3B00AA405C /* OnboardingView.swift in Sources */,
F4C6D9082544E17400F8903A /* wulkanowyApp.swift in Sources */, F4C6D9082544E17400F8903A /* wulkanowyApp.swift in Sources */,
96A2D97B25D7003F001CB109 /* OnboardingView.swift in Sources */,
967B5B9825D813F5006ED944 /* LoginView.swift in Sources */,
96A5571725D81BD20094BF48 /* CustomTextFieldView.swift in Sources */,
96A2D98825D73DCF001CB109 /* CustomButtonView.swift in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -593,7 +627,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
PRODUCT_BUNDLE_IDENTIFIER = "io.github.wulkanowy.wulkanowy-ios"; PRODUCT_BUNDLE_IDENTIFIER = "io.wulkanowy.wulkanowy-ios";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
@ -615,7 +649,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
PRODUCT_BUNDLE_IDENTIFIER = "io.github.wulkanowy.wulkanowy-ios"; PRODUCT_BUNDLE_IDENTIFIER = "io.wulkanowy.wulkanowy-ios";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";

BIN
wulkanowy/.DS_Store vendored
View file

Binary file not shown.

135
wulkanowy/Assets.xcassets/AppIcon.appiconset/Contents.json
View file

@ -1,120 +1,99 @@
{ {
"images" : [ "images" : [
{
"size" : "20x20",
"idiom": "iphone",
"filename" : "wulkanowy-20@2x.png",
"scale": "2x"
},
{
"size" : "20x20",
"idiom": "iphone",
"filename" : "wulkanowy-20@3x.png",
"scale": "3x"
},
{
"size" : "20x20",
"idiom": "ipad",
"filename" : "wulkanowy-20.png",
"scale": "1x"
},
{ {
"size" : "20x20",
"idiom": "ipad",
"filename" : "wulkanowy-20@2x.png",
"scale": "2x"
},
{
"size" : "29x29",
"idiom" : "iphone", "idiom" : "iphone",
"filename" : "wulkanowy-29@2x.png", "scale" : "2x",
"scale" : "2x" "size" : "20x20"
}, },
{ {
"size" : "29x29",
"idiom" : "iphone", "idiom" : "iphone",
"filename" : "wulkanowy-29@3x.png", "scale" : "3x",
"scale" : "3x" "size" : "20x20"
},
{
"idiom" : "iphone",
"scale" : "2x",
"size" : "29x29"
},
{
"idiom" : "iphone",
"scale" : "3x",
"size" : "29x29"
},
{
"idiom" : "iphone",
"scale" : "2x",
"size" : "40x40"
},
{
"idiom" : "iphone",
"scale" : "3x",
"size" : "40x40"
}, },
{ {
<<<<<<< HEAD
"size" : "40x40",
=======
"filename" : "logo.jpg", "filename" : "logo.jpg",
>>>>>>> feature/register-device
"idiom" : "iphone", "idiom" : "iphone",
"filename" : "wulkanowy-40@2x.png", "scale" : "2x",
"scale" : "2x" "size" : "60x60"
}, },
{ {
"size" : "40x40",
"idiom" : "iphone", "idiom" : "iphone",
"filename" : "wulkanowy-40@3x.png", "scale" : "3x",
"scale" : "3x" "size" : "60x60"
}, },
{ {
"size" : "60x60",
"idiom" : "iphone",
"filename" : "wulkanowy-60@2x.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "wulkanowy-60@3x.png",
"scale" : "3x"
},
{
"size" : "29x29",
"idiom" : "ipad", "idiom" : "ipad",
"filename" : "wulkanowy-29.png", "scale" : "1x",
"scale" : "1x" "size" : "20x20"
}, },
{ {
"size" : "29x29",
"idiom" : "ipad", "idiom" : "ipad",
"filename" : "wulkanowy-29@2x.png", "scale" : "2x",
"scale" : "2x" "size" : "20x20"
}, },
{ {
"size" : "40x40",
"idiom" : "ipad", "idiom" : "ipad",
"filename" : "wulkanowy-40.png", "scale" : "1x",
"scale" : "1x" "size" : "29x29"
}, },
{ {
"size" : "40x40",
"idiom" : "ipad", "idiom" : "ipad",
"filename" : "wulkanowy-40@2x.png", "scale" : "2x",
"scale" : "2x" "size" : "29x29"
}, },
{ {
"size" : "76x76",
"idiom" : "ipad", "idiom" : "ipad",
"filename" : "wulkanowy-76.png", "scale" : "1x",
"scale" : "1x" "size" : "40x40"
}, },
{ {
"size" : "76x76",
"idiom" : "ipad", "idiom" : "ipad",
"filename" : "wulkanowy-76@2x.png", "scale" : "2x",
"scale" : "2x" "size" : "40x40"
}, },
{ {
"size" : "83.5x83.5",
"idiom" : "ipad", "idiom" : "ipad",
"filename" : "wulkanowy-83.5@2x.png", "scale" : "1x",
"scale" : "2x" "size" : "76x76"
},
{
"idiom" : "ipad",
"scale" : "2x",
"size" : "76x76"
},
{
"idiom" : "ipad",
"scale" : "2x",
"size" : "83.5x83.5"
}, },
{ {
"size" : "1024x1024",
"idiom" : "ios-marketing", "idiom" : "ios-marketing",
"filename" : "wulkanowy-1024.png", "scale" : "1x",
"scale" : "1x" "size" : "1024x1024"
} }
], ],
"info" : { "info" : {
"version" : 1, "author" : "xcode",
"author" : "xcode" "version" : 1
} }
} }

49
wulkanowy/Views/Login/LoginView.swift
View file

@ -1,48 +1,4 @@
// //
<<<<<<< HEAD
// LoginView.swift
// wulkanowy
//
// Created by Karol Zientek on 13/02/2021.
//
import SwiftUI
struct LoginView: View {
@AppStorage("needsAppOnboarding") private var needsAppOnboarding: Bool = true
@State private var token: String = ""
var body: some View {
VStack {
Image("wulkanowy-svg")
.resizable()
.foregroundColor(Color("PrimaryColor"))
.frame(width: /*@START_MENU_TOKEN@*/100/*@END_MENU_TOKEN@*/, height: /*@START_MENU_TOKEN@*/100/*@END_MENU_TOKEN@*/)
Text("login.login")
.font(.largeTitle)
.padding(.bottom, 30)
CustomTextFieldView(placeholder: "login.token", text: "")
CustomTextFieldView(placeholder: "login.symbol", text: "")
CustomTextFieldView(placeholder: "login.pin", text: "")
Spacer()
CustomButtonView(action: {
print("Works")
}, title: "login.login")
}
.padding([.top, .horizontal], 20)
.sheet(isPresented: $needsAppOnboarding) {
OnboardingView()
}
=======
// ContentView.swift // ContentView.swift
// wulkanowy // wulkanowy
// //
@ -225,19 +181,14 @@ struct LoginView: View {
} }
.padding() .padding()
Spacer() Spacer()
>>>>>>> feature/register-device
} }
} }
struct LoginView_Previews: PreviewProvider { struct LoginView_Previews: PreviewProvider {
static var previews: some View { static var previews: some View {
<<<<<<< HEAD
LoginView()
=======
Group { Group {
LoginView() LoginView()
} }
.preferredColorScheme(.dark) .preferredColorScheme(.dark)
>>>>>>> feature/register-device
} }
} }

45
wulkanowy/Views/Onboarding/OnboardingView.swift
View file

@ -1,45 +0,0 @@
//
// OnboardingView.swift
// wulkanowy
//
// Created by Karol Zientek on 12/02/2021.
//
import SwiftUI
struct OnboardingView: View {
@AppStorage("needsAppOnboarding") private var needsAppOnboarding: Bool = true
var body: some View {
VStack(spacing: 20) {
Spacer()
Image("wulkanowy-svg")
.resizable()
.frame(width: 200, height: 200, alignment: .top)
.foregroundColor(Color("PrimaryColor"))
VStack(spacing: 20) {
Text("onboarding.description.title")
.font(.headline)
.multilineTextAlignment(.center)
Text("onboarding.description.content")
.font(.subheadline)
.multilineTextAlignment(.center)
}
.padding(.horizontal, 20)
Spacer()
CustomButtonView(action: {
needsAppOnboarding = false
}, title: "onboarding.continue")
.padding()
}
}
}
struct WulkanowyCardView_Previews: PreviewProvider {
static var previews: some View {
Group {
OnboardingView().previewLayout(.fixed(width: 320, height: 640))
}
}
}

35
wulkanowy/Views/Shared/CustomButtonView.swift
View file

@ -1,35 +0,0 @@
//
// CustomButtonView.swift
// wulkanowy
//
// Created by Karol Zientek on 12/02/2021.
//
import SwiftUI
struct CustomButtonView: View {
var action: () -> ()
var title: String
var body: some View {
Button(action: action, label: {
Text(LocalizedStringKey(title))
})
.padding(10)
.frame(minWidth: 0, maxWidth: .infinity)
.background(Color("PrimaryColor"))
.foregroundColor(.white)
.font(.title)
.cornerRadius(20)
}
}
struct CustomButtonView_Previews: PreviewProvider {
static var previews: some View {
CustomButtonView(action: {
print("Button tapped!")
}, title: "Test")
.previewLayout(.sizeThatFits)
}
}