Merge branch 'release/2.0.1' into main

M1zz · Sep 2, 2022 · 2495090 · 2495090
2 parents dd9bc93 + ad1d677
commit 2495090
Show file tree

Hide file tree

Showing 146 changed files with 2,627 additions and 1,778 deletions.
diff --git a/RelaxOn.xcodeproj/project.pbxproj b/RelaxOn.xcodeproj/project.pbxproj
diff --git a/RelaxOn.xcodeproj/xcshareddata/xcschemes/RelaxOn.xcscheme b/RelaxOn.xcodeproj/xcshareddata/xcschemes/RelaxOn.xcscheme
@@ -28,6 +28,16 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C776B16D28B2620000A13052"
+               BuildableName = "RelaxOnUITests.xctest"
+               BlueprintName = "RelaxOnUITests"
+               ReferencedContainer = "container:RelaxOn.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

diff --git a/RelaxOn.xcodeproj/xcshareddata/xcschemes/RelaxOnUITests.xcscheme b/RelaxOn.xcodeproj/xcshareddata/xcschemes/RelaxOnUITests.xcscheme
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1330"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C776B16D28B2620000A13052"
+               BuildableName = "RelaxOnUITests.xctest"
+               BlueprintName = "RelaxOnUITests"
+               ReferencedContainer = "container:RelaxOn.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      notificationPayloadFile = "RelaxOnWatch WatchKit Extension/PushNotificationPayload.apns">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "58DE617E2839C13900F25769"
+            BuildableName = "RelaxOn.app"
+            BlueprintName = "RelaxOn"
+            ReferencedContainer = "container:RelaxOn.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "58DE617E2839C13900F25769"
+            BuildableName = "RelaxOn.app"
+            BlueprintName = "RelaxOn"
+            ReferencedContainer = "container:RelaxOn.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/RelaxOn.xcodeproj/xcshareddata/xcschemes/RelaxOnWatch (Complication).xcscheme b/RelaxOn.xcodeproj/xcshareddata/xcschemes/RelaxOnWatch (Complication).xcscheme
@@ -42,6 +42,16 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C776B16D28B2620000A13052"
+               BuildableName = "RelaxOnUITests.xctest"
+               BlueprintName = "RelaxOnUITests"
+               ReferencedContainer = "container:RelaxOn.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
@@ -55,16 +65,18 @@
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES"
       launchAutomaticallySubstyle = "32">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <RemoteRunnable
+         runnableDebuggingMode = "2"
+         BundleIdentifier = "com.apple.Carousel"
+         RemotePath = "/RelaxOnWatch">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "21B7A64C28A31DE600E90744"
             BuildableName = "RelaxOnWatch.app"
             BlueprintName = "RelaxOnWatch"
             ReferencedContainer = "container:RelaxOn.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </RemoteRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -73,16 +85,27 @@
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES"
       launchAutomaticallySubstyle = "32">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <RemoteRunnable
+         runnableDebuggingMode = "2"
+         BundleIdentifier = "com.apple.Carousel"
+         RemotePath = "/RelaxOnWatch">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "21B7A64C28A31DE600E90744"
+            BuildableName = "RelaxOnWatch.app"
+            BlueprintName = "RelaxOnWatch"
+            ReferencedContainer = "container:RelaxOn.xcodeproj">
+         </BuildableReference>
+      </RemoteRunnable>
+      <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "21B7A64C28A31DE600E90744"
             BuildableName = "RelaxOnWatch.app"
             BlueprintName = "RelaxOnWatch"
             ReferencedContainer = "container:RelaxOn.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/RelaxOn.xcodeproj/xcshareddata/xcschemes/RelaxOnWatch (Notification).xcscheme b/RelaxOn.xcodeproj/xcshareddata/xcschemes/RelaxOnWatch (Notification).xcscheme
@@ -42,6 +42,16 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C776B16D28B2620000A13052"
+               BuildableName = "RelaxOnUITests.xctest"
+               BlueprintName = "RelaxOnUITests"
+               ReferencedContainer = "container:RelaxOn.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
@@ -56,16 +66,18 @@
       allowLocationSimulation = "YES"
       launchAutomaticallySubstyle = "8"
       notificationPayloadFile = "RelaxOnWatch WatchKit Extension/PushNotificationPayload.apns">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <RemoteRunnable
