Merge pull request #8 from liu044100/develop

use https for wunderground api
liu044100 · Jan 8, 2017 · b37b8df · b37b8df
2 parents fb46009 + 4abf486
commit b37b8df
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 14 deletions.
diff --git a/SmileWeather-Example/SmileWeather-Example/Info.plist b/SmileWeather-Example/SmileWeather-Example/Info.plist
@@ -35,15 +35,6 @@
 				<key>NSTemporaryExceptionMinimumTLSVersion</key>
 				<string>TLSv1.1</string>
 			</dict>
-			<key>wunderground.com</key>
-			<dict>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-				<key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-				<key>NSTemporaryExceptionMinimumTLSVersion</key>
-				<string>TLSv1.1</string>
-			</dict>
 		</dict>
 	</dict>
 	<key>SmileWeather</key>

diff --git a/SmileWeather-Example/SmileWeather-Example/ViewController.m b/SmileWeather-Example/SmileWeather-Example/ViewController.m
@@ -78,6 +78,8 @@ - (void)viewDidLoad {
     _demoVC = [SmileWeatherDemoVC DemoVCToView:self.containerView];
     _demoVC.delegate = self;
     _demoVC.fahrenheit = [_userDefaults boolForKey:kIsFahrenheit];
+    //customize tint color
+    //_demoVC.higlightedInterfaceColor = [UIColor brownColor];
 
     //get weather data
     [self getWeatherData];

diff --git a/SmileWeather.podspec b/SmileWeather.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SmileWeather"
-  s.version      = "0.2.2"
+  s.version      = "0.2.3"
   s.summary      = "A library for Search & Parse the weather data from Wunderground conveniently."
   s.description  = <<-DESC
                    1. Handle all complicated things about Search & Parse the weather data.

diff --git a/SmileWeather/Classes/SmileWeatherDemoVC.m b/SmileWeather/Classes/SmileWeatherDemoVC.m
@@ -302,6 +302,8 @@ -(void)updateUI{
 
     self.conditionsLabel.text = self.data.currentData.condition;
     self.loading = NO;
+
+    self.tempUnitsSegmentControl.tintColor = self.higlightedInterfaceColor;
 }
 
 #pragma mark <UICollectionViewDataSource>
@@ -355,11 +357,9 @@ -(void)configureForForecastCell:(UICollectionViewCell*)cell atIndexPath:(NSIndex
     UILabel *lowTempLabel = (UILabel*)[cell viewWithTag:400];
 
     if (self.nightMode) {
-        weekLabel.textColor = self.mainInterfaceNightModeColor;
         weatherLabel.textColor = self.mainInterfaceNightModeColor;
         highTempLabel.textColor = self.mainInterfaceNightModeColor;
     } else {
-        weekLabel.textColor = self.mainInterfaceColor;
         weatherLabel.textColor = self.mainInterfaceColor;
         highTempLabel.textColor = self.mainInterfaceColor;
     }
@@ -380,7 +380,7 @@ -(void)configureForForecastCell:(UICollectionViewCell*)cell atIndexPath:(NSIndex
             if (self.nightMode){
                 weekLabel.textColor = self.mainInterfaceNightModeColor;
             }else{
-                weekLabel.textColor = self.mainInterfaceColor;
+                weekLabel.textColor = [UIColor whiteColor];
             }
             weekLabel.layer.cornerRadius = 3;
             weekLabel.layer.masksToBounds = YES;

diff --git a/SmileWeather/Classes/SmileWeatherDownLoader.m b/SmileWeather/Classes/SmileWeatherDownLoader.m
@@ -445,7 +445,7 @@ -(NSURL*)urlForLocation:(CLLocation *)location {
 
     NSString *lang = [[SmileWeatherDownLoader sharedDownloader] preferedLanguage];
 
-    static NSString *baseURL_wunderground =  @"http://api.wunderground.com/api/";
+    static NSString *baseURL_wunderground =  @"https://api.wunderground.com/api/";
     NSString *parameters_wunderground = [NSString stringWithFormat:@"/forecast/conditions/astronomy/hourly/lang:%@/q/",lang];
     CLLocationCoordinate2D coordinates = location.coordinate;
     requestURL = [NSString stringWithFormat:@"%@%@%@%f,%f.json", baseURL_wunderground, self.key, parameters_wunderground, coordinates.latitude, coordinates.longitude];