lyhungcoder@gmail.com / Lifelog

Download as
Browse Code ยป

Commit b0ce6aa26a53bc19895976c0c36de4825d1015d4

Authored by phong
1 parent c3656cafff
Exists in master

fix bug gui iphone x

Showing 10 changed files with 25 additions and 14 deletions Side-by-side Diff

LifeLog/LifeLog/HistoryViewController.m
Diff comments   View file @ b0ce6aa
... ... @@ -20,6 +20,7 @@
20 20  
21 21 - (void)viewDidLoad {
22 22 [super viewDidLoad];
  23 + [self.view addConstraint:[NSLayoutConstraint constraintWithItem:self.bottomLayoutGuide attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.viewCollectionMode attribute:NSLayoutAttributeBottom multiplier:1 constant:0]];
23 24 // Do any additional setup after loading the view from its nib.
24 25 self.title = NSLocalizedString(@"lifelog.history.title", nil);
25 26  
LifeLog/LifeLog/HistoryViewController.xib
Diff comments   View file @ b0ce6aa
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
  2 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
3 3 <device id="retina4_7" orientation="portrait">
4 4 <adaptation id="fullscreen"/>
5 5 </device>
6 6 <dependencies>
7   - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
  7 + <deployment identifier="iOS"/>
  8 + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
8 9 <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
9 10 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
10 11 </dependencies>
... ... @@ -477,7 +478,7 @@
477 478 <constraint firstItem="yxY-4d-tB6" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="2" id="Jqg-nE-6dv"/>
478 479 <constraint firstAttribute="trailing" secondItem="BVv-qD-EHM" secondAttribute="trailing" id="MCi-Tl-hSp"/>
479 480 <constraint firstAttribute="trailing" secondItem="yxY-4d-tB6" secondAttribute="trailing" constant="2" id="Qs5-ky-nmB"/>
480   - <constraint firstAttribute="bottom" secondItem="BVv-qD-EHM" secondAttribute="bottom" constant="50" id="SbT-PG-8MJ"/>
  481 + <constraint firstAttribute="bottom" secondItem="BVv-qD-EHM" secondAttribute="bottom" constant="50" placeholder="YES" id="SbT-PG-8MJ"/>
481 482 <constraint firstItem="BVv-qD-EHM" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="SqH-AA-Z2K"/>
482 483 <constraint firstItem="FLa-rV-Aas" firstAttribute="top" secondItem="yxY-4d-tB6" secondAttribute="bottom" constant="15" id="cWw-RX-1Kp"/>
483 484 <constraint firstItem="yxY-4d-tB6" firstAttribute="top" secondItem="Cf1-lP-zbB" secondAttribute="bottom" constant="15" id="dSN-ey-gQ7"/>
LifeLog/LifeLog/HomeViewConb troller.m
Diff comments   View file @ b0ce6aa
... ... @@ -57,6 +57,7 @@
57 57 self.lblTitle.text = NSLocalizedString(@"lifelog.home.title", nil);
58 58  
59 59 [self.view addConstraint:[NSLayoutConstraint constraintWithItem:self.topLayoutGuide attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:self.lblTitle attribute:NSLayoutAttributeTop multiplier:1 constant:0]];
  60 + [self.view addConstraint:[NSLayoutConstraint constraintWithItem:self.bottomLayoutGuide attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.segmentHome attribute:NSLayoutAttributeBottom multiplier:1 constant:20]];
60 61  
61 62 self.avatar.backgroundColor = [UIColor whiteColor];
62 63 self.avatar.layer.borderWidth = 2.0f;
... ... @@ -282,7 +283,7 @@
282 283 #pragma mark - Functions Private
283 284 - (void)saveStepForDay:(NSDate *)date
284 285 {
285   - if ([CMMotionActivityManager isActivityAvailable]) {
  286 + if ([CMMotionActivityManager isActivityAvailable] == YES) {
286 287 [progressHud showAnimated:YES];
287 288 [progressHud setHidden:NO];
288 289 self.bike = 0;
... ... @@ -326,6 +327,9 @@
326 327 [weakSelf save20objectOfActivityExtras:arrayActivities];
327 328 }];
328 329 });
  330 + }
  331 + else {
  332 + [self updateStepUI];
329 333 }
330 334 }
331 335  
LifeLog/LifeLog/HomeViewController.xib
Diff comments   View file @ b0ce6aa
... ... @@ -200,7 +200,7 @@
200 200 <constraint firstItem="vRa-cr-YTe" firstAttribute="centerY" secondItem="J2A-tf-wH0" secondAttribute="centerY" id="IDF-HZ-fqt"/>
201 201 <constraint firstAttribute="trailing" secondItem="lnt-4H-Ao8" secondAttribute="trailing" constant="8" id="IEA-1V-AZx"/>
202 202 <constraint firstItem="ibb-Yl-iqu" firstAttribute="top" secondItem="VAz-hq-dvR" secondAttribute="bottom" constant="20" id="Ib2-KY-3A7"/>
203   - <constraint firstAttribute="bottom" secondItem="ibb-Yl-iqu" secondAttribute="bottom" constant="64" id="Iv8-Al-1Ff"/>
  203 + <constraint firstAttribute="bottom" secondItem="ibb-Yl-iqu" secondAttribute="bottom" constant="64" placeholder="YES" id="Iv8-Al-1Ff"/>
