Skip to content

Commit

Permalink
izrada prve zadace
Browse files Browse the repository at this point in the history
  • Loading branch information
tonikreso committed Apr 14, 2021
1 parent 6c9c137 commit 6bd9052
Show file tree
Hide file tree
Showing 32 changed files with 888 additions and 192 deletions.
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ target 'QuizApp' do
use_frameworks!

# Pods for QuizApp

pod 'PureLayout'
end
15 changes: 14 additions & 1 deletion Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
PODFILE CHECKSUM: 5094765c6c649c0cb02825a3e15ee4a9839edcfa
PODS:
- PureLayout (3.1.8)

DEPENDENCIES:
- PureLayout

SPEC REPOS:
trunk:
- PureLayout

SPEC CHECKSUMS:
PureLayout: a4afb3d79dd958564ce33d22c89f407280d8e6a8

PODFILE CHECKSUM: 5cfac7c4818554e7e70fec23e5eb8855b64c43a6

COCOAPODS: 1.10.1
15 changes: 14 additions & 1 deletion Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

409 changes: 320 additions & 89 deletions Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

73 changes: 55 additions & 18 deletions QuizApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,42 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 51;
objects = {

/* Begin PBXBuildFile section */
31035EFF261C93E700302556 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31035EFE261C93E700302556 /* AppDelegate.swift */; };
31035F01261C93E700302556 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31035F00261C93E700302556 /* SceneDelegate.swift */; };
31035F03261C93E700302556 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31035F02261C93E700302556 /* ViewController.swift */; };
31035F06261C93E700302556 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 31035F04261C93E700302556 /* Main.storyboard */; };
31035F08261C93EA00302556 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 31035F07261C93EA00302556 /* Assets.xcassets */; };
31035F0B261C93EA00302556 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 31035F09261C93EA00302556 /* LaunchScreen.storyboard */; };
31035F19262377DA00302556 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31035F18262377DA00302556 /* LoginViewController.swift */; };
31035F1F26245AD000302556 /* MyTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31035F1E26245AD000302556 /* MyTextField.swift */; };
31035F242625E02800302556 /* DataService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31035F212625E02700302556 /* DataService.swift */; };
31035F252625E02800302556 /* DataServiceProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31035F222625E02700302556 /* DataServiceProtocol.swift */; };
31035F4426262CC800302556 /* QuizCategory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31035F4026262CC800302556 /* QuizCategory.swift */; };
31035F4526262CC800302556 /* Question.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31035F4126262CC800302556 /* Question.swift */; };
31035F4626262CC800302556 /* LoginStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31035F4226262CC800302556 /* LoginStatus.swift */; };
31035F4726262CC800302556 /* Quiz.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31035F4326262CC800302556 /* Quiz.swift */; };
31035F4A2626381C00302556 /* QuizzesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31035F492626381C00302556 /* QuizzesViewController.swift */; };
870848CDA69A97D7352E127C /* Pods_QuizApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F0AD51285DA2931D6FFFFE23 /* Pods_QuizApp.framework */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
31035EFB261C93E700302556 /* QuizApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = QuizApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
31035EFE261C93E700302556 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
31035F00261C93E700302556 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
31035F02261C93E700302556 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
31035F05261C93E700302556 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
31035F07261C93EA00302556 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
31035F0A261C93EA00302556 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
31035F0C261C93EA00302556 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
31035F18262377DA00302556 /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = "<group>"; };
31035F1E26245AD000302556 /* MyTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyTextField.swift; sourceTree = "<group>"; };
31035F212625E02700302556 /* DataService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DataService.swift; path = ../../../Downloads/Data/DataService.swift; sourceTree = "<group>"; };
31035F222625E02700302556 /* DataServiceProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DataServiceProtocol.swift; path = ../../../Downloads/Data/DataServiceProtocol.swift; sourceTree = "<group>"; };
31035F4026262CC800302556 /* QuizCategory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QuizCategory.swift; sourceTree = "<group>"; };
31035F4126262CC800302556 /* Question.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Question.swift; sourceTree = "<group>"; };
31035F4226262CC800302556 /* LoginStatus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LoginStatus.swift; path = "../../../Downloads/Data 2/Models/LoginStatus.swift"; sourceTree = "<group>"; };
31035F4326262CC800302556 /* Quiz.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Quiz.swift; sourceTree = "<group>"; };
31035F492626381C00302556 /* QuizzesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuizzesViewController.swift; sourceTree = "<group>"; };
7610A9948254786BA5AE56F5 /* Pods-QuizApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QuizApp.release.xcconfig"; path = "Target Support Files/Pods-QuizApp/Pods-QuizApp.release.xcconfig"; sourceTree = "<group>"; };
BED3E5E79189FE3168DE3248 /* Pods-QuizApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QuizApp.debug.xcconfig"; path = "Target Support Files/Pods-QuizApp/Pods-QuizApp.debug.xcconfig"; sourceTree = "<group>"; };
F0AD51285DA2931D6FFFFE23 /* Pods_QuizApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_QuizApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -63,13 +77,20 @@
31035EFD261C93E700302556 /* QuizApp */ = {
isa = PBXGroup;
children = (
31035F4226262CC800302556 /* LoginStatus.swift */,
31035F4126262CC800302556 /* Question.swift */,
31035F4326262CC800302556 /* Quiz.swift */,
31035F4026262CC800302556 /* QuizCategory.swift */,
31035F212625E02700302556 /* DataService.swift */,
31035F222625E02700302556 /* DataServiceProtocol.swift */,
31035EFE261C93E700302556 /* AppDelegate.swift */,
31035F00261C93E700302556 /* SceneDelegate.swift */,
31035F02261C93E700302556 /* ViewController.swift */,
31035F04261C93E700302556 /* Main.storyboard */,
31035F07261C93EA00302556 /* Assets.xcassets */,
31035F09261C93EA00302556 /* LaunchScreen.storyboard */,
31035F0C261C93EA00302556 /* Info.plist */,
31035F18262377DA00302556 /* LoginViewController.swift */,
31035F1E26245AD000302556 /* MyTextField.swift */,
31035F492626381C00302556 /* QuizzesViewController.swift */,
);
path = QuizApp;
sourceTree = "<group>";
Expand All @@ -88,7 +109,6 @@
BED3E5E79189FE3168DE3248 /* Pods-QuizApp.debug.xcconfig */,
7610A9948254786BA5AE56F5 /* Pods-QuizApp.release.xcconfig */,
);
name = Pods;
path = Pods;
sourceTree = "<group>";
};
Expand All @@ -103,6 +123,7 @@
31035EF7261C93E700302556 /* Sources */,
31035EF8261C93E700302556 /* Frameworks */,
31035EF9261C93E700302556 /* Resources */,
6FD503AE3DD062B09268957E /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -152,13 +173,29 @@
files = (
31035F0B261C93EA00302556 /* LaunchScreen.storyboard in Resources */,
31035F08261C93EA00302556 /* Assets.xcassets in Resources */,
31035F06261C93E700302556 /* Main.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
6FD503AE3DD062B09268957E /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-QuizApp/Pods-QuizApp-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-QuizApp/Pods-QuizApp-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-QuizApp/Pods-QuizApp-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
BD3252A995701FF33E443593 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -188,23 +225,23 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
31035F03261C93E700302556 /* ViewController.swift in Sources */,
31035F19262377DA00302556 /* LoginViewController.swift in Sources */,
31035F4526262CC800302556 /* Question.swift in Sources */,
31035F4426262CC800302556 /* QuizCategory.swift in Sources */,
31035EFF261C93E700302556 /* AppDelegate.swift in Sources */,
31035F01261C93E700302556 /* SceneDelegate.swift in Sources */,
31035F4A2626381C00302556 /* QuizzesViewController.swift in Sources */,
31035F252625E02800302556 /* DataServiceProtocol.swift in Sources */,
31035F4726262CC800302556 /* Quiz.swift in Sources */,
31035F1F26245AD000302556 /* MyTextField.swift in Sources */,
31035F4626262CC800302556 /* LoginStatus.swift in Sources */,
31035F242625E02800302556 /* DataService.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXVariantGroup section */
31035F04261C93E700302556 /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
31035F05261C93E700302556 /* Base */,
);
name = Main.storyboard;
sourceTree = "<group>";
};
31035F09261C93EA00302556 /* LaunchScreen.storyboard */ = {
isa = PBXVariantGroup;
children = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>QuizApp.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
<integer>2</integer>
</dict>
</dict>
</dict>
Expand Down
Binary file not shown.
2 changes: 0 additions & 2 deletions QuizApp/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import UIKit
@main
class AppDelegate: UIResponder, UIApplicationDelegate {



func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
return true
Expand Down
23 changes: 23 additions & 0 deletions QuizApp/Assets.xcassets/ic_eye_closed.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "ic_eye_closed.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions QuizApp/Assets.xcassets/ic_eye_open.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "ic_eye_open.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 0 additions & 24 deletions QuizApp/Base.lproj/Main.storyboard

This file was deleted.

4 changes: 0 additions & 4 deletions QuizApp/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
<string>Default Configuration</string>
<key>UISceneDelegateClassName</key>
<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
<key>UISceneStoryboardFile</key>
<string>Main</string>
</dict>
</array>
</dict>
Expand All @@ -43,8 +41,6 @@
<true/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
Expand Down
6 changes: 6 additions & 0 deletions QuizApp/LoginStatus.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
enum LoginStatus {

case success
case error(Int, String)

}
Loading

0 comments on commit 6bd9052

Please sign in to comment.