Skip to content

Commit

Permalink
Merge branch 'dev-nathan'
Browse files Browse the repository at this point in the history
  • Loading branch information
t04glovern committed Apr 13, 2018
2 parents 40964aa + 3a22338 commit ec591b6
Show file tree
Hide file tree
Showing 51 changed files with 388 additions and 193 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
## 1.0.2

- iOS build fixed
- Icons updated and documented process for changing
- Changes to cats that occur in the database should change in the UI without interaction
- Updated to Flutter 0.2.8 builds

## 1.0.1

- Updated apk with the correct signing settings for OAuth2.0

## 1.0

- Initial beta release v1.0
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<h1>CatBox</h1>
<p>View cats that are up for adoption</p>
<a href="https://www.dartlang.org/" target="_blank"><img src="https://img.shields.io/badge/Dart-2.0.0-ff69b4.svg?longCache=true&style=for-the-badge" alt="Dart"></a>
<a href="https://flutter.io/" target="_blank"><img src="https://img.shields.io/badge/Flutter-0.2.3-3BB9FF.svg?longCache=true&style=for-the-badge" alt="Flutter"></a>
<a href="https://flutter.io/" target="_blank"><img src="https://img.shields.io/badge/Flutter-0.2.8-3BB9FF.svg?longCache=true&style=for-the-badge" alt="Flutter"></a>
<a href="https://firebase.google.com/" target="_blank"><img src="https://img.shields.io/badge/Firebase-Cloud-orange.svg?longCache=true&style=for-the-badge" alt="Firebase"></a>
<a href="https://gradle.org/" target="_blank"><img src="https://img.shields.io/badge/Gradle-4.4-green.svg?longCache=true&style=for-the-badge" alt="Gradle"></a>
</div>
Expand All @@ -21,7 +21,7 @@ A Flutter app that displays cats that are up for adoption along with information

