Update Logo

Keeping/Keeping.xcodeproj/project.pbxproj

@@ -1232,7 +1232,6 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;

Keeping/Keeping/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -147,7 +147,7 @@
     {
       "size" : "1024x1024",
       "idiom" : "ios-marketing",
-      "filename" : "1024.png",
+      "filename" : "ios-marketing.png",
       "scale" : "1x"
     }
   ],

Keeping/Keeping/Base.lproj/LaunchScreen.storyboard

@@ -10,8 +10,8 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <customFonts key="customFonts">
-        <array key="LaoSangamMN.ttf">
-            <string>LaoSangamMN</string>
+        <array key="Futura.ttc">
+            <string>Futura-Bold</string>
         </array>
     </customFonts>
     <scenes>
@@ -30,7 +30,7 @@
                             <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="7qV-GG-tWE">
                                 <rect key="frame" x="57.5" y="529" width="260" height="80"/>
                                 <subviews>
-                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LOGO_512" translatesAutoresizingMaskIntoConstraints="NO" id="aer-fa-Ux9">
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LOGO_1024" translatesAutoresizingMaskIntoConstraints="NO" id="aer-fa-Ux9">
                                         <rect key="frame" x="0.0" y="0.0" width="80" height="80"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="80" id="1w3-kh-EdX"/>
@@ -39,20 +39,20 @@
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="今日打卡" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LFD-tL-v3L">
                                         <rect key="frame" x="100" y="14" width="160" height="52"/>
-                                        <fontDescription key="fontDescription" name="LaoSangamMN" family="Lao Sangam MN" pointSize="40"/>
-                                        <nil key="textColor"/>
+                                        <fontDescription key="fontDescription" name="Futura-Bold" family="Futura" pointSize="40"/>
+                                        <color key="textColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                 </subviews>
                             </stackView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="© 2017 Kuixi Song" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zo2-kG-0Gv">
                                 <rect key="frame" x="124" y="629" width="125.5" height="18"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="textColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.3085496723651886" green="0.51898699998855591" blue="0.78826791048049927" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                         <constraints>
                             <constraint firstItem="7qV-GG-tWE" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="6l3-pl-Nmi"/>
                             <constraint firstItem="Zo2-kG-0Gv" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="V8g-hk-6Oo"/>
@@ -67,6 +67,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="LOGO_512" width="512" height="512"/>
+        <image name="LOGO_1024" width="1024" height="1024"/>
     </resources>
 </document>

Keeping/Keeping/Base.lproj/Main.storyboard

@@ -1361,7 +1361,7 @@
                                                                     <fontDescription key="fontDescription" name="Futura-Medium" family="Futura" pointSize="35"/>
                                                                     <color key="tintColor" red="0.3194947541" green="0.52328276630000004" blue="0.78042376040000005" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                                                     <state key="normal" title="20">
-                                                                        <color key="titleColor" red="0.3194947541" green="0.52328276630000004" blue="0.78042376040000005" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                                                        <color key="titleColor" red="0.23137254900000001" green="0.52549019610000003" blue="0.81176470590000005" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                                                     </state>
                                                                     <connections>
                                                                         <action selector="chooseDateAction:" destination="6at-be-euJ" eventType="touchUpInside" id="ATP-1A-Nz9"/>
@@ -1386,12 +1386,12 @@
                                                                 </userDefinedRuntimeAttribute>
                                                             </userDefinedRuntimeAttributes>
                                                         </view>
-                                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ymX-S3-76N" customClass="KCProgressButton" customModule="Keeping" customModuleProvider="target">
+                                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ymX-S3-76N" customClass="KCProgressButton">
                                                             <rect key="frame" x="95" y="0.0" width="260" height="85"/>
                                                             <color key="backgroundColor" red="0.99404761904761907" green="0.98809523809523814" blue="1" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                                             <fontDescription key="fontDescription" name="Futura-Medium" family="Futura" pointSize="40"/>
                                                             <state key="normal" title="0 / 0">
