diff --git a/.theos/_/DEBIAN/control b/.theos/_/DEBIAN/control index dede7d3..d1eddc3 100644 --- a/.theos/_/DEBIAN/control +++ b/.theos/_/DEBIAN/control @@ -8,5 +8,5 @@ Depiction: https://mpg13.github.io/repo/depicts/undertime.html Maintainer: MPG13 Author: MPG13 Section: Tweaks -Version: 1.5.1-12+debug +Version: 1.6-21+debug Installed-Size: 200 diff --git a/.theos/_/Library/MobileSubstrate/DynamicLibraries/UnderTime.dylib b/.theos/_/Library/MobileSubstrate/DynamicLibraries/UnderTime.dylib index 417ce76..88b1c9b 100755 Binary files a/.theos/_/Library/MobileSubstrate/DynamicLibraries/UnderTime.dylib and b/.theos/_/Library/MobileSubstrate/DynamicLibraries/UnderTime.dylib differ diff --git a/.theos/_/Library/PreferenceBundles/UnderTime.bundle/Root.plist b/.theos/_/Library/PreferenceBundles/UnderTime.bundle/Root.plist index c65c9af..2c931ea 100644 --- a/.theos/_/Library/PreferenceBundles/UnderTime.bundle/Root.plist +++ b/.theos/_/Library/PreferenceBundles/UnderTime.bundle/Root.plist @@ -24,6 +24,19 @@ label Enable tweak + + cell + PSSwitchCell + default + + defaults + com.mpg13.UnderTime + key + hasSeconds + label + Time has seconds in it + + cell PSGroupCell @@ -38,7 +51,7 @@ height 45 label - Edit all settings you want changed! Just because + Edit all settings you want changed! cell @@ -46,7 +59,31 @@ height 45 label - they look configured doesn't mean they are! + Prefs don't always save right! + + + cell + PSStaticTextCell + height + 45 + label + Go swipe back a page and re-open + + + cell + PSStaticTextCell + height + 45 + label + UnderTime Settings to make sure + + + cell + PSStaticTextCell + height + 45 + label + that your settings saved! diff --git a/.theos/_/Library/PreferenceBundles/UnderTime.bundle/UnderTime b/.theos/_/Library/PreferenceBundles/UnderTime.bundle/UnderTime index 5351d58..2ce8144 100755 Binary files a/.theos/_/Library/PreferenceBundles/UnderTime.bundle/UnderTime and b/.theos/_/Library/PreferenceBundles/UnderTime.bundle/UnderTime differ diff --git a/.theos/last_package b/.theos/last_package index 5a48474..3f61a24 100644 --- a/.theos/last_package +++ b/.theos/last_package @@ -1 +1 @@ -./packages/com.mpg13.undertime_1.5.1-12+debug_iphoneos-arm.deb +./packages/com.mpg13.undertime_1.6-21+debug_iphoneos-arm.deb diff --git a/.theos/obj/debug/UnderTime.bundle/Root.plist b/.theos/obj/debug/UnderTime.bundle/Root.plist index c65c9af..2c931ea 100644 --- a/.theos/obj/debug/UnderTime.bundle/Root.plist +++ b/.theos/obj/debug/UnderTime.bundle/Root.plist @@ -24,6 +24,19 @@ label Enable tweak + + cell + PSSwitchCell + default + + defaults + com.mpg13.UnderTime + key + hasSeconds + label + Time has seconds in it + + cell PSGroupCell @@ -38,7 +51,7 @@ height 45 label - Edit all settings you want changed! Just because + Edit all settings you want changed! cell @@ -46,7 +59,31 @@ height 45 label - they look configured doesn't mean they are! + Prefs don't always save right! + + + cell + PSStaticTextCell + height + 45 + label + Go swipe back a page and re-open + + + cell + PSStaticTextCell + height + 45 + label + UnderTime Settings to make sure + + + cell + PSStaticTextCell + height + 45 + label + that your settings saved! diff --git a/.theos/obj/debug/UnderTime.bundle/UnderTime b/.theos/obj/debug/UnderTime.bundle/UnderTime index 5351d58..2ce8144 100755 Binary files a/.theos/obj/debug/UnderTime.bundle/UnderTime and b/.theos/obj/debug/UnderTime.bundle/UnderTime differ diff --git a/.theos/obj/debug/UnderTime.dylib b/.theos/obj/debug/UnderTime.dylib index 417ce76..88b1c9b 100755 Binary files a/.theos/obj/debug/UnderTime.dylib and b/.theos/obj/debug/UnderTime.dylib differ diff --git a/.theos/obj/debug/arm64/Tweak.xm.41206041.o b/.theos/obj/debug/arm64/Tweak.xm.41206041.o index 6d6f990..dd5647e 100644 Binary files a/.theos/obj/debug/arm64/Tweak.xm.41206041.o and b/.theos/obj/debug/arm64/Tweak.xm.41206041.o differ diff --git a/.theos/obj/debug/arm64/UnderTime.bundle/UnderTime b/.theos/obj/debug/arm64/UnderTime.bundle/UnderTime index 2247be7..6b42957 100755 Binary files a/.theos/obj/debug/arm64/UnderTime.bundle/UnderTime and b/.theos/obj/debug/arm64/UnderTime.bundle/UnderTime differ diff --git a/.theos/obj/debug/arm64/UnderTime.dylib b/.theos/obj/debug/arm64/UnderTime.dylib index 787c9d4..c297066 100755 Binary files a/.theos/obj/debug/arm64/UnderTime.dylib and b/.theos/obj/debug/arm64/UnderTime.dylib differ diff --git a/.theos/obj/debug/arm64/UnderTime.dylib.dSYM/Contents/Resources/DWARF/UnderTime.dylib b/.theos/obj/debug/arm64/UnderTime.dylib.dSYM/Contents/Resources/DWARF/UnderTime.dylib index 50e0ac1..dc29569 100644 Binary files a/.theos/obj/debug/arm64/UnderTime.dylib.dSYM/Contents/Resources/DWARF/UnderTime.dylib and b/.theos/obj/debug/arm64/UnderTime.dylib.dSYM/Contents/Resources/DWARF/UnderTime.dylib differ diff --git a/.theos/packages/com.mpg13.undertime-1.6 b/.theos/packages/com.mpg13.undertime-1.6 new file mode 100644 index 0000000..b5045cc --- /dev/null +++ b/.theos/packages/com.mpg13.undertime-1.6 @@ -0,0 +1 @@ +21 \ No newline at end of file diff --git a/Tweak.xm b/Tweak.xm index 79d3cd0..fbf248d 100644 --- a/Tweak.xm +++ b/Tweak.xm @@ -56,18 +56,15 @@ int sizeOfFont = GetPrefInt(@"sizeOfFont"); int fontAlpha = GetPrefInt(@"fontAlpha"); -NSString *lineOne = GetPrefString(@"lineOne"); -NSString *lineTwo = GetPrefString(@"lineTwo"); NSString *fontColor = GetPrefString(@"fontHex"); - NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; -%group allHooks - %hook _UIStatusBarStringView - (void)setText:(NSString *)text { if(GetPrefBool(@"Enable") && [text containsString:@":"]) { + NSString *lineOne = GetPrefString(@"lineOne"); + NSString *lineTwo = GetPrefString(@"lineTwo"); NSString *timeLineOne = lineOne; NSString *timeLineTwo = lineTwo; @@ -113,15 +110,15 @@ NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; - (instancetype)init { %orig; - if(GetPrefBool(@"Enable") && ((!GetPrefBool(@"lineTwoStandard") && [lineTwo containsString:@"s"]) || (!GetPrefBool(@"lineOneStandard") && [lineOne containsString:@"s"]))) { + if(GetPrefBool(@"Enable") && GetPrefBool(@"hasSeconds")) { 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; + }]; + } + return self; } - (id)applyUpdate:(id)arg1 toDisplayItem:(id)arg2 { @@ -157,15 +154,9 @@ NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; %end -%end - %ctor { - dateFormatter = [[NSDateFormatter alloc] init]; + dateFormatter = [[NSDateFormatter alloc] init]; dateFormatter.dateStyle = NSDateFormatterNoStyle; dateFormatter.timeStyle = NSDateFormatterMediumStyle; dateFormatter.locale = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US"]; - - if (![@"com.saurik.Cydia" boolValue]) { - %init(allHooks); - } } \ No newline at end of file diff --git a/control b/control index 91cd461..aca8e65 100644 --- a/control +++ b/control @@ -1,7 +1,7 @@ Package: com.mpg13.undertime Name: UnderTime Depends: mobilesubstrate -Version: 1.5.1 +Version: 1.6 Architecture: iphoneos-arm Description: Customizable date under time in iX StatusBar. Homepage: https://mpg13.github.io diff --git a/packages/com.mpg13.undertime_1.6-1+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.6-1+debug_iphoneos-arm.deb new file mode 100644 index 0000000..0f0cc51 Binary files /dev/null and b/packages/com.mpg13.undertime_1.6-1+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.6-10+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.6-10+debug_iphoneos-arm.deb new file mode 100644 index 0000000..b928f9b Binary files /dev/null and b/packages/com.mpg13.undertime_1.6-10+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.6-11+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.6-11+debug_iphoneos-arm.deb new file mode 100644 index 0000000..4c0b702 Binary files /dev/null and b/packages/com.mpg13.undertime_1.6-11+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.6-12+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.6-12+debug_iphoneos-arm.deb new file mode 100644 index 0000000..89ecd82 Binary files /dev/null and b/packages/com.mpg13.undertime_1.6-12+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.6-13+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.6-13+debug_iphoneos-arm.deb new file mode 100644 index 0000000..f7b8423 Binary files /dev/null and b/packages/com.mpg13.undertime_1.6-13+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.6-14+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.6-14+debug_iphoneos-arm.deb new file mode 100644 index 0000000..673cb00 Binary files /dev/null and b/packages/com.mpg13.undertime_1.6-14+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.6-15+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.6-15+debug_iphoneos-arm.deb new file mode 100644 index 0000000..aaf41b7 Binary files /dev/null and b/packages/com.mpg13.undertime_1.6-15+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.6-16+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.6-16+debug_iphoneos-arm.deb new file mode 100644 index 0000000..36a7971 Binary files /dev/null and b/packages/com.mpg13.undertime_1.6-16+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.6-17+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.6-17+debug_iphoneos-arm.deb new file mode 100644 index 0000000..4396c31 Binary files /dev/null and b/packages/com.mpg13.undertime_1.6-17+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.6-18+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.6-18+debug_iphoneos-arm.deb new file mode 100644 index 0000000..6b8994e Binary files /dev/null and b/packages/com.mpg13.undertime_1.6-18+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.6-19+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.6-19+debug_iphoneos-arm.deb new file mode 100644 index 0000000..c98c8ca Binary files /dev/null and b/packages/com.mpg13.undertime_1.6-19+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.6-2+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.6-2+debug_iphoneos-arm.deb new file mode 100644 index 0000000..aa174fb Binary files /dev/null and b/packages/com.mpg13.undertime_1.6-2+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.6-20+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.6-20+debug_iphoneos-arm.deb new file mode 100644 index 0000000..669d26d Binary files /dev/null and b/packages/com.mpg13.undertime_1.6-20+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.6-21+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.6-21+debug_iphoneos-arm.deb new file mode 100644 index 0000000..9a8291c Binary files /dev/null and b/packages/com.mpg13.undertime_1.6-21+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.6-3+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.6-3+debug_iphoneos-arm.deb new file mode 100644 index 0000000..41336d7 Binary files /dev/null and b/packages/com.mpg13.undertime_1.6-3+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.6-4+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.6-4+debug_iphoneos-arm.deb new file mode 100644 index 0000000..0cdd2fb Binary files /dev/null and b/packages/com.mpg13.undertime_1.6-4+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.6-5+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.6-5+debug_iphoneos-arm.deb new file mode 100644 index 0000000..021ad14 Binary files /dev/null and b/packages/com.mpg13.undertime_1.6-5+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.6-6+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.6-6+debug_iphoneos-arm.deb new file mode 100644 index 0000000..ceb148f Binary files /dev/null and b/packages/com.mpg13.undertime_1.6-6+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.6-7+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.6-7+debug_iphoneos-arm.deb new file mode 100644 index 0000000..06f07bc Binary files /dev/null and b/packages/com.mpg13.undertime_1.6-7+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.6-8+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.6-8+debug_iphoneos-arm.deb new file mode 100644 index 0000000..6f6d660 Binary files /dev/null and b/packages/com.mpg13.undertime_1.6-8+debug_iphoneos-arm.deb differ diff --git a/packages/com.mpg13.undertime_1.6-9+debug_iphoneos-arm.deb b/packages/com.mpg13.undertime_1.6-9+debug_iphoneos-arm.deb new file mode 100644 index 0000000..8994fc2 Binary files /dev/null and b/packages/com.mpg13.undertime_1.6-9+debug_iphoneos-arm.deb differ diff --git a/undertime/Resources/Root.plist b/undertime/Resources/Root.plist index c65c9af..2c931ea 100644 --- a/undertime/Resources/Root.plist +++ b/undertime/Resources/Root.plist @@ -24,6 +24,19 @@ label Enable tweak + + cell + PSSwitchCell + default + + defaults + com.mpg13.UnderTime + key + hasSeconds + label + Time has seconds in it + + cell PSGroupCell @@ -38,7 +51,7 @@ height 45 label - Edit all settings you want changed! Just because + Edit all settings you want changed! cell @@ -46,7 +59,31 @@ height 45 label - they look configured doesn't mean they are! + Prefs don't always save right! + + + cell + PSStaticTextCell + height + 45 + label + Go swipe back a page and re-open + + + cell + PSStaticTextCell + height + 45 + label + UnderTime Settings to make sure + + + cell + PSStaticTextCell + height + 45 + label + that your settings saved!