diff --git a/Better Together/Better Together.xcodeproj/project.pbxproj b/Better Together/Better Together.xcodeproj/project.pbxproj
index 581aed1d2d3d0d5b484f947053c3281f4ec621b8..3bca948ea5accd0595f2ac318ec1452ef18fad74 100644
--- a/Better Together/Better Together.xcodeproj/project.pbxproj
+++ b/Better Together/Better Together.xcodeproj/project.pbxproj
@@ -29,6 +29,7 @@
80CD582A25CB6B030078031F /* CharacterManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80CD582925CB6B030078031F /* CharacterManager.swift */; };
80D1699C25CE2AE40069375C /* SpinnerView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 80D1699B25CE2AE40069375C /* SpinnerView.xib */; };
80D169A425CE2C9B0069375C /* SpinnerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80D169A325CE2C9B0069375C /* SpinnerView.swift */; };
+ 80DD334F25D201870030F56F /* TestConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80DD334E25D201870030F56F /* TestConnection.swift */; };
80E55F6725CF3A8600630587 /* SetUpState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80E55F6625CF3A8600630587 /* SetUpState.swift */; };
80F869BA25A65CC900CF3D59 /* GameKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 80F869B925A65CC900CF3D59 /* GameKit.framework */; };
80F869BC25A65CFD00CF3D59 /* MutliplayerManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80F869BB25A65CFD00CF3D59 /* MutliplayerManager.swift */; };
@@ -96,6 +97,7 @@
80CD582925CB6B030078031F /* CharacterManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CharacterManager.swift; sourceTree = "<group>"; };
80D1699B25CE2AE40069375C /* SpinnerView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SpinnerView.xib; sourceTree = "<group>"; };
80D169A325CE2C9B0069375C /* SpinnerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpinnerView.swift; sourceTree = "<group>"; };
+ 80DD334E25D201870030F56F /* TestConnection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestConnection.swift; sourceTree = "<group>"; };
80E55F6625CF3A8600630587 /* SetUpState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetUpState.swift; sourceTree = "<group>"; };
80F869B925A65CC900CF3D59 /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; };
80F869BB25A65CFD00CF3D59 /* MutliplayerManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MutliplayerManager.swift; sourceTree = "<group>"; };
@@ -264,9 +266,6 @@
F2FD143F25A07C4900A0181C /* UIViewComponents */ = {
isa = PBXGroup;
children = (
- 80E55F6625CF3A8600630587 /* SetUpState.swift */,
- 80D169A325CE2C9B0069375C /* SpinnerView.swift */,
- 80D1699B25CE2AE40069375C /* SpinnerView.xib */,
F2FD144025A07C7C00A0181C /* RoundedRectangleButton.swift */,
F2AB5B8725CD382300F8BA8E /* LevelCollectionViewCell.swift */,
F2AB5B8F25CD7D1600F8BA8E /* Spinner.swift */,
@@ -277,9 +276,13 @@
F2FD144825A07EB900A0181C /* UIViews */ = {
isa = PBXGroup;
children = (
+ 80E55F6625CF3A8600630587 /* SetUpState.swift */,
+ 80D169A325CE2C9B0069375C /* SpinnerView.swift */,
+ 80D1699B25CE2AE40069375C /* SpinnerView.xib */,
F2FD144C25A07F1200A0181C /* CharacterControlSettingViewController.swift */,
80CD582925CB6B030078031F /* CharacterManager.swift */,
F2FD145A25A098D100A0181C /* PlayerModeSelectorViewController.swift */,
+ 80DD334E25D201870030F56F /* TestConnection.swift */,
808F8C9525ACFFE500C7FFFE /* LevelSelectionViewController.swift */,
);
path = UIViews;
@@ -465,6 +468,7 @@
8084DEE625C040350053D095 /* HapticResponseController.swift in Sources */,
F2FD144D25A07F1200A0181C /* CharacterControlSettingViewController.swift in Sources */,
808F8CB425AD08AD00C7FFFE /* PlayMode.swift in Sources */,
+ 80DD334F25D201870030F56F /* TestConnection.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -634,7 +638,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- DEVELOPMENT_TEAM = Y2YVKT7HM8;
+ DEVELOPMENT_TEAM = NYTT9V938N;
INFOPLIST_FILE = "Better Together/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 14.2;
LD_RUNPATH_SEARCH_PATHS = (
@@ -655,7 +659,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
- DEVELOPMENT_TEAM = Y2YVKT7HM8;
+ DEVELOPMENT_TEAM = NYTT9V938N;
INFOPLIST_FILE = "Better Together/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 14.2;
LD_RUNPATH_SEARCH_PATHS = (
diff --git a/Better Together/Better Together/Assets.xcassets/BTArmsImagesFlipped.002.imageset/BTArmsImagesFlipped.001.png b/Better Together/Better Together/Assets.xcassets/BTArmsImagesFlipped.002.imageset/BTArmsImagesFlipped.001.png
deleted file mode 100644
index 5c828a7c304c1a4d23235cf5da2feaaa9c040f3c..0000000000000000000000000000000000000000
Binary files a/Better Together/Better Together/Assets.xcassets/BTArmsImagesFlipped.002.imageset/BTArmsImagesFlipped.001.png and /dev/null differ
diff --git a/Better Together/Better Together/Assets.xcassets/BTArmsImagesFlipped.002.imageset/Contents.json b/Better Together/Better Together/Assets.xcassets/BTArmsImagesFlipped.002.imageset/Contents.json
deleted file mode 100644
index e2e86d46cca3cd33a356daa15a6048b895837ecf..0000000000000000000000000000000000000000
--- a/Better Together/Better Together/Assets.xcassets/BTArmsImagesFlipped.002.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "images" : [
- {
- "filename" : "BTArmsImagesFlipped.001.png",
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/Better Together/Better Together/Assets.xcassets/BTArmsImagesFlipped.003.imageset/BTArmsImagesFlipped.002.png b/Better Together/Better Together/Assets.xcassets/BTArmsImagesFlipped.003.imageset/BTArmsImagesFlipped.002.png
deleted file mode 100644
index f9a8ef0eddb3bb8d4a8b3c0fed7f7bedc42f726d..0000000000000000000000000000000000000000
Binary files a/Better Together/Better Together/Assets.xcassets/BTArmsImagesFlipped.003.imageset/BTArmsImagesFlipped.002.png and /dev/null differ
diff --git a/Better Together/Better Together/Assets.xcassets/BTArmsImagesFlipped.003.imageset/Contents.json b/Better Together/Better Together/Assets.xcassets/BTArmsImagesFlipped.003.imageset/Contents.json
deleted file mode 100644
index 020dcf32275ae69871f36590e96ab8d413f7e414..0000000000000000000000000000000000000000
--- a/Better Together/Better Together/Assets.xcassets/BTArmsImagesFlipped.003.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "images" : [
- {
- "filename" : "BTArmsImagesFlipped.002.png",
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/Better Together/Better Together/Assets.xcassets/BTArmsImagesFlipped.004.imageset/BTArmsImagesFlipped.003.png b/Better Together/Better Together/Assets.xcassets/BTArmsImagesFlipped.004.imageset/BTArmsImagesFlipped.003.png
deleted file mode 100644
index 34a07abc4aeb69be0e535f5efb896b6514094341..0000000000000000000000000000000000000000
Binary files a/Better Together/Better Together/Assets.xcassets/BTArmsImagesFlipped.004.imageset/BTArmsImagesFlipped.003.png and /dev/null differ
diff --git a/Better Together/Better Together/Assets.xcassets/BTArmsImagesFlipped.004.imageset/Contents.json b/Better Together/Better Together/Assets.xcassets/BTArmsImagesFlipped.004.imageset/Contents.json
deleted file mode 100644
index 1c6291ee905529b19f27f61c982f25611bd51887..0000000000000000000000000000000000000000
--- a/Better Together/Better Together/Assets.xcassets/BTArmsImagesFlipped.004.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "images" : [
- {
- "filename" : "BTArmsImagesFlipped.003.png",
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/Better Together/Better Together/Controls/HapticResponseController.swift b/Better Together/Better Together/Controls/HapticResponseController.swift
index 59eefbfb49424b2a728e9d367e6d219cabb62376..af676c6cdaaa19858bb39a47b957b6f6037e8b36 100644
--- a/Better Together/Better Together/Controls/HapticResponseController.swift
+++ b/Better Together/Better Together/Controls/HapticResponseController.swift
@@ -11,10 +11,12 @@ import CoreHaptics
class HapticResponseController {
// Feedback for grabbing.
static func openGrabFeedback() {
+ // MARK: - TODO: Remove the function if it is not used in any place
let generator = UIImpactFeedbackGenerator(style: .medium)
generator.impactOccurred()
}
static func grabNotSucceedFeedback() {
+ // MARK: - TODO: The function name should be changed according to its usage
let generator = UIImpactFeedbackGenerator(style: .rigid)
generator.impactOccurred()
}
@@ -25,6 +27,7 @@ class HapticResponseController {
}
static func simpleFallDownFeedback() {
+ // MARK: - TODO: Remove the function if it is not used in any place
let generator = UIImpactFeedbackGenerator(style: .heavy)
generator.impactOccurred()
}
diff --git a/Better Together/Better Together/GameViews/GameViewController.swift b/Better Together/Better Together/GameViews/GameViewController.swift
index a47a2716bdb5d9c13f548754823191f3dd1cf2d3..51510855c662312650c00b4ef3b2d27d66a16a07 100644
--- a/Better Together/Better Together/GameViews/GameViewController.swift
+++ b/Better Together/Better Together/GameViews/GameViewController.swift
@@ -10,7 +10,6 @@ import SpriteKit
import GameplayKit
import MultipeerConnectivity
-/// View Controller that manages the game scene in single play mode, as well as in mulitplayer mode.
class GameViewController: UIViewController, LocalTeamPlayDelegate {
var gamePlayMode: PlayMode? = nil
diff --git a/Better Together/Better Together/GameViews/Partial/Character.swift b/Better Together/Better Together/GameViews/Partial/Character.swift
index b6ccd5a0b193a7bf316f16d1ec7b0a12e9a5a775..fd289ca2fa8008e18a95a9e4079c4b9bb694d136 100644
--- a/Better Together/Better Together/GameViews/Partial/Character.swift
+++ b/Better Together/Better Together/GameViews/Partial/Character.swift
@@ -917,9 +917,9 @@ class Character : SKNode {
func applyPreLoadTextures(for playerIndex: Int) {
let startIndex = playerIndex * 9
let textures = CharacterManager.sharedInstance.preloadedTextures[startIndex ..< startIndex + 9]
- var i = startIndex
+ var i = 0
for part in BodyPart.allCases {
- let texture : SKTexture = textures[i]
+ let texture : SKTexture! = textures[i]
if let _ = bodyParts[part] as? SKShapeNode {
(bodyParts[part] as! SKShapeNode).strokeColor = UIColor.clear
(bodyParts[part] as! SKShapeNode).fillTexture = texture
@@ -933,10 +933,10 @@ class Character : SKNode {
i += 1
}
- leftHandOpenTexture = textures[startIndex + 3]
- leftHandCloseTexture = textures[startIndex + 7]
- righttHandOpenTexture = textures[startIndex + 6]
- rightHandCloseTexture = textures[startIndex + 8]
+ leftHandOpenTexture = textures[3]
+ leftHandCloseTexture = textures[7]
+ righttHandOpenTexture = textures[6]
+ rightHandCloseTexture = textures[8]
bodyParts[.LeftHand]?.zPosition = 10
@@ -950,7 +950,13 @@ class Character : SKNode {
rightHandCloseTexture = SKTexture(imageNamed: "righthandGrab.png")
}
-
+ func useCustomizedHands() {
+ guard characterCustomization != nil else { return }
+ leftHandOpenTexture = SKTexture(image: characterCustomization![3])
+ leftHandCloseTexture = SKTexture(image: characterCustomization![7])
+ righttHandOpenTexture = SKTexture(image: characterCustomization![6])
+ rightHandCloseTexture = SKTexture(image: characterCustomization![8])
+ }
}
// Class for Factory Method
diff --git a/Better Together/Better Together/Mutiplayer/LocalTeamPlayManager.swift b/Better Together/Better Together/Mutiplayer/LocalTeamPlayManager.swift
index 535e65be4f31d72d0bb08ae212d62d4bb7e306e0..303959332d476466b6224c122df66fcc84ec4bab 100644
--- a/Better Together/Better Together/Mutiplayer/LocalTeamPlayManager.swift
+++ b/Better Together/Better Together/Mutiplayer/LocalTeamPlayManager.swift
@@ -296,64 +296,3 @@ extension Notification.Name {
static let gameResultReceived = Notification.Name(rawValue: "gameResultReceived")
static let dimissedInvitationBrowserClient = Notification.Name(rawValue: "dismissedInvitationClient")
}
-
-
-/* ************************************************** Setup process in multiplayer mode ************************************************** */
-//
-//
-// ┌────────────────────────────┐ ┌────────────────────────────┐
-// │ Server │ │ Client │
-// └────────────────────────────┘ └────────────────────────────┘
-// │ ┌────────────────────┐ │
-// │ │ Send Invitation │ │
-// ├──────────────────┴────────────────────┴────────────────▶│
-// │ ┌────────────────────┐ │
-// │ │ Accept invitation │ │
-// │◀─────────────────┴────────────────────┴─────────────────┼─
-// ┌──────────────┤ │
-// │ Wait for all │ │
-// │ clients │ ┌─────────────────────────────┐ │
-// └──────────────┤ │ send Invitation completed │ │
-// ├──────────────┴─────────────────────────────┴───────────▶│
-// │ ┌────────────────────────────┐ │
-// │ │ Send clients customization │ │
-// │◀─────────────┴────────────────────────────┴─────────────┤
-// │ ┌────────────────────────────┐ │
-// │ │ Send selected level │ │
-// ├──────────────┴────────────────────────────┴────────────▶│
-// │ ┌────────────────────────────┐ │
-// │ │ Confirm level │ │
-// │◀─────────────┴────────────────────────────┴─────────────│
-// ┌──────────────┤ │
-// │ Wait for all │ │
-// │ clients │ ┌────────────────────────────┐ │
-// └──────────────┤ │ Send player info │ │
-// ├──────────────┴────────────────────────────┴────────────▶│
-// │ ┌────────────────────────────┐ │
-// │ │ Confirm info │ │
-// │◀─────────────┴────────────────────────────┴─────────────┤
-// ┌──────────────┤ │
-// │ Wait for all │ │
-// │ clients │ ┌────────────────────────────┐ │
-// └──────────────┤ │ Send start game │ │
-// ├──────────────┴────────────────────────────┴────────────▶│
-// │ ┌────────────────────────────┐ │
-// │ │ Send game scene loaded │ │
-// │◀─────────────┴────────────────────────────┴─────────────┤
-// ┌──────────────┤ │
-// │ Wait for all │ │
-// │ clients │ │
-// └──────────────┤ ┌────────────────────────────┐ │
-// │ │ Send game started │ │
-// ├──────────────┴────────────────────────────┴────────────▶│
-// │ │
-// │ │
-// │ │
-// │ │
-// │ │
-// │ │
-// │ │
-// ▼ ▼
-//
-//
-/* ********************************************************************************************************************************** */
diff --git a/Better Together/Better Together/UIViews/CharacterManager.swift b/Better Together/Better Together/UIViews/CharacterManager.swift
index 37ac31b30afeeecb7384f40aed4b2efd2c9bdb7f..d128e502c6ce8fdf45105be40ec4cb4c00853532 100644
--- a/Better Together/Better Together/UIViews/CharacterManager.swift
+++ b/Better Together/Better Together/UIViews/CharacterManager.swift
@@ -9,7 +9,6 @@ import UIKit
import MultipeerConnectivity
import SpriteKit
-/// Character Manager manages the preperation of customizations for loading, saving and sending.
class CharacterManager {
private static let bodies = ["BTBodiesImages.001","BTBodiesImages.002","BTBodiesImages.003","BTBodiesImages.004","BTBodiesImages.005", "BTBodiesImages.006", "BTBodiesImages.007"]
@@ -18,9 +17,6 @@ class CharacterManager {
private static let grabHands = ["BTHandsImagesClosed.001","BTHandsImagesClosed.002","BTHandsImagesClosed.003","BTHandsImagesClosed.004","BTHandsImagesClosed.005","BTHandsImagesClosed.006"]
private static let rightHands = ["BTHandsRightImages.001","BTHandsRightImages.002","BTHandsRightImages.003","BTHandsRightImages.004","BTHandsRightImages.005","BTHandsRightImages.006"]
private static let rightGrabHands = ["BTHandsRightImagesClosed.001","BTHandsRightImagesClosed.002","BTHandsRightImagesClosed.003","BTHandsRightImagesClosed.004","BTHandsRightImagesClosed.005","BTHandsRightImagesClosed.006"]
- private static let flippedArms = ["BTArmsImagesFlipped.002","BTArmsImagesFlipped.003","BTArmsImagesFlipped.004"]
-
- private static let nintyDegrees: Float = 1.5708
static let sharedInstance: CharacterManager = CharacterManager()
// Contains the configuration of all other players.
@@ -28,11 +24,10 @@ class CharacterManager {
var allOtherConfigurations = [[String]]()// used on client side
var preloadedTextures = [SKTexture]()
-
- // MARK: - Save and load configuration of my own character
private let handKey = "handKey"
private let armKey = "ArmKey"
private let bodyKey = "bodyKey"
+ // private let personFace = "personFace"
func saveHand(with imageName: String) {
UserDefaults.standard.setValue(imageName, forKey: handKey)
}
@@ -49,8 +44,6 @@ class CharacterManager {
saveHand(with: handName)
}
-
- // MARK: - Preperation of data for saving, loading and sending.
func getMyConfigText() -> [String]? {
guard let body = UserDefaults.standard.value(forKey: bodyKey) as? String else { return nil }
guard let arm = UserDefaults.standard.value(forKey: armKey) as? String else { return nil }
@@ -70,6 +63,8 @@ class CharacterManager {
return nil
}
+ private static let nintyDegrees: Float = 1.5708
+
static func getCustomization(from text: [String]?) -> [UIImage]? {
guard text != nil else { return nil }
guard text!.count == 9 else { return nil }
@@ -119,29 +114,9 @@ class CharacterManager {
}
func preloadConfigurationTexturesServer(completion: @escaping () -> Void) {
- for config in allPlayersConfiguration {
- guard let allTextureNames = CharacterManager.getCompleteCustomization(for: config.1) else { return }
- for i in 0 ..< allTextureNames.count {
- var name = allTextureNames[i]
- switch i {
- case 4:
- if let index = name.last?.wholeNumberValue, [2,3,4].contains(index) {
- name = CharacterManager.flippedArms[index - 2]
- }
- case 5:
- if let index = name.last?.wholeNumberValue, [2,3,4].contains(index) {
- name = CharacterManager.flippedArms[index - 2]
- }
- case 6: name = name.replacingOccurrences(of: "BTHandsImages", with: "BTHandsRightImages")
- case 7: name = name.replacingOccurrences(of: "BTHandsImages", with: "BTHandsImagesClosed")
- case 8: name = name.replacingOccurrences(of: "BTHandsImages", with: "BTHandsRightImagesClosed")
- default: break
- }
- if allTextureNames[2] == CharacterManager.arms[2] && i == 2 {
- name = CharacterManager.arms[6]
- } else if allTextureNames[2] == CharacterManager.arms[2] && i == 5 {
- name = CharacterManager.flippedArms[2]
- }
+ for i in 0 ..< allPlayersConfiguration.count {
+ guard let allTextureNames = CharacterManager.getCompleteCustomization(for: allPlayersConfiguration[i].1) else { return }
+ for name in allTextureNames {
preloadedTextures.append(SKTexture(imageNamed: name))
}
}
@@ -149,30 +124,10 @@ class CharacterManager {
}
func preloadConfigurationTextureClient(completion: @escaping () -> Void) {
- for config in allOtherConfigurations {
- guard let completeConfiguration = CharacterManager.getCompleteCustomization(for: config) else { return }
- for i in 0 ..< completeConfiguration.count {
- var name = completeConfiguration[i]
- switch i {
- case 4:
- if let index = name.last?.wholeNumberValue, [2,3,4].contains(index) {
- name = CharacterManager.flippedArms[index - 2]
- }
- case 5:
- if let index = name.last?.wholeNumberValue, [2,3,4].contains(index) {
- name = CharacterManager.flippedArms[index - 2]
- }
- case 6: name = name.replacingOccurrences(of: "BTHandsImages", with: "BTHandsRightImages")
- case 7: name = name.replacingOccurrences(of: "BTHandsImages", with: "BTHandsImagesClosed")
- case 8: name = name.replacingOccurrences(of: "BTHandsImages", with: "BTHandsRightImagesClosed")
- default: break
- }
- if completeConfiguration[2] == CharacterManager.arms[2] && i == 2 {
- name = CharacterManager.arms[6]
- } else if completeConfiguration[2] == CharacterManager.arms[2] && i == 5 {
- name = CharacterManager.flippedArms[2]
- }
- preloadedTextures.append(SKTexture(imageNamed: name))
+ for i in 0 ..< allOtherConfigurations.count {
+ guard let completeConfiguration = CharacterManager.getCompleteCustomization(for: allOtherConfigurations[i]) else { return }
+ for textureName in completeConfiguration {
+ preloadedTextures.append(SKTexture(imageNamed: textureName))
}
}
SKTexture.preload(preloadedTextures, withCompletionHandler: completion)
diff --git a/Better Together/Better Together/UIViewComponents/SetUpState.swift b/Better Together/Better Together/UIViews/SetUpState.swift
similarity index 100%
rename from Better Together/Better Together/UIViewComponents/SetUpState.swift
rename to Better Together/Better Together/UIViews/SetUpState.swift
diff --git a/Better Together/Better Together/UIViewComponents/SpinnerView.swift b/Better Together/Better Together/UIViews/SpinnerView.swift
similarity index 85%
rename from Better Together/Better Together/UIViewComponents/SpinnerView.swift
rename to Better Together/Better Together/UIViews/SpinnerView.swift
index 877b71dc94947e712d28714c1b371d3428ee822f..2769bd4e9e37a7605a6b441220c03ffe0d913868 100644
--- a/Better Together/Better Together/UIViewComponents/SpinnerView.swift
+++ b/Better Together/Better Together/UIViews/SpinnerView.swift
@@ -7,7 +7,6 @@
import UIKit
-/// SpinnerView is the waiting room whihc is presented on server side, while host is waiting for the other players.
class SpinnerView: UIView {
@IBOutlet var contentView: UIView!
@@ -36,17 +35,6 @@ class SpinnerView: UIView {
contentView.frame = self.bounds
}
-
- /// Start the anomation, by entering the number of maximum set up setps.
- /// - Parameter maxProgress: The maximum steps until set up pocess is complete.
- func start(maxProgress: Int) {
- activityIndicator.startAnimating()
- DispatchQueue.main.async {
- self.progressBar.setProgress(0, animated: false)
- }
- self.maxProgress = maxProgress
- }
-
func updateProgress(progressCount: Int) {
let actualProgress: Float = Float(progressCount / maxProgress)
let percentage = actualProgress * 100
@@ -55,6 +43,14 @@ class SpinnerView: UIView {
self.progressBar.setProgress(actualProgress, animated: true)
}
}
+
+ func start(maxProgress: Int) {
+ activityIndicator.startAnimating()
+ DispatchQueue.main.async {
+ self.progressBar.setProgress(0, animated: false)
+ }
+ self.maxProgress = maxProgress
+ }
func dismissView() {
DispatchQueue.main.async {
diff --git a/Better Together/Better Together/UIViewComponents/SpinnerView.xib b/Better Together/Better Together/UIViews/SpinnerView.xib
similarity index 100%
rename from Better Together/Better Together/UIViewComponents/SpinnerView.xib
rename to Better Together/Better Together/UIViews/SpinnerView.xib
diff --git a/Better Together/Better Together/UIViews/TestConnection.swift b/Better Together/Better Together/UIViews/TestConnection.swift
new file mode 100644
index 0000000000000000000000000000000000000000..ccdc69bf981ea5434f6da3c54946daaeea0ef04e
--- /dev/null
+++ b/Better Together/Better Together/UIViews/TestConnection.swift
@@ -0,0 +1,15 @@
+//
+// TestConnection.swift
+// Better Together
+//
+// Created by Lukas Woyke on 09.02.21.
+//
+
+import UIKit
+import Network
+
+// MARK: TODO - remove this if it is not used
+extension PlayerModeSelectorViewController {
+
+
+}