🔀 Merge branch 'develop'

Signed-off-by: Peter Friese <[email protected]>

.gitignore

@@ -542,5 +542,5 @@ hs_err_pid*
 # End of https://www.gitignore.io/api/node,swift,xcode,macos,appcode,android,objective-c,androidstudio,visualstudiocode
 /archive
 /research
-/final/MakeItSo/MakeItSo/GoogleService-Info.plist
 /final/backend/.firebaserc
+GoogleService-Info.plist

assets/logo/AppIcon.appiconset/Contents.json

@@ -0,0 +1,176 @@
+{
+ "info" : {
+ "version" : 1,
+ "author" : "Bakery"
+ },
+ "images" : [
+ {
+ "idiom" : "iphone",
+ "size" : "20x20",
+ "scale" : "2x",
+ "filename" : "notification40.png"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "20x20",
+ "scale" : "3x",
+ "filename" : "notification60.png"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "29x29",
+ "scale" : "2x",
+ "filename" : "settings58.png"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "29x29",
+ "scale" : "3x",
+ "filename" : "settings87.png"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "40x40",
+ "scale" : "2x",
+ "filename" : "spotlight80.png"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "40x40",
+ "scale" : "3x",
+ "filename" : "spotlight120.png"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "60x60",
+ "scale" : "2x",
+ "filename" : "iphone120.png"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "60x60",
+ "scale" : "3x",
+ "filename" : "iphone180.png"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "20x20",
+ "scale" : "1x",
+ "filename" : "ipadNotification20.png"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "20x20",
+ "scale" : "2x",
+ "filename" : "ipadNotification40.png"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "29x29",
+ "scale" : "1x",
+ "filename" : "ipadSettings29.png"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "29x29",
+ "scale" : "2x",
+ "filename" : "ipadSettings58.png"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "40x40",
+ "scale" : "1x",
+ "filename" : "ipadSpotlight40.png"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "40x40",
+ "scale" : "2x",
+ "filename" : "ipadSpotlight80.png"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "76x76",
+ "scale" : "1x",
+ "filename" : "ipad76.png"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "76x76",
+ "scale" : "2x",
+ "filename" : "ipad152.png"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "83.5x83.5",
+ "scale" : "2x",
+ "filename" : "ipadPro167.png"
+ },
+ {
+ "idiom" : "ios-marketing",
+ "size" : "1024x1024",
+ "scale" : "1x",
+ "filename" : "appstore1024.png"
+ },
+ {
+ "idiom" : "mac",
+ "size" : "16x16",
+ "scale" : "1x",
+ "filename" : "mac16.png"
+ },
+ {
+ "idiom" : "mac",
+ "size" : "16x16",
+ "scale" : "2x",
+ "filename" : "mac32.png"
+ },
+ {
+ "idiom" : "mac",
+ "size" : "32x32",
+ "scale" : "1x",
+ "filename" : "mac32.png"
+ },
+ {
+ "idiom" : "mac",
+ "size" : "32x32",
+ "scale" : "2x",
+ "filename" : "mac64.png"
+ },
+ {
+ "idiom" : "mac",
+ "size" : "128x128",
+ "scale" : "1x",
+ "filename" : "mac128.png"
+ },
+ {
+ "idiom" : "mac",
+ "size" : "128x128",
+ "scale" : "2x",
+ "filename" : "mac256.png"
+ },
+ {
+ "idiom" : "mac",
+ "size" : "256x256",
+ "scale" : "1x",
+ "filename" : "mac256.png"
+ },
+ {
+ "idiom" : "mac",
+ "size" : "256x256",
+ "scale" : "2x",
+ "filename" : "mac512.png"
+ },
+ {
+ "idiom" : "mac",
+ "size" : "512x512",
+ "scale" : "1x",
+ "filename" : "mac512.png"
+ },
+ {
+ "idiom" : "mac",
+ "size" : "512x512",
+ "scale" : "2x",
+ "filename" : "mac1024.png"
+ }
+ ]
+}

