[global] nahhhh let's move back to springboard

hbang · Nov 15, 2015 · fc101f4 · fc101f4
1 parent 9b74b14
commit fc101f4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/client/HBTSStatusBarAlertServer+Private.h → ...gboard/HBTSStatusBarAlertServer+Private.h b/client/HBTSStatusBarAlertServer+Private.h → ...gboard/HBTSStatusBarAlertServer+Private.h
@@ -1,3 +1,5 @@
+#import "HBTSStatusBarAlertServer.h"
+
 @interface HBTSStatusBarAlertServer (Private)
 
 + (void)sendAlertType:(HBTSStatusBarType)type sender:(NSString *)sender timeout:(NSTimeInterval)timeout;

diff --git a/client/HBTSStatusBarAlertServer.h → springboard/HBTSStatusBarAlertServer.h b/client/HBTSStatusBarAlertServer.h → springboard/HBTSStatusBarAlertServer.h
diff --git a/client/HBTSStatusBarAlertServer.m → springboard/HBTSStatusBarAlertServer.x b/client/HBTSStatusBarAlertServer.m → springboard/HBTSStatusBarAlertServer.x
@@ -1,5 +1,5 @@
 #import "HBTSStatusBarAlertServer.h"
-#import "HBTSPreferences.h"
+#import "../client/HBTSPreferences.h"
 #import <Foundation/NSDistributedNotificationCenter.h>
 
 @implementation HBTSStatusBarAlertServer
@@ -56,7 +56,7 @@ + (void)sendAlertWithIconName:(NSString *)iconName title:(NSString *)title conte
 
 + (void)sendAlertWithIconName:(NSString *)iconName title:(NSString *)title content:(NSString *)content animatingInDirection:(BOOL)direction timeout:(NSTimeInterval)timeout {
 	if (timeout == -1) {
-		timeout = [HBTSPreferences sharedInstance].overlayDisplayDuration;
+		timeout = ((HBTSPreferences *)[%c(HBTSPreferences) sharedInstance]).overlayDisplayDuration;
 	}
 
 	dispatch_async(dispatch_get_main_queue(), ^{

diff --git a/springboard/Makefile b/springboard/Makefile
@@ -2,7 +2,7 @@ include $(THEOS)/makefiles/common.mk
 
 TWEAK_NAME = TypeStatus
 
-TypeStatus_FILES = $(wildcard *.xm) $(wildcard *.m)
+TypeStatus_FILES = $(wildcard *.xm) $(wildcard *.x) $(wildcard *.m)
 TypeStatus_FRAMEWORKS = UIKit
 TypeStatus_EXTRA_FRAMEWORKS = Cephei
 TypeStatus_CFLAGS = -include ../Global.h

diff --git a/springboard/SpringBoard.xm b/springboard/SpringBoard.xm
@@ -1,7 +1,7 @@
 #import "HBTSStatusBarIconController.h"
+#import "HBTSStatusBarAlertServer.h"
+#import "HBTSStatusBarAlertServer+Private.h"
 #import "../client/HBTSPreferences.h"
-#import "../client/HBTSStatusBarAlertServer.h"
-#import "../client/HBTSStatusBarAlertServer+Private.h"
 #import <Cephei/HBPreferences.h>
 #import <ChatKit/CKEntity.h>
 #import <ChatKit/CKDNDList.h>
@@ -51,7 +51,7 @@ void HBTSShowAlert(HBTSStatusBarType type, NSString *sender, BOOL isTyping) {
 
 	switch (notificationType) {
 		case HBTSNotificationTypeOverlay:
-			[%c(HBTSStatusBarAlertServer) sendAlertType:type sender:HBTSNameForHandle(sender) timeout:timeout];
+			[HBTSStatusBarAlertServer sendAlertType:type sender:HBTSNameForHandle(sender) timeout:timeout];
 			break;
 
 		case HBTSNotificationTypeIcon: