Browse Source

updated the top shelf image, made the logs a bit more informative, added SVProgressHUD so something shows while its running uicache / respringing

Kevin Bradley 6 years ago
parent
commit
31df82b16e

+ 60 - 0
g0blin.xcodeproj/project.pbxproj

@@ -7,7 +7,16 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		3262684020267B560022A21E /* angle-mask.png in Resources */ = {isa = PBXBuildFile; fileRef = 3262683D20267B470022A21E /* angle-mask.png */; };
+		3262684120267B580022A21E /* angle-mask@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3262683E20267B470022A21E /* angle-mask@2x.png */; };
+		3262684220267B5B0022A21E /* angle-mask@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3262683F20267B470022A21E /* angle-mask@3x.png */; };
+		3262684A20267B6E0022A21E /* SVIndefiniteAnimatedView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3262684520267B660022A21E /* SVIndefiniteAnimatedView.m */; };
+		3262684B20267B6E0022A21E /* SVProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 3262684720267B660022A21E /* SVProgressHUD.m */; };
+		3262684C20267B6E0022A21E /* SVRadialGradientLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3262684920267B660022A21E /* SVRadialGradientLayer.m */; };
 		327748392011FF7C00B538DA /* motd in Resources */ = {isa = PBXBuildFile; fileRef = 327748382011FF7C00B538DA /* motd */; };
+		328F2D502021B9D40046DA02 /* gg.png in Resources */ = {isa = PBXBuildFile; fileRef = 328F2D4E2021B3410046DA02 /* gg.png */; };
+		328F2D512021BA380046DA02 /* greeng0blin-white copy.png in Resources */ = {isa = PBXBuildFile; fileRef = 328F2D4F2021B6700046DA02 /* greeng0blin-white copy.png */; };
+		328F2D542021C1E00046DA02 /* UIColor+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 328F2D532021C1E00046DA02 /* UIColor+Additions.m */; };
 		32AFC552200DB5CC00352702 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 32AFC551200DB5CC00352702 /* AppDelegate.m */; };
 		32AFC555200DB5CC00352702 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32AFC554200DB5CC00352702 /* ViewController.m */; };
 		32AFC558200DB5CC00352702 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 32AFC556200DB5CC00352702 /* Main.storyboard */; };
@@ -53,7 +62,20 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		3262683D20267B470022A21E /* angle-mask.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "angle-mask.png"; sourceTree = "<group>"; };
+		3262683E20267B470022A21E /* angle-mask@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "angle-mask@2x.png"; sourceTree = "<group>"; };
+		3262683F20267B470022A21E /* angle-mask@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "angle-mask@3x.png"; sourceTree = "<group>"; };
+		3262684420267B660022A21E /* SVIndefiniteAnimatedView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVIndefiniteAnimatedView.h; sourceTree = "<group>"; };
+		3262684520267B660022A21E /* SVIndefiniteAnimatedView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SVIndefiniteAnimatedView.m; sourceTree = "<group>"; };
+		3262684620267B660022A21E /* SVProgressHUD.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVProgressHUD.h; sourceTree = "<group>"; };
+		3262684720267B660022A21E /* SVProgressHUD.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SVProgressHUD.m; sourceTree = "<group>"; };
+		3262684820267B660022A21E /* SVRadialGradientLayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVRadialGradientLayer.h; sourceTree = "<group>"; };
+		3262684920267B660022A21E /* SVRadialGradientLayer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SVRadialGradientLayer.m; sourceTree = "<group>"; };
 		327748382011FF7C00B538DA /* motd */ = {isa = PBXFileReference; lastKnownFileType = text; path = motd; sourceTree = "<group>"; };
