diff --git a/.gitignore b/.gitignore index 12e5f74..6acc7d2 100644 --- a/.gitignore +++ b/.gitignore @@ -65,4 +65,5 @@ fastlane/test_output # After new code Injection tools there's a generated folder /iOSInjectionProject # https://github.com/johnno1962/injectionforxcode -iOSInjectionProject/ \ No newline at end of file +iOSInjectionProject/ +.DS_Store diff --git a/Brokenithm-iOS.xcodeproj/project.pbxproj b/Brokenithm-iOS.xcodeproj/project.pbxproj index 4820914..f9b4351 100644 --- a/Brokenithm-iOS.xcodeproj/project.pbxproj +++ b/Brokenithm-iOS.xcodeproj/project.pbxproj @@ -18,6 +18,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 1277586B240D1432002C27EE /* MainApp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MainApp.h; sourceTree = ""; }; 1968E72124086C2200784829 /* Brokenithm-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Brokenithm-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 1968E72424086C2200784829 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; 1968E72524086C2200784829 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; @@ -29,7 +30,6 @@ 1968E73324086C2B00784829 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 19F13E22240A683200809B83 /* SocketDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SocketDelegate.h; sourceTree = ""; }; 19F13E29240A6F2200809B83 /* SocketDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SocketDelegate.m; sourceTree = ""; }; - 19F13E2E240CFC8900809B83 /* MainApp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MainApp.h; sourceTree = ""; }; 19F40719240CFCFF00D7F506 /* MainApp.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MainApp.m; sourceTree = ""; }; 259804D4CC006A58255BC938 /* Pods-Brokenithm-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Brokenithm-iOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-Brokenithm-iOS/Pods-Brokenithm-iOS.release.xcconfig"; sourceTree = ""; }; 5A7EE02147010843456A2152 /* libPods-Brokenithm-iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Brokenithm-iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -79,7 +79,7 @@ 1968E73324086C2B00784829 /* main.m */, 19F13E22240A683200809B83 /* SocketDelegate.h */, 19F13E29240A6F2200809B83 /* SocketDelegate.m */, - 19F13E2E240CFC8900809B83 /* MainApp.h */, + 1277586B240D1432002C27EE /* MainApp.h */, 19F40719240CFCFF00D7F506 /* MainApp.m */, ); path = "Brokenithm-iOS"; @@ -333,7 +333,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = K9CP5766XY; + DEVELOPMENT_TEAM = MXJJEEMF3U; INFOPLIST_FILE = "Brokenithm-iOS/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -352,7 +352,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = K9CP5766XY; + DEVELOPMENT_TEAM = MXJJEEMF3U; INFOPLIST_FILE = "Brokenithm-iOS/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = ( diff --git a/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/Contents.json index d8db8d6..29d9125 100644 --- a/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,93 +1,111 @@ { "images" : [ { - "idiom" : "iphone", "size" : "20x20", + "idiom" : "iphone", + "filename" : "icon_20pt@2x.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "20x20", + "idiom" : "iphone", + "filename" : "icon_20pt@3x.png", "scale" : "3x" }, { - "idiom" : "iphone", "size" : "29x29", + "idiom" : "iphone", + "filename" : "icon_29pt@2x.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "29x29", + "idiom" : "iphone", + "filename" : "icon_29pt@3x.png", "scale" : "3x" }, { - "idiom" : "iphone", "size" : "40x40", + "idiom" : "iphone", + "filename" : "icon_40pt@2x.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "40x40", + "idiom" : "iphone", + "filename" : "icon_40pt@3x.png", "scale" : "3x" }, { - "idiom" : "iphone", "size" : "60x60", + "idiom" : "iphone", + "filename" : "icon_60pt@2x.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "60x60", + "idiom" : "iphone", + "filename" : "icon_60pt@3x.png", "scale" : "3x" }, { - "idiom" : "ipad", "size" : "20x20", + "idiom" : "ipad", + "filename" : "icon_20pt.png", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "20x20", + "idiom" : "ipad", + "filename" : "icon_20pt@2x-1.png", "scale" : "2x" }, { - "idiom" : "ipad", "size" : "29x29", + "idiom" : "ipad", + "filename" : "icon_29pt.png", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "29x29", + "idiom" : "ipad", + "filename" : "icon_29pt@2x-1.png", "scale" : "2x" }, { - "idiom" : "ipad", "size" : "40x40", + "idiom" : "ipad", + "filename" : "icon_40pt.png", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "40x40", + "idiom" : "ipad", + "filename" : "icon_40pt@2x-1.png", "scale" : "2x" }, { - "idiom" : "ipad", "size" : "76x76", + "idiom" : "ipad", + "filename" : "icon_76pt.png", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "76x76", + "idiom" : "ipad", + "filename" : "icon_76pt@2x.png", "scale" : "2x" }, { - "idiom" : "ipad", "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "icon_83.5@2x.png", "scale" : "2x" }, { - "idiom" : "ios-marketing", "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "Icon.png", "scale" : "1x" } ], diff --git a/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/Icon.png b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/Icon.png new file mode 100644 index 0000000..d87ad16 Binary files /dev/null and b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/Icon.png differ diff --git a/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_20pt.png b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_20pt.png new file mode 100644 index 0000000..22d8957 Binary files /dev/null and b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_20pt.png differ diff --git a/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_20pt@2x-1.png b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_20pt@2x-1.png new file mode 100644 index 0000000..b8f40bb Binary files /dev/null and b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_20pt@2x-1.png differ diff --git a/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_20pt@2x.png b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_20pt@2x.png new file mode 100644 index 0000000..b8f40bb Binary files /dev/null and b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_20pt@2x.png differ diff --git a/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_20pt@3x.png b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_20pt@3x.png new file mode 100644 index 0000000..5ae1fec Binary files /dev/null and b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_20pt@3x.png differ diff --git a/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_29pt.png b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_29pt.png new file mode 100644 index 0000000..1390af0 Binary files /dev/null and b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_29pt.png differ diff --git a/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_29pt@2x-1.png b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_29pt@2x-1.png new file mode 100644 index 0000000..ca61e96 Binary files /dev/null and b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_29pt@2x-1.png differ diff --git a/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_29pt@2x.png b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_29pt@2x.png new file mode 100644 index 0000000..ca61e96 Binary files /dev/null and b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_29pt@2x.png differ diff --git a/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_29pt@3x.png b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_29pt@3x.png new file mode 100644 index 0000000..9a8e99c Binary files /dev/null and b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_29pt@3x.png differ diff --git a/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_40pt.png b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_40pt.png new file mode 100644 index 0000000..b8f40bb Binary files /dev/null and b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_40pt.png differ diff --git a/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_40pt@2x-1.png b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_40pt@2x-1.png new file mode 100644 index 0000000..8445298 Binary files /dev/null and b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_40pt@2x-1.png differ diff --git a/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_40pt@2x.png b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_40pt@2x.png new file mode 100644 index 0000000..8445298 Binary files /dev/null and b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_40pt@2x.png differ diff --git a/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_40pt@3x.png b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_40pt@3x.png new file mode 100644 index 0000000..01b55a3 Binary files /dev/null and b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_40pt@3x.png differ diff --git a/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_60pt@2x.png b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_60pt@2x.png new file mode 100644 index 0000000..01b55a3 Binary files /dev/null and b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_60pt@2x.png differ diff --git a/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_60pt@3x.png b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_60pt@3x.png new file mode 100644 index 0000000..1c18ae5 Binary files /dev/null and b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_60pt@3x.png differ diff --git a/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_76pt.png b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_76pt.png new file mode 100644 index 0000000..3a09c95 Binary files /dev/null and b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_76pt.png differ diff --git a/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_76pt@2x.png b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_76pt@2x.png new file mode 100644 index 0000000..893e854 Binary files /dev/null and b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_76pt@2x.png differ diff --git a/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_83.5@2x.png b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_83.5@2x.png new file mode 100644 index 0000000..a869e07 Binary files /dev/null and b/Brokenithm-iOS/Assets.xcassets/AppIcon.appiconset/icon_83.5@2x.png differ diff --git a/Brokenithm-iOS/ViewController.h b/Brokenithm-iOS/ViewController.h index 4c87206..0717fde 100644 --- a/Brokenithm-iOS/ViewController.h +++ b/Brokenithm-iOS/ViewController.h @@ -14,7 +14,7 @@ #import #import #import "SocketDelegate.h" -#import "MainView.h" +#import "MainApp.h" @interface ViewController : UIViewController { float screenWidth; diff --git a/Podfile.lock b/Podfile.lock index b8ac4a2..3b486ab 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -5,7 +5,7 @@ DEPENDENCIES: - CocoaAsyncSocket SPEC REPOS: - https://github.com/cocoapods/specs.git: + https://github.com/CocoaPods/Specs.git: - CocoaAsyncSocket SPEC CHECKSUMS: @@ -13,4 +13,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 203779727e696b4a59a26ea541d7cfcfdf196b38 -COCOAPODS: 1.5.3 +COCOAPODS: 1.8.4