+         runnableDebuggingMode = "2"
+         BundleIdentifier = "com.apple.Carousel"
+         RemotePath = "/RelaxOnWatch">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "21B7A64C28A31DE600E90744"
             BuildableName = "RelaxOnWatch.app"
             BlueprintName = "RelaxOnWatch"
             ReferencedContainer = "container:RelaxOn.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </RemoteRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -75,16 +87,27 @@
       debugDocumentVersioning = "YES"
       launchAutomaticallySubstyle = "8"
       notificationPayloadFile = "RelaxOnWatch WatchKit Extension/PushNotificationPayload.apns">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <RemoteRunnable
+         runnableDebuggingMode = "2"
+         BundleIdentifier = "com.apple.Carousel"
+         RemotePath = "/RelaxOnWatch">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "21B7A64C28A31DE600E90744"
+            BuildableName = "RelaxOnWatch.app"
+            BlueprintName = "RelaxOnWatch"
+            ReferencedContainer = "container:RelaxOn.xcodeproj">
+         </BuildableReference>
+      </RemoteRunnable>
+      <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "21B7A64C28A31DE600E90744"
             BuildableName = "RelaxOnWatch.app"
             BlueprintName = "RelaxOnWatch"
             ReferencedContainer = "container:RelaxOn.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/RelaxOn.xcodeproj/xcshareddata/xcschemes/RelaxOnWatch.xcscheme b/RelaxOn.xcodeproj/xcshareddata/xcschemes/RelaxOnWatch.xcscheme
@@ -42,6 +42,16 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C776B16D28B2620000A13052"
+               BuildableName = "RelaxOnUITests.xctest"
+               BlueprintName = "RelaxOnUITests"
+               ReferencedContainer = "container:RelaxOn.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
@@ -55,33 +65,46 @@
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES"
       notificationPayloadFile = "RelaxOnWatch WatchKit Extension/PushNotificationPayload.apns">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <RemoteRunnable
+         runnableDebuggingMode = "2"
+         BundleIdentifier = "com.apple.Carousel"
+         RemotePath = "/RelaxOnWatch">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "21B7A64C28A31DE600E90744"
             BuildableName = "RelaxOnWatch.app"
             BlueprintName = "RelaxOnWatch"
             ReferencedContainer = "container:RelaxOn.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </RemoteRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <RemoteRunnable
+         runnableDebuggingMode = "2"
+         BundleIdentifier = "com.apple.Carousel"
+         RemotePath = "/RelaxOnWatch">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "21B7A64C28A31DE600E90744"
+            BuildableName = "RelaxOnWatch.app"
+            BlueprintName = "RelaxOnWatch"
+            ReferencedContainer = "container:RelaxOn.xcodeproj">
+         </BuildableReference>
+      </RemoteRunnable>
+      <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "21B7A64C28A31DE600E90744"
             BuildableName = "RelaxOnWatch.app"
             BlueprintName = "RelaxOnWatch"
             ReferencedContainer = "container:RelaxOn.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/RelaxOn/AppDelegate.swift b/RelaxOn/AppDelegate.swift