- [ ] Launch adoption page using [url_launcher](https://pub.dartlang.org/packages/url_launcher)
- [ ] Change Firestore schema to new naming convention
- [ ] Live Cat item reference so we can do updates to the UI in sync with Firestore changes
- [x] Live Cat item reference so we can do updates to the UI in sync with Firestore changes
- [ ] Add Cat description field

## Building
Expand Down Expand Up @@ -133,6 +133,8 @@ flutter pub get
flutter pub pub run flutter_launcher_icons:main
```

Due to a difference in the way that iOS and Android handle transparency, there's a separate icon file for iOS and a method for toggling on and off the icon changes in the `pubspec.yaml`

### Build Issues

#### `MissingPluginException`
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ android {
applicationId "com.nathanglover.catbox"
minSdkVersion 16
targetSdkVersion 27
versionCode 2
versionName "1.0.1"
versionCode 3
versionName "1.0.2"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}

Expand Down
Binary file added assets/icon-ios.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ios/Flutter/flutter_assets/AssetManifest.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"images/profile_header_background.png":["images/profile_header_background.png"],"images/portfolio_1.jpeg":["images/portfolio_1.jpeg"],"images/portfolio_2.jpeg":["images/portfolio_2.jpeg"],"images/portfolio_3.jpeg":["images/portfolio_3.jpeg"],"images/portfolio_4.jpeg":["images/portfolio_4.jpeg"],"images/portfolio_5.jpeg":["images/portfolio_5.jpeg"],"images/portfolio_6.jpeg":["images/portfolio_6.jpeg"]}
{"images/profile_header_background.png":["images/profile_header_background.png"],"fonts/Ubuntu-Regular.ttf":["fonts/Ubuntu-Regular.ttf"],"fonts/Ubuntu-Bold.ttf":["fonts/Ubuntu-Bold.ttf"],"packages/font_awesome_flutter/assets/fa-brands-400.ttf":["packages/font_awesome_flutter/assets/fa-brands-400.ttf"],"packages/font_awesome_flutter/assets/fa-regular-400.ttf":["packages/font_awesome_flutter/assets/fa-regular-400.ttf"],"packages/font_awesome_flutter/assets/fa-solid-900.ttf":["packages/font_awesome_flutter/assets/fa-solid-900.ttf"]}
2 changes: 1 addition & 1 deletion ios/Flutter/flutter_assets/FontManifest.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"fonts":[{"asset":"fonts/MaterialIcons-Regular.ttf"}],"family":"MaterialIcons"}]
[{"fonts":[{"asset":"fonts/MaterialIcons-Regular.ttf"}],"family":"MaterialIcons"},{"fonts":[{"asset":"fonts/Ubuntu-Regular.ttf"},{"asset":"fonts/Ubuntu-Bold.ttf"}],"family":"Ubuntu"},{"family":"packages/font_awesome_flutter/FontAwesomeBrands","fonts":[{"weight":400,"asset":"packages/font_awesome_flutter/assets/fa-brands-400.ttf"}]},{"family":"packages/font_awesome_flutter/FontAwesomeRegular","fonts":[{"weight":400,"asset":"packages/font_awesome_flutter/assets/fa-regular-400.ttf"}]},{"family":"packages/font_awesome_flutter/FontAwesomeSolid","fonts":[{"weight":900,"asset":"packages/font_awesome_flutter/assets/fa-solid-900.ttf"}]}]
91 changes: 91 additions & 0 deletions ios/Flutter/flutter_assets/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -3100,6 +3100,36 @@ 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.

--------------------------------------------------------------------------------
cloud_firestore

Copyright 2017, the Chromium project authors. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
colorama

Expand Down Expand Up @@ -10509,6 +10539,37 @@ 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.
--------------------------------------------------------------------------------
firebase_auth
firebase_core

// Copyright 2017 The Chromium Authors. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
flutter_launcher_icons

MIT License
Expand Down Expand Up @@ -11248,6 +11309,36 @@ may be used:
"The Graphics Interchange Format(c) is the Copyright property of
CompuServe Incorporated. GIF(sm) is a Service Mark property of
CompuServe Incorporated."
--------------------------------------------------------------------------------
google_sign_in

Copyright 2016, the Flutter project authors. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
harfbuzz

Expand Down
Binary file added ios/Flutter/flutter_assets/fonts/Ubuntu-Bold.ttf
Binary file not shown.
Binary file not shown.
Binary file removed ios/Flutter/flutter_assets/images/portfolio_1.jpeg
Binary file not shown.
Binary file removed ios/Flutter/flutter_assets/images/portfolio_2.jpeg
Binary file not shown.
Binary file removed ios/Flutter/flutter_assets/images/portfolio_3.jpeg
Binary file not shown.
Binary file removed ios/Flutter/flutter_assets/images/portfolio_4.jpeg
Binary file not shown.
Binary file removed ios/Flutter/flutter_assets/images/portfolio_5.jpeg
Binary file not shown.
Binary file removed ios/Flutter/flutter_assets/images/portfolio_6.jpeg
Binary file not shown.
Binary file modified ios/Flutter/flutter_assets/snapshot_blob.bin
Binary file not shown.
4 changes: 4 additions & 0 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,9 @@ post_install do |installer|
target.build_configurations.each do |config|
config.build_settings['ENABLE_BITCODE'] = 'NO'
end
# workaround for https://github.com/CocoaPods/CocoaPods/issues/7463
target.headers_build_phase.files.each do |file|
file.settings = { 'ATTRIBUTES' => ['Public'] }
end
end
end
76 changes: 63 additions & 13 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,24 @@ PODS:
- Firebase/Firestore (4.11.0):
- Firebase/Core
- FirebaseFirestore (= 0.10.4)
- firebase_auth (0.0.1):
- Firebase/Auth
- Firebase/Core
- Flutter
- firebase_core (0.0.1):
- Firebase/Core
- Flutter
- FirebaseAnalytics (4.1.0):
- FirebaseCore (~> 4.0)
- FirebaseInstanceID (~> 2.0)
- GoogleToolboxForMac/NSData+zlib (~> 2.1)
- "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
- nanopb (~> 0.3)
- FirebaseAuth (4.5.0):
- FirebaseAnalytics (~> 4.1)
- GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)
- "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)"
- GTMSessionFetcher/Core (~> 1.1)
- FirebaseCore (4.0.18):
- GoogleToolboxForMac/NSData+zlib (~> 2.1)
- "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
- FirebaseDatabase (4.1.5):
- FirebaseAnalytics (~> 4.1)
- FirebaseCore (~> 4.0)
Expand All @@ -50,16 +54,24 @@ PODS:
- FirebaseInstanceID (2.0.10):
- FirebaseCore (~> 4.0)
- Flutter (1.0.0)
- google_sign_in (0.0.1):
- Flutter
- GoogleSignIn (~> 4.0)
- GoogleSignIn (4.1.2):
- "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)"
- "GoogleToolboxForMac/NSString+URLArguments (~> 2.1)"
- GTMOAuth2 (~> 1.0)
- GTMSessionFetcher/Core (~> 1.1)
- GoogleToolboxForMac/DebugUtils (2.1.3):
- GoogleToolboxForMac/Defines (= 2.1.3)
- GoogleToolboxForMac/Defines (2.1.3)
- GoogleToolboxForMac/NSData+zlib (2.1.3):
- "GoogleToolboxForMac/NSData+zlib (2.1.3)":
- GoogleToolboxForMac/Defines (= 2.1.3)
- GoogleToolboxForMac/NSDictionary+URLArguments (2.1.3):
- "GoogleToolboxForMac/NSDictionary+URLArguments (2.1.3)":
- GoogleToolboxForMac/DebugUtils (= 2.1.3)
- GoogleToolboxForMac/Defines (= 2.1.3)
- GoogleToolboxForMac/NSString+URLArguments (= 2.1.3)
- GoogleToolboxForMac/NSString+URLArguments (2.1.3)
- "GoogleToolboxForMac/NSString+URLArguments (= 2.1.3)"
- "GoogleToolboxForMac/NSString+URLArguments (2.1.3)"
- gRPC (1.10.0):
- gRPC-RxLibrary (= 1.10.0)
- gRPC/Main (= 1.10.0)
Expand All @@ -79,7 +91,13 @@ PODS:
- gRPC/Main (1.10.0):
- gRPC-Core (= 1.10.0)
- gRPC-RxLibrary (= 1.10.0)
- GTMSessionFetcher/Core (1.1.14)
- GTMOAuth2 (1.1.6):
- GTMSessionFetcher (~> 1.1)
- GTMSessionFetcher (1.1.15):
- GTMSessionFetcher/Full (= 1.1.15)
- GTMSessionFetcher/Core (1.1.15)
- GTMSessionFetcher/Full (1.1.15):
- GTMSessionFetcher/Core (= 1.1.15)
- leveldb-library (1.20)
- nanopb (0.3.8):
- nanopb/decode (= 0.3.8)
Expand All @@ -90,21 +108,50 @@ PODS:

DEPENDENCIES:
- cloud_firestore (from `Pods/.symlinks/plugins/cloud_firestore-0.3.0/ios`)
- firebase_core (from `Pods/.symlinks/plugins/firebase_core-0.1.0/ios`)
- firebase_auth (from `Pods/.symlinks/plugins/firebase_auth-0.5.3/ios`)
- firebase_core (from `Pods/.symlinks/plugins/firebase_core-0.1.2/ios`)
- Flutter (from `Pods/.symlinks/flutter/ios`)
- google_sign_in (from `Pods/.symlinks/plugins/google_sign_in-3.0.0/ios`)

SPEC REPOS:
https://github.com/CocoaPods/Specs.git:
- BoringSSL
- Firebase
- FirebaseAnalytics
- FirebaseAuth
- FirebaseCore
- FirebaseDatabase
- FirebaseFirestore
- FirebaseInstanceID
- GoogleSignIn
- GoogleToolboxForMac
- gRPC
- gRPC-Core
- gRPC-ProtoRPC
- gRPC-RxLibrary
- GTMOAuth2
- GTMSessionFetcher
- leveldb-library
- nanopb
- Protobuf

EXTERNAL SOURCES:
cloud_firestore:
:path: Pods/.symlinks/plugins/cloud_firestore-0.3.0/ios
firebase_auth:
:path: Pods/.symlinks/plugins/firebase_auth-0.5.3/ios
firebase_core:
:path: Pods/.symlinks/plugins/firebase_core-0.1.0/ios
:path: Pods/.symlinks/plugins/firebase_core-0.1.2/ios
Flutter:
:path: Pods/.symlinks/flutter/ios
google_sign_in:
:path: Pods/.symlinks/plugins/google_sign_in-3.0.0/ios

SPEC CHECKSUMS:
BoringSSL: 32764dbaf5f5888cf51fbaa172a010126b41bcd4
cloud_firestore: 00886d0b271577dfadd33be97d6bb6095f49499d
Firebase: cc13dfab1038c8b45d7903e01fc690451d6d0b24
firebase_auth: 499d5bfb249606a276f6bddf292a3b2d44139f75
firebase_core: eb181e4f329c1806efdf2aed9e59ea98fe924ef5
FirebaseAnalytics: 3dfae28d4a5e06f86c4fae830efc2ad3fadb19bc
FirebaseAuth: 147bf340a0706b44ca1753d6b41ebafd9687cfe6
Expand All @@ -113,16 +160,19 @@ SPEC CHECKSUMS:
FirebaseFirestore: 796df79c29cf8ecf806564f4d347665bdafa6ef0
FirebaseInstanceID: 8d20d890d65c917f9f7d9950b6e10a760ad34321
Flutter: 9d0fac939486c9aba2809b7982dfdbb47a7b0296
google_sign_in: 64523e9b42c475b01b726ff87e450425ea6d15bc
GoogleSignIn: d9ef55b10f0aa401a5de2747f59b725e4b9732ac
GoogleToolboxForMac: 2501e2ad72a52eb3dfe7bd9aee7dad11b858bd20
gRPC: f54f0e6d603052b4562447da442ce2ff30bcdacc
gRPC-Core: a030b1678ded49c88ec5ba7c90ee8ee5f47ec6e1
gRPC-ProtoRPC: 22712b23eb1bda656a59715fa5c1da0ea1493ea4
gRPC-RxLibrary: a41a4652d220f230ba1c0491a94ce2ee04c6180a
GTMSessionFetcher: 390ea358e5a0d0133153806f744662dad933d06b
GTMOAuth2: c77fe325e4acd453837e72d91e3b5f13116857b2
GTMSessionFetcher: 5fa5b80fd20e439ef5f545fb2cb3ca6c6714caa2
leveldb-library: 08cba283675b7ed2d99629a4bc5fd052cd2bb6a5
nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3
Protobuf: 8a9838fba8dae3389230e1b7f8c104aa32389c03

PODFILE CHECKSUM: 0420ab312a523ae0eecfb1fc19ea51dd82cc17c7
PODFILE CHECKSUM: 6544793fe2cf8d9dd3ae24b7885ecace4b2f87fb

COCOAPODS: 1.4.0
COCOAPODS: 1.5.0
Loading

0 comments on commit ec591b6

Please sign in to comment.