204 204 <constraint firstItem="DuE-Dh-nEe" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="Rum-yc-3Ym"/>
205 205 <constraint firstItem="Low-8n-pqa" firstAttribute="centerY" secondItem="J2A-tf-wH0" secondAttribute="centerY" id="W7b-Hb-9ME"/>
206 206 <constraint firstItem="IaR-IO-4RA" firstAttribute="centerY" secondItem="J2A-tf-wH0" secondAttribute="centerY" id="b4I-Me-4xZ"/>
LifeLog/LifeLog/Info.plist
Diff comments   View file @ b0ce6aa
... ... @@ -23,7 +23,7 @@
23 23 <dict/>
24 24 </array>
25 25 <key>CFBundleVersion</key>
26   - <string>5</string>
  26 + <string>7</string>
27 27 <key>LSApplicationQueriesSchemes</key>
28 28 <array>
29 29 <string>line</string>
LifeLog/LifeLog/MapViewController.m
Diff comments   View file @ b0ce6aa
... ... @@ -25,6 +25,7 @@
25 25  
26 26 @property (nonatomic, weak) IBOutlet UILabel *lblValueStep;
27 27 @property (nonatomic, weak) IBOutlet UILabel *lblUnitStep;
  28 +@property (weak, nonatomic) IBOutlet UIView *viewOther;
28 29  
29 30 @property (strong, nonatomic) CLLocationManager *locationManager;
30 31  
... ... @@ -43,6 +44,7 @@
43 44 // Do any additional setup after loading the view from its nib.
44 45 self.title = NSLocalizedString(@"lifelog.tapbar.map", nil);
45 46 [self.view addConstraint:[NSLayoutConstraint constraintWithItem:self.topLayoutGuide attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:self.mapView attribute:NSLayoutAttributeTop multiplier:1 constant:0]];
  47 + [self.view addConstraint:[NSLayoutConstraint constraintWithItem:self.bottomLayoutGuide attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.mapView attribute:NSLayoutAttributeBottom multiplier:1 constant:44]];
46 48 geocoder = [[CLGeocoder alloc] init];
47 49 [self setupLocation];
48 50 [self setupMapView];
LifeLog/LifeLog/MapViewController.xib
Diff comments   View file @ b0ce6aa
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
  2 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
3 3 <device id="retina4_7" orientation="portrait">
4 4 <adaptation id="fullscreen"/>
5 5 </device>
6 6 <dependencies>
7   - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
  7 + <deployment identifier="iOS"/>
  8 + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
8 9 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
9 10 </dependencies>
10 11 <objects>
... ... @@ -16,6 +17,7 @@
16 17 <outlet property="mapView" destination="GCl-mf-CD8" id="SpU-ML-EIf"/>
17 18 <outlet property="slider" destination="79Q-XB-cW2" id="NXm-rp-Ycy"/>
18 19 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
  20 + <outlet property="viewOther" destination="ayh-Y4-2QM" id="rpM-WE-7du"/>
19 21 </connections>
20 22 </placeholder>
21 23 <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
... ... @@ -91,7 +93,7 @@
91 93 </subviews>
92 94 <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
93 95 <constraints>
94   - <constraint firstAttribute="bottom" secondItem="GCl-mf-CD8" secondAttribute="bottom" constant="88" id="8R5-IL-ZOZ"/>
  96 + <constraint firstAttribute="bottom" secondItem="GCl-mf-CD8" secondAttribute="bottom" constant="88" placeholder="YES" id="8R5-IL-ZOZ"/>
