Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
bddd76e
[Add] icon ๋ณ€๊ฒฝ
GeonHyeongKim Mar 15, 2024
b864a05
[Feat] ์˜ˆ์‚ฐ์ด ์„ค์ •๋˜์–ด ์žˆ์„๋–„, ๋ฌธ๊ตฌ ๋ณ€๊ฒฝ
GeonHyeongKim Mar 15, 2024
96a07b9
[Style] Yellow 100 ์ƒ‰์ƒ ๋ณ€๊ฒฝ
GeonHyeongKim Mar 15, 2024
11dc23d
[Style] ๋ถˆํ•„์š”ํ•œ ์ฝ”๋“œ ์ œ๊ฑฐ
GeonHyeongKim Mar 15, 2024
03696ab
[Style] ๋ถˆํ•„์š”ํ•œ ์ฝ”๋“œ ์ œ๊ฑฐ
GeonHyeongKim Mar 15, 2024
567466d
[Feat] ํ˜„์žฌ ์ง€์ถœ, ์˜ˆ์‚ฐ UI
GeonHyeongKim Mar 15, 2024
f381f6e
[Feat] ์˜ˆ์‚ฐ ์„ค์ • UI
GeonHyeongKim Mar 15, 2024
3320d5c
[Feat] ํ˜„์žฌ ์ง€์ถœ๊ณผ ์˜ˆ์‚ฐ Label์˜ ๊ตฌ๋ถ„์„  UI ๋ณ€๊ฒฝ
GeonHyeongKim Mar 15, 2024
b2ec46c
[Style] ๊ตฌ๋ถ„์„  ์œ„์น˜ ์กฐ์ ˆ
GeonHyeongKim Mar 15, 2024
2952513
[Feat] ์ ์ • ์ง€์ถœ์˜ ๋‹ฌ์„ฑ ์—ฌ๋ถ€์— ๋”ฐ๋ฅธ Case ์ฒ˜๋ฆฌ
GeonHyeongKim Mar 15, 2024
19efcda
[Feat] ์˜ˆ์‚ฐ ์„ค์ •์— ๋”ฐ๋ฅธ ํ†ต๊ณ„ UI
GeonHyeongKim Mar 15, 2024
3378f90
[Add] StarGray24 Icon ์ถ”๊ฐ€
GeonHyeongKim Mar 25, 2024
9077007
[Feat] ๋งŒ์กฑ๋„ Empty case
GeonHyeongKim Mar 25, 2024
ac5c0e1
[Rename] ํŒŒ์ผ ์ด๋ฆ„ ๋ณ€๊ฒฝ
GeonHyeongKim Apr 2, 2024
89e839e
[Feat] ์˜ˆ์‚ฐ API ํ†ต์‹ 
GeonHyeongKim Apr 2, 2024
facacd0
[Feat] ์˜ˆ์‚ฐ์„ ์ฝค๋งˆ๋ฅผ ์ฐ์–ด ํ‘œ์‹œ
GeonHyeongKim Apr 2, 2024
c8ac382
[Feat] ์˜ˆ์ƒ ์ˆ˜์ž…์ด ์•„๋‹Œ, ์˜ˆ์‚ฐ์„ UI ์— ํ‘œ์‹œ
GeonHyeongKim Apr 2, 2024
f079e23
[Feat] ํ†ต๊ณ„์—์„œ ์›”๋ณ„ ํ˜„์žฌ ์ง€์ถœ API ์—ฐ๊ฒฐ
GeonHyeongKim Apr 2, 2024
56f6213
[Style] ๋ถˆํ•„์š”ํ•œ ํ…Œ์ŠคํŠธ ์ฝ”๋“œ ์ œ๊ฑฐ
GeonHyeongKim Apr 2, 2024
9eee421
[Fix] ํƒ€์ด๋จธ๊ฐ€ ๋Œ์•„๊ฐ€์ง€ ์•Š๋Š” ๋ฌธ์ œ ํ•ด๊ฒฐ
GeonHyeongKim Apr 2, 2024
249a0ac
[Feat] ์˜ˆ์‚ฐ ๊ทธ๋ž˜ํ”„ ํ‘œํ˜„
GeonHyeongKim Apr 3, 2024
fdd8089
[Feat] 11 % ๋ณด๋‹ค ์ž‘์„ ๊ฒฝ์šฐ percent label์„ ์˜ค๋ฅธ์ชฝ์— ๋ฐฐ์น˜
GeonHyeongKim Apr 3, 2024
4400459
[Feat] ์ ์ • ์ง€์ถœ UI
GeonHyeongKim Apr 7, 2024
c29a595
[Feat] ์ ์ • ์ง€์ถœ ์ ์„  ์œ„์น˜
GeonHyeongKim Apr 7, 2024
ce35c15
[Feat] ์›”์„ ๋ณ€๊ฒฝํ–ˆ์„ ๊ฒฝ์šฐ, ์ ์ • ์ง€์ถœ ๋ผ๋ฒจ์€ ๋งˆ์ง€๋ง‰ ์ผ์— ์œ„์น˜์‹œํ‚ค๊ธฐ
GeonHyeongKim Apr 7, 2024
4210e4f
[Fix] ์˜ค๋Š˜์— ํ•ด๋‹นํ•˜๋Š” ๋‹ฌ์— ๋Œ์•„์™”์„๋•Œ, ์ ์ • ์ง€์ถœ ๋ผ๋ฒจ์ด ๋‹ค๋ฅธ ๋ฌธ์ œ ํ•ด๊ฒฐ
GeonHyeongKim Apr 7, 2024
e371138
[Feat] ๋‚ ์งœ์— ๋”ฐ๋ฅธ Dot Line ๋ณ€๊ฒฝ
GeonHyeongKim Apr 8, 2024
9fdbc2a
[Feat] Percent์™€ ์ ์ • ์ง€์ถœ ๋ผ๋ฒจ์„ ๋น„๊ตํ•˜์—ฌ case๋ณ„ UI ํ‘œ์‹œ
GeonHyeongKim Apr 8, 2024
e646702
[Style] ํ…Œ์ŠคํŠธ๋ฅผ ์œ„ํ•œ ์ฝ”๋“œ ์ฃผ์„
GeonHyeongKim Apr 8, 2024
83cbe53
[Feat] Percent label ์ƒ‰์ƒ์ด ์•ˆ๋ณด์ด๋Š” case ๋””์ž์ธ ์ˆ˜์ •
GeonHyeongKim Apr 8, 2024
3e4da1f
[Add] icon Popup 01 ์ถ”๊ฐ€
GeonHyeongKim Apr 9, 2024
58d2891
[Feat] Popup VC
GeonHyeongKim Apr 9, 2024
1fd36f7
[Rename] ํŒŒ์ผ ์ด๋ฆ„ ๋ณ€๊ฒฝ
GeonHyeongKim Apr 9, 2024
38f80cb
[Add] Popup icon 2~4๋ฒˆ์งธ ์ถ”๊ฐ€
GeonHyeongKim Apr 9, 2024
c9158e9
[Feat] ์˜จ๋ณด๋”ฉ ๊ธฐ๋Šฅ
GeonHyeongKim Apr 10, 2024
702399c
Merge branch 'dev' into feat/158-statistics/budget
GeonHyeongKim Apr 16, 2024
022bab7
Merge pull request #190 from MUCH-MORE-MONEY/feat/158-statistics/budget
GeonHyeongKim Apr 16, 2024
98799e8
[Style] ํ…Œ์ŠคํŠธ๋ฅผ ์œ„ํ•œ ์ž„์‹œ ์ฝ”๋“œ ์ œ๊ฑฐ
GeonHyeongKim Apr 16, 2024
eaa3a90
Merge pull request #191 from MUCH-MORE-MONEY/feat/158-statistics/budget
GeonHyeongKim Apr 16, 2024
8835122
[Fix] ๋ˆ„๋ฝ๋œ ์ฝ”๋“œ ์ถ”๊ฐ€
GeonHyeongKim Apr 16, 2024
6f8e478
[Fix] ๋ˆ„๋ฝ๋œ ์ฝ”๋“œ ์ถ”๊ฐ€
GeonHyeongKim Apr 16, 2024
b10a930
[Feat] ๋ˆ„๋ฝ๋œ ์ฝ”๋“œ ์ถ”๊ฐ€ - API, Icon
GeonHyeongKim Apr 16, 2024
b5deba4
[Feat] ์˜ˆ์‚ฐ ์„ค์ • ๋ทฐ indicator ๋ณ€์ˆ˜ ๋ณ€๊ฒฝ
jwoo820 Apr 16, 2024
67fd600
[Feat] ์˜ˆ์‚ฐ ์„ค์ •์—์„œ ๊ฐ๊ฐ ๋ทฐ๋กœ ์ด๋™ ๋ฐ ์—๋‹ˆ๋ฉ”์ด์…˜ ์ถ”๊ฐ€
jwoo820 Apr 16, 2024
8e9a123
[Chore] UI Rendering ์˜ค๋ฅ˜ ํ•ด๊ฒฐ
jwoo820 Apr 16, 2024
dc8ce36
[Feat] ํˆดํŒ๋ทฐ ์ƒ์„ฑ ๋ฐ ์ ์šฉ
jwoo820 Apr 17, 2024
2bddb7f
[Feat] ์˜ˆ์‚ฐ ์„ค์ • ํ…์ŠคํŠธํ•„๋“œ hidekeyboard ๊ธฐ๋Šฅ์ถ”๊ฐ€
jwoo820 Apr 17, 2024
228343a
[Feat] ์Šฌ๋ผ์ด๋” ์ด๋™ ์‹œ ํ–…ํ‹ฑ ๊ธฐ๋Šฅ ์ถ”๊ฐ€
jwoo820 Apr 17, 2024
63011fc
[Style] ์บ˜๋ฆฐ๋” ์ด๋ฏธ์ง€ ๋ณ€๊ฒฝ
jwoo820 Apr 17, 2024
0bad956
[Feat] ์˜ˆ์‚ฐ ์„ค์ •03 ํ…์ŠคํŠธํ•„๋“œ ๋ทฐ ์ถ”๊ฐ€
jwoo820 Apr 17, 2024
e88e175
[Feat] ์˜ˆ์‚ฐ์„ค์ •05๋ทฐ UI ๊ตฌ์„ฑ
jwoo820 Apr 17, 2024
280d316
[Feat] ์˜ˆ์‚ฐ์„ค์ •05 ์™„๋ฃŒ ๋ฒ„ํŠผ ํด๋ฆญ์‹œ pop navigation
jwoo820 Apr 17, 2024
5479d8f
[Feat] ์„ธ๊ทธ๋จผํŠธ๋ทฐ ๋ฒ„ํŠผ ๋™์ž‘ ๋น„ํ™œ์„ฑํ™”
jwoo820 Apr 17, 2024
e4db977
[Style] ์˜ˆ์‚ฐ์„ค์ •05 ๋งˆ์ง€๋ง‰ ์ด๋ฏธ์ง€ ๋ณ€๊ฒฝ
jwoo820 Apr 18, 2024
a164cb5
[Feat] ์˜ˆ์‚ฐ์„ค์ • ๋’ค๋กœ๊ฐ€๊ธฐ๋ฒ„ํŠผ ์ถ”๊ฐ€
jwoo820 Apr 18, 2024
7e7d32c
[Feat] ์˜ˆ์‚ฐ์„ค์ •03 ์‹œํŠธ๋ทฐ ์ถ”๊ฐ€
jwoo820 Apr 18, 2024
d858fd6
[Feat] ์ด์ „๋‹ฌ ๊ตฌํ•˜๋Š” ํ•จ์ˆ˜
GeonHyeongKim May 2, 2024
dd0a564
[Feat] ์ด์ „๋‹ฌ์— ๋Œ€ํ•œ ์˜ˆ์‚ฐ state ๊ฐ’
GeonHyeongKim May 2, 2024
cecbdcc
[Feat] budgetsetting Navigation item ๋ณ€๊ฒฝ
jwoo820 May 5, 2024
1c93c7f
[Style] Budgetsetting Navi color ๋ณ€๊ฒฝ
jwoo820 May 5, 2024
8d293a2
[Feat] ์˜ˆ์‚ฐ์„ค์ • step2 ์—์„œ ์ž…๋ ฅ์ด ๋น„์–ด์žˆ์„ ๊ฒฝ์šฐ ๋ฒ„ํŠผ ๋น„ํ™œ์„ฑํ™”
jwoo820 May 5, 2024
22c98b2
[Chore] ์˜ˆ์‚ฐ์„ค์ • ๋ทฐ๋ชจ๋ธ ์ˆ˜์ •
jwoo820 May 5, 2024
bd5e944
[Feat] Swiftui์šฉ shake ํ•จ์ˆ˜
jwoo820 May 9, 2024
9a451a0
[Feat] TexField ๋งŒ์›๋‹จ์œ„ custom
jwoo820 May 9, 2024
38dfa09
[Feat] ์˜ˆ์‚ฐ ๋ฒ”์œ„๋ฅผ ๋ฒ—์–ด๋‚ฌ์„ ๊ฒฝ์šฐ ๋ฒ„ํŠผ ๋น„ํ™œ์„ฑํ™”
jwoo820 May 9, 2024
2f2bf20
[Feat] textField์˜ step์— ๋”ฐ๋ฅธ binding ๋ถ„๋ฆฌ
jwoo820 May 9, 2024
9466947
Merge pull request #193 from MUCH-MORE-MONEY/feat/192-budget/budget
jwoo820 May 9, 2024
5217a47
[Style] budgetsetting01 text ๋ณ€๊ฒฝ
jwoo820 May 9, 2024
1b1b7d8
[Feat] BudgetVM์—์„œ ์ดˆ๊ธฐ Budget๋ชจ๋ธ ์ „๋‹ฌ
jwoo820 May 9, 2024
62483e6
[Style] textfield placeholder color ๋ณ€๊ฒฝ
jwoo820 May 9, 2024
ed02982
[Feat] Budget์—์„œ segment๊ฐ€ ๋งž์ง€์•Š๋Š” ์˜ค๋ฅ˜ ํ•ด๊ฒฐ
jwoo820 May 9, 2024
a1f856f
[Feat] budget ๋ทฐ transition ๊ฐœ๋ฐœ์ค‘์— ์ง‘์œผ๋กœ ๊ฐ
jwoo820 May 9, 2024
3b0621d
[Feat] BudgetVM ์˜ˆ์‚ฐ์„ค์ • ๋„คํŠธ์›Œํฌ ํ•จ์ˆ˜
jwoo820 May 10, 2024
9bfbd9e
[Feat] ์˜ˆ์‚ฐ์„ค์ • API ์—ฐ๊ฒฐ ์™„๋ฃŒ
jwoo820 May 11, 2024
de2b7a6
[Feat] ์˜ˆ์‚ฐ ์„ค์ • VM ํ”„๋กœํผํ‹ฐ ๋ณ€๊ฒฝ ๋ฐ ์ ์šฉ
jwoo820 May 11, 2024
246d3fd
[Feat] budget02 ํˆดํŒ, ์Šฌ๋ผ์ด๋” ์œ„์น˜ ๋ณ€๊ฒฝ
jwoo820 May 11, 2024
0dbd95f
[Add] ํ†ต๊ณ„์˜ ์˜ˆ์‚ฐ ๋‹ค์ด์–ด๋กœ๊ทธ Sheet ํŒŒ์ผ ์ถ”๊ฐ€
GeonHyeongKim May 13, 2024
0e62c49
[Add] ํ†ต๊ณ„์˜ ์˜ˆ์‚ฐ ๋‹ค์ด์–ด๋กœ๊ทธ Sheet Reactor ํŒŒ์ผ ์ถ”๊ฐ€
GeonHyeongKim May 13, 2024
2c97c36
[Feat] budget03 tooltip text
jwoo820 May 13, 2024
b0ef7b2
[Feat] budgetVM ์ˆ˜์ • ๋ฐ ๋ฐ์ดํ„ฐ ์—ฐ๊ฒฐ
jwoo820 May 14, 2024
e9bf36d
Merge pull request #196 from MUCH-MORE-MONEY/feat/194-budget/network
jwoo820 May 14, 2024
e431ddf
[Feat] ์˜ˆ์‚ฐ ๊ธฐ์กด ์„ค์ • ๋ถˆ๋Ÿฌ์˜ค๊ธฐ
GeonHyeongKim May 15, 2024
d305d5a
[Hotfix] ํ†ต๊ณ„ ๊ณ„์‚ฐ์‹ ์˜ค๋ฅ˜ ์ˆ˜์ •
GeonHyeongKim May 15, 2024
b692ac0
[Feat] API ์ ์šฉ
GeonHyeongKim Jun 11, 2024
d888f1a
Merge pull request #199 from MUCH-MORE-MONEY/feat/195-budget/dialog
GeonHyeongKim Jun 11, 2024
199ee5c
[Feat] ์ˆซ์ž์— ์ฝค๋งˆ ์ถœ๋ ฅ
GeonHyeongKim Jun 11, 2024
3ccfcc2
[Feat] ๋‹ค์ด์–ด๋กœ๊ทธ์—์„œ ๋˜‘๊ฐ™์ด ์ ์šฉํ•˜๊ธฐ ๊ธฐ๋Šฅ
GeonHyeongKim Jun 11, 2024
b20aadc
Merge pull request #201 from MUCH-MORE-MONEY/feat/195-budget/dialog
GeonHyeongKim Jun 11, 2024
0ff012f
[Feat] User Default์— ์˜จ๋ณด๋”ฉ ํŒ์—… ์—ฌ๋ถ€ ์„ค์ •
GeonHyeongKim Jun 11, 2024
ce8cfae
Merge branch 'dev' into feat/185-popup/slide
GeonHyeongKim Jun 11, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 52 additions & 16 deletions MMM.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Binary file not shown.
6 changes: 6 additions & 0 deletions MMM/Resources/Assets/APIParameters.swift
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,12 @@ struct APIParameters{
/// ์นดํ…Œ๊ณ ๋ฆฌ ์กฐํšŒ
struct CategoryListReqDto: Encodable {
}

struct UpsertEconomicPlanReqDto: Encodable {
var budgetAmt: Int
var economicPlanYM: String
var estimatedEarningAmt: Int
}
}