code/frontend/MakeItSo/MakeItSo.xcodeproj/project.xcworkspace/xcshareddata/IDETemplateMacros.plist

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http:https://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>COPYRIGHT</key>
+ <string>Copyright © 2021 Google LLC. All rights reserved.</string>
+ <key>FILEHEADER</key>
+ <string>
+// ___FILENAME___
+// ___PACKAGENAME___
+//
+// Created by ___FULLUSERNAME___ on ___DATE___.
+// ___COPYRIGHT___
+//
+// Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http:https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.</string>
+</dict>
+</plist>

code/frontend/MakeItSo/MakeItSo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http:https://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IDEDidComputeMac32BitWarning</key>
+ <true/>
+</dict>
+</plist>

code/frontend/MakeItSo/MakeItSo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -0,0 +1,122 @@
+{
+ "pins" : [
+ {
+ "identity" : "abseil-cpp-swiftpm",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/firebase/abseil-cpp-SwiftPM.git",
+ "state" : {
+ "revision" : "d302de612e3d57c6f4afaf087da18fba8eac72a7",
+ "version" : "0.20220203.1"
+ }
+ },
+ {
+ "identity" : "boringssl-swiftpm",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/firebase/boringssl-SwiftPM.git",
+ "state" : {
+ "revision" : "79db6516894a932d0ddaff3b05b9da1e4f6c4069",
+ "version" : "0.9.0"
+ }
+ },
+ {
+ "identity" : "firebase-ios-sdk",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/firebase/firebase-ios-sdk",
+ "state" : {
+ "revision" : "111d8d6ad1a1afd6c8e9561d26e55ab1e74fcb42",
+ "version" : "8.15.0"
+ }
+ },
+ {
+ "identity" : "googleappmeasurement",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/google/GoogleAppMeasurement.git",
+ "state" : {
+ "revision" : "ef819db8c58657a6ca367322e73f3b6322afe0a2",
+ "version" : "8.15.0"
+ }
+ },
+ {
+ "identity" : "googledatatransport",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/google/GoogleDataTransport.git",
+ "state" : {
+ "revision" : "15ccdfd25ac55b9239b82809531ff26605e7556e",
+ "version" : "9.1.2"
+ }
+ },
+ {
+ "identity" : "googleutilities",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/google/GoogleUtilities.git",
+ "state" : {
+ "revision" : "f4abe56ce62a779e64b525eb133c8fc2a84bbc1f",
+ "version" : "7.7.1"
+ }
+ },
+ {
+ "identity" : "grpc-ios",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/grpc/grpc-ios.git",
+ "state" : {
+ "revision" : "abd2d5a4347efa0454606a788678a5d8ec223738",
+ "version" : "1.44.0-grpc"
+ }
+ },
+ {
+ "identity" : "gtm-session-fetcher",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/google/gtm-session-fetcher.git",
+ "state" : {
+ "revision" : "4e9bbf2808b8fee444e84a48f5f3c12641987d3e",
+ "version" : "1.7.2"
+ }
+ },
+ {
+ "identity" : "leveldb",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/firebase/leveldb.git",
+ "state" : {
+ "revision" : "0706abcc6b0bd9cedfbb015ba840e4a780b5159b",
+ "version" : "1.22.2"
+ }
+ },
+ {
+ "identity" : "nanopb",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/firebase/nanopb.git",
+ "state" : {
+ "revision" : "7ee9ef9f627d85cbe1b8c4f49a3ed26eed216c77",
+ "version" : "2.30908.0"
+ }
+ },
+ {
+ "identity" : "promises",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/google/promises.git",
+ "state" : {
+ "revision" : "46c1e6b5ac09d8f82c991061c659f67e573d425d",
+ "version" : "2.1.0"
+ }
+ },
+ {
+ "identity" : "resolver",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/hmlongco/Resolver",
+ "state" : {
+ "branch" : "master",
+ "revision" : "bd565aae33a08dd4e10747bfb98e2bf8a63bfa28"
+ }
+ },
+ {
+ "identity" : "swift-protobuf",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/apple/swift-protobuf.git",
+ "state" : {
+ "revision" : "e1499bc69b9040b29184f7f2996f7bab467c1639",
+ "version" : "1.19.0"
+ }
+ }
+ ],
+ "version" : 2
+}