95 97 <constraint firstItem="ayh-Y4-2QM" firstAttribute="top" secondItem="qLg-XF-Dyf" secondAttribute="bottom" constant="8" id="CCW-El-IlM"/>
96 98 <constraint firstAttribute="trailing" secondItem="bSt-HN-qcq" secondAttribute="trailing" constant="20" id="GmG-Qy-kpO"/>
97 99 <constraint firstAttribute="trailing" secondItem="ayh-Y4-2QM" secondAttribute="trailing" id="Mwo-O6-jk0"/>
LifeLog/LifeLog/RankingViewController.m
Diff comments   View file @ b0ce6aa
... ... @@ -20,6 +20,7 @@
20 20  
21 21 - (void)viewDidLoad {
22 22 [super viewDidLoad];
  23 + [self.view addConstraint:[NSLayoutConstraint constraintWithItem:self.bottomLayoutGuide attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.viewCollectionType attribute:NSLayoutAttributeBottom multiplier:1 constant:5]];
23 24 // Do any additional setup after loading the view from its nib.
24 25 self.title = NSLocalizedString(@"lifelog.rank.title", nil);
25 26  
LifeLog/LifeLog/RankingViewController.xib
Diff comments   View file @ b0ce6aa
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
  2 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
3 3 <device id="retina4_7" orientation="portrait">
4 4 <adaptation id="fullscreen"/>
5 5 </device>
6 6 <dependencies>
7   - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
  7 + <deployment identifier="iOS"/>
  8 + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
8 9 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
9 10 </dependencies>
10 11 <objects>
... ... @@ -159,7 +160,7 @@
159 160 <constraint firstItem="B33-xX-Jro" firstAttribute="top" secondItem="u5D-xz-8dK" secondAttribute="bottom" id="VOl-jo-wU3"/>
160 161 <constraint firstItem="GBx-lY-9YI" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="YjB-ef-xTt"/>
161 162 <constraint firstItem="syA-uK-pbr" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="aTf-mb-wlT"/>
162   - <constraint firstAttribute="bottom" secondItem="oUo-Eo-tz5" secondAttribute="bottom" constant="50" id="cux-Vm-qq7"/>
  163 + <constraint firstAttribute="bottom" secondItem="oUo-Eo-tz5" secondAttribute="bottom" constant="50" placeholder="YES" id="cux-Vm-qq7"/>
163 164 <constraint firstAttribute="trailing" secondItem="R3A-K9-MFe" secondAttribute="trailing" id="jBn-JI-SQP"/>
164 165 <constraint firstItem="R3A-K9-MFe" firstAttribute="top" secondItem="B33-xX-Jro" secondAttribute="bottom" constant="1" id="jTi-59-XsZ"/>
165 166 <constraint firstAttribute="trailing" secondItem="u5D-xz-8dK" secondAttribute="trailing" id="mDB-o3-gtA"/>
LifeLog/LifeLog/ServerAPI.m
Diff comments   View file @ b0ce6aa
... ... @@ -1191,7 +1191,7 @@
1191 1191 for (id key in dictionary)
1192 1192 {
1193 1193 NSString *encodedValue = [[dictionary[key] description] urlencode];
1194   - NSString *encodedKey = [[key description] urlencode];//[[key description] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
  1194 + NSString *encodedKey = [[key description] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];//[[key description] urlencode];
1195 1195 NSString *part = [NSString stringWithFormat: @"%@=%@", encodedKey, encodedValue];
1196 1196 [parts addObject:part];
1197 1197 }
... ... @@ -1213,7 +1213,6 @@
1213 1213 if (paras != nil)
1214 1214 {
1215 1215 NSData *encodedData = [self _encodeDictionary: paras];
1216   - [request setValue: [NSString stringWithFormat: @"%lu", (unsigned long) encodedData.length] forHTTPHeaderField: @"Content-Length"];
1217 1216 [request setValue: @"application/x-www-form-urlencoded charset=utf-8" forHTTPHeaderField: @"Content-Type"];
1218 1217 [request setHTTPBody: encodedData];
1219 1218 }