+		328F2D4E2021B3410046DA02 /* gg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = gg.png; sourceTree = "<group>"; };
+		328F2D4F2021B6700046DA02 /* greeng0blin-white copy.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "greeng0blin-white copy.png"; sourceTree = "<group>"; };
+		328F2D522021C1E00046DA02 /* UIColor+Additions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIColor+Additions.h"; sourceTree = "<group>"; };
+		328F2D532021C1E00046DA02 /* UIColor+Additions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIColor+Additions.m"; sourceTree = "<group>"; };
 		32AFC54E200DB5CC00352702 /* g0blinTV.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = g0blinTV.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		32AFC550200DB5CC00352702 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		32AFC551200DB5CC00352702 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -134,9 +156,34 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		3262683C20267B470022A21E /* Images */ = {
+			isa = PBXGroup;
+			children = (
+				3262683D20267B470022A21E /* angle-mask.png */,
+				3262683E20267B470022A21E /* angle-mask@2x.png */,
+				3262683F20267B470022A21E /* angle-mask@3x.png */,
+			);
+			path = Images;
+			sourceTree = "<group>";
+		};
+		3262684320267B660022A21E /* SVProgressHUD */ = {
+			isa = PBXGroup;
+			children = (
+				3262684420267B660022A21E /* SVIndefiniteAnimatedView.h */,
+				3262684520267B660022A21E /* SVIndefiniteAnimatedView.m */,
+				3262684620267B660022A21E /* SVProgressHUD.h */,
+				3262684720267B660022A21E /* SVProgressHUD.m */,
+				3262684820267B660022A21E /* SVRadialGradientLayer.h */,
+				3262684920267B660022A21E /* SVRadialGradientLayer.m */,
+			);
+			path = SVProgressHUD;
+			sourceTree = "<group>";
+		};
 		32AFC54F200DB5CC00352702 /* g0blinTV */ = {
 			isa = PBXGroup;
 			children = (
+				328F2D4E2021B3410046DA02 /* gg.png */,
+				328F2D4F2021B6700046DA02 /* greeng0blin-white copy.png */,
 				32AFC57D2010A56B00352702 /* NewV0rtex */,
 				32AFC579200F2DC100352702 /* binpack64-256.tar */,
 				32AFC577200F182C00352702 /* tar */,
@@ -150,6 +197,10 @@
 				32AFC551200DB5CC00352702 /* AppDelegate.m */,
 				32AFC553200DB5CC00352702 /* ViewController.h */,
 				32AFC554200DB5CC00352702 /* ViewController.m */,
+				328F2D522021C1E00046DA02 /* UIColor+Additions.h */,
+				328F2D532021C1E00046DA02 /* UIColor+Additions.m */,
+				3262684320267B660022A21E /* SVProgressHUD */,
+				3262683C20267B470022A21E /* Images */,
 				32AFC556200DB5CC00352702 /* Main.storyboard */,
 				32AFC559200DB5CC00352702 /* Assets.xcassets */,
 				32AFC55B200DB5CC00352702 /* Info.plist */,
@@ -330,7 +381,12 @@
 				32AFC55A200DB5CC00352702 /* Assets.xcassets in Resources */,
 				32AFC578200F183400352702 /* tar in Resources */,
 				32AFC558200DB5CC00352702 /* Main.storyboard in Resources */,
+				328F2D512021BA380046DA02 /* greeng0blin-white copy.png in Resources */,
 				32AFC56B200DB6B900352702 /* launchctl in Resources */,
+				3262684220267B5B0022A21E /* angle-mask@3x.png in Resources */,
+				328F2D502021B9D40046DA02 /* gg.png in Resources */,
+				3262684120267B580022A21E /* angle-mask@2x.png in Resources */,
+				3262684020267B560022A21E /* angle-mask.png in Resources */,
 				32AFC56F200DC2C200352702 /* bootstrap.tar in Resources */,
 				32AFC57A200F2FBF00352702 /* binpack64-256.tar in Resources */,
 				327748392011FF7C00B538DA /* motd in Resources */,
@@ -366,14 +422,18 @@
 			files = (
 				32AFC5842010A77400352702 /* offsets2.m in Sources */,
 				32AFC576200DC58A00352702 /* bootstrap.m in Sources */,
+				328F2D542021C1E00046DA02 /* UIColor+Additions.m in Sources */,
 				32AFC566200DB60700352702 /* remount.m in Sources */,
 				32AFC555200DB5CC00352702 /* ViewController.m in Sources */,
 				32AFC5832010A77100352702 /* v0rtex2.m in Sources */,
 				32AFC565200DB60400352702 /* kernel.m in Sources */,
+				3262684C20267B6E0022A21E /* SVRadialGradientLayer.m in Sources */,
 				32AFC563200DB5FD00352702 /* kpp.m in Sources */,
 				32AFC55D200DB5CC00352702 /* main.m in Sources */,
+				3262684B20267B6E0022A21E /* SVProgressHUD.m in Sources */,
 				32AFC573200DC48900352702 /* patchfinder64.c in Sources */,
 				32AFC552200DB5CC00352702 /* AppDelegate.m in Sources */,
+				3262684A20267B6E0022A21E /* SVIndefiniteAnimatedView.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

+ 1 - 1
g0blinTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image Wide.imageset/Contents.json

@@ -6,7 +6,7 @@
     },
     {
       "idiom" : "tv",
-      "filename" : "gg_topshelf.png",
+      "filename" : "greeng0blin-white.png",
       "scale" : "2x"
     }
   ],

BIN
g0blinTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image Wide.imageset/gg_topshelf.png


BIN
g0blinTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image Wide.imageset/greeng0blin-white.png


+ 1 - 1
g0blinTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/Contents.json

@@ -6,7 +6,7 @@
     },
     {
       "idiom" : "tv",
-      "filename" : "gg_topshelf.png",
+      "filename" : "greeng0blin-white.png",
       "scale" : "2x"
     }
   ],

BIN
g0blinTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/gg_topshelf.png


BIN
g0blinTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/greeng0blin-white.png


+ 15 - 2
g0blinTV/ViewController.m

@@ -19,6 +19,7 @@
 #include <sys/utsname.h>
 #import <AVFoundation/AVFoundation.h>
 #import <AVKit/AVKit.h>
+#import "SVProgressHUD.h"
 
 #import "UIColor+Additions.h"
 
@@ -341,7 +342,7 @@ AVPlayerViewController *cont;
     [self log:[NSString stringWithFormat:@"SSH server is ready at %@.local", hostname]];
     [self log:@"change your root/mobile passwords"];
     [self log:@""];
-    [self log:@"respring to load tweaks"];
+    [self log:@"reloading daemons..."];
     
     sleep(2);
     RunCmd("/usr/libexec/substrate");
@@ -354,15 +355,26 @@ AVPlayerViewController *cont;
     
     dispatch_async(dispatch_get_main_queue(), ^{
         respringNeeded = YES;
+        [self log:@""];
+        [self log:@"respring to reload Applications and Tweaks"];
         [self.goButton setTitle:@"respring" forState:UIControlStateNormal];
         self.goButton.enabled = YES;
     });
 
 }
 
+- (void)showHUD
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [SVProgressHUD setBackgroundColor:[UIColor clearColor]];
+        [SVProgressHUD show];
+     });
+}
+
+
 - (void)restart {
     
-    
+    [self showHUD];
     LOG("Running uicache...");
     
     //pid_t pd;
@@ -370,6 +382,7 @@ AVPlayerViewController *cont;
     //posix_spawn(&pid, "/jb/usr/bin/killall", NULL, NULL, (char* const*)args, NULL);
     //posix_spawn(&pd, "/usr/bin/uicache", 0, 0, (char**)&(const char*[]){"/usr/bin/uicache", NULL}, NULL);
     //waitpid(pd, 0, 0);
+    RunCmd("/usr/libexec/substrate");
     RunCmd("/usr/bin/uicache");
 }
 

BIN
g0blinTV/bootstrap.tar