struct APIHeader {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xC0",
"green" : "0xF1",
"blue" : "0x98",
"green" : "0xE2",
"red" : "0xFF"
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "iconStarGray24.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "iconStarGray24@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "iconStarGray24@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"images" : [
{
"filename" : "iconCheckboxDisable.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "original"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"images" : [
{
"filename" : "iconCheckboxEnableOrange.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "original"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "iconPopup01.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "iconPopup01@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "iconPopup01@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "iconPopup02.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "iconPopup02@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "iconPopup02@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "iconPopup03.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "iconPopup03@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "iconPopup03@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "iconPopup04.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "iconPopup04@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "iconPopup04@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
{
"images" : [
{
"filename" : "imageBackgroundBoost366.svg",
"idiom" : "universal"
"filename" : "imageBackgroundBoost366.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "imageBackgroundBoost366@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "imageBackgroundBoost366@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,8 @@
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "original"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions MMM/Resources/Configuration/Constants.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ final class Constants {
case statisticsDate // ํ˜„์žฌ ํ†ต๊ณ„ ๋‚ ์งœ
case isInit // ์ฒซ ์ง„์ž…์ธ์ง€
case isHomeLoading // ํƒญ ์ด๋™์„ ํ†ตํ•œ Home ์ ‘๊ทผ์ธ์ง€
case onBoardingFlag // ํ™ˆ์—์„œ ์˜จ๋ณด๋”ฉ ํŒ์—… ์—ฌ๋ถ€
}

/**
Expand Down

This file was deleted.

26 changes: 26 additions & 0 deletions MMM/Resources/Extensions/SwiftUI/Ex+View.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ extension View {
HalfSheetHelper(sheetView: sheetView(), showSheet: showSheet, onEnd: onEnd)
}
}

func navigationTransition(start insertion: Edge, to removal: Edge) -> some View {
self.transition(.asymmetric(insertion: .move(edge: insertion), removal: .move(edge: removal)))
}
}

// UIKit Integration
Expand Down Expand Up @@ -83,3 +87,25 @@ final class CustomHostingController<Content: View>: UIHostingController<Content>
}
}
}

struct ShakeEffect: GeometryEffect {
var amount: CGFloat = 10
var shakesPerUnit: CGFloat = 3
var animatableData: CGFloat

func effectValue(size: CGSize) -> ProjectionTransform {
ProjectionTransform(CGAffineTransform(translationX: amount * sin(animatableData * .pi * shakesPerUnit), y: 0))
}
}

extension View {
func shake(animatableData: CGFloat) -> some View {
modifier(ShakeEffect(animatableData: animatableData))
}

/// Automatically triggers a shake animation based on a boolean flag.
func autoShake(shakeCount: Binding<CGFloat>, triggerFlag: Bool) -> some View {
self.modifier(AutoShakeModifier(shakeCount: shakeCount, triggerFlag: triggerFlag))
}
}

36 changes: 36 additions & 0 deletions MMM/Resources/Extensions/SwiftUI/Modifiers.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
//
// Modifiers.swift
// MMM
//
// Created by yuraMacBookPro on 5/9/24.
//

import SwiftUI

struct BudgetSettingSubTitleModifier: ViewModifier {
func body(content: Content) -> some View {
content
.font(Font(R.Font.title3))
.padding(EdgeInsets(top: 10, leading: 16, bottom: 10, trailing: 16))
.background(Color(R.Color.gray800))
.cornerRadius(4.0)
}
}

struct AutoShakeModifier: ViewModifier {
@Binding var shakeCount: CGFloat
let triggerFlag: Bool

func body(content: Content) -> some View {
content
.shake(animatableData: shakeCount)
.onChange(of: triggerFlag) { isActive in
if isActive {
UIDevice.vibrate()
withAnimation(.linear(duration: 0.2)) {
shakeCount += 1
}
}
}
}
}
7 changes: 7 additions & 0 deletions MMM/Resources/Extensions/UIKit/Ex+Color.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//

import UIKit
import SwiftUI

public extension MMMResource {
enum Color {
Expand Down Expand Up @@ -63,3 +64,9 @@ public extension MMMResource {
public static let red500 = UIColor(named: "red500", in: .main, compatibleWith: nil)!
}
}

public extension UIColor {
var suColor: Color {
return Color(self)
}
}
10 changes: 9 additions & 1 deletion MMM/Resources/Extensions/UIKit/Ex+Date.swift
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,22 @@ extension Date {
return dateformat.string(from: self)
}

/// format: yyMM
/// format: yyyyMM
func getFormattedYM() -> String {
let dateformat = DateFormatter()
dateformat.locale = Locale(identifier: "ko_KR")
dateformat.timeZone = TimeZone(abbreviation: "KST")
dateformat.dateFormat = "yyyyMM"
return dateformat.string(from: self)
}

/// ์ด์ „๋‹ฌ
func previousMonth() -> Date {
guard let previousMonth = Calendar.current.date(byAdding: .month, value: -1, to: self) else {
return self
}
return previousMonth
}

func getFormattedTime() -> String {
let dateformat = DateFormatter()
Expand Down
9 changes: 9 additions & 0 deletions MMM/Resources/Extensions/UIKit/Ex+Font.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//

import UIKit
import SwiftUI

public extension MMMResource {
enum Font {
Expand Down Expand Up @@ -90,6 +91,9 @@ public extension MMMResource {
// MARK: - medium14
/// Weight : medium, Size : 14
public static let medium14 = prtendard(family: .medium, size: 14)
// MARK: - medium16
/// Weight : medium, Size : 16
public static let medium16 = prtendard(family: .medium, size: 16)
}
}

Expand All @@ -113,3 +117,8 @@ public extension MMMResource {
}
}

public extension UIFont {
var suFont: Font {
return Font(self)
}
}
Loading