diff --git a/.theos/last_package b/.theos/last_package index d016051..d70d92a 100644 --- a/.theos/last_package +++ b/.theos/last_package @@ -1 +1 @@ -./packages/com.mpg13.undertime_1.4-32+debug_iphoneos-arm.deb +./packages/com.mpg13.undertime_1.4.1-4+debug_iphoneos-arm.deb diff --git a/.theos/obj/debug/arm64/Tweak.xm.41206041.Td b/.theos/obj/debug/arm64/Tweak.xm.41206041.Td index 5d7191f..5923f15 100644 --- a/.theos/obj/debug/arm64/Tweak.xm.41206041.Td +++ b/.theos/obj/debug/arm64/Tweak.xm.41206041.Td @@ -4,7 +4,6 @@ /home/mpg13/theos/vendor/include/_Prefix/BackwardsCompat.h \ /home/mpg13/theos/vendor/include/_Prefix/IOSMacros.h \ /home/mpg13/UnderTime/important.h \ - /home/mpg13/theos/include/PersistentConnection/PCSimpleTimer.h \ /home/mpg13/theos/vendor/include/substrate.h /home/mpg13/theos/Prefix.pch: @@ -15,6 +14,4 @@ /home/mpg13/UnderTime/important.h: -/home/mpg13/theos/include/PersistentConnection/PCSimpleTimer.h: - /home/mpg13/theos/vendor/include/substrate.h: diff --git a/.theos/packages/com.mpg13.undertime-1.4 b/.theos/packages/com.mpg13.undertime-1.4 index 1758ddd..3e932fe 100644 --- a/.theos/packages/com.mpg13.undertime-1.4 +++ b/.theos/packages/com.mpg13.undertime-1.4 @@ -1 +1 @@ -32 \ No newline at end of file +34 \ No newline at end of file diff --git a/.theos/packages/com.mpg13.undertime-1.4.1 b/.theos/packages/com.mpg13.undertime-1.4.1 new file mode 100644 index 0000000..bf0d87a --- /dev/null +++ b/.theos/packages/com.mpg13.undertime-1.4.1 @@ -0,0 +1 @@ +4 \ No newline at end of file diff --git a/Makefile b/Makefile index 714efe1..77fc46c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ ARCHS = arm64 -TARGET = iphone:10.3:10.3 +TARGET = iphone:clang:latest include $(THEOS)/makefiles/common.mk diff --git a/Tweak (copy).xm b/Tweak (copy).xm new file mode 100644 index 0000000..a055bc0 --- /dev/null +++ b/Tweak (copy).xm @@ -0,0 +1,165 @@ +#import "important.h" +#import + +@interface _UIStatusBarStringView : UIView +@property (copy) NSString *text; +@property NSInteger numberOfLines; +@property (copy) UIFont *font; +@property NSInteger textAlignment; +@end + +int sizeOfFont = GetPrefInt(@"sizeOfFont"); + +NSString *lineTwo = GetPrefString(@"lineTwo"); +NSString *lineOne = GetPrefString(@"lineOne"); +NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; + +%hook _UIStatusBarStringView + +- (void)setText:(NSString *)text { + if(GetPrefBool(@"Enable") && ![text containsString:@"%"] && ![text containsString:@"1x"] && ![text containsString:@"LTE"] && ![text containsString:@"4G"] && ![text containsString:@"3G"] && ![text containsString:@"2G"] && ![text containsString:@"EDGE"]) { + + NSString *timeLineTwo = lineTwo; + NSString *timeLineOne = lineOne; + + + NSDate *now = [NSDate date]; + if(!GetPrefBool(@"lineTwoStandard")){ + [dateFormatter setDateFormat:lineTwo]; + timeLineTwo = [dateFormatter stringFromDate:now]; + timeLineTwo = [timeLineTwo substringToIndex:[timeLineTwo length]]; + } + if(!GetPrefBool(@"lineOneStandard")){ + [dateFormatter setDateFormat:lineOne]; + timeLineOne = [dateFormatter stringFromDate:now]; + timeLineOne = [timeLineOne substringToIndex:[timeLineOne length]]; + } + NSString *newString; + if(GetPrefBool(@"lineOneEnable")){ + newString = [NSString stringWithFormat:@"%@\n%@", timeLineOne, timeLineTwo]; + } + else{ + newString = [NSString stringWithFormat:@"%@\n%@", text, timeLineTwo]; + } + + [self setFont: [self.font fontWithSize:sizeOfFont]]; + if(GetPrefBool(@"replaceTime")){ + %orig(timeLineOne); + } + else{ + self.textAlignment = 1; + self.numberOfLines = 2; + %orig(newString); + } + } + else { + %orig(text); + } +} + +%end + +@interface _UIStatusBarTimeItem : UIView +@property (copy) _UIStatusBarStringView *shortTimeView; +@property (copy) _UIStatusBarStringView *pillTimeView; +@property (nonatomic, retain) NSTimer *nz9_seconds_timer; +@end + +//Pray to god this works + +@interface SBClockDataProvider : NSObject ++ (id)sharedInstance; +@end + +@interface PCSimpleTimer : NSObject +@property BOOL disableSystemWaking; +- (BOOL)disableSystemWaking; +- (id)initWithFireDate:(id)arg1 serviceIdentifier:(id)arg2 target:(id)arg3 selector:(SEL)arg4 userInfo:(id)arg5; +- (id)initWithTimeInterval:(double)arg1 serviceIdentifier:(id)arg2 target:(id)arg3 selector:(SEL)arg4 userInfo:(id)arg5; +- (void)invalidate; +- (BOOL)isValid; +- (void)scheduleInRunLoop:(id)arg1; +- (void)setDisableSystemWaking:(BOOL)arg1; +- (id)userInfo; +@end + +NSMutableDictionary *data = [[NSMutableDictionary alloc] init]; + +static PCSimpleTimer *udtTimer = [[%c(PCSimpleTimer) alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:1] serviceIdentifier:@"com.mpg13.UnderTime" target:[%c(SBClockDataProvider) sharedInstance] selector:@selector(udtTimerFired) userInfo:data]; + +%hook _UIStatusBarTimeItem +%new +-(void)udtTimerFired{ + NSLog(@"Timer Fired"); + self.shortTimeView.text = @":"; + self.pillTimeView.text = @":"; + [self.shortTimeView setFont: [self.shortTimeView.font fontWithSize:sizeOfFont]]; + [self.pillTimeView setFont: [self.pillTimeView.font fontWithSize:sizeOfFont]]; +} + +- (id)applyUpdate:(id)arg1 toDisplayItem:(id)arg2 { + id returnThis = %orig; + [self.shortTimeView setFont: [self.shortTimeView.font fontWithSize:sizeOfFont]]; + [self.pillTimeView setFont: [self.pillTimeView.font fontWithSize:sizeOfFont]]; + return returnThis;} + +%end + +/* +%property (nonatomic, retain) NSTimer *nz9_seconds_timer; + +- (instancetype)init { + %orig; + if(GetPrefBool(@"Enable") && ((!GetPrefBool(@"lineTwoStandard") && [lineTwo containsString:@"s"]) || (!GetPrefBool(@"lineOneStandard") && [lineOne containsString:@"s"]))) { + self.nz9_seconds_timer = [NSTimer scheduledTimerWithTimeInterval:1.0 repeats:YES block:^(NSTimer *timer) { + self.shortTimeView.text = @":"; + self.pillTimeView.text = @":"; + [self.shortTimeView setFont: [self.shortTimeView.font fontWithSize:sizeOfFont]]; + [self.pillTimeView setFont: [self.pillTimeView.font fontWithSize:sizeOfFont]]; + }]; +} + return self; +} + +- (id)applyUpdate:(id)arg1 toDisplayItem:(id)arg2 { + id returnThis = %orig; + [self.shortTimeView setFont: [self.shortTimeView.font fontWithSize:sizeOfFont]]; + [self.pillTimeView setFont: [self.pillTimeView.font fontWithSize:sizeOfFont]]; + return returnThis; +} + +%end +*/ + +@interface _UIStatusBarBackgroundActivityView : UIView +@property (copy) CALayer *pulseLayer; +@end + +%hook _UIStatusBarBackgroundActivityView + +- (void)setCenter:(CGPoint)point { + if(GetPrefBool(@"Enable") && !GetPrefBool(@"replaceTime")){ + point.y = 11; + self.frame = CGRectMake(0, 0, self.frame.size.width, 31); + self.pulseLayer.frame = CGRectMake(0, 0, self.frame.size.width, 31); + %orig(point); + } +} + +%end + +%hook _UIStatusBarIndicatorLocationItem + +- (id)applyUpdate:(id)arg1 toDisplayItem:(id)arg2 { + return nil; +} + +%end + +%ctor { + dateFormatter = [[NSDateFormatter alloc] init]; + dateFormatter.dateStyle = NSDateFormatterNoStyle; + dateFormatter.timeStyle = NSDateFormatterMediumStyle; + dateFormatter.locale = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US"]; + %init; +} diff --git a/Tweak.xm b/Tweak.xm index 5af8f26..feeaf03 100644 --- a/Tweak.xm +++ b/Tweak.xm @@ -1,6 +1,5 @@ #import "important.h" #import -#import @interface _UIStatusBarStringView : UIView @property (copy) NSString *text; @@ -63,16 +62,31 @@ NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; @interface _UIStatusBarTimeItem : UIView @property (copy) _UIStatusBarStringView *shortTimeView; @property (copy) _UIStatusBarStringView *pillTimeView; -@property (nonatomic) PCSimpleTimer *nz9_seconds_timer; +@property (nonatomic, retain) PCSimpleTimer *udtTimer; +@end + +@interface PCSimpleTimer : NSObject +@property BOOL disableSystemWaking; +- (BOOL)disableSystemWaking; +- (id)initWithFireDate:(id)arg1 serviceIdentifier:(id)arg2 target:(id)arg3 selector:(SEL)arg4; +- (id)initWithTimeInterval:(double)arg1 serviceIdentifier:(id)arg2 target:(id)arg3 selector:(SEL)arg4; +- (void)invalidate; +- (BOOL)isValid; +- (void)scheduleInRunLoop:(id)arg1; +- (void)setDisableSystemWaking:(BOOL)arg1; +@end + +@interface SBClockDataProvider : NSObject ++ (id)sharedInstance; @end %hook _UIStatusBarTimeItem -%property (nonatomic, retain) PCSimpleTimer *nz9_seconds_timer; +%property (nonatomic, retain) PCSimpleTimer *udtTimer; - (instancetype)init { %orig; if(GetPrefBool(@"Enable") && ((!GetPrefBool(@"lineTwoStandard") && [lineTwo containsString:@"s"]) || (!GetPrefBool(@"lineOneStandard") && [lineOne containsString:@"s"]))) { - self.nz9_seconds_timer = [PCSimpleTimer initWithTimerInterval:1.0 block:^(PCSimpleTimer *timer) { + self.udtTimer = [[[%c(PCSimpleTimer) alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:1] serviceIdentifier:@"com.mpg13.UnderTime" target:[%c(SBClockDataProvider) sharedInstance] selector:@selector(udtTimerFired)](NSTimer udtTimer) { self.shortTimeView.text = @":"; self.pillTimeView.text = @":"; [self.shortTimeView setFont: [self.shortTimeView.font fontWithSize:sizeOfFont]]; @@ -123,4 +137,4 @@ NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; dateFormatter.timeStyle = NSDateFormatterMediumStyle; dateFormatter.locale = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US"]; %init; -} +} \ No newline at end of file diff --git a/control b/control index 6ae7332..0a47753 100644 --- a/control +++ b/control @@ -1,7 +1,7 @@ Package: com.mpg13.undertime Name: UnderTime Depends: mobilesubstrate -Version: 1.4 +Version: 1.4.1 Architecture: iphoneos-arm Description: Customizable date under time in iX StatusBar. Homepage: https://mpg13.github.io diff --git a/packages/com.mpg13.undertime_1.3.1-10+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.3.1-10+debug_iphoneos-arm.deb new file mode 100644 index 0000000..90fb28e Binary files /dev/null and b/packages/com.mpg13.undertime_1.3.1-10+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.3.1-11+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.3.1-11+debug_iphoneos-arm.deb new file mode 100644 index 0000000..d6d1436 Binary files /dev/null and b/packages/com.mpg13.undertime_1.3.1-11+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.3.1-12+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.3.1-12+debug_iphoneos-arm.deb new file mode 100644 index 0000000..76e75b2 Binary files /dev/null and b/packages/com.mpg13.undertime_1.3.1-12+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.3.1-13+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.3.1-13+debug_iphoneos-arm.deb new file mode 100644 index 0000000..09108ea Binary files /dev/null and b/packages/com.mpg13.undertime_1.3.1-13+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.3.1-14+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.3.1-14+debug_iphoneos-arm.deb new file mode 100644 index 0000000..b02b54e Binary files /dev/null and b/packages/com.mpg13.undertime_1.3.1-14+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.3.1-15+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.3.1-15+debug_iphoneos-arm.deb new file mode 100644 index 0000000..398a300 Binary files /dev/null and b/packages/com.mpg13.undertime_1.3.1-15+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.3.1-16+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.3.1-16+debug_iphoneos-arm.deb new file mode 100644 index 0000000..734c673 Binary files /dev/null and b/packages/com.mpg13.undertime_1.3.1-16+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.3.1-17+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.3.1-17+debug_iphoneos-arm.deb new file mode 100644 index 0000000..d1f1714 Binary files /dev/null and b/packages/com.mpg13.undertime_1.3.1-17+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.3.1-18+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.3.1-18+debug_iphoneos-arm.deb new file mode 100644 index 0000000..81f1390 Binary files /dev/null and b/packages/com.mpg13.undertime_1.3.1-18+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.3.1-19+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.3.1-19+debug_iphoneos-arm.deb new file mode 100644 index 0000000..352a1c5 Binary files /dev/null and b/packages/com.mpg13.undertime_1.3.1-19+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.3.1-20+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.3.1-20+debug_iphoneos-arm.deb new file mode 100644 index 0000000..919bc38 Binary files /dev/null and b/packages/com.mpg13.undertime_1.3.1-20+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.3.1-21+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.3.1-21+debug_iphoneos-arm.deb new file mode 100644 index 0000000..83190de Binary files /dev/null and b/packages/com.mpg13.undertime_1.3.1-21+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.3.1-22+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.3.1-22+debug_iphoneos-arm.deb new file mode 100644 index 0000000..53ac6c7 Binary files /dev/null and b/packages/com.mpg13.undertime_1.3.1-22+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.3.1-23+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.3.1-23+debug_iphoneos-arm.deb new file mode 100644 index 0000000..f945623 Binary files /dev/null and b/packages/com.mpg13.undertime_1.3.1-23+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.3.1-24+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.3.1-24+debug_iphoneos-arm.deb new file mode 100644 index 0000000..f7c8df2 Binary files /dev/null and b/packages/com.mpg13.undertime_1.3.1-24+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.3.1-25+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.3.1-25+debug_iphoneos-arm.deb new file mode 100644 index 0000000..d155b8c Binary files /dev/null and b/packages/com.mpg13.undertime_1.3.1-25+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.3.1-26+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.3.1-26+debug_iphoneos-arm.deb new file mode 100644 index 0000000..f29c8f1 Binary files /dev/null and b/packages/com.mpg13.undertime_1.3.1-26+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.3.1-27+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.3.1-27+debug_iphoneos-arm.deb new file mode 100644 index 0000000..d751e14 Binary files /dev/null and b/packages/com.mpg13.undertime_1.3.1-27+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.3.1-28+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.3.1-28+debug_iphoneos-arm.deb new file mode 100644 index 0000000..15d4561 Binary files /dev/null and b/packages/com.mpg13.undertime_1.3.1-28+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.3.1-5+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.3.1-5+debug_iphoneos-arm.deb new file mode 100644 index 0000000..53f860a Binary files /dev/null and b/packages/com.mpg13.undertime_1.3.1-5+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.3.1-6+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.3.1-6+debug_iphoneos-arm.deb new file mode 100644 index 0000000..c574ee5 Binary files /dev/null and b/packages/com.mpg13.undertime_1.3.1-6+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.3.1-7+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.3.1-7+debug_iphoneos-arm.deb new file mode 100644 index 0000000..79a6680 Binary files /dev/null and b/packages/com.mpg13.undertime_1.3.1-7+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.3.1-8+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.3.1-8+debug_iphoneos-arm.deb new file mode 100644 index 0000000..de4b70b Binary files /dev/null and b/packages/com.mpg13.undertime_1.3.1-8+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.3.1-9+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.3.1-9+debug_iphoneos-arm.deb new file mode 100644 index 0000000..ada79c1 Binary files /dev/null and b/packages/com.mpg13.undertime_1.3.1-9+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.4-33+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.4-33+debug_iphoneos-arm.deb new file mode 100644 index 0000000..d63e866 Binary files /dev/null and b/packages/com.mpg13.undertime_1.4-33+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.4-34+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.4-34+debug_iphoneos-arm.deb new file mode 100644 index 0000000..d1f7ad6 Binary files /dev/null and b/packages/com.mpg13.undertime_1.4-34+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.4.1-1+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.4.1-1+debug_iphoneos-arm.deb new file mode 100644 index 0000000..a57aa95 Binary files /dev/null and b/packages/com.mpg13.undertime_1.4.1-1+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.4.1-2+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.4.1-2+debug_iphoneos-arm.deb new file mode 100644 index 0000000..dffde16 Binary files /dev/null and b/packages/com.mpg13.undertime_1.4.1-2+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.4.1-3+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.4.1-3+debug_iphoneos-arm.deb new file mode 100644 index 0000000..d8d5069 Binary files /dev/null and b/packages/com.mpg13.undertime_1.4.1-3+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.4.1-4+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.4.1-4+debug_iphoneos-arm.deb new file mode 100644 index 0000000..1e638a4 Binary files /dev/null and b/packages/com.mpg13.undertime_1.4.1-4+debug_iphoneos-arm.deb differ