From 731021ed440b57a7b47c28525adb873fdce8b0f8 Mon Sep 17 00:00:00 2001 From: nshhhin Date: Fri, 19 Feb 2021 15:08:08 +0900 Subject: [PATCH] :bookmark: v1.1.5 --- Otofuda-iOS.xcodeproj/project.pbxproj | 317 +- .../contents.xcworkspacedata | 2 +- .../xcschemes/Otofuda-iOS.xcscheme | 98 + .../contents.xcworkspacedata | 10 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - Otofuda-iOS/src/Constants.swift | 5 +- .../src/Utility/Models/CardCountMode.swift | 8 + Otofuda-iOS/src/Utility/Models/Room.swift | 3 +- .../src/View/Storyboard/Menu.storyboard | 165 +- .../src/ViewController/Menu/MenuVC+Ex.swift | 21 + .../src/ViewController/Menu/MenuVC.swift | 129 +- .../src/ViewController/Play/PlayVC+Ex.swift | 89 +- .../Play/PlayVC+UICollectionDelegate.swift | 16 +- .../src/ViewController/Play/PlayVC.swift | 26 +- .../ViewController/Result/ResultVC+Ex.swift | 3 + .../src/ViewController/Result/ResultVC.swift | 13 +- .../src/ViewController/Top/TopVC.swift | 26 - Podfile | 34 - Podfile.lock | 141 - Pods/Firebase/CoreOnly/Sources/Firebase.h | 136 - .../CoreOnly/Sources/module.modulemap | 4 - Pods/Firebase/README.md | 320 - .../FIRAnalyticsConnector | Bin 682576 -> 0 bytes .../Modules/module.modulemap | 11 - .../FirebaseAnalytics | Bin 651944 -> 0 bytes .../Headers/FIRAnalytics+AppDelegate.h | 62 - .../Headers/FIRAnalytics.h | 173 - .../Headers/FIREventNames.h | 495 -- .../Headers/FIRParameterNames.h | 731 -- .../Headers/FIRUserPropertyNames.h | 29 - .../Headers/FirebaseAnalytics.h | 6 - .../Modules/module.modulemap | 12 - Pods/FirebaseCore/LICENSE | 202 - Pods/FirebaseCore/README.md | 320 - Pods/FirebaseDatabase/LICENSE | 202 - Pods/FirebaseDatabase/README.md | 320 - .../GoogleAppMeasurement | Bin 33515864 -> 0 bytes .../Modules/module.modulemap | 11 - .../GULAppDelegateSwizzler.m | 1070 --- .../Internal/GULAppDelegateSwizzler_Private.h | 55 - .../GoogleUtilities/Common/GULLoggerCodes.h | 56 - .../third_party/GULAppEnvironmentUtil.m | 312 - .../GoogleUtilities/Logger/GULLogger.m | 215 - .../MethodSwizzler/GULSwizzler.m | 153 - .../NSData+zlib/GULNSData+zlib.m | 207 - .../Network/GULMutableDictionary.m | 101 - .../GoogleUtilities/Network/GULNetwork.m | 390 - .../Network/GULNetworkConstants.m | 41 - .../Network/GULNetworkURLSession.m | 766 -- .../GULReachabilityChecker+Internal.h | 48 - .../Reachability/GULReachabilityChecker.m | 263 - .../UserDefaults/GULUserDefaults.m | 213 - Pods/GoogleUtilities/README.md | 320 - Pods/Headers/Private/Firebase/Firebase.h | 1 - Pods/Headers/Public/Firebase/Firebase.h | 1 - Pods/Manifest.lock | 141 - Pods/Pods.xcodeproj/project.pbxproj | 7822 ----------------- .../FirebaseCore/FirebaseCore-Info.plist | 26 - .../FirebaseCore/FirebaseCore-dummy.m | 5 - .../FirebaseCore/FirebaseCore-umbrella.h | 22 - .../FirebaseCore/FirebaseCore.modulemap | 6 - .../FirebaseDatabase-Info.plist | 26 - .../FirebaseDatabase/FirebaseDatabase-dummy.m | 5 - .../FirebaseDatabase-umbrella.h | 25 - .../FirebaseDatabase.modulemap | 6 - .../GoogleUtilities-Info.plist | 26 - .../GoogleUtilities/GoogleUtilities-dummy.m | 5 - .../GoogleUtilities-umbrella.h | 39 - .../GoogleUtilities/GoogleUtilities.modulemap | 6 - .../Pods-Otofuda-iOS-Info.plist | 26 - ...Pods-Otofuda-iOS-acknowledgements.markdown | 1879 ---- .../Pods-Otofuda-iOS-acknowledgements.plist | 2013 ----- .../Pods-Otofuda-iOS/Pods-Otofuda-iOS-dummy.m | 5 - .../Pods-Otofuda-iOS-frameworks.sh | 213 - .../Pods-Otofuda-iOS-umbrella.h | 16 - .../Pods-Otofuda-iOS.debug.xcconfig | 14 - .../Pods-Otofuda-iOS.modulemap | 6 - .../Pods-Otofuda-iOS.release.xcconfig | 14 - .../leveldb-library-Info.plist | 26 - .../leveldb-library/leveldb-library-dummy.m | 5 - .../leveldb-library-prefix.pch | 12 - .../leveldb-library-umbrella.h | 31 - .../leveldb-library/leveldb-library.modulemap | 6 - .../nanopb/nanopb-Info.plist | 26 - .../nanopb/nanopb-dummy.m | 5 - .../nanopb/nanopb-prefix.pch | 12 - .../nanopb/nanopb-umbrella.h | 26 - .../nanopb/nanopb.modulemap | 6 - Pods/leveldb-library/LICENSE | 27 - Pods/leveldb-library/README.md | 225 - Pods/leveldb-library/db/builder.cc | 79 - Pods/leveldb-library/db/builder.h | 30 - Pods/leveldb-library/db/c.cc | 566 -- Pods/leveldb-library/db/db_impl.cc | 1550 ---- Pods/leveldb-library/db/db_impl.h | 216 - Pods/leveldb-library/db/db_iter.cc | 309 - Pods/leveldb-library/db/db_iter.h | 26 - Pods/leveldb-library/db/dbformat.cc | 140 - Pods/leveldb-library/db/dbformat.h | 218 - Pods/leveldb-library/db/dumpfile.cc | 232 - Pods/leveldb-library/db/filename.cc | 141 - Pods/leveldb-library/db/filename.h | 84 - Pods/leveldb-library/db/log_format.h | 35 - Pods/leveldb-library/db/log_reader.cc | 274 - Pods/leveldb-library/db/log_reader.h | 112 - Pods/leveldb-library/db/log_writer.cc | 111 - Pods/leveldb-library/db/log_writer.h | 54 - Pods/leveldb-library/db/memtable.cc | 136 - Pods/leveldb-library/db/memtable.h | 87 - Pods/leveldb-library/db/repair.cc | 450 - Pods/leveldb-library/db/skiplist.h | 382 - Pods/leveldb-library/db/snapshot.h | 95 - Pods/leveldb-library/db/table_cache.cc | 120 - Pods/leveldb-library/db/table_cache.h | 58 - Pods/leveldb-library/db/version_edit.cc | 260 - Pods/leveldb-library/db/version_edit.h | 106 - Pods/leveldb-library/db/version_set.cc | 1585 ---- Pods/leveldb-library/db/version_set.h | 393 - Pods/leveldb-library/db/write_batch.cc | 150 - .../leveldb-library/db/write_batch_internal.h | 45 - Pods/leveldb-library/include/leveldb/c.h | 270 - Pods/leveldb-library/include/leveldb/cache.h | 111 - .../include/leveldb/comparator.h | 64 - Pods/leveldb-library/include/leveldb/db.h | 167 - .../include/leveldb/dumpfile.h | 28 - Pods/leveldb-library/include/leveldb/env.h | 387 - .../include/leveldb/filter_policy.h | 72 - .../include/leveldb/iterator.h | 112 - .../leveldb-library/include/leveldb/options.h | 187 - Pods/leveldb-library/include/leveldb/slice.h | 115 - Pods/leveldb-library/include/leveldb/status.h | 122 - Pods/leveldb-library/include/leveldb/table.h | 84 - .../include/leveldb/table_builder.h | 93 - .../include/leveldb/write_batch.h | 83 - Pods/leveldb-library/port/port.h | 19 - Pods/leveldb-library/port/port_example.h | 104 - .../leveldb-library/port/thread_annotations.h | 108 - Pods/leveldb-library/table/block.cc | 266 - Pods/leveldb-library/table/block.h | 44 - Pods/leveldb-library/table/block_builder.cc | 108 - Pods/leveldb-library/table/block_builder.h | 55 - Pods/leveldb-library/table/filter_block.cc | 106 - Pods/leveldb-library/table/filter_block.h | 69 - Pods/leveldb-library/table/format.cc | 141 - Pods/leveldb-library/table/format.h | 100 - Pods/leveldb-library/table/iterator.cc | 76 - Pods/leveldb-library/table/iterator_wrapper.h | 92 - Pods/leveldb-library/table/merger.cc | 191 - Pods/leveldb-library/table/merger.h | 26 - Pods/leveldb-library/table/table.cc | 273 - Pods/leveldb-library/table/table_builder.cc | 265 - .../table/two_level_iterator.cc | 171 - .../table/two_level_iterator.h | 31 - Pods/leveldb-library/util/arena.cc | 66 - Pods/leveldb-library/util/arena.h | 71 - Pods/leveldb-library/util/bloom.cc | 92 - Pods/leveldb-library/util/cache.cc | 400 - Pods/leveldb-library/util/coding.cc | 192 - Pods/leveldb-library/util/coding.h | 104 - Pods/leveldb-library/util/comparator.cc | 73 - Pods/leveldb-library/util/crc32c.cc | 380 - Pods/leveldb-library/util/crc32c.h | 43 - Pods/leveldb-library/util/env.cc | 92 - Pods/leveldb-library/util/env_posix.cc | 876 -- .../util/env_posix_test_helper.h | 28 - Pods/leveldb-library/util/filter_policy.cc | 11 - Pods/leveldb-library/util/hash.cc | 55 - Pods/leveldb-library/util/hash.h | 19 - Pods/leveldb-library/util/histogram.cc | 272 - Pods/leveldb-library/util/histogram.h | 44 - Pods/leveldb-library/util/logging.cc | 85 - Pods/leveldb-library/util/logging.h | 45 - Pods/leveldb-library/util/mutexlock.h | 39 - Pods/leveldb-library/util/options.cc | 14 - Pods/leveldb-library/util/posix_logger.h | 130 - Pods/leveldb-library/util/random.h | 63 - Pods/leveldb-library/util/status.cc | 77 - Pods/leveldb-library/util/testharness.cc | 81 - Pods/leveldb-library/util/testharness.h | 141 - Pods/leveldb-library/util/testutil.h | 66 - Pods/nanopb/LICENSE.txt | 20 - Pods/nanopb/README.md | 71 - Pods/nanopb/pb.h | 599 -- Pods/nanopb/pb_common.c | 97 - Pods/nanopb/pb_common.h | 42 - Pods/nanopb/pb_decode.c | 1551 ---- Pods/nanopb/pb_decode.h | 178 - Pods/nanopb/pb_encode.c | 913 -- Pods/nanopb/pb_encode.h | 170 - 189 files changed, 552 insertions(+), 39945 deletions(-) create mode 100644 Otofuda-iOS.xcodeproj/xcshareddata/xcschemes/Otofuda-iOS.xcscheme delete mode 100644 Otofuda-iOS.xcworkspace/contents.xcworkspacedata delete mode 100644 Otofuda-iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 Otofuda-iOS/src/Utility/Models/CardCountMode.swift delete mode 100644 Podfile delete mode 100644 Podfile.lock delete mode 100755 Pods/Firebase/CoreOnly/Sources/Firebase.h delete mode 100755 Pods/Firebase/CoreOnly/Sources/module.modulemap delete mode 100644 Pods/Firebase/README.md delete mode 100755 Pods/FirebaseAnalytics/Frameworks/FIRAnalyticsConnector.framework/FIRAnalyticsConnector delete mode 100755 Pods/FirebaseAnalytics/Frameworks/FIRAnalyticsConnector.framework/Modules/module.modulemap delete mode 100755 Pods/FirebaseAnalytics/Frameworks/FirebaseAnalytics.framework/FirebaseAnalytics delete mode 100755 Pods/FirebaseAnalytics/Frameworks/FirebaseAnalytics.framework/Headers/FIRAnalytics+AppDelegate.h delete mode 100755 Pods/FirebaseAnalytics/Frameworks/FirebaseAnalytics.framework/Headers/FIRAnalytics.h delete mode 100755 Pods/FirebaseAnalytics/Frameworks/FirebaseAnalytics.framework/Headers/FIREventNames.h delete mode 100755 Pods/FirebaseAnalytics/Frameworks/FirebaseAnalytics.framework/Headers/FIRParameterNames.h delete mode 100755 Pods/FirebaseAnalytics/Frameworks/FirebaseAnalytics.framework/Headers/FIRUserPropertyNames.h delete mode 100755 Pods/FirebaseAnalytics/Frameworks/FirebaseAnalytics.framework/Headers/FirebaseAnalytics.h delete mode 100755 Pods/FirebaseAnalytics/Frameworks/FirebaseAnalytics.framework/Modules/module.modulemap delete mode 100644 Pods/FirebaseCore/LICENSE delete mode 100644 Pods/FirebaseCore/README.md delete mode 100644 Pods/FirebaseDatabase/LICENSE delete mode 100644 Pods/FirebaseDatabase/README.md delete mode 100755 Pods/GoogleAppMeasurement/Frameworks/GoogleAppMeasurement.framework/GoogleAppMeasurement delete mode 100755 Pods/GoogleAppMeasurement/Frameworks/GoogleAppMeasurement.framework/Modules/module.modulemap delete mode 100644 Pods/GoogleUtilities/GoogleUtilities/AppDelegateSwizzler/GULAppDelegateSwizzler.m delete mode 100644 Pods/GoogleUtilities/GoogleUtilities/AppDelegateSwizzler/Internal/GULAppDelegateSwizzler_Private.h delete mode 100644 Pods/GoogleUtilities/GoogleUtilities/Common/GULLoggerCodes.h delete mode 100644 Pods/GoogleUtilities/GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.m delete mode 100644 Pods/GoogleUtilities/GoogleUtilities/Logger/GULLogger.m delete mode 100644 Pods/GoogleUtilities/GoogleUtilities/MethodSwizzler/GULSwizzler.m delete mode 100644 Pods/GoogleUtilities/GoogleUtilities/NSData+zlib/GULNSData+zlib.m delete mode 100644 Pods/GoogleUtilities/GoogleUtilities/Network/GULMutableDictionary.m delete mode 100644 Pods/GoogleUtilities/GoogleUtilities/Network/GULNetwork.m delete mode 100644 Pods/GoogleUtilities/GoogleUtilities/Network/GULNetworkConstants.m delete mode 100644 Pods/GoogleUtilities/GoogleUtilities/Network/GULNetworkURLSession.m delete mode 100644 Pods/GoogleUtilities/GoogleUtilities/Reachability/GULReachabilityChecker+Internal.h delete mode 100644 Pods/GoogleUtilities/GoogleUtilities/Reachability/GULReachabilityChecker.m delete mode 100644 Pods/GoogleUtilities/GoogleUtilities/UserDefaults/GULUserDefaults.m delete mode 100644 Pods/GoogleUtilities/README.md delete mode 120000 Pods/Headers/Private/Firebase/Firebase.h delete mode 120000 Pods/Headers/Public/Firebase/Firebase.h delete mode 100644 Pods/Manifest.lock delete mode 100644 Pods/Pods.xcodeproj/project.pbxproj delete mode 100644 Pods/Target Support Files/FirebaseCore/FirebaseCore-Info.plist delete mode 100644 Pods/Target Support Files/FirebaseCore/FirebaseCore-dummy.m delete mode 100644 Pods/Target Support Files/FirebaseCore/FirebaseCore-umbrella.h delete mode 100644 Pods/Target Support Files/FirebaseCore/FirebaseCore.modulemap delete mode 100644 Pods/Target Support Files/FirebaseDatabase/FirebaseDatabase-Info.plist delete mode 100644 Pods/Target Support Files/FirebaseDatabase/FirebaseDatabase-dummy.m delete mode 100644 Pods/Target Support Files/FirebaseDatabase/FirebaseDatabase-umbrella.h delete mode 100644 Pods/Target Support Files/FirebaseDatabase/FirebaseDatabase.modulemap delete mode 100644 Pods/Target Support Files/GoogleUtilities/GoogleUtilities-Info.plist delete mode 100644 Pods/Target Support Files/GoogleUtilities/GoogleUtilities-dummy.m delete mode 100644 Pods/Target Support Files/GoogleUtilities/GoogleUtilities-umbrella.h delete mode 100644 Pods/Target Support Files/GoogleUtilities/GoogleUtilities.modulemap delete mode 100644 Pods/Target Support Files/Pods-Otofuda-iOS/Pods-Otofuda-iOS-Info.plist delete mode 100644 Pods/Target Support Files/Pods-Otofuda-iOS/Pods-Otofuda-iOS-acknowledgements.markdown delete mode 100644 Pods/Target Support Files/Pods-Otofuda-iOS/Pods-Otofuda-iOS-acknowledgements.plist delete mode 100644 Pods/Target Support Files/Pods-Otofuda-iOS/Pods-Otofuda-iOS-dummy.m delete mode 100755 Pods/Target Support Files/Pods-Otofuda-iOS/Pods-Otofuda-iOS-frameworks.sh delete mode 100644 Pods/Target Support Files/Pods-Otofuda-iOS/Pods-Otofuda-iOS-umbrella.h delete mode 100644 Pods/Target Support Files/Pods-Otofuda-iOS/Pods-Otofuda-iOS.debug.xcconfig delete mode 100644 Pods/Target Support Files/Pods-Otofuda-iOS/Pods-Otofuda-iOS.modulemap delete mode 100644 Pods/Target Support Files/Pods-Otofuda-iOS/Pods-Otofuda-iOS.release.xcconfig delete mode 100644 Pods/Target Support Files/leveldb-library/leveldb-library-Info.plist delete mode 100644 Pods/Target Support Files/leveldb-library/leveldb-library-dummy.m delete mode 100644 Pods/Target Support Files/leveldb-library/leveldb-library-prefix.pch delete mode 100644 Pods/Target Support Files/leveldb-library/leveldb-library-umbrella.h delete mode 100644 Pods/Target Support Files/leveldb-library/leveldb-library.modulemap delete mode 100644 Pods/Target Support Files/nanopb/nanopb-Info.plist delete mode 100644 Pods/Target Support Files/nanopb/nanopb-dummy.m delete mode 100644 Pods/Target Support Files/nanopb/nanopb-prefix.pch delete mode 100644 Pods/Target Support Files/nanopb/nanopb-umbrella.h delete mode 100644 Pods/Target Support Files/nanopb/nanopb.modulemap delete mode 100644 Pods/leveldb-library/LICENSE delete mode 100644 Pods/leveldb-library/README.md delete mode 100644 Pods/leveldb-library/db/builder.cc delete mode 100644 Pods/leveldb-library/db/builder.h delete mode 100644 Pods/leveldb-library/db/c.cc delete mode 100644 Pods/leveldb-library/db/db_impl.cc delete mode 100644 Pods/leveldb-library/db/db_impl.h delete mode 100644 Pods/leveldb-library/db/db_iter.cc delete mode 100644 Pods/leveldb-library/db/db_iter.h delete mode 100644 Pods/leveldb-library/db/dbformat.cc delete mode 100644 Pods/leveldb-library/db/dbformat.h delete mode 100644 Pods/leveldb-library/db/dumpfile.cc delete mode 100644 Pods/leveldb-library/db/filename.cc delete mode 100644 Pods/leveldb-library/db/filename.h delete mode 100644 Pods/leveldb-library/db/log_format.h delete mode 100644 Pods/leveldb-library/db/log_reader.cc delete mode 100644 Pods/leveldb-library/db/log_reader.h delete mode 100644 Pods/leveldb-library/db/log_writer.cc delete mode 100644 Pods/leveldb-library/db/log_writer.h delete mode 100644 Pods/leveldb-library/db/memtable.cc delete mode 100644 Pods/leveldb-library/db/memtable.h delete mode 100644 Pods/leveldb-library/db/repair.cc delete mode 100644 Pods/leveldb-library/db/skiplist.h delete mode 100644 Pods/leveldb-library/db/snapshot.h delete mode 100644 Pods/leveldb-library/db/table_cache.cc delete mode 100644 Pods/leveldb-library/db/table_cache.h delete mode 100644 Pods/leveldb-library/db/version_edit.cc delete mode 100644 Pods/leveldb-library/db/version_edit.h delete mode 100644 Pods/leveldb-library/db/version_set.cc delete mode 100644 Pods/leveldb-library/db/version_set.h delete mode 100644 Pods/leveldb-library/db/write_batch.cc delete mode 100644 Pods/leveldb-library/db/write_batch_internal.h delete mode 100644 Pods/leveldb-library/include/leveldb/c.h delete mode 100644 Pods/leveldb-library/include/leveldb/cache.h delete mode 100644 Pods/leveldb-library/include/leveldb/comparator.h delete mode 100644 Pods/leveldb-library/include/leveldb/db.h delete mode 100644 Pods/leveldb-library/include/leveldb/dumpfile.h delete mode 100644 Pods/leveldb-library/include/leveldb/env.h delete mode 100644 Pods/leveldb-library/include/leveldb/filter_policy.h delete mode 100644 Pods/leveldb-library/include/leveldb/iterator.h delete mode 100644 Pods/leveldb-library/include/leveldb/options.h delete mode 100644 Pods/leveldb-library/include/leveldb/slice.h delete mode 100644 Pods/leveldb-library/include/leveldb/status.h delete mode 100644 Pods/leveldb-library/include/leveldb/table.h delete mode 100644 Pods/leveldb-library/include/leveldb/table_builder.h delete mode 100644 Pods/leveldb-library/include/leveldb/write_batch.h delete mode 100644 Pods/leveldb-library/port/port.h delete mode 100644 Pods/leveldb-library/port/port_example.h delete mode 100644 Pods/leveldb-library/port/thread_annotations.h delete mode 100644 Pods/leveldb-library/table/block.cc delete mode 100644 Pods/leveldb-library/table/block.h delete mode 100644 Pods/leveldb-library/table/block_builder.cc delete mode 100644 Pods/leveldb-library/table/block_builder.h delete mode 100644 Pods/leveldb-library/table/filter_block.cc delete mode 100644 Pods/leveldb-library/table/filter_block.h delete mode 100644 Pods/leveldb-library/table/format.cc delete mode 100644 Pods/leveldb-library/table/format.h delete mode 100644 Pods/leveldb-library/table/iterator.cc delete mode 100644 Pods/leveldb-library/table/iterator_wrapper.h delete mode 100644 Pods/leveldb-library/table/merger.cc delete mode 100644 Pods/leveldb-library/table/merger.h delete mode 100644 Pods/leveldb-library/table/table.cc delete mode 100644 Pods/leveldb-library/table/table_builder.cc delete mode 100644 Pods/leveldb-library/table/two_level_iterator.cc delete mode 100644 Pods/leveldb-library/table/two_level_iterator.h delete mode 100644 Pods/leveldb-library/util/arena.cc delete mode 100644 Pods/leveldb-library/util/arena.h delete mode 100644 Pods/leveldb-library/util/bloom.cc delete mode 100644 Pods/leveldb-library/util/cache.cc delete mode 100644 Pods/leveldb-library/util/coding.cc delete mode 100644 Pods/leveldb-library/util/coding.h delete mode 100644 Pods/leveldb-library/util/comparator.cc delete mode 100644 Pods/leveldb-library/util/crc32c.cc delete mode 100644 Pods/leveldb-library/util/crc32c.h delete mode 100644 Pods/leveldb-library/util/env.cc delete mode 100644 Pods/leveldb-library/util/env_posix.cc delete mode 100644 Pods/leveldb-library/util/env_posix_test_helper.h delete mode 100644 Pods/leveldb-library/util/filter_policy.cc delete mode 100644 Pods/leveldb-library/util/hash.cc delete mode 100644 Pods/leveldb-library/util/hash.h delete mode 100644 Pods/leveldb-library/util/histogram.cc delete mode 100644 Pods/leveldb-library/util/histogram.h delete mode 100644 Pods/leveldb-library/util/logging.cc delete mode 100644 Pods/leveldb-library/util/logging.h delete mode 100644 Pods/leveldb-library/util/mutexlock.h delete mode 100644 Pods/leveldb-library/util/options.cc delete mode 100644 Pods/leveldb-library/util/posix_logger.h delete mode 100644 Pods/leveldb-library/util/random.h delete mode 100644 Pods/leveldb-library/util/status.cc delete mode 100644 Pods/leveldb-library/util/testharness.cc delete mode 100644 Pods/leveldb-library/util/testharness.h delete mode 100644 Pods/leveldb-library/util/testutil.h delete mode 100644 Pods/nanopb/LICENSE.txt delete mode 100644 Pods/nanopb/README.md delete mode 100644 Pods/nanopb/pb.h delete mode 100644 Pods/nanopb/pb_common.c delete mode 100644 Pods/nanopb/pb_common.h delete mode 100644 Pods/nanopb/pb_decode.c delete mode 100644 Pods/nanopb/pb_decode.h delete mode 100644 Pods/nanopb/pb_encode.c delete mode 100644 Pods/nanopb/pb_encode.h diff --git a/Otofuda-iOS.xcodeproj/project.pbxproj b/Otofuda-iOS.xcodeproj/project.pbxproj index 43c1760..2d4e1c9 100644 --- a/Otofuda-iOS.xcodeproj/project.pbxproj +++ b/Otofuda-iOS.xcodeproj/project.pbxproj @@ -3,11 +3,10 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ - 01B1B9FF299F1F7AFCE10DB1 /* Pods_Otofuda_iOSUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A8CDC4134202E14425297323 /* Pods_Otofuda_iOSUITests.framework */; }; 589460D522852E9500319032 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 589460D422852E9500319032 /* AppDelegate.swift */; }; 589460D722852E9500319032 /* TopVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 589460D622852E9500319032 /* TopVC.swift */; }; 589460DC22852E9500319032 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 589460DB22852E9500319032 /* Assets.xcassets */; }; @@ -15,8 +14,6 @@ 589460F122855AAE00319032 /* CreateGroupVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 589460F022855AAE00319032 /* CreateGroupVC.swift */; }; 589460F522855D9F00319032 /* SearchGroupVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 589460F422855D9F00319032 /* SearchGroupVC.swift */; }; 589460F722867A4800319032 /* FirebaseManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 589460F622867A4800319032 /* FirebaseManager.swift */; }; - 87B6FE4F76959AE731B4A6B8 /* Pods_Otofuda_iOSTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA582A8B6C1AC60CA05C8891 /* Pods_Otofuda_iOSTests.framework */; }; - ABB34FFD4B8DD80A5EAA9C01 /* Pods_Otofuda_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F973746A2B06067E4EA3ABB /* Pods_Otofuda_iOS.framework */; }; F308114D233325C6009E7726 /* Splash.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F308114C233325C6009E7726 /* Splash.storyboard */; }; F308115623335E48009E7726 /* MenuVC+Ex.swift in Sources */ = {isa = PBXBuildFile; fileRef = F308115523335E48009E7726 /* MenuVC+Ex.swift */; }; F30811692335C937009E7726 /* Date+Ex.swift in Sources */ = {isa = PBXBuildFile; fileRef = F30811682335C937009E7726 /* Date+Ex.swift */; }; @@ -35,6 +32,15 @@ F3225F092330AFF300D9BD79 /* iTunesPicker.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F3225F082330AFF200D9BD79 /* iTunesPicker.storyboard */; }; F3225F0C2330B01D00D9BD79 /* SearchResultCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3225F0A2330B01D00D9BD79 /* SearchResultCell.swift */; }; F3225F0D2330B01D00D9BD79 /* SearchResultCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F3225F0B2330B01D00D9BD79 /* SearchResultCell.xib */; }; + F323810225DEB23300892DAB /* Toast in Frameworks */ = {isa = PBXBuildFile; productRef = F323810125DEB23300892DAB /* Toast */; }; + F32B062A25DEBDC700AA30D8 /* FirebaseDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = F32B062925DEBDC700AA30D8 /* FirebaseDatabase */; }; + F32B063C25DF360700AA30D8 /* Alamofire in Frameworks */ = {isa = PBXBuildFile; productRef = F32B063B25DF360700AA30D8 /* Alamofire */; }; + F32B064B25DF365400AA30D8 /* AlamofireImage in Frameworks */ = {isa = PBXBuildFile; productRef = F32B064A25DF365400AA30D8 /* AlamofireImage */; }; + F32B066625DF378800AA30D8 /* ObjectMapper in Frameworks */ = {isa = PBXBuildFile; productRef = F32B066525DF378800AA30D8 /* ObjectMapper */; }; + F32B066C25DF37D400AA30D8 /* PromiseKit in Frameworks */ = {isa = PBXBuildFile; productRef = F32B066B25DF37D400AA30D8 /* PromiseKit */; }; + F32B067225DF37FB00AA30D8 /* SwiftyJSON in Frameworks */ = {isa = PBXBuildFile; productRef = F32B067125DF37FB00AA30D8 /* SwiftyJSON */; }; + F32B067825DF382D00AA30D8 /* RxSwift in Frameworks */ = {isa = PBXBuildFile; productRef = F32B067725DF382D00AA30D8 /* RxSwift */; }; + F32B067A25DF382D00AA30D8 /* RxCocoa in Frameworks */ = {isa = PBXBuildFile; productRef = F32B067925DF382D00AA30D8 /* RxCocoa */; }; F32B91A923320BF80031B062 /* tap_fuda.caf in Resources */ = {isa = PBXBuildFile; fileRef = F32B91A823320BF80031B062 /* tap_fuda.caf */; }; F32B91AC233231FD0031B062 /* ResultVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = F32B91AB233231FD0031B062 /* ResultVC.swift */; }; F32B91AE233232660031B062 /* ResultVC+UICollectionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F32B91AD233232660031B062 /* ResultVC+UICollectionDelegate.swift */; }; @@ -72,6 +78,7 @@ F3C8E6A42361E73700864279 /* RequestEntity.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3C8E6A32361E73700864279 /* RequestEntity.swift */; }; F3C8E6AB2361F0A400864279 /* PresetResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3C8E6AA2361F0A400864279 /* PresetResponse.swift */; }; F3C8E6AD2362B41D00864279 /* Preset.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3C8E6AC2362B41D00864279 /* Preset.swift */; }; + F3D03DFC25DF7F11003C4A39 /* CardCountMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3D03DFB25DF7F11003C4A39 /* CardCountMode.swift */; }; F3E25FD0232F9E5200134769 /* PlayVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3E25FCF232F9E5200134769 /* PlayVC.swift */; }; F3E25FD2232F9F5700134769 /* PlayVC+UICollectionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3E25FD1232F9F5700134769 /* PlayVC+UICollectionDelegate.swift */; }; F3E25FD4232F9F6600134769 /* PlayVC+UICollectionDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3E25FD3232F9F6600134769 /* PlayVC+UICollectionDataSource.swift */; }; @@ -120,13 +127,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 03555C36D7B3F6240EE0182C /* Pods-Otofuda-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Otofuda-iOS.release.xcconfig"; path = "Target Support Files/Pods-Otofuda-iOS/Pods-Otofuda-iOS.release.xcconfig"; sourceTree = ""; }; - 1950F3B136AEAAC0B3CE5024 /* Pods-Otofuda-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Otofuda-iOS.debug.xcconfig"; path = "Target Support Files/Pods-Otofuda-iOS/Pods-Otofuda-iOS.debug.xcconfig"; sourceTree = ""; }; - 1B7465F4A0D598A5FEFCDE39 /* Pods-Otofuda-iOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Otofuda-iOSTests.release.xcconfig"; path = "Target Support Files/Pods-Otofuda-iOSTests/Pods-Otofuda-iOSTests.release.xcconfig"; sourceTree = ""; }; - 39D95D0D2EA417A05FCACEDE /* Pods-Otofuda-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Otofuda-iOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Otofuda-iOS/Pods-Otofuda-iOS.debug.xcconfig"; sourceTree = ""; }; - 404A2813DE2749B4D0EED308 /* Pods-Otofuda-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Otofuda-iOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-Otofuda-iOS/Pods-Otofuda-iOS.release.xcconfig"; sourceTree = ""; }; - 4F4DB329C6599576A6CF9A87 /* Pods-Otofuda-iOSUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Otofuda-iOSUITests.release.xcconfig"; path = "Target Support Files/Pods-Otofuda-iOSUITests/Pods-Otofuda-iOSUITests.release.xcconfig"; sourceTree = ""; }; - 4F973746A2B06067E4EA3ABB /* Pods_Otofuda_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Otofuda_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 5880D37B22B4928700F40959 /* FirebaseCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = FirebaseCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 589460D122852E9500319032 /* 音札.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "音札.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 589460D422852E9500319032 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -137,10 +137,6 @@ 589460F022855AAE00319032 /* CreateGroupVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateGroupVC.swift; sourceTree = ""; }; 589460F422855D9F00319032 /* SearchGroupVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchGroupVC.swift; sourceTree = ""; }; 589460F622867A4800319032 /* FirebaseManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirebaseManager.swift; sourceTree = ""; }; - 8FA81005ED0399BA25805BAD /* Pods-Otofuda-iOSUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Otofuda-iOSUITests.debug.xcconfig"; path = "Target Support Files/Pods-Otofuda-iOSUITests/Pods-Otofuda-iOSUITests.debug.xcconfig"; sourceTree = ""; }; - A8CDC4134202E14425297323 /* Pods_Otofuda_iOSUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Otofuda_iOSUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D7EFAE83DD86409EF8712C2C /* Pods-Otofuda-iOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Otofuda-iOSTests.debug.xcconfig"; path = "Target Support Files/Pods-Otofuda-iOSTests/Pods-Otofuda-iOSTests.debug.xcconfig"; sourceTree = ""; }; - DA582A8B6C1AC60CA05C8891 /* Pods_Otofuda_iOSTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Otofuda_iOSTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; F308114C233325C6009E7726 /* Splash.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Splash.storyboard; sourceTree = ""; }; F308115223333081009E7726 /* Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Bridging-Header.h"; sourceTree = ""; }; F308115523335E48009E7726 /* MenuVC+Ex.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MenuVC+Ex.swift"; sourceTree = ""; }; @@ -208,6 +204,7 @@ F3C8E6A62361E8F500864279 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = ""; }; F3C8E6AA2361F0A400864279 /* PresetResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PresetResponse.swift; sourceTree = ""; }; F3C8E6AC2362B41D00864279 /* Preset.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Preset.swift; sourceTree = ""; }; + F3D03DFB25DF7F11003C4A39 /* CardCountMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardCountMode.swift; sourceTree = ""; }; F3E25FCF232F9E5200134769 /* PlayVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayVC.swift; sourceTree = ""; }; F3E25FD1232F9F5700134769 /* PlayVC+UICollectionDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PlayVC+UICollectionDelegate.swift"; sourceTree = ""; }; F3E25FD3232F9F6600134769 /* PlayVC+UICollectionDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PlayVC+UICollectionDataSource.swift"; sourceTree = ""; }; @@ -231,7 +228,15 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - ABB34FFD4B8DD80A5EAA9C01 /* Pods_Otofuda_iOS.framework in Frameworks */, + F32B067825DF382D00AA30D8 /* RxSwift in Frameworks */, + F32B066625DF378800AA30D8 /* ObjectMapper in Frameworks */, + F32B067A25DF382D00AA30D8 /* RxCocoa in Frameworks */, + F32B062A25DEBDC700AA30D8 /* FirebaseDatabase in Frameworks */, + F32B067225DF37FB00AA30D8 /* SwiftyJSON in Frameworks */, + F32B063C25DF360700AA30D8 /* Alamofire in Frameworks */, + F32B064B25DF365400AA30D8 /* AlamofireImage in Frameworks */, + F323810225DEB23300892DAB /* Toast in Frameworks */, + F32B066C25DF37D400AA30D8 /* PromiseKit in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -239,7 +244,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 87B6FE4F76959AE731B4A6B8 /* Pods_Otofuda_iOSTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -247,7 +251,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 01B1B9FF299F1F7AFCE10DB1 /* Pods_Otofuda_iOSUITests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -265,9 +268,6 @@ F3225F102330B25400D9BD79 /* PromiseKit.framework */, F3225F0F2330B25400D9BD79 /* SwiftyJSON.framework */, 5880D37B22B4928700F40959 /* FirebaseCore.framework */, - 4F973746A2B06067E4EA3ABB /* Pods_Otofuda_iOS.framework */, - DA582A8B6C1AC60CA05C8891 /* Pods_Otofuda_iOSTests.framework */, - A8CDC4134202E14425297323 /* Pods_Otofuda_iOSUITests.framework */, ); name = Frameworks; sourceTree = ""; @@ -298,7 +298,6 @@ F30811712336535D009E7726 /* Otofuda-iOSTests */, F308117F2336536F009E7726 /* Otofuda-iOSUITests */, 589460D222852E9500319032 /* Products */, - DF4B4C7A60863B6BDBCE3175 /* Pods */, 54E6151815F6B8962458DCA0 /* Frameworks */, ); sourceTree = ""; @@ -360,21 +359,6 @@ path = Top; sourceTree = ""; }; - DF4B4C7A60863B6BDBCE3175 /* Pods */ = { - isa = PBXGroup; - children = ( - 1950F3B136AEAAC0B3CE5024 /* Pods-Otofuda-iOS.debug.xcconfig */, - 03555C36D7B3F6240EE0182C /* Pods-Otofuda-iOS.release.xcconfig */, - 39D95D0D2EA417A05FCACEDE /* Pods-Otofuda-iOS.debug.xcconfig */, - 404A2813DE2749B4D0EED308 /* Pods-Otofuda-iOS.release.xcconfig */, - D7EFAE83DD86409EF8712C2C /* Pods-Otofuda-iOSTests.debug.xcconfig */, - 1B7465F4A0D598A5FEFCDE39 /* Pods-Otofuda-iOSTests.release.xcconfig */, - 8FA81005ED0399BA25805BAD /* Pods-Otofuda-iOSUITests.debug.xcconfig */, - 4F4DB329C6599576A6CF9A87 /* Pods-Otofuda-iOSUITests.release.xcconfig */, - ); - path = Pods; - sourceTree = ""; - }; F30811712336535D009E7726 /* Otofuda-iOSTests */ = { isa = PBXGroup; children = ( @@ -448,6 +432,7 @@ F33D416424ED05E100AD9C41 /* UsingMusicMode.swift */, F33D40F524D6F53F00AD9C41 /* ScoreMode.swift */, F33D40F724D6F57600AD9C41 /* PlaybackMode.swift */, + F3D03DFB25DF7F11003C4A39 /* CardCountMode.swift */, ); path = Models; sourceTree = ""; @@ -563,11 +548,9 @@ isa = PBXNativeTarget; buildConfigurationList = 589460E322852E9500319032 /* Build configuration list for PBXNativeTarget "Otofuda-iOS" */; buildPhases = ( - 72E1837E0B9A4EA64C3F807C /* [CP] Check Pods Manifest.lock */, 589460CD22852E9500319032 /* Sources */, 589460CE22852E9500319032 /* Frameworks */, 589460CF22852E9500319032 /* Resources */, - 787488BFDB152AFD921AF178 /* [CP] Embed Pods Frameworks */, F3225F182330B26200D9BD79 /* CopyFiles */, ); buildRules = ( @@ -575,6 +558,17 @@ dependencies = ( ); name = "Otofuda-iOS"; + packageProductDependencies = ( + F323810125DEB23300892DAB /* Toast */, + F32B062925DEBDC700AA30D8 /* FirebaseDatabase */, + F32B063B25DF360700AA30D8 /* Alamofire */, + F32B064A25DF365400AA30D8 /* AlamofireImage */, + F32B066525DF378800AA30D8 /* ObjectMapper */, + F32B066B25DF37D400AA30D8 /* PromiseKit */, + F32B067125DF37FB00AA30D8 /* SwiftyJSON */, + F32B067725DF382D00AA30D8 /* RxSwift */, + F32B067925DF382D00AA30D8 /* RxCocoa */, + ); productName = "Otofuda-iOS"; productReference = 589460D122852E9500319032 /* 音札.app */; productType = "com.apple.product-type.application"; @@ -583,7 +577,6 @@ isa = PBXNativeTarget; buildConfigurationList = F30811772336535D009E7726 /* Build configuration list for PBXNativeTarget "Otofuda-iOSTests" */; buildPhases = ( - 2B6766A51D96AA3CB5FECEFA /* [CP] Check Pods Manifest.lock */, F308116C2336535C009E7726 /* Sources */, F308116D2336535C009E7726 /* Frameworks */, F308116E2336535C009E7726 /* Resources */, @@ -602,7 +595,6 @@ isa = PBXNativeTarget; buildConfigurationList = F30811852336536F009E7726 /* Build configuration list for PBXNativeTarget "Otofuda-iOSUITests" */; buildPhases = ( - CA4278867C022823BB07E8D3 /* [CP] Check Pods Manifest.lock */, F308117A2336536F009E7726 /* Sources */, F308117B2336536F009E7726 /* Frameworks */, F308117C2336536F009E7726 /* Resources */, @@ -649,6 +641,16 @@ Base, ); mainGroup = 589460C822852E9500319032; + packageReferences = ( + F323810025DEB23300892DAB /* XCRemoteSwiftPackageReference "Toast-Swift" */, + F32B062825DEBDC700AA30D8 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, + F32B063A25DF360600AA30D8 /* XCRemoteSwiftPackageReference "Alamofire" */, + F32B064925DF365400AA30D8 /* XCRemoteSwiftPackageReference "AlamofireImage" */, + F32B066425DF378800AA30D8 /* XCRemoteSwiftPackageReference "ObjectMapper" */, + F32B066A25DF37D400AA30D8 /* XCRemoteSwiftPackageReference "PromiseKit" */, + F32B067025DF37FB00AA30D8 /* XCRemoteSwiftPackageReference "SwiftyJSON" */, + F32B067625DF382D00AA30D8 /* XCRemoteSwiftPackageReference "RxSwift" */, + ); productRefGroup = 589460D222852E9500319032 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -697,92 +699,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 2B6766A51D96AA3CB5FECEFA /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Otofuda-iOSTests-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - 72E1837E0B9A4EA64C3F807C /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Otofuda-iOS-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - 787488BFDB152AFD921AF178 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Otofuda-iOS/Pods-Otofuda-iOS-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Otofuda-iOS/Pods-Otofuda-iOS-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Otofuda-iOS/Pods-Otofuda-iOS-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - CA4278867C022823BB07E8D3 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Otofuda-iOSUITests-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 589460CD22852E9500319032 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -842,6 +758,7 @@ F32B91AC233231FD0031B062 /* ResultVC.swift in Sources */, F35ED17324B744E400727207 /* SceneDelegate.swift in Sources */, F3E25FE8233085DF00134769 /* FudaCollectionCell.swift in Sources */, + F3D03DFC25DF7F11003C4A39 /* CardCountMode.swift in Sources */, F32B91BA2332434B0031B062 /* ResultVC+Ex.swift in Sources */, F3E25FE42330856300134769 /* UITable+Ex.swift in Sources */, F3C21BC0232F809100546D5B /* Room.swift in Sources */, @@ -925,6 +842,7 @@ DEFINES_MODULE = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + EXCLUDED_ARCHS = arm64; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -942,7 +860,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.3; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; - ONLY_ACTIVE_ARCH = YES; + ONLY_ACTIVE_ARCH = NO; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -988,6 +906,7 @@ DEFINES_MODULE = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + EXCLUDED_ARCHS = arm64; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -1009,13 +928,12 @@ }; 589460E422852E9500319032 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1950F3B136AEAAC0B3CE5024 /* Pods-Otofuda-iOS.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1.1.4; - DEVELOPMENT_TEAM = S26A4W8VSZ; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; + CURRENT_PROJECT_VERSION = 1.1.5; + DEVELOPMENT_TEAM = T8YPT438X6; + EXCLUDED_ARCHS = "arm64, arm64e, x86_64"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"", @@ -1035,7 +953,8 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1.4; + MARKETING_VERSION = 1.1.5; + ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "lab-snakamura.org.Otofuda"; PRODUCT_NAME = "音札"; SWIFT_VERSION = 5.0; @@ -1045,13 +964,12 @@ }; 589460E522852E9500319032 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 03555C36D7B3F6240EE0182C /* Pods-Otofuda-iOS.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1.1.4; - DEVELOPMENT_TEAM = S26A4W8VSZ; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; + CURRENT_PROJECT_VERSION = 1.1.5; + DEVELOPMENT_TEAM = T8YPT438X6; + EXCLUDED_ARCHS = "arm64, arm64e, x86_64"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", @@ -1061,7 +979,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1.4; + MARKETING_VERSION = 1.1.5; PRODUCT_BUNDLE_IDENTIFIER = "lab-snakamura.org.Otofuda"; PRODUCT_NAME = "音札"; SWIFT_VERSION = 5.0; @@ -1071,7 +989,6 @@ }; F30811782336535D009E7726 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D7EFAE83DD86409EF8712C2C /* Pods-Otofuda-iOSTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -1082,7 +999,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - ONLY_ACTIVE_ARCH = YES; + ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "Nakamura-labProject.Otofuda-iOSTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -1093,7 +1010,6 @@ }; F30811792336535D009E7726 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1B7465F4A0D598A5FEFCDE39 /* Pods-Otofuda-iOSTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -1114,7 +1030,6 @@ }; F30811862336536F009E7726 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 8FA81005ED0399BA25805BAD /* Pods-Otofuda-iOSUITests.debug.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = T8YPT438X6; @@ -1124,7 +1039,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - ONLY_ACTIVE_ARCH = YES; + ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "Nakamura-labProject.Otofuda-iOSUITests"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -1135,7 +1050,6 @@ }; F30811872336536F009E7726 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4F4DB329C6599576A6CF9A87 /* Pods-Otofuda-iOSUITests.release.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = T8YPT438X6; @@ -1193,6 +1107,121 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + F323810025DEB23300892DAB /* XCRemoteSwiftPackageReference "Toast-Swift" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/scalessec/Toast-Swift"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 5.0.1; + }; + }; + F32B062825DEBDC700AA30D8 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 7.6.0; + }; + }; + F32B063A25DF360600AA30D8 /* XCRemoteSwiftPackageReference "Alamofire" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/Alamofire/Alamofire.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 5.4.1; + }; + }; + F32B064925DF365400AA30D8 /* XCRemoteSwiftPackageReference "AlamofireImage" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/Alamofire/AlamofireImage.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 4.1.0; + }; + }; + F32B066425DF378800AA30D8 /* XCRemoteSwiftPackageReference "ObjectMapper" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/tristanhimmelman/ObjectMapper.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 4.2.0; + }; + }; + F32B066A25DF37D400AA30D8 /* XCRemoteSwiftPackageReference "PromiseKit" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/mxcl/PromiseKit"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 6.13.3; + }; + }; + F32B067025DF37FB00AA30D8 /* XCRemoteSwiftPackageReference "SwiftyJSON" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/SwiftyJSON/SwiftyJSON.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 5.0.0; + }; + }; + F32B067625DF382D00AA30D8 /* XCRemoteSwiftPackageReference "RxSwift" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/ReactiveX/RxSwift.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 6.1.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + F323810125DEB23300892DAB /* Toast */ = { + isa = XCSwiftPackageProductDependency; + package = F323810025DEB23300892DAB /* XCRemoteSwiftPackageReference "Toast-Swift" */; + productName = Toast; + }; + F32B062925DEBDC700AA30D8 /* FirebaseDatabase */ = { + isa = XCSwiftPackageProductDependency; + package = F32B062825DEBDC700AA30D8 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseDatabase; + }; + F32B063B25DF360700AA30D8 /* Alamofire */ = { + isa = XCSwiftPackageProductDependency; + package = F32B063A25DF360600AA30D8 /* XCRemoteSwiftPackageReference "Alamofire" */; + productName = Alamofire; + }; + F32B064A25DF365400AA30D8 /* AlamofireImage */ = { + isa = XCSwiftPackageProductDependency; + package = F32B064925DF365400AA30D8 /* XCRemoteSwiftPackageReference "AlamofireImage" */; + productName = AlamofireImage; + }; + F32B066525DF378800AA30D8 /* ObjectMapper */ = { + isa = XCSwiftPackageProductDependency; + package = F32B066425DF378800AA30D8 /* XCRemoteSwiftPackageReference "ObjectMapper" */; + productName = ObjectMapper; + }; + F32B066B25DF37D400AA30D8 /* PromiseKit */ = { + isa = XCSwiftPackageProductDependency; + package = F32B066A25DF37D400AA30D8 /* XCRemoteSwiftPackageReference "PromiseKit" */; + productName = PromiseKit; + }; + F32B067125DF37FB00AA30D8 /* SwiftyJSON */ = { + isa = XCSwiftPackageProductDependency; + package = F32B067025DF37FB00AA30D8 /* XCRemoteSwiftPackageReference "SwiftyJSON" */; + productName = SwiftyJSON; + }; + F32B067725DF382D00AA30D8 /* RxSwift */ = { + isa = XCSwiftPackageProductDependency; + package = F32B067625DF382D00AA30D8 /* XCRemoteSwiftPackageReference "RxSwift" */; + productName = RxSwift; + }; + F32B067925DF382D00AA30D8 /* RxCocoa */ = { + isa = XCSwiftPackageProductDependency; + package = F32B067625DF382D00AA30D8 /* XCRemoteSwiftPackageReference "RxSwift" */; + productName = RxCocoa; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 589460C922852E9500319032 /* Project object */; } diff --git a/Otofuda-iOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Otofuda-iOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata index c2cf5a9..919434a 100644 --- a/Otofuda-iOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/Otofuda-iOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/Otofuda-iOS.xcodeproj/xcshareddata/xcschemes/Otofuda-iOS.xcscheme b/Otofuda-iOS.xcodeproj/xcshareddata/xcschemes/Otofuda-iOS.xcscheme new file mode 100644 index 0000000..f987839 --- /dev/null +++ b/Otofuda-iOS.xcodeproj/xcshareddata/xcschemes/Otofuda-iOS.xcscheme @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Otofuda-iOS.xcworkspace/contents.xcworkspacedata b/Otofuda-iOS.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index e69f833..0000000 --- a/Otofuda-iOS.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/Otofuda-iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Otofuda-iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/Otofuda-iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/Otofuda-iOS/src/Constants.swift b/Otofuda-iOS/src/Constants.swift index 387a9e1..14ac0b9 100644 --- a/Otofuda-iOS/src/Constants.swift +++ b/Otofuda-iOS/src/Constants.swift @@ -9,8 +9,9 @@ import Foundation import UIKit -var CARD_CLM_COUNT = 4 -var CARD_ROW_COUNT = 4 +var CARD_CLM_COUNT = 2 +var CARD_ROW_COUNT = 2 +var CARD_COUNT_STRING = "2x2" var CARD_MAX_COUNT = CARD_CLM_COUNT * CARD_ROW_COUNT let CARD_LAYOUT_MARGIN: CGFloat = 5.0 diff --git a/Otofuda-iOS/src/Utility/Models/CardCountMode.swift b/Otofuda-iOS/src/Utility/Models/CardCountMode.swift new file mode 100644 index 0000000..12afd5e --- /dev/null +++ b/Otofuda-iOS/src/Utility/Models/CardCountMode.swift @@ -0,0 +1,8 @@ + +import Foundation + +enum CardCountMode: String { + case twoAndTow = "2x2" + case threeAndThree = "3x3" + case fourAndFour = "4x4" +} diff --git a/Otofuda-iOS/src/Utility/Models/Room.swift b/Otofuda-iOS/src/Utility/Models/Room.swift index 29ac98d..5118b0d 100644 --- a/Otofuda-iOS/src/Utility/Models/Room.swift +++ b/Otofuda-iOS/src/Utility/Models/Room.swift @@ -16,7 +16,8 @@ struct Room { var mode: Dictionary = [ "playback": PlaybackMode.intro.rawValue, "score": ScoreMode.normal.rawValue, - "usingMusic": UsingMusicMode.preset.rawValue + "usingMusic": UsingMusicMode.preset.rawValue, + "cardCount": CARD_COUNT_STRING ] init(name: String) { diff --git a/Otofuda-iOS/src/View/Storyboard/Menu.storyboard b/Otofuda-iOS/src/View/Storyboard/Menu.storyboard index 687f598..21247dd 100644 --- a/Otofuda-iOS/src/View/Storyboard/Menu.storyboard +++ b/Otofuda-iOS/src/View/Storyboard/Menu.storyboard @@ -1,9 +1,8 @@ - + - - + @@ -24,8 +23,81 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -90,14 +162,14 @@ - + - + @@ -105,14 +177,14 @@ - + - + @@ -177,14 +249,14 @@ - + - + @@ -246,79 +318,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -