Skip to content

Commit

Permalink
Dark mode and fix duplicate pins (#149)
Browse files Browse the repository at this point in the history
Dark mode and fix duplicate pins
  • Loading branch information
fassko authored Sep 29, 2019
2 parents ab6ab2b + 1426cbe commit 7b90975
Show file tree
Hide file tree
Showing 58 changed files with 391 additions and 259 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,4 @@ fastlane/test_output
# End of https://www.gitignore.io/api/fastlane
/fastlane/report.xml
/codesigndoc_exports
/Dodies.lv.app.dSYM.zip
220 changes: 149 additions & 71 deletions Dodies.lv.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,97 @@
{
"object": {
"pins": [
{
"package": "Cache",
"repositoryURL": "https://github.com/fassko/Cache",
"state": {
"branch": "master",
"revision": "9e4ec388aada963cb6c3ce68fcac6abdcadd4320",
"version": null
}
},
{
"package": "HTMLString",
"repositoryURL": "https://github.com/alexaubry/HTMLString",
"state": {
"branch": null,
"revision": "373048cc4084dd7481c86e3bee41612eff93b14d",
"version": "5.0.0"
}
},
{
"package": "Imaginary",
"repositoryURL": "https://github.com/fassko/Imaginary",
"state": {
"branch": "master",
"revision": "2847cd255160dabf4317d08843ab6ed8d16f2a67",
"version": null
}
},
{
"package": "Kingfisher",
"repositoryURL": "https://github.com/onevcat/Kingfisher",
"state": {
"branch": null,
"revision": "ea84ff22e8c6da676354b162476aad0efd013d7d",
"version": "5.8.1"
}
},
{
"package": "Lightbox",
"repositoryURL": "https://github.com/fassko/Lightbox",
"state": {
"branch": "master",
"revision": "b2b00a26165ab9bc66c2a9adf7bef0cfc8249cd9",
"version": null
}
},
{
"package": "Localize_Swift",
"repositoryURL": "https://github.com/marmelroy/Localize-Swift",
"state": {
"branch": "master",
"revision": "19123eef354205d52978daf60d86c92d1a9e5c50",
"version": null
}
},
{
"package": "PromiseKit",
"repositoryURL": "https://github.com/mxcl/PromiseKit.git",
"state": {
"branch": null,
"revision": "4d8d1287d2e50c53a9f8430ffe88925292838c57",
"version": "6.11.0"
}
},
{
"package": "Realm",
"repositoryURL": "https://github.com/realm/realm-cocoa.git",
"state": {
"branch": "master",
"revision": "6d52751b9c9aa7e6e6b8413721543133a05ad79e",
"version": null
}
},
{
"package": "RealmCore",
"repositoryURL": "https://github.com/realm/realm-core",
"state": {
"branch": null,
"revision": "512dfaa4f59930e193c92e00ba1924bde69b19de",
"version": "5.23.5"
}
},
{
"package": "SwiftSpinner",
"repositoryURL": "https://github.com/icanzilb/SwiftSpinner",
"state": {
"branch": null,
"revision": "b11109c98524526af3a1c6f69c5818862acda6fb",
"version": "2.1.0"
}
}
]
},
"version": 1
}
22 changes: 9 additions & 13 deletions Dodies.lv.xcodeproj/xcshareddata/xcschemes/Dodies.lv.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "636EA8311BA5BDF40071397A"
BuildableName = "Dodies.lv.app"
BlueprintName = "Dodies.lv"
ReferencedContainer = "container:Dodies.lv.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO"
Expand All @@ -41,17 +50,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "636EA8311BA5BDF40071397A"
BuildableName = "Dodies.lv.app"
BlueprintName = "Dodies.lv"
ReferencedContainer = "container:Dodies.lv.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand Down Expand Up @@ -80,8 +78,6 @@
isEnabled = "YES">
</EnvironmentVariable>
</EnvironmentVariables>
<AdditionalOptions>
</AdditionalOptions>
<LocationScenarioReference
identifier = "../Dodies.lv/Valmiera.gpx"
referenceType = "0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,16 @@
<key>orderHint</key>
<integer>0</integer>
</dict>
<key>UITestScheme.xcscheme</key>
<key>Local.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
</dict>
<key>UITestScheme.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
Expand Down
10 changes: 0 additions & 10 deletions Dodies.lv.xcworkspace/contents.xcworkspacedata

This file was deleted.

4 changes: 0 additions & 4 deletions Dodies.lv/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

import UIKit

import Fabric
import Crashlytics
import RealmSwift

@UIApplicationMain
Expand All @@ -20,8 +18,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {

func application(_ application: UIApplication,
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
Fabric.with([Crashlytics.self])

Realm.Configuration.defaultConfiguration = Realm.Configuration(
schemaVersion: 6,
migrationBlock: { migration, oldSchemaVersion in
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
38 changes: 38 additions & 0 deletions Dodies.lv/Assets.xcassets/dodies-green.colorset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
},
"colors" : [
{
"idiom" : "universal",
"color" : {
"color-space" : "srgb",
"components" : {
"red" : "0x6D",
"alpha" : "1.000",
"blue" : "0x41",
"green" : "0x97"
}
}
},
{
"idiom" : "universal",
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"red" : "0.290",
"alpha" : "1.000",
"blue" : "0.178",
"green" : "0.402"
}
}
}
]
}
File renamed without changes
File renamed without changes
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"color" : {
"color-space" : "srgb",
"components" : {
"red" : "0x6D",
"red" : "0.427",
"alpha" : "1.000",
"blue" : "0x41",
"green" : "0x97"
"blue" : "0.255",
"green" : "0.592"
}
}
}
Expand Down
10 changes: 4 additions & 6 deletions Dodies.lv/Base.lproj/LaunchScreen.storyboard
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="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="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="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="14460.20"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand Down Expand Up @@ -67,7 +65,7 @@
<image name="dodies.png" width="124" height="200"/>
<image name="dodies_logo.png" width="200" height="59"/>
<namedColor name="dodies-green">
<color red="0.42745098039215684" green="0.59215686274509804" blue="0.25490196078431371" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.25544185118405033" green="0.35421270030854979" blue="0.15667100205955087" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
Loading

0 comments on commit 7b90975

Please sign in to comment.