Skip to content

Commit 0983ccd

Browse files
backslash112backslash112
committed
version 2.2.0
1 parent 0efff06 commit 0983ccd

9 files changed

Lines changed: 13 additions & 62 deletions

File tree

‎WorkAndRest.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
644554641A7CADD100F48164 /* TaskListItemCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 644554631A7CADD100F48164 /* TaskListItemCell.xib */; };
3434
6458B66B1A7722BD004FD3D9 /* RootViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6458B66A1A7722BD004FD3D9 /* RootViewController.swift */; };
3535
645FDE0E1A7D98FB002EC8EF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645FDE0D1A7D98FB002EC8EF /* AppDelegate.swift */; };
36-
645FDE121A7D9BA9002EC8EF /* sec.wav in Resources */ = {isa = PBXBuildFile; fileRef = 645FDE101A7D9BA9002EC8EF /* sec.wav */; };
37-
645FDE131A7D9BA9002EC8EF /* SecondBeep.wav in Resources */ = {isa = PBXBuildFile; fileRef = 645FDE111A7D9BA9002EC8EF /* SecondBeep.wav */; };
3836
645FDE161A7D9E8C002EC8EF /* GlobalConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645FDE151A7D9E8B002EC8EF /* GlobalConstants.swift */; };
3937
646141A61A80C11E0010E19E /* V8HorizontalPickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 646141A41A80C11E0010E19E /* V8HorizontalPickerView.m */; };
4038
646B04ED1A9A99C00083E065 /* WorkManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 646B04EC1A9A99C00083E065 /* WorkManager.swift */; };
@@ -59,8 +57,6 @@
5957
64A0BCDA1A7FA14700F210CC /* NewTaskViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64A0BCD91A7FA14700F210CC /* NewTaskViewController.swift */; };
6058
64A4D70A18F7DCF8006BF4D1 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 64A4D70918F7DCF8006BF4D1 /* AVFoundation.framework */; };
6159
64A6D00E1B66ECE4000D7F2E /* QuotationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64A6D00D1B66ECE4000D7F2E /* QuotationManager.swift */; };
62-
64A6D0101B66ED22000D7F2E /* Quotations-en.plist in Resources */ = {isa = PBXBuildFile; fileRef = 64A6D00F1B66ED22000D7F2E /* Quotations-en.plist */; };
63-
64A6D0121B66FE0A000D7F2E /* Quotations-cn.plist in Resources */ = {isa = PBXBuildFile; fileRef = 64A6D0111B66FE0A000D7F2E /* Quotations-cn.plist */; };
6460
64B563111AA7FC5700098532 /* StatisticsLocker.xib in Resources */ = {isa = PBXBuildFile; fileRef = 64B563101AA7FC5700098532 /* StatisticsLocker.xib */; };
6561
64B563131AA7FC7000098532 /* StatisticsLocker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64B563121AA7FC7000098532 /* StatisticsLocker.swift */; };
6662
64B563151AA8238300098532 /* ApplicationStateManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64B563141AA8238300098532 /* ApplicationStateManager.swift */; };
@@ -77,6 +73,7 @@
7773
64EAEC2D1A7E37F70026C748 /* TaskRunner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64EAEC2C1A7E37F70026C748 /* TaskRunner.swift */; };
7874
64EBF6271AA9591200ACA139 /* ProductsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64EBF6261AA9591200ACA139 /* ProductsManager.swift */; };
7975
C31B8A801B74A92300271DF4 /* WARSecond.swift in Sources */ = {isa = PBXBuildFile; fileRef = C31B8A7F1B74A92300271DF4 /* WARSecond.swift */; };
76+
C322AF541B845F9A009710B1 /* WorkAndRest.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = C322AF531B845F9A009710B1 /* WorkAndRest.entitlements */; };
8077
C32C7E321B73075400977421 /* WARTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = C32C7E311B73075400977421 /* WARTimer.swift */; };
8178
C354053C1B560C80008111C2 /* IdentifierDef.swift in Sources */ = {isa = PBXBuildFile; fileRef = C354053B1B560C80008111C2 /* IdentifierDef.swift */; };
8279
C36E43381B67707D00834902 /* TableViewHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = C36E43371B67707D00834902 /* TableViewHeader.swift */; };
@@ -141,8 +138,6 @@
141138
644554631A7CADD100F48164 /* TaskListItemCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TaskListItemCell.xib; sourceTree = "<group>"; };
142139
6458B66A1A7722BD004FD3D9 /* RootViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RootViewController.swift; sourceTree = "<group>"; };
143140
645FDE0D1A7D98FB002EC8EF /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
144-
645FDE101A7D9BA9002EC8EF /* sec.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = sec.wav; sourceTree = "<group>"; };
145-
645FDE111A7D9BA9002EC8EF /* SecondBeep.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SecondBeep.wav; sourceTree = "<group>"; };
146141
645FDE151A7D9E8B002EC8EF /* GlobalConstants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlobalConstants.swift; sourceTree = "<group>"; };
147142
646141A31A80C11E0010E19E /* V8HorizontalPickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = V8HorizontalPickerView.h; sourceTree = "<group>"; };
148143
646141A41A80C11E0010E19E /* V8HorizontalPickerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = V8HorizontalPickerView.m; sourceTree = "<group>"; };
@@ -174,8 +169,6 @@
174169
64A0BCD91A7FA14700F210CC /* NewTaskViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewTaskViewController.swift; sourceTree = "<group>"; };
175170
64A4D70918F7DCF8006BF4D1 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
176171
64A6D00D1B66ECE4000D7F2E /* QuotationManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QuotationManager.swift; sourceTree = "<group>"; };
177-
64A6D00F1B66ED22000D7F2E /* Quotations-en.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Quotations-en.plist"; sourceTree = "<group>"; };
178-
64A6D0111B66FE0A000D7F2E /* Quotations-cn.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Quotations-cn.plist"; sourceTree = "<group>"; };
179172
64B563101AA7FC5700098532 /* StatisticsLocker.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = StatisticsLocker.xib; sourceTree = "<group>"; };
180173
64B563121AA7FC7000098532 /* StatisticsLocker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatisticsLocker.swift; sourceTree = "<group>"; };
181174
64B563141AA8238300098532 /* ApplicationStateManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApplicationStateManager.swift; sourceTree = "<group>"; };
@@ -192,9 +185,9 @@
192185
64EAEC2C1A7E37F70026C748 /* TaskRunner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TaskRunner.swift; sourceTree = "<group>"; };
193186
64EBF6261AA9591200ACA139 /* ProductsManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProductsManager.swift; sourceTree = "<group>"; };
194187
C31B8A7F1B74A92300271DF4 /* WARSecond.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WARSecond.swift; sourceTree = "<group>"; };
188+
C322AF531B845F9A009710B1 /* WorkAndRest.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = WorkAndRest.entitlements; sourceTree = "<group>"; };
195189
C32C7E311B73075400977421 /* WARTimer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WARTimer.swift; sourceTree = "<group>"; };
196190
C354053B1B560C80008111C2 /* IdentifierDef.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IdentifierDef.swift; sourceTree = "<group>"; };
197-
C35405401B560E37008111C2 /* WorkAndRest.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = WorkAndRest.entitlements; sourceTree = "<group>"; };
198191
C36E43371B67707D00834902 /* TableViewHeader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableViewHeader.swift; sourceTree = "<group>"; };
199192
C5A3E743E49F064E285AF8F1 /* Pods-WorkAndRest.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WorkAndRest.release.xcconfig"; path = "Pods/Target Support Files/Pods-WorkAndRest/Pods-WorkAndRest.release.xcconfig"; sourceTree = "<group>"; };
200193
/* End PBXFileReference section */
@@ -317,7 +310,7 @@
317310
6434827718C5D344009BF110 /* WorkAndRest */ = {
318311
isa = PBXGroup;
319312
children = (
320-
C35405401B560E37008111C2 /* WorkAndRest.entitlements */,
313+
C322AF531B845F9A009710B1 /* WorkAndRest.entitlements */,
321314
6458B66C1A7722E3004FD3D9 /* Views */,
322315
6497FE501A75A72000174307 /* Models */,
323316
6458B6661A772279004FD3D9 /* ViewControllers */,
@@ -339,11 +332,8 @@
339332
6434827F18C5D344009BF110 /* WorkAndRest-Prefix.pch */,
340333
6497FE581A75A91600174307 /* WorkAndRest-Bridging-Header.h */,
341334
6434827918C5D344009BF110 /* WorkAndRest-Info.plist */,
342-
645FDE0F1A7D9BA9002EC8EF /* Sounds */,
343335
64228ECC18FE2ED300461550 /* Localizable.strings */,
344336
6434827A18C5D344009BF110 /* InfoPlist.strings */,
345-
64A6D00F1B66ED22000D7F2E /* Quotations-en.plist */,
346-
64A6D0111B66FE0A000D7F2E /* Quotations-cn.plist */,
347337
);
348338
name = "Supporting Files";
349339
sourceTree = "<group>";
@@ -390,15 +380,6 @@
390380
path = Views;
391381
sourceTree = "<group>";
392382
};
393-
645FDE0F1A7D9BA9002EC8EF /* Sounds */ = {
394-
isa = PBXGroup;
395-
children = (
396-
645FDE101A7D9BA9002EC8EF /* sec.wav */,
397-
645FDE111A7D9BA9002EC8EF /* SecondBeep.wav */,
398-
);
399-
path = Sounds;
400-
sourceTree = "<group>";
401-
};
402383
645FDE141A7D9E7F002EC8EF /* Common */ = {
403384
isa = PBXGroup;
404385
children = (
@@ -567,21 +548,18 @@
567548
isa = PBXResourcesBuildPhase;
568549
buildActionMask = 2147483647;
569550
files = (
570-
64A6D0101B66ED22000D7F2E /* Quotations-en.plist in Resources */,
571551
649D54041A84521D002593F8 /* TaskTitleView.xib in Resources */,
572552
6434828A18C5D344009BF110 /* Images.xcassets in Resources */,
573-
64A6D0121B66FE0A000D7F2E /* Quotations-cn.plist in Resources */,
574553
64E3C1AD1A8752CF00418426 /* TaskListHeaderView.xib in Resources */,
575554
649893971A842F8B0091822A /* CompletionCycleView.xib in Resources */,
576555
6434827C18C5D344009BF110 /* InfoPlist.strings in Resources */,
577556
64228ECA18FE2ED300461550 /* Localizable.strings in Resources */,
557+
C322AF541B845F9A009710B1 /* WorkAndRest.entitlements in Resources */,
578558
64012C931900B979006FC2B2 /* AppiraterLocalizable.strings in Resources */,
579559
64C99A581A7902A100F1D796 /* Launch Screen.xib in Resources */,
580560
64B563111AA7FC5700098532 /* StatisticsLocker.xib in Resources */,
581561
644554641A7CADD100F48164 /* TaskListItemCell.xib in Resources */,
582562
64C497F61A8AE7F10051E605 /* TaskItemBaseView.xib in Resources */,
583-
645FDE131A7D9BA9002EC8EF /* SecondBeep.wav in Resources */,
584-
645FDE121A7D9BA9002EC8EF /* sec.wav in Resources */,
585563
6434828518C5D344009BF110 /* Main.storyboard in Resources */,
586564
);
587565
runOnlyForDeploymentPostprocessing = 0;
@@ -827,7 +805,7 @@
827805
GCC_PREFIX_HEADER = "WorkAndRest/WorkAndRest-Prefix.pch";
828806
GCC_WARN_UNDECLARED_SELECTOR = NO;
829807
INFOPLIST_FILE = "WorkAndRest/WorkAndRest-Info.plist";
830-
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
808+
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
831809
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
832810
PRODUCT_NAME = "$(TARGET_NAME)";
833811
PROVISIONING_PROFILE = "98ede1fb-5058-49c5-a83c-f03bd86a7dce";
@@ -850,7 +828,7 @@
850828
GCC_PREFIX_HEADER = "WorkAndRest/WorkAndRest-Prefix.pch";
851829
GCC_WARN_UNDECLARED_SELECTOR = NO;
852830
INFOPLIST_FILE = "WorkAndRest/WorkAndRest-Info.plist";
853-
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
831+
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
854832
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
855833
PRODUCT_NAME = "$(TARGET_NAME)";
856834
PROVISIONING_PROFILE = "98ede1fb-5058-49c5-a83c-f03bd86a7dce";

‎WorkAndRest/BusinessLogic/QuotationManager.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class QuotationManager: NSObject {
4646
func loadQuotationsByLanguage(language: LanguageType) -> NSArray? {
4747
let flag = language == LanguageType.cn ? "cn" : "en"
4848
let plistPath = NSBundle.mainBundle().pathForResource("Quotations-\(flag)", ofType: "plist")
49-
let dictionary = NSDictionary(contentsOfFile: plistPath!)
49+
_ = NSDictionary(contentsOfFile: plistPath!)
5050
let array = NSArray(contentsOfFile: plistPath!)
5151
return array
5252
}

‎WorkAndRest/Common/GlobalConstants.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class GlobalConstants {
2727
class var DEFAULT_MINUTES: Int { return 25 }
2828
class var DEFAULT_NUMBER: Int { return 1 }
2929
class var TITLE_MAXLENGTH: Int { return 50 }
30-
class var VERSION: String { return "2.1.0" }
30+
class var VERSION: String { return "2.2.0" }
3131
class var kBOOL_Purchased: String { return "Purchased" }
3232
class var kBOOL_HAS_SETUP_SAMPLE_TASK: String { return "HasSetupSampleTask" }
3333
class var kBOOL_HAS_SHOW_GUIDE: String { return "HasShowGuide" }

‎WorkAndRest/Quotations-cn.plist‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎WorkAndRest/Quotations-en.plist‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎WorkAndRest/Sounds/SecondBeep.wav‎

-3.26 KB
Binary file not shown.

‎WorkAndRest/Sounds/sec.wav‎

-89.6 KB
Binary file not shown.

‎WorkAndRest/ViewControllers/TaskListViewController.swift‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class TaskListViewController: BaseTableViewController,TaskTitleViewControllerDel
6767
NSUserDefaults.standardUserDefaults().setBool(true, forKey: GlobalConstants.kBOOL_HAS_SETUP_SAMPLE_TASK)
6868
}
6969

70-
self.registerUserNotificationSettings()
70+
//self.registerUserNotificationSettings()
7171
}
7272

7373
func setupSampleTask() {
@@ -82,6 +82,7 @@ class TaskListViewController: BaseTableViewController,TaskTitleViewControllerDel
8282

8383
}
8484

85+
/*
8586
func registerUserNotificationSettings() {
8687
let application = UIApplication.sharedApplication()
8788
if #available(iOS 8.0, *) {
@@ -92,6 +93,7 @@ class TaskListViewController: BaseTableViewController,TaskTitleViewControllerDel
9293
application.registerForRemoteNotificationTypes([.Sound, .Alert, .Badge])
9394
}
9495
}
96+
*/
9597

9698
func showGuide() {
9799
let delayTime = dispatch_time(DISPATCH_TIME_NOW,

‎WorkAndRest/WorkAndRest-Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
<key>CFBundlePackageType</key>
2020
<string>APPL</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>2.1.1</string>
22+
<string>2.2.0</string>
2323
<key>CFBundleSignature</key>
2424
<string>????</string>
2525
<key>CFBundleVersion</key>
26-
<string>0731</string>
26+
<string>08191520</string>
2727
<key>LSRequiresIPhoneOS</key>
2828
<true/>
2929
<key>UILaunchStoryboardName</key>

0 commit comments

Comments
 (0)