-                                                                <color key="titleColor" red="0.3194947541" green="0.52328276630000004" blue="0.78042376040000005" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                                                <color key="titleColor" red="0.23137254900000001" green="0.52549019610000003" blue="0.81176470590000005" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                                             </state>
                                                             <userDefinedRuntimeAttributes>
                                                                 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -1699,8 +1699,8 @@
         <image name="Weekday" width="16" height="16"/>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="ZOT-mw-fWn"/>
+        <segue reference="KVR-SD-oGK"/>
         <segue reference="fad-KU-zal"/>
-        <segue reference="9tp-5Z-bmL"/>
+        <segue reference="QMM-bj-IhC"/>
     </inferredMetricsTieBreakers>
 </document>

Keeping/Keeping/KCEdgeInsetLabel.h

@@ -10,8 +10,8 @@
 
 @interface KCEdgeInsetLabel : UILabel
 
-- (instancetype _Nonnull)initWithFrame:(CGRect)frame andEdgeInset:(UIEdgeInsets)inset;
-
 @property (nonatomic) UIEdgeInsets textEdgeInsets;
 
+- (instancetype _Nonnull)initWithFrame:(CGRect)frame andEdgeInset:(UIEdgeInsets)inset;
+
 @end

Keeping/Keeping/KCProgressButton.h

@@ -14,4 +14,6 @@
 
 @property (nonatomic, nullable) KCEdgeInsetLabel *maskLabel;
 
+- (void)setProgressWithFinished:(int)finished andTotal:(int)total;
+
 @end

Keeping/Keeping/KCProgressButton.m

@@ -24,20 +24,24 @@ - (instancetype)initWithCoder:(NSCoder *)aDecoder{
     return [super initWithCoder:aDecoder];
 }
 
-- (void)setProgressWithProgress:(int)finished andTotal:(int)total {
+- (void)setProgressWithFinished:(int)finished andTotal:(int)total {
     float progress = 0.0;
     if (total > 0) {
         progress = (float)finished / (float)total;
     }
+    [self addMaskLabelWithTitle:[NSString stringWithFormat:@"%d / %d", finished, total] andProgress:progress];
 }
 
 - (void)addMaskLabelWithTitle:(NSString *)title andProgress:(float)progress {
     if (self.maskLabel != nil) {
         [self.maskLabel removeFromSuperview];
     }
     [self setTitle:title forState:UIControlStateNormal];
-    CGRect frame = self.titleLabel.frame;
-    self.maskLabel = [[KCEdgeInsetLabel alloc] initWithFrame:CGRectMake(0, 0, frame.size.width * progress, self.frame.size.height)
+
+    self.maskLabel = [[KCEdgeInsetLabel alloc] initWithFrame:CGRectMake(0,
+                                                                        0,
+                                                                        self.frame.size.width * progress,
+                                                                        self.frame.size.height)
                                                 andEdgeInset:UIEdgeInsetsMake(0, self.titleLabel.frame.origin.x, 0, 0)];
     self.maskLabel.text = title;
     self.maskLabel.font = self.titleLabel.font;

Keeping/Keeping/KPTodayTableViewController.m

@@ -157,7 +157,7 @@ - (void)loadTasks{
     //设置进度
     NSUInteger finished = self.finishedTaskArr.count;
     NSUInteger total = self.finishedTaskArr.count + self.unfinishedTaskArr.count;
-    [self.progressButton setProgressWithFinished:finished total:total];
+    [self.progressButton setProgressWithFinished:(int)finished andTotal:(int)total];
 
     //排序
     self.unfinishedTaskArr = [NSMutableArray arrayWithArray:[TaskDataHelper sortTasks:self.unfinishedTaskArr withSortFactor:self.sortFactor isAscend:self.isAscend.intValue]];

Logo/AppIcon.appiconset/Contents.json

@@ -143,6 +143,12 @@
       "idiom" : "ipad",
       "filename" : "[email protected]",
       "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "ios-marketing.png",
+      "scale" : "1x"
     }
   ],
   "info" : {