@@ -0,0 +1,29 @@
+//
+//  AppDelegate.swift
+//  RelaxOn
+//
+//  Created by 이가은 on 2022/08/30.
+//
+
+import UIKit
+
+class AppDelegate: NSObject, UIApplicationDelegate {
+    func application(
+        _ application: UIApplication,
+        didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
+    ) -> Bool {
+        // ...
+        return true
+    }
+    func application(
+        _ application: UIApplication,
+        configurationForConnecting connectingSceneSession: UISceneSession,
+        options: UIScene.ConnectionOptions
+    ) -> UISceneConfiguration {
+        let sceneConfig = UISceneConfiguration(name: nil, sessionRole: connectingSceneSession.role)
+        sceneConfig.delegateClass = SceneDelegate.self
+        return sceneConfig
+    }
+}
+
+
diff --git a/RelaxOn/Assets.xcassets/Sound thumbnail/Base/LongSun.imageset/LongSun.png b/RelaxOn/Assets.xcassets/Sound thumbnail/Base/LongSun.imageset/LongSun.png
diff --git a/RelaxOn/Assets.xcassets/Sound thumbnail/Base/Oxygen.imageset/Oxygen.png b/RelaxOn/Assets.xcassets/Sound thumbnail/Base/Oxygen.imageset/Oxygen.png
diff --git a/RelaxOn/Assets.xcassets/Sound thumbnail/Base/SpaceHigh.imageset/SpaceHigh.png b/RelaxOn/Assets.xcassets/Sound thumbnail/Base/SpaceHigh.imageset/SpaceHigh.png
diff --git a/RelaxOn/Assets.xcassets/Sound thumbnail/Base/SpaceLow.imageset/SpaceLow.png b/RelaxOn/Assets.xcassets/Sound thumbnail/Base/SpaceLow.imageset/SpaceLow.png
diff --git a/RelaxOn/Assets.xcassets/Sound thumbnail/Base/SpaceMid.imageset/SpaceMid.png b/RelaxOn/Assets.xcassets/Sound thumbnail/Base/SpaceMid.imageset/SpaceMid.png
diff --git a/RelaxOn/Assets.xcassets/Sound thumbnail/Melody/Ambient.imageset/Ambient.png b/RelaxOn/Assets.xcassets/Sound thumbnail/Melody/Ambient.imageset/Ambient.png
diff --git a/RelaxOn/Assets.xcassets/Sound thumbnail/Melody/Garden.imageset/Contents.json b/RelaxOn/Assets.xcassets/Sound thumbnail/Melody/Garden.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Garden.png",
+      "filename" : "PeacefulGarden.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

