diff --git a/.gitignore b/.gitignore index 86de6aa..09e2e94 100644 --- a/.gitignore +++ b/.gitignore @@ -1,63 +1 @@ -# Xcode -# -# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore - -## Build generated -build/ -DerivedData/ - -## Various settings -*.pbxuser -!default.pbxuser -*.mode1v3 -!default.mode1v3 -*.mode2v3 -!default.mode2v3 -*.perspectivev3 -!default.perspectivev3 -xcuserdata/ - -## Other -*.moved-aside -*.xccheckout -*.xcscmblueprint - -## Obj-C/Swift specific -*.hmap -*.ipa -*.dSYM.zip -*.dSYM - -# CocoaPods -# -# We recommend against adding the Pods directory to your .gitignore. However -# you should judge for yourself, the pros and cons are mentioned at: -# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control -# -# Pods/ - -# Carthage -# -# Add this line if you want to avoid checking in source code from Carthage dependencies. -# Carthage/Checkouts - -Carthage/Build - -# fastlane -# -# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the -# screenshots whenever they are needed. -# For more information about the recommended setup visit: -# https://docs.fastlane.tools/best-practices/source-control/#source-control - -fastlane/report.xml -fastlane/Preview.html -fastlane/screenshots/**/*.png -fastlane/test_output - -# Code Injection -# -# After new code Injection tools there's a generated folder /iOSInjectionProject -# https://github.com/johnno1962/injectionforxcode - -iOSInjectionProject/ +/.theos diff --git a/Makefile b/Makefile index 103e6a1..6d974a0 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ - +FINALPACKAGE = 1 GO_EASY_ON_ME = 1 ARCHS = arm64 armv7 diff --git a/Tweak.xm b/Tweak.xm index 8885430..afdd61f 100644 --- a/Tweak.xm +++ b/Tweak.xm @@ -18,11 +18,12 @@ -(id)_dateColor; -(BOOL)isDateHidden; -(void)layoutDuplexCalendarLabel; +-(void)_updateLabels; @end @interface _UILegibilityView : UIView -@end +@end @interface _UILegibilityLabel : _UILegibilityView @end @@ -56,7 +57,7 @@ static float sizeheight = 0.0; -(void)_layoutLunarDateLabel{ %orig; - + if(!isLunarDateRefreshed) { isLunarDateRefreshed = YES; [lockScreenDateView _updateLabels]; @@ -75,7 +76,7 @@ static float sizeheight = 0.0; self.duplexCalendarLabel.font = [[self _dateFont] fontWithSize:16]; [self addSubview:self.duplexCalendarLabel]; self.duplexCalendarLabel.textColor = [self _dateColor]; - self.duplexCalendarLabel.textAlignment = 1; + self.duplexCalendarLabel.textAlignment = (NSTextAlignment)1; } return lockScreenDateView; } @@ -84,8 +85,8 @@ static float sizeheight = 0.0; -(void)layoutDuplexCalendarLabel{ NSString *offsetXTextField = [prefs objectForKey:@"offsetXTextField"]; NSString *offsetYTextField = [prefs objectForKey:@"offsetYTextField"]; - NSString *FontSizeTextField = [prefs objectForKey:@"FontSizeTextField"]; - + NSString *FontSizeTextField = [prefs objectForKey:@"FontSizeTextField"]; + //if(originx <= 0.0) //{ UILabel *originalLabel = MSHookIvar(self, "_dateLabel"); @@ -114,9 +115,9 @@ static float sizeheight = 0.0; self.duplexCalendarLabel.text = self.todayHeaderViewText; - + } --(void)_layoutDateLabel { +-(void)_layoutDateLabel { %orig; [self layoutDuplexCalendarLabel]; _UILegibilityLabel *originalLegibilityLabel = MSHookIvar<_UILegibilityLabel *>(self, "_legibilityDateLabel"); @@ -161,7 +162,7 @@ self.dateInSettings = nil; (void*)myObserver, savePressed, CFSTR("duplexcalendar.savepressed"), - NULL, + NULL, CFNotificationSuspensionBehaviorDeliverImmediately); savePressed(); } diff --git a/control b/control index 6c79f78..a970781 100644 --- a/control +++ b/control @@ -1,7 +1,7 @@ Package: com.gilshahar7.duplexcalendar Name: DuplexCalendar Depends: mobilesubstrate -Version: 1.0.3 +Version: 1.0.4 Architecture: iphoneos-arm Description: Add the alternate calendar label to the LockScreen on iOS 8 & 9. Maintainer: gilshahar7 diff --git a/packages/com.gilshahar7.duplexcalendar_1.0.4_iphoneos-arm.deb b/packages/com.gilshahar7.duplexcalendar_1.0.4_iphoneos-arm.deb new file mode 100644 index 0000000..a00310e Binary files /dev/null and b/packages/com.gilshahar7.duplexcalendar_1.0.4_iphoneos-arm.deb differ