diff --git a/Soyuz.xcodeproj/project.pbxproj b/Soyuz.xcodeproj/project.pbxproj index 34789d3..bccc150 100755 --- a/Soyuz.xcodeproj/project.pbxproj +++ b/Soyuz.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + C15F06A62A20198300C14CD8 /* Soyuz.help in Resources */ = {isa = PBXBuildFile; fileRef = C15F06A42A20171E00C14CD8 /* Soyuz.help */; }; E124B9D929941A4D00C0D2D2 /* PrinterConfigView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E124B9D829941A4D00C0D2D2 /* PrinterConfigView.swift */; }; E16378B429A491E6002F05E9 /* MoonrakerSocketManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E16378B329A491E6002F05E9 /* MoonrakerSocketManagerTests.swift */; }; E180B5E92992CD9100425DB0 /* SoyuzApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = E180B5E82992CD9100425DB0 /* SoyuzApp.swift */; }; @@ -43,6 +44,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + C15F06A42A20171E00C14CD8 /* Soyuz.help */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Soyuz.help; sourceTree = ""; }; E124B9D72993FE5500C0D2D2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; E124B9D829941A4D00C0D2D2 /* PrinterConfigView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrinterConfigView.swift; sourceTree = ""; }; E16378B329A491E6002F05E9 /* MoonrakerSocketManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoonrakerSocketManagerTests.swift; sourceTree = ""; }; @@ -117,6 +119,7 @@ E1A93C6529C92B3500BAE750 /* ViewModels */, E1A93C6429C92AEE00BAE750 /* Views */, E124B9D72993FE5500C0D2D2 /* Info.plist */, + C15F06A42A20171E00C14CD8 /* Soyuz.help */, E180B5E82992CD9100425DB0 /* SoyuzApp.swift */, E180B5EC2992CD9200425DB0 /* Assets.xcassets */, E180B5F12992CD9200425DB0 /* Persistence.swift */, @@ -283,6 +286,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + C15F06A62A20198300C14CD8 /* Soyuz.help in Resources */, E180B5F02992CD9200425DB0 /* Preview Assets.xcassets in Resources */, E180B5ED2992CD9200425DB0 /* Assets.xcassets in Resources */, ); diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/100.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/100.png new file mode 100644 index 0000000..f49ae5f Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/100.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/102.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/102.png new file mode 100644 index 0000000..9b463f5 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/102.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/1024.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/1024.png new file mode 100644 index 0000000..3b2be16 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/1024.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/114.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/114.png new file mode 100644 index 0000000..1efe55a Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/114.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/120.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/120.png new file mode 100644 index 0000000..b3c909d Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/120.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/128.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/128.png new file mode 100644 index 0000000..a52a142 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/128.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/144.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/144.png new file mode 100644 index 0000000..d642238 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/144.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/152.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/152.png new file mode 100644 index 0000000..3b2826d Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/152.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/16.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/16.png new file mode 100644 index 0000000..6951298 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/16.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/167.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/167.png new file mode 100644 index 0000000..d5efa7f Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/167.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/172.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/172.png new file mode 100644 index 0000000..17cd8f6 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/172.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/180.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/180.png new file mode 100644 index 0000000..1e4dc13 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/180.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/196.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/196.png new file mode 100644 index 0000000..f62db80 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/196.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/20.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/20.png new file mode 100644 index 0000000..8226522 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/20.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/216.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/216.png new file mode 100644 index 0000000..0ccc928 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/216.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/256.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/256.png new file mode 100644 index 0000000..350811c Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/256.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/29.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/29.png new file mode 100644 index 0000000..b59b486 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/29.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/32.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/32.png new file mode 100644 index 0000000..87a4078 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/32.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/40.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/40.png new file mode 100644 index 0000000..c7ddbfb Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/40.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/48.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/48.png new file mode 100644 index 0000000..53656ab Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/48.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/50.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/50.png new file mode 100644 index 0000000..eeda11e Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/50.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/512.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/512.png new file mode 100644 index 0000000..9ed5178 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/512.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/55.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/55.png new file mode 100644 index 0000000..fe60f74 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/55.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/57.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/57.png new file mode 100644 index 0000000..88592cc Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/57.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/58.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/58.png new file mode 100644 index 0000000..b6b81d9 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/58.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/60.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/60.png new file mode 100644 index 0000000..506ba19 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/60.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/64.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/64.png new file mode 100644 index 0000000..156c4ed Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/64.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/66.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/66.png new file mode 100644 index 0000000..3e3ea27 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/66.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/72.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/72.png new file mode 100644 index 0000000..e08a599 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/72.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/76.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/76.png new file mode 100644 index 0000000..1d0cb97 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/76.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/80.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/80.png new file mode 100644 index 0000000..c5aa17d Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/80.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/87.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/87.png new file mode 100644 index 0000000..4867996 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/87.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/88.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/88.png new file mode 100644 index 0000000..fa7e871 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/88.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/92.png b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/92.png new file mode 100644 index 0000000..95d5446 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/92.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/Contents.json b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/Contents.json new file mode 100644 index 0000000..2e5c79d --- /dev/null +++ b/Soyuz/Assets.xcassets/AppIcon Old 1.appiconset/Contents.json @@ -0,0 +1,347 @@ +{ + "images" : [ + { + "filename" : "40.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "60.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "29.png", + "idiom" : "iphone", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "58.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "87.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "80.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "120.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "57.png", + "idiom" : "iphone", + "scale" : "1x", + "size" : "57x57" + }, + { + "filename" : "114.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "57x57" + }, + { + "filename" : "120.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "180.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "20.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "40.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "29.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "58.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "40.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "80.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "50.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "50x50" + }, + { + "filename" : "100.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "50x50" + }, + { + "filename" : "72.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "72x72" + }, + { + "filename" : "144.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "72x72" + }, + { + "filename" : "76.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "152.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "167.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "1024.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + }, + { + "filename" : "16.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "16x16" + }, + { + "filename" : "32.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "16x16" + }, + { + "filename" : "32.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "32x32" + }, + { + "filename" : "64.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "32x32" + }, + { + "filename" : "128.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "128x128" + }, + { + "filename" : "256.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "128x128" + }, + { + "filename" : "256.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "256x256" + }, + { + "filename" : "512.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "256x256" + }, + { + "filename" : "512.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "512x512" + }, + { + "filename" : "1024.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "512x512" + }, + { + "filename" : "48.png", + "idiom" : "watch", + "role" : "notificationCenter", + "scale" : "2x", + "size" : "24x24", + "subtype" : "38mm" + }, + { + "filename" : "55.png", + "idiom" : "watch", + "role" : "notificationCenter", + "scale" : "2x", + "size" : "27.5x27.5", + "subtype" : "42mm" + }, + { + "filename" : "58.png", + "idiom" : "watch", + "role" : "companionSettings", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "87.png", + "idiom" : "watch", + "role" : "companionSettings", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "66.png", + "idiom" : "watch", + "role" : "notificationCenter", + "scale" : "2x", + "size" : "33x33", + "subtype" : "45mm" + }, + { + "filename" : "80.png", + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "40x40", + "subtype" : "38mm" + }, + { + "filename" : "88.png", + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "44x44", + "subtype" : "40mm" + }, + { + "filename" : "92.png", + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "46x46", + "subtype" : "41mm" + }, + { + "filename" : "100.png", + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "50x50", + "subtype" : "44mm" + }, + { + "filename" : "102.png", + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "51x51", + "subtype" : "45mm" + }, + { + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "54x54", + "subtype" : "49mm" + }, + { + "filename" : "172.png", + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "86x86", + "subtype" : "38mm" + }, + { + "filename" : "196.png", + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "98x98", + "subtype" : "42mm" + }, + { + "filename" : "216.png", + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "108x108", + "subtype" : "44mm" + }, + { + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "117x117", + "subtype" : "45mm" + }, + { + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "129x129", + "subtype" : "49mm" + }, + { + "filename" : "1024.png", + "idiom" : "watch-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/100.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/100.png new file mode 100644 index 0000000..6c744d2 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/100.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/102.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/102.png new file mode 100644 index 0000000..c39a15c Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/102.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/1024.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/1024.png new file mode 100644 index 0000000..5be7833 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/1024.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/114.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/114.png new file mode 100644 index 0000000..fc47652 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/114.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/120.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/120.png new file mode 100644 index 0000000..19f7f00 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/120.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/128.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/128.png new file mode 100644 index 0000000..690bed9 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/128.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/144.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/144.png new file mode 100644 index 0000000..f70825a Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/144.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/152.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/152.png new file mode 100644 index 0000000..9ebc9e4 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/152.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/16.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/16.png new file mode 100644 index 0000000..459f78b Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/16.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/167.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/167.png new file mode 100644 index 0000000..d330882 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/167.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/172.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/172.png new file mode 100644 index 0000000..721288b Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/172.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/180.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/180.png new file mode 100644 index 0000000..bce5c16 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/180.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/196.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/196.png new file mode 100644 index 0000000..857e9f2 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/196.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/20.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/20.png new file mode 100644 index 0000000..1cb98fd Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/20.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/216.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/216.png new file mode 100644 index 0000000..e213b1e Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/216.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/256.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/256.png new file mode 100644 index 0000000..eacd576 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/256.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/29.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/29.png new file mode 100644 index 0000000..f557bc3 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/29.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/32.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/32.png new file mode 100644 index 0000000..c770e24 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/32.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/40.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/40.png new file mode 100644 index 0000000..a9a471b Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/40.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/48.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/48.png new file mode 100644 index 0000000..5c5c3f5 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/48.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/50.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/50.png new file mode 100644 index 0000000..17a0ba1 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/50.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/512.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/512.png new file mode 100644 index 0000000..8828f67 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/512.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/55.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/55.png new file mode 100644 index 0000000..934500c Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/55.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/57.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/57.png new file mode 100644 index 0000000..af86e1f Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/57.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/58.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/58.png new file mode 100644 index 0000000..9f351e3 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/58.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/60.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/60.png new file mode 100644 index 0000000..9529615 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/60.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/64.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/64.png new file mode 100644 index 0000000..b53be87 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/64.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/66.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/66.png new file mode 100644 index 0000000..60c5ee1 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/66.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/72.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/72.png new file mode 100644 index 0000000..acb60db Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/72.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/76.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/76.png new file mode 100644 index 0000000..93ac9c9 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/76.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/80.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/80.png new file mode 100644 index 0000000..2a880bb Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/80.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/87.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/87.png new file mode 100644 index 0000000..2d4770a Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/87.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/88.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/88.png new file mode 100644 index 0000000..012c0d9 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/88.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/92.png b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/92.png new file mode 100644 index 0000000..7dc00f2 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/92.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/Contents.json b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/Contents.json new file mode 100644 index 0000000..6bf81eb --- /dev/null +++ b/Soyuz/Assets.xcassets/AppIcon Old 2.appiconset/Contents.json @@ -0,0 +1,354 @@ +{ + "images" : [ + { + "filename" : "40.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "60.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "29.png", + "idiom" : "iphone", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "58.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "87.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "80.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "120.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "57.png", + "idiom" : "iphone", + "scale" : "1x", + "size" : "57x57" + }, + { + "filename" : "114.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "57x57" + }, + { + "filename" : "120.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "180.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "20.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "40.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "29.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "58.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "40.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "80.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "50.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "50x50" + }, + { + "filename" : "100.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "50x50" + }, + { + "filename" : "72.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "72x72" + }, + { + "filename" : "144.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "72x72" + }, + { + "filename" : "76.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "152.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "167.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "1024.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + }, + { + "filename" : "16.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "16x16" + }, + { + "filename" : "32.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "16x16" + }, + { + "filename" : "32.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "32x32" + }, + { + "filename" : "64.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "32x32" + }, + { + "filename" : "128.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "128x128" + }, + { + "filename" : "256.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "128x128" + }, + { + "filename" : "256.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "256x256" + }, + { + "filename" : "512.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "256x256" + }, + { + "filename" : "512.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "512x512" + }, + { + "filename" : "1024.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "512x512" + }, + { + "filename" : "48.png", + "idiom" : "watch", + "role" : "notificationCenter", + "scale" : "2x", + "size" : "24x24", + "subtype" : "38mm" + }, + { + "filename" : "55.png", + "idiom" : "watch", + "role" : "notificationCenter", + "scale" : "2x", + "size" : "27.5x27.5", + "subtype" : "42mm" + }, + { + "filename" : "58.png", + "idiom" : "watch", + "role" : "companionSettings", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "87.png", + "idiom" : "watch", + "role" : "companionSettings", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "66.png", + "idiom" : "watch", + "role" : "notificationCenter", + "scale" : "2x", + "size" : "33x33", + "subtype" : "45mm" + }, + { + "filename" : "80.png", + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "40x40", + "subtype" : "38mm" + }, + { + "filename" : "88.png", + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "44x44", + "subtype" : "40mm" + }, + { + "filename" : "92.png", + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "46x46", + "subtype" : "41mm" + }, + { + "filename" : "100.png", + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "50x50", + "subtype" : "44mm" + }, + { + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "51x51", + "subtype" : "45mm" + }, + { + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "54x54", + "subtype" : "49mm" + }, + { + "filename" : "172.png", + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "86x86", + "subtype" : "38mm" + }, + { + "filename" : "196.png", + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "98x98", + "subtype" : "42mm" + }, + { + "filename" : "216.png", + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "108x108", + "subtype" : "44mm" + }, + { + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "117x117", + "subtype" : "45mm" + }, + { + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "129x129", + "subtype" : "49mm" + }, + { + "filename" : "1024.png", + "idiom" : "watch-marketing", + "scale" : "1x", + "size" : "1024x1024" + }, + { + "filename" : "102.png", + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "45x45", + "subtype" : "41mm" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/100.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/100.png new file mode 100644 index 0000000..cb4e754 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/100.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/102.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/102.png new file mode 100644 index 0000000..eaa3a0a Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/102.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/1024.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/1024.png new file mode 100644 index 0000000..7010b37 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/1024.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/114.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/114.png new file mode 100644 index 0000000..1bb613b Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/114.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/120.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/120.png new file mode 100644 index 0000000..b7003a6 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/120.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/128.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/128.png new file mode 100644 index 0000000..12bac5b Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/128.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/144.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/144.png new file mode 100644 index 0000000..1183d11 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/144.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/152.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/152.png new file mode 100644 index 0000000..4f534e8 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/152.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/16.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/16.png new file mode 100644 index 0000000..db87270 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/16.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/167.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/167.png new file mode 100644 index 0000000..c2608d0 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/167.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/172.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/172.png new file mode 100644 index 0000000..14063fe Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/172.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/180.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/180.png new file mode 100644 index 0000000..c172809 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/180.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/196.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/196.png new file mode 100644 index 0000000..572870e Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/196.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/20.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/20.png new file mode 100644 index 0000000..80ef400 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/20.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/216.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/216.png new file mode 100644 index 0000000..71e065b Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/216.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/256.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/256.png new file mode 100644 index 0000000..4b005b0 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/256.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/29.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/29.png new file mode 100644 index 0000000..fe8ad66 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/29.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/32.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/32.png new file mode 100644 index 0000000..9a8e126 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/32.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/40.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/40.png new file mode 100644 index 0000000..fea87c1 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/40.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/48.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/48.png new file mode 100644 index 0000000..e1d33ea Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/48.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/50.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/50.png new file mode 100644 index 0000000..e57312e Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/50.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/512.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/512.png new file mode 100644 index 0000000..6fdb6d3 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/512.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/55.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/55.png new file mode 100644 index 0000000..b33a8b3 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/55.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/57.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/57.png new file mode 100644 index 0000000..05c1b13 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/57.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/58.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/58.png new file mode 100644 index 0000000..7e1f9a8 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/58.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/60.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/60.png new file mode 100644 index 0000000..6ed69bb Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/60.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/64.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/64.png new file mode 100644 index 0000000..11afc23 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/64.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/66.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/66.png new file mode 100644 index 0000000..7fe3d5c Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/66.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/72.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/72.png new file mode 100644 index 0000000..8b31ee6 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/72.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/76.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/76.png new file mode 100644 index 0000000..621bc1c Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/76.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/80.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/80.png new file mode 100644 index 0000000..f3cc85b Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/80.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/87.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/87.png new file mode 100644 index 0000000..331e993 Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/87.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/88.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/88.png new file mode 100644 index 0000000..3eefecd Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/88.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/92.png b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/92.png new file mode 100644 index 0000000..137c17a Binary files /dev/null and b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/92.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon Old.appiconset/Contents.json b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/Contents.json new file mode 100644 index 0000000..2e5c79d --- /dev/null +++ b/Soyuz/Assets.xcassets/AppIcon Old.appiconset/Contents.json @@ -0,0 +1,347 @@ +{ + "images" : [ + { + "filename" : "40.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "60.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "29.png", + "idiom" : "iphone", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "58.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "87.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "80.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "120.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "57.png", + "idiom" : "iphone", + "scale" : "1x", + "size" : "57x57" + }, + { + "filename" : "114.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "57x57" + }, + { + "filename" : "120.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "180.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "20.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "40.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "29.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "58.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "40.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "80.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "50.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "50x50" + }, + { + "filename" : "100.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "50x50" + }, + { + "filename" : "72.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "72x72" + }, + { + "filename" : "144.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "72x72" + }, + { + "filename" : "76.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "152.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "167.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "1024.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + }, + { + "filename" : "16.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "16x16" + }, + { + "filename" : "32.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "16x16" + }, + { + "filename" : "32.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "32x32" + }, + { + "filename" : "64.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "32x32" + }, + { + "filename" : "128.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "128x128" + }, + { + "filename" : "256.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "128x128" + }, + { + "filename" : "256.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "256x256" + }, + { + "filename" : "512.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "256x256" + }, + { + "filename" : "512.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "512x512" + }, + { + "filename" : "1024.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "512x512" + }, + { + "filename" : "48.png", + "idiom" : "watch", + "role" : "notificationCenter", + "scale" : "2x", + "size" : "24x24", + "subtype" : "38mm" + }, + { + "filename" : "55.png", + "idiom" : "watch", + "role" : "notificationCenter", + "scale" : "2x", + "size" : "27.5x27.5", + "subtype" : "42mm" + }, + { + "filename" : "58.png", + "idiom" : "watch", + "role" : "companionSettings", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "87.png", + "idiom" : "watch", + "role" : "companionSettings", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "66.png", + "idiom" : "watch", + "role" : "notificationCenter", + "scale" : "2x", + "size" : "33x33", + "subtype" : "45mm" + }, + { + "filename" : "80.png", + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "40x40", + "subtype" : "38mm" + }, + { + "filename" : "88.png", + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "44x44", + "subtype" : "40mm" + }, + { + "filename" : "92.png", + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "46x46", + "subtype" : "41mm" + }, + { + "filename" : "100.png", + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "50x50", + "subtype" : "44mm" + }, + { + "filename" : "102.png", + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "51x51", + "subtype" : "45mm" + }, + { + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "54x54", + "subtype" : "49mm" + }, + { + "filename" : "172.png", + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "86x86", + "subtype" : "38mm" + }, + { + "filename" : "196.png", + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "98x98", + "subtype" : "42mm" + }, + { + "filename" : "216.png", + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "108x108", + "subtype" : "44mm" + }, + { + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "117x117", + "subtype" : "45mm" + }, + { + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "129x129", + "subtype" : "49mm" + }, + { + "filename" : "1024.png", + "idiom" : "watch-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/100.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/100.png index fcc72ed..b6861db 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/100.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/100.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/102.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/102.png index b828f0e..af2c1e7 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/102.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/102.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/1024.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/1024.png index ea5fd3a..0645fe1 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/1024.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/1024.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/114.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/114.png index f07dc82..026a583 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/114.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/114.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/120.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/120.png index 6b05d9f..f3bc1f8 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/120.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/120.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/128.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/128.png index 4dd38d2..4f676eb 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/128.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/128.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/144.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/144.png index 1329ef8..9f1dcaf 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/144.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/144.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/152.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/152.png index 3b3d71f..9efcc73 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/152.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/152.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/16.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/16.png index 1668363..2f2c4ca 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/16.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/16.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/167.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/167.png index 833fe49..a3eef2c 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/167.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/167.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/172.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/172.png index 699e54f..e793b15 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/172.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/172.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/180.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/180.png index 1a49e04..02ca32e 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/180.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/180.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/196.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/196.png index d09d4f8..6724357 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/196.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/196.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/20.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/20.png index 59de13b..f72eca4 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/20.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/20.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/216.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/216.png index ecd163e..a132689 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/216.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/216.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/256.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/256.png index 7d194bd..ea220fb 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/256.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/256.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/29.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/29.png index ad094f8..152361e 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/29.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/29.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/32.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/32.png index 0521b21..60ddfe3 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/32.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/32.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/40.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/40.png index b7862c6..3bfeede 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/40.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/40.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/48.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/48.png index 52673c9..c3562e8 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/48.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/48.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/50.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/50.png index ad722f7..fa857f0 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/50.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/50.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/512.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/512.png index 28da56b..06c4271 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/512.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/512.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/55.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/55.png index 15efe56..23ad01d 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/55.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/55.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/57.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/57.png index 86ddb31..e6ed3bd 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/57.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/57.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/58.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/58.png index 13f3f05..2091ca3 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/58.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/58.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/60.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/60.png index a4a5678..940f9c0 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/60.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/60.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/64.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/64.png index f58c195..b3548ec 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/64.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/64.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/66.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/66.png index b515548..580584f 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/66.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/66.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/72.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/72.png index 543334f..31756d1 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/72.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/72.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/76.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/76.png index 57e0d2b..65f89c8 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/76.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/76.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/80.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/80.png index 7864796..b441066 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/80.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/80.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/87.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/87.png index f45da4d..477ba8d 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/87.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/87.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/88.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/88.png index 9153a9d..aca400a 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/88.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/88.png differ diff --git a/Soyuz/Assets.xcassets/AppIcon.appiconset/92.png b/Soyuz/Assets.xcassets/AppIcon.appiconset/92.png index 615894a..8b9168f 100644 Binary files a/Soyuz/Assets.xcassets/AppIcon.appiconset/92.png and b/Soyuz/Assets.xcassets/AppIcon.appiconset/92.png differ diff --git a/Soyuz/Assets.xcassets/menubar.imageset/Contents.json b/Soyuz/Assets.xcassets/menubar.imageset/Contents.json new file mode 100644 index 0000000..9716974 --- /dev/null +++ b/Soyuz/Assets.xcassets/menubar.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "menubar.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Soyuz/Assets.xcassets/menubar.imageset/menubar.png b/Soyuz/Assets.xcassets/menubar.imageset/menubar.png new file mode 100644 index 0000000..cef4dd5 Binary files /dev/null and b/Soyuz/Assets.xcassets/menubar.imageset/menubar.png differ diff --git a/Soyuz/Info.plist b/Soyuz/Info.plist index 9d2e1c8..0160f5a 100755 --- a/Soyuz/Info.plist +++ b/Soyuz/Info.plist @@ -2,6 +2,10 @@ + CFBundleHelpBookFolder + Soyuz.help + CFBundleHelpBookName + info.maddie.Soyuz.help LSApplicationCategoryType public.app-category.utilities NSAppTransportSecurity diff --git a/Soyuz/Soyuz.help/Contents/Info.plist b/Soyuz/Soyuz.help/Contents/Info.plist new file mode 100644 index 0000000..c2954a4 --- /dev/null +++ b/Soyuz/Soyuz.help/Contents/Info.plist @@ -0,0 +1,30 @@ + + + + + CFBundlePackageType + BNDL + CFBundleIdentifier + info.maddie.Soyuz.help + CFBundleDevelopmentRegion + en_us + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + Soyuz + CFBundleShortVersionString + 1 + CFBundleSignature + hbwr + CFBundleVersion + 1 + HPDBookAccessPath + index.html + HPDBookKBProduct + SoyuzCapsule1 + HPDBookTitle + Soyuz Capsule Help + HPDBookType + 3 + + diff --git a/Soyuz/Soyuz.help/Contents/Resources/English.lproj/index.html b/Soyuz/Soyuz.help/Contents/Resources/English.lproj/index.html new file mode 100644 index 0000000..6f61f5b --- /dev/null +++ b/Soyuz/Soyuz.help/Contents/Resources/English.lproj/index.html @@ -0,0 +1,21 @@ + + First Start Configuration + + + + + +

First Start Configuration

+

+ Soyuz can auto-detect your 3D printer using Bonjour, also known as zeroconf. An install of Mainsail + supports zeroconf, but it isn't enabled out of the box and requires a single-line configuration change. +

+

+ To enable zeroconf in Mainsail, locate your moonraker.conf file and add a single entry: +

+ [zeroconf] +
+

+ This is sufficient to enable zeroconf support, you don't need any additional configuration after this single line. +

+ diff --git a/Soyuz/Soyuz.help/Contents/Resources/English.lproj/mainPage.html b/Soyuz/Soyuz.help/Contents/Resources/English.lproj/mainPage.html new file mode 100644 index 0000000..e69de29 diff --git a/Soyuz/ViewModels/MoonrakerSocketManager.swift b/Soyuz/ViewModels/MoonrakerSocketManager.swift index 31f15dd..b50dc85 100755 --- a/Soyuz/ViewModels/MoonrakerSocketManager.swift +++ b/Soyuz/ViewModels/MoonrakerSocketManager.swift @@ -27,6 +27,7 @@ class MoonrakerSocketManager: ObservableObject, WebSocketDelegate { // Published NWConnection for listing connection information @Published var connection: NWConnection? + @Published var friendlyHostname: String = "" private var socket: WebSocket? private var lastPingDate = Date() @@ -66,6 +67,11 @@ class MoonrakerSocketManager: ObservableObject, WebSocketDelegate { print("\(key): \(value)") }) +// if isConnected == true { +// connection?.cancel() +// socket?.disconnect() +// } +// if connection == nil { connection = NWConnection(to: endpoint, using: .tcp) } @@ -89,6 +95,7 @@ class MoonrakerSocketManager: ObservableObject, WebSocketDelegate { connection?.cancel() DispatchQueue.main.async { + friendlyHostname = endpoint.toFriendlyString() self.socketHost = sanitizedHost self.socketPort = "\(port)" self.openWebsocket() @@ -102,6 +109,10 @@ class MoonrakerSocketManager: ObservableObject, WebSocketDelegate { } func disconnect() { + print("disconnect() called") + isConnected = false + //connection?.cancel() + connection = nil socket?.disconnect() } @@ -110,17 +121,25 @@ class MoonrakerSocketManager: ObservableObject, WebSocketDelegate { // Opens the websocket connection private func openWebsocket() { - //let fullUrlString = "http://\(socketHost):\(socketPort)/websocket" + // Exit function if there is no server to connect to + if socketHost.isEmpty || socketPort.isEmpty { + return + } + + lastPingDate = Date.now + var request = URLRequest(url: URL(string: "http://\(socketHost):\(socketPort)/websocket")!) - request.timeoutInterval = 5 + request.timeoutInterval = 30 socket = WebSocket(request: request, engine: starscreamEngine) socket!.delegate = self print("About to connect to WebSocket at: \(request.debugDescription)") socket!.connect() } + // TODO: This may not work properly when already connected to the socket private func reconnectWebsocket() { if socket == nil { + print("Socket doesn't exist. Fail-safe triggered.") return } @@ -132,8 +151,10 @@ class MoonrakerSocketManager: ObservableObject, WebSocketDelegate { func screenChangedSleepState(_ notification: Notification) { switch(notification.name) { case NSWorkspace.screensDidSleepNotification: + print("Screen slept. Disconnecting..") socket?.disconnect() case NSWorkspace.screensDidWakeNotification: + print("Screen awoke. Opening websocket..") self.openWebsocket() default: return diff --git a/Soyuz/Views/PrinterConfigView.swift b/Soyuz/Views/PrinterConfigView.swift index f955476..f240e3f 100755 --- a/Soyuz/Views/PrinterConfigView.swift +++ b/Soyuz/Views/PrinterConfigView.swift @@ -13,24 +13,54 @@ struct PrinterConfigView: View { @ObservedObject var printerManager: MoonrakerSocketManager @ObservedObject var bonjourBrowser = BonjourBrowser() + @Environment(\.openURL) private var openURL + + var body: some View { VStack { if(printerManager.isConnected) { - HStack { - Image(systemName: "network") - Text(printerManager.connection?.endpoint.toFriendlyString() ?? "Unknown Host") - Text("\(printerManager.socketHost):\(printerManager.socketPort)") - Button { - printerManager.disconnect() - } label: { - Text("Disconnect") + VStack { + Text("Soyuz Capsule is running in your menubar") + .font(.title) + .padding(4) + Image("menubar") + .resizable() + .frame(width: 225, height: 100) + .padding([.top], 2) + .padding([.leading, .trailing, .bottom], 8) + HStack { + Image(systemName: "network") + Text(printerManager.friendlyHostname) + Text("\(printerManager.socketHost):\(printerManager.socketPort)") + Button { + printerManager.disconnect() + } label: { + Text("Disconnect") + } } } - .frame(width: 500, height: 80) + .frame(width: 500, height: 200) } else { VStack { - Text("Auto-detected Printers") - .font(.title) + HStack { + Text("Auto-detected Printers") + .font(.title) + // Help button + Button { + let locBookName = Bundle.main.object(forInfoDictionaryKey: "CFBundleHelpBookName") as? String + NSHelpManager.shared.openHelpAnchor("bonjour", inBook: locBookName) + } label: { + ZStack { + Circle() + .strokeBorder(Color(NSColor.controlShadowColor), lineWidth: 0.5) + .background(Circle().foregroundColor(Color(NSColor.controlColor))) + .shadow(color: Color(NSColor.controlShadowColor).opacity(0.3), radius: 1) + .frame(width: 20, height: 20) + Text("?").font(.system(size: 15, weight: .medium )) + } + }.buttonStyle(PlainButtonStyle()) + + } ForEach(bonjourBrowser.NDEngineResults , id: \.hashValue) { result in HStack { Text(result.endpoint.toFriendlyString()) @@ -48,7 +78,7 @@ struct PrinterConfigView: View { } } .onAppear { - NSApplication.shared.activate(ignoringOtherApps: true) + //NSApplication.shared.activate(ignoringOtherApps: true) } } }