Skip to content

Commit

Permalink
Merge pull request #39 from fassko/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@fassko
fassko authored Aug 1, 2020
2 parents 2ca92e5 + db7c34a commit 44b5aa3
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 19 deletions.
25 changes: 23 additions & 2 deletions MeteoLV.xcodeproj/xcuserdata/kristaps.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,36 @@
<key>orderHint</key>
<integer>0</integer>
</dict>
<key>MeteoLVProvider (Playground) 1.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>4</integer>
</dict>
<key>MeteoLVProvider (Playground) 2.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>5</integer>
</dict>
<key>MeteoLVProvider (Playground).xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>3</integer>
</dict>
<key>MeteoLVShare.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
<integer>1</integer>
</dict>
<key>MeteoLVTodayNotification.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
<integer>2</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
Expand Down
2 changes: 1 addition & 1 deletion MeteoLV/Core/Extensions.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ import Foundation

extension String {
var localized: String {
return NSLocalizedString(self, comment: "")
NSLocalizedString(self, comment: "")
}
}
2 changes: 1 addition & 1 deletion MeteoLV/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.10</string>
<string>1.11</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
Expand Down
20 changes: 10 additions & 10 deletions MeteoLV/Storyboards/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="l3R-nr-Nn0">
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="l3R-nr-Nn0">
<rect key="frame" x="16" y="264" width="343" height="514"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="textColor" systemColor="labelColor" cocoaTouchSystemColor="darkTextColor"/>
<fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="14"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
<dataDetectorType key="dataDetectorTypes" link="YES"/>
</textView>
Expand Down Expand Up @@ -162,21 +162,21 @@
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="cell" textLabel="Xxq-st-iex" detailTextLabel="VZl-u6-sCH" style="IBUITableViewCellStyleValue1" id="pmr-hP-8aV">
<rect key="frame" x="0.0" y="28" width="375" height="43.666667938232422"/>
<rect key="frame" x="0.0" y="28" width="375" height="55.666667938232422"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="pmr-hP-8aV" id="B6a-8U-zcd">
<rect key="frame" x="0.0" y="0.0" width="348" height="43.666667938232422"/>
<rect key="frame" x="0.0" y="0.0" width="348" height="55.666667938232422"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Xxq-st-iex">
<rect key="frame" x="15.999999999999996" y="8.9999999999999982" width="41.666666666666664" height="26.333333333333332"/>
<rect key="frame" x="15.999999999999996" y="14.999999999999998" width="41.666666666666664" height="26.333333333333332"/>
<autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleTitle2"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VZl-u6-sCH">
<rect key="frame" x="289.66666666666669" y="11" width="50.333333333333336" height="24"/>
<rect key="frame" x="289.66666666666669" y="17" width="50.333333333333336" height="24"/>
<autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleTitle3"/>
<nil key="textColor"/>
Expand Down Expand Up @@ -206,21 +206,21 @@
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="cell" textLabel="wKg-wp-EuH" detailTextLabel="tOI-eL-qzY" style="IBUITableViewCellStyleValue1" id="LUN-Fb-JpP">
<rect key="frame" x="0.0" y="28" width="375" height="43.666667938232422"/>
<rect key="frame" x="0.0" y="28" width="375" height="55.666667938232422"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LUN-Fb-JpP" id="5q1-1j-YNM">
<rect key="frame" x="0.0" y="0.0" width="348" height="43.666667938232422"/>
<rect key="frame" x="0.0" y="0.0" width="348" height="55.666667938232422"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wKg-wp-EuH">
<rect key="frame" x="15.999999999999996" y="8.9999999999999982" width="41.666666666666664" height="26.333333333333332"/>
<rect key="frame" x="15.999999999999996" y="14.999999999999998" width="41.666666666666664" height="26.333333333333332"/>
<autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleTitle2"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="tOI-eL-qzY">
<rect key="frame" x="289.66666666666669" y="11" width="50.333333333333336" height="24"/>
<rect key="frame" x="289.66666666666669" y="17" width="50.333333333333336" height="24"/>
<autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleTitle3"/>
<nil key="textColor"/>
Expand Down
2 changes: 1 addition & 1 deletion MeteoLVShare/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.10</string>
<string>1.11</string>
<key>CFBundleVersion</key>
<string>1.9.200419.1133</string>
<key>NSExtension</key>
Expand Down
2 changes: 1 addition & 1 deletion MeteoLVTodayNotification/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.10</string>
<string>1.11</string>
<key>CFBundleVersion</key>
<string>1.9.200419.1133</string>
<key>NSAppTransportSecurity</key>
Expand Down
2 changes: 1 addition & 1 deletion MeteoLVUITests/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.10</string>
<string>1.11</string>
<key>CFBundleVersion</key>
<string>1.9.200419.1133</string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion fastlane/.github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Build and test Weather Latvia
on: push

env:
DEVELOPER_DIR: /Applications/Xcode_11.5.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_11.6.app/Contents/Developer

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion fastlane/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Install _fastlane_ using
```
[sudo] gem install fastlane -NV
```
or alternatively using `brew cask install fastlane`
or alternatively using `brew install fastlane`

# Available Actions
## iOS
Expand Down

0 comments on commit 44b5aa3

Please sign in to comment.