Skip to content
This repository has been archived by the owner on Sep 4, 2022. It is now read-only.

Commit

Permalink
Merge pull request #5 from agottardo/v2.0
Browse files Browse the repository at this point in the history
Merge v2.0 into master
  • Loading branch information
agottardo committed May 8, 2020
2 parents d4c79ca + 15e1722 commit e705671
Show file tree
Hide file tree
Showing 109 changed files with 3,877 additions and 931 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Rainy.xcodeproj/xcuserdata/
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
language: objective-c
osx_image: xcode10.3
osx_image: xcode11.4
script:
- xcodebuild clean build -project Rainy.xcodeproj -scheme Rainy -destination "platform=iOS Simulator,name=iPhone X,OS=12.4" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO -quiet
- xcodebuild clean build -project Rainy.xcodeproj -scheme Rainy -destination "platform=iOS Simulator,name=iPhone X,OS=13.4" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO -quiet
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Rainy for iOS ☔️
<img src="https://api.travis-ci.org/agottardo/Rainy-Swift.svg?branch=master" alt="Travis Status" /> ![GitHub](https://img.shields.io/github/license/agottardo/Rainy-Swift.svg) ![GitHub release](https://img.shields.io/github/release/agottardo/Rainy-Swift/all.svg)

<img src="http://rainyapp.com/img/rainy-screenshot2.png" alt="A screenshot of Rainy" height="200" />
<img src="Screenshots/HomeScreen.PNG" alt="A screenshot of Rainy" height="450" />

☔️ Rainy is a nice-looking, rain-oriented weather app for iOS, written in Swift. Basically, the ideal tool if you live in a place like Vancouver. Currently available for download [on the iOS App Store](https://itunes.apple.com/fm/app/rainy-rain-forecasts/id1312152536).

Expand Down
413 changes: 384 additions & 29 deletions Rainy.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"object": {
"pins": [
{
"package": "MBProgressHUD",
"repositoryURL": "https://github.com/jdg/MBProgressHUD.git",
"state": {
"branch": null,
"revision": "bca42b801100b2b3a4eda0ba8dd33d858c780b0d",
"version": "1.2.0"
}
},
{
"package": "Sentry",
"repositoryURL": "https://github.com/getsentry/sentry-cocoa.git",
"state": {
"branch": null,
"revision": "fb4b4be84ae61f9e306348a65600c9dd93977e6f",
"version": "4.5.0"
}
}
]
},
"version": 1
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
uuid = "103B5CE3-4678-4BE0-989A-B249E46910E0"
type = "1"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "E069D390-430F-4679-8C4E-DA208C91CB80"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Rainy/GUI/View Controllers/HourlyDetailTableViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "96"
endingLineNumber = "96"
landmarkName = "tableView(_:cellForRowAt:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "6D8DB1E3-9433-4076-B3DC-F33FDFA2AF24"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Rainy/GUI/View Controllers/HourlyDetailTableViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "98"
endingLineNumber = "98"
landmarkName = "tableView(_:cellForRowAt:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "112FE739-9E78-43EB-8B07-5806733D84E3"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Rainy/GUI/View Controllers/HourlyDetailTableViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "99"
endingLineNumber = "99"
landmarkName = "tableView(_:cellForRowAt:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
26 changes: 26 additions & 0 deletions Rainy/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,39 @@
// Copyright © 2017 Andrea Gottardo. All rights reserved.
//

import Sentry
import UIKit

@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?

func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Register the app with Sentry.
do {
Client.shared = try Client(dsn: "https://6940618716d54c108188e82ba381383a@o304136.ingest.sentry.io/5193012")
// This feature is strictly opt-in to preserve user privacy, so we check whether
// the user enabled it and disable the library if the setting value is zero.
Client.shared?.enabled = SettingsManager.shared.diagnosticsEnabled as NSNumber
try Client.shared?.startCrashHandler()
} catch {
// Sentry is not yet initialized here, so we cannot use the `Log`.
print("\(error)")
}
window?.tintColor = Theme.current.accentTint
return true
}

/// Called when opening/restoring the app from a Siri Shortcut.
func application(_: UIApplication, continue userActivity: NSUserActivity, restorationHandler _: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
let locationsManager = LocationsManager.shared
guard let uuidString = userActivity.userInfo?["location_uuid"] as? String,
let uuid = UUID(uuidString: uuidString),
let location = locationsManager.locations.first(where: { $0.uuid == uuid }) else {
Log.error("No location with UUID.")
return false
}
locationsManager.currentLocation = location
return true
}
}
116 changes: 0 additions & 116 deletions Rainy/Assets.xcassets/AppIcon.appiconset/Contents.json

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
23 changes: 0 additions & 23 deletions Rainy/Assets.xcassets/SettingsGear.imageset/Contents.json

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
21 changes: 0 additions & 21 deletions Rainy/Assets.xcassets/drop.imageset/Contents.json

This file was deleted.

Binary file removed Rainy/Assets.xcassets/drop.imageset/rainy-60@3x.png
Binary file not shown.
48 changes: 41 additions & 7 deletions Rainy/Base.lproj/LaunchScreen.storyboard
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina4_7" orientation="portrait" appearance="dark"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand All @@ -17,7 +14,41 @@
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="j9h-UU-c6r">
<rect key="frame" x="147" y="262.5" width="81" height="142.5"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="umbrella.fill" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="T99-7k-N7a">
<rect key="frame" x="0.0" y="0.5" width="81" height="79.5"/>
<color key="tintColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" secondItem="T99-7k-N7a" secondAttribute="height" multiplier="1:1" id="iwN-WG-edi"/>
</constraints>
<preferredSymbolConfiguration key="preferredSymbolConfiguration" weight="ultraLight"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rainy" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wJo-mU-Apj">
<rect key="frame" x="0.0" y="81" width="81" height="41"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleTitle0"/>
<color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="beta" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ejb-6d-sDL">
<rect key="frame" x="0.0" y="122" width="81" height="20.5"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
<color key="textColor" systemColor="tertiaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.29999999999999999" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="T99-7k-N7a" firstAttribute="width" secondItem="wJo-mU-Apj" secondAttribute="width" id="bVG-KI-PwI"/>
</constraints>
</stackView>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="j9h-UU-c6r" firstAttribute="centerY" secondItem="6Tk-OE-BBY" secondAttribute="centerY" id="due-Ie-pxd"/>
<constraint firstItem="j9h-UU-c6r" firstAttribute="centerX" secondItem="6Tk-OE-BBY" secondAttribute="centerX" id="ffS-pZ-HIT"/>
</constraints>
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
</view>
</viewController>
Expand All @@ -26,4 +57,7 @@
<point key="canvasLocation" x="52" y="374.66266866566718"/>
</scene>
</scenes>
<resources>
<image name="umbrella.fill" catalog="system" width="118" height="128"/>
</resources>
</document>

0 comments on commit e705671

Please sign in to comment.