Implemented colour picker, TODO: change plan cell colour to selected colours, make CollectionView refresh on colour picked, change selection visualisation in colour picker

This commit is contained in:
Deniz Duezgoeren
2019-07-21 21:14:38 +02:00
parent c041e67064
commit 13b9721c00
22 changed files with 1288 additions and 1224 deletions
+1 -5
View File
@@ -1,6 +1,5 @@
PODS:
- Alamofire (4.8.2)
- Kanna (5.0.0)
- MagazineLayout (1.5.0)
- SQLite.swift (0.12.2):
- SQLite.swift/standard (= 0.12.2)
@@ -9,7 +8,6 @@ PODS:
DEPENDENCIES:
- Alamofire
- Kanna
- MagazineLayout
- SQLite.swift
- SwiftSoup
@@ -17,18 +15,16 @@ DEPENDENCIES:
SPEC REPOS:
https://github.com/cocoapods/specs.git:
- Alamofire
- Kanna
- MagazineLayout
- SQLite.swift
- SwiftSoup
SPEC CHECKSUMS:
Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3
Kanna: a32875df62975f8f4b871e933b4ea1a5c3b8be0f
MagazineLayout: fe41dc2cf1923e3bf377cd8d906a4455a0bf9c83
SQLite.swift: d2b4642190917051ce6bd1d49aab565fe794eea3
SwiftSoup: 92f5b348c131aed8af04f4326db1579ab19fa08c
PODFILE CHECKSUM: 800b015f8a9a586793f8789b635602ca3c1941e7
PODFILE CHECKSUM: 193891d247791f0b53f0dc2ae08ce321f2c24c0d
COCOAPODS: 1.6.1
+814 -1021
View File
File diff suppressed because it is too large Load Diff
@@ -14,7 +14,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A3659275593D1A051A41F7ACAF1CEBF6"
BlueprintIdentifier = "FBCC9250CC2F3CD2F4F7861DAE38E61D"
BuildableName = "Pods_AvH_Plan.framework"
BlueprintName = "Pods-AvH Plan"
ReferencedContainer = "container:Pods.xcodeproj">
@@ -45,7 +45,7 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A3659275593D1A051A41F7ACAF1CEBF6"
BlueprintIdentifier = "FBCC9250CC2F3CD2F4F7861DAE38E61D"
BuildableName = "Pods_AvH_Plan.framework"
BlueprintName = "Pods-AvH Plan"
ReferencedContainer = "container:Pods.xcodeproj">
@@ -14,7 +14,7 @@
buildForArchiving = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "CC36B519DC0BE1511623F9A1B41B6F96"
BlueprintIdentifier = "401664DA96804F2306813DC441D08F45"
BuildableName = "SwiftSoup.framework"
BlueprintName = "SwiftSoup"
ReferencedContainer = "container:Pods.xcodeproj">
@@ -8,57 +8,36 @@
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>0</integer>
</dict>
<key>Kanna.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>1</integer>
</dict>
<key>MagazineLayout.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>2</integer>
</dict>
<key>Pods-AvH Plan.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>3</integer>
</dict>
<key>Pods-AvH PlanTests.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>4</integer>
</dict>
<key>Pods-AvH PlanUITests.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>5</integer>
</dict>
<key>SQLite.swift.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>6</integer>
</dict>
<key>SwiftSoup.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>7</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
@@ -24,30 +24,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
## Kanna
The MIT License (MIT)
Copyright (c) 2014 - 2015 Atsushi Kiwaki (@_tid_)
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
## MagazineLayout
Apache License
@@ -41,36 +41,6 @@ THE SOFTWARE.
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
<dict>
<key>FooterText</key>
<string>The MIT License (MIT)
Copyright (c) 2014 - 2015 Atsushi Kiwaki (@_tid_)
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.</string>
<key>License</key>
<string>MIT</string>
<key>Title</key>
<string>Kanna</string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
<dict>
<key>FooterText</key>
<string> Apache License
@@ -154,14 +154,12 @@ strip_invalid_archs() {
if [[ "$CONFIGURATION" == "Debug" ]]; then
install_framework "${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework"
install_framework "${BUILT_PRODUCTS_DIR}/Kanna/Kanna.framework"
install_framework "${BUILT_PRODUCTS_DIR}/MagazineLayout/MagazineLayout.framework"
install_framework "${BUILT_PRODUCTS_DIR}/SQLite.swift/SQLite.framework"
install_framework "${BUILT_PRODUCTS_DIR}/SwiftSoup/SwiftSoup.framework"
fi
if [[ "$CONFIGURATION" == "Release" ]]; then
install_framework "${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework"
install_framework "${BUILT_PRODUCTS_DIR}/Kanna/Kanna.framework"
install_framework "${BUILT_PRODUCTS_DIR}/MagazineLayout/MagazineLayout.framework"
install_framework "${BUILT_PRODUCTS_DIR}/SQLite.swift/SQLite.framework"
install_framework "${BUILT_PRODUCTS_DIR}/SwiftSoup/SwiftSoup.framework"