Skip to content

Commit

Permalink
Merge branch 'develop/renew' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
M1zz committed Sep 4, 2023
2 parents 9d8fd3b + 9f5c35e commit ade6553
Show file tree
Hide file tree
Showing 471 changed files with 5,158 additions and 7,552 deletions.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.
11 changes: 0 additions & 11 deletions LockScreenWidgetExtension/Info.plist

This file was deleted.

124 changes: 0 additions & 124 deletions LockScreenWidgetExtension/LockScreenWidgetExtension.swift

This file was deleted.

42 changes: 42 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<<<<<<< HEAD
<h1 align="center">
<img style="height:50px; vertical-align:middle; border-radius:15px;" src="https://is2-ssl.mzstatic.com/image/thumb/Purple122/v4/32/48/ad/3248ad23-c180-5966-f7a0-a595121c3901/AppIcon-1x_U007emarketing-0-10-0-85-220.png/3000x0w.webp"/> LullabyRecipe iOS
</h1>
Expand Down Expand Up @@ -77,3 +78,44 @@ LullabyRecipe

# Release Note
[Release Note](/release-note.md)
=======
# RelaxOn
내 손으로 만드는 ASMR

<div align="center">
<img width=300 src="https://github.com/M1zz/RelaxOn/assets/108422901/15b96ad4-7a3a-41b2-a54f-b15b8a6fee28">
<img width=300 src="https://github.com/M1zz/RelaxOn/assets/108422901/68b4af29-eb06-4739-b848-dba907a3c20f">
</div>
<div align="center">
<img width=300 src="https://github.com/M1zz/RelaxOn/assets/108422901/9f3fe328-fbd6-4a24-88ee-f445292707c7">
<img width=300 src="https://github.com/M1zz/RelaxOn/assets/108422901/c851de4c-5594-425a-87cc-94d39d7870b3">
<img width=300 src="https://github.com/M1zz/RelaxOn/assets/108422901/bb065671-745d-4d6a-a749-290e86cfe049">
</div>

## AppStore Link 🔗
[‎Relax On - 수면 백색 소음 & 자연의 소리](https://apps.apple.com/kr/app/relax-on-수면-백색-소음-자연의-소리/id1626715109)

## Project Description 👩‍🏫
“더 이상 수면에 도움되는 소리를 찾지 말고 Relax On과 함께 만들어보세요.“

몇 번의 탭만으로 재생 목록에서 원하는 소리를 선택하고,
타이머를 설정하여 소리가 서서히 사라지도록 하여 깊은 잠에 빠져들 수 있으며,
상쾌한 기분으로 하루를 시작할 준비를 할 수 있습니다.

## Duration 🗓️
2023.03 ~

## Member 👨‍💻
ProjectManager - 2명
Design - 1명
iOS Mento - 1명
iOS - 2명

## Architecture 🏰
MVVM

## Tech Stack 🔨
- SwiftUI
- Combine
- AVFoundation
>>>>>>> renew
Loading

0 comments on commit ade6553

Please sign in to comment.