Просмотр исходного кода

Merge branch 'master' into BaseProject

Iñigo Valentin 9 лет назад
Родитель
Сommit
ad40713bf0
3 измененных файлов с 6 добавлено и 4 удалено
  1. 1 1
      app/Base.lproj/Main.storyboard
  2. 2 2
      app/Info.plist
  3. 3 1
      app/ViewController.swift

+ 1 - 1
app/Base.lproj/Main.storyboard

@@ -16,7 +16,7 @@
         <scene sceneID="e3W-6Z-Jyk">
             <objects>
                 <navigationController title="Gasteizko Margolariak" id="cgF-cq-ysf" sceneMemberID="viewController">
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="lgI-h9-O0s">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="lgI-h9-O0s">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="backgroundColor" red="0.4079896717" green="1" blue="0.34807942549999998" alpha="1" colorSpace="calibratedRGB"/>

+ 2 - 2
app/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1</string>
+	<string>1.0.1</string>
 	<key>CFBundleVersion</key>
-	<string>12</string>
+	<string>13</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSLocationWhenInUseUsageDescription</key>

+ 3 - 1
app/ViewController.swift

@@ -303,7 +303,9 @@ class ViewController: UIViewController, UICollectionViewDataSource, UICollection
 	
 		// Reverts the style of the first tab.
 		if selected != 0{
-			self.sectionCollection.visibleCells[0].isSelected = false
+			if self.sectionCollection != nil{
+				self.sectionCollection.visibleCells[0].isSelected = false
+			}
 		}
 				
 		//Show the view