diff --git a/RelaxOn/Assets.xcassets/Sound thumbnail/Melody/Garden.imageset/Garden.png b/RelaxOn/Assets.xcassets/Sound thumbnail/Melody/Garden.imageset/Garden.png
diff --git a/RelaxOn/Assets.xcassets/Sound thumbnail/Melody/Garden.imageset/PeacefulGarden.png b/RelaxOn/Assets.xcassets/Sound thumbnail/Melody/Garden.imageset/PeacefulGarden.png
diff --git a/RelaxOn/Assets.xcassets/Sound thumbnail/Melody/Gymnopedia.imageset/Gymnopedie.png b/RelaxOn/Assets.xcassets/Sound thumbnail/Melody/Gymnopedia.imageset/Gymnopedie.png
diff --git a/.../Melody/Gymnopedia.imageset/Contents.json → .../Melody/Gymnopedie.imageset/Contents.json b/.../Melody/Gymnopedia.imageset/Contents.json → .../Melody/Gymnopedie.imageset/Contents.json
diff --git a/RelaxOn/Assets.xcassets/Sound thumbnail/Melody/Gymnopedie.imageset/Gymnopedie.png b/RelaxOn/Assets.xcassets/Sound thumbnail/Melody/Gymnopedie.imageset/Gymnopedie.png
diff --git a/RelaxOn/Assets.xcassets/Sound thumbnail/Melody/Relaxing.imageset/Relaxing.png b/RelaxOn/Assets.xcassets/Sound thumbnail/Melody/Relaxing.imageset/Relaxing.png
diff --git a/RelaxOn/Assets.xcassets/Sound thumbnail/Melody/Wisdom.imageset/Wisdom.png b/RelaxOn/Assets.xcassets/Sound thumbnail/Melody/Wisdom.imageset/Wisdom.png
diff --git a/RelaxOn/Assets.xcassets/Sound thumbnail/Natural/DryGrass.imageset/DryGrass.png b/RelaxOn/Assets.xcassets/Sound thumbnail/Natural/DryGrass.imageset/DryGrass.png
diff --git a/RelaxOn/Assets.xcassets/Sound thumbnail/Natural/Stream.imageset/Stream.png b/RelaxOn/Assets.xcassets/Sound thumbnail/Natural/Stream.imageset/Stream.png
diff --git a/...On/Assets.xcassets/Sound thumbnail/Natural/SummerField.imageset/SummerField.png b/...On/Assets.xcassets/Sound thumbnail/Natural/SummerField.imageset/SummerField.png
diff --git a/.../Assets.xcassets/Sound thumbnail/Natural/UmbrellaRain.imageset/UmbrellaRain.png b/.../Assets.xcassets/Sound thumbnail/Natural/UmbrellaRain.imageset/UmbrellaRain.png
diff --git a/RelaxOn/Assets.xcassets/Sound thumbnail/Natural/Wave.imageset/Wave.png b/RelaxOn/Assets.xcassets/Sound thumbnail/Natural/Wave.imageset/Wave.png
diff --git a/...ets/Sound thumbnail/Natural/Contents.json → .../Sound thumbnail/WhiteNoise/Contents.json b/...ets/Sound thumbnail/Natural/Contents.json → .../Sound thumbnail/WhiteNoise/Contents.json
diff --git a/...l/Natural/DryGrass.imageset/Contents.json → ...hiteNoise/DryGrass.imageset/Contents.json b/...l/Natural/DryGrass.imageset/Contents.json → ...hiteNoise/DryGrass.imageset/Contents.json
diff --git a/RelaxOn/Assets.xcassets/Sound thumbnail/WhiteNoise/DryGrass.imageset/DryGrass.png b/RelaxOn/Assets.xcassets/Sound thumbnail/WhiteNoise/DryGrass.imageset/DryGrass.png
diff --git a/...ail/Natural/Stream.imageset/Contents.json → .../WhiteNoise/Stream.imageset/Contents.json b/...ail/Natural/Stream.imageset/Contents.json → .../WhiteNoise/Stream.imageset/Contents.json
diff --git a/RelaxOn/Assets.xcassets/Sound thumbnail/WhiteNoise/Stream.imageset/Stream.png b/RelaxOn/Assets.xcassets/Sound thumbnail/WhiteNoise/Stream.imageset/Stream.png
diff --git a/...atural/SummerField.imageset/Contents.json → ...eNoise/SummerField.imageset/Contents.json b/...atural/SummerField.imageset/Contents.json → ...eNoise/SummerField.imageset/Contents.json
diff --git a/...Assets.xcassets/Sound thumbnail/WhiteNoise/SummerField.imageset/SummerField.png b/...Assets.xcassets/Sound thumbnail/WhiteNoise/SummerField.imageset/SummerField.png
diff --git a/...tural/UmbrellaRain.imageset/Contents.json → ...Noise/UmbrellaRain.imageset/Contents.json b/...tural/UmbrellaRain.imageset/Contents.json → ...Noise/UmbrellaRain.imageset/Contents.json
diff --git a/...sets.xcassets/Sound thumbnail/WhiteNoise/UmbrellaRain.imageset/UmbrellaRain.png b/...sets.xcassets/Sound thumbnail/WhiteNoise/UmbrellaRain.imageset/UmbrellaRain.png
diff --git a/...bnail/Natural/Wave.imageset/Contents.json → ...il/WhiteNoise/Wave.imageset/Contents.json b/...bnail/Natural/Wave.imageset/Contents.json → ...il/WhiteNoise/Wave.imageset/Contents.json
diff --git a/RelaxOn/Assets.xcassets/Sound thumbnail/WhiteNoise/Wave.imageset/Wave.png b/RelaxOn/Assets.xcassets/Sound thumbnail/WhiteNoise/Wave.imageset/Wave.png
diff --git a/RelaxOn/Assets.xcassets/Widget/Contents.json b/RelaxOn/Assets.xcassets/Widget/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/RelaxOn/Assets.xcassets/Widget/WidgetBackground.imageset/Contents.json b/RelaxOn/Assets.xcassets/Widget/WidgetBackground.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "WidgetBackground.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/RelaxOn/Assets.xcassets/Widget/WidgetBackground.imageset/WidgetBackground.png b/RelaxOn/Assets.xcassets/Widget/WidgetBackground.imageset/WidgetBackground.png
diff --git a/RelaxOn/Assets.xcassets/Widget/WidgetLogo.imageset/Contents.json b/RelaxOn/Assets.xcassets/Widget/WidgetLogo.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "WidgetLogo.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/RelaxOn/Assets.xcassets/Widget/WidgetLogo.imageset/WidgetLogo.png b/RelaxOn/Assets.xcassets/Widget/WidgetLogo.imageset/WidgetLogo.png