Skip to content

Commit b10b204

Browse files
authored
Merge pull request #122 from DeveloperAcademy-POSTECH/feature/#116
[Release] 1.1.0 업데이트
2 parents e652d3e + f54ff1b commit b10b204

File tree

67 files changed

+859
-756
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+859
-756
lines changed

Projects/App/Project.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import ProjectDescriptionHelpers
1111
private let moduleName = "App"
1212

1313
let infoPlist: [String: Plist.Value] = [
14-
"CFBundleShortVersionString": "1.0.3",
14+
"CFBundleShortVersionString": "1.1.0",
1515
"CFBundleVersion": "1",
1616
"CFBundleDisplayName": "Linable",
1717
"UIMainStoryboardFile": "",
1818
"UILaunchStoryboardName": "LaunchScreen",
19-
"NSPhotoLibraryAddUsageDescription" : "to let you export images to photo library",
20-
"CFBundleAllowMixedLocalizations" : "true",
19+
"NSPhotoLibraryAddUsageDescription": "to let you export images to photo library",
20+
"CFBundleAllowMixedLocalizations": "true",
2121
"UISupportedInterfaceOrientations": ["UIInterfaceOrientationPortrait"],
2222
"LSApplicationCategoryType": "public.app-category.sports",
2323
"UIUserInterfaceStyle": "Light"

Projects/App/Resources/Localizable.xcstrings

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,23 @@
6969
}
7070
}
7171
},
72+
"Add Team" : {
73+
"extractionState" : "manual",
74+
"localizations" : {
75+
"en" : {
76+
"stringUnit" : {
77+
"state" : "translated",
78+
"value" : "Add Team"
79+
}
80+
},
81+
"ko" : {
82+
"stringUnit" : {
83+
"state" : "translated",
84+
"value" : "팀 추가"
85+
}
86+
}
87+
}
88+
},
7289
"Change" : {
7390
"extractionState" : "manual",
7491
"localizations" : {
@@ -352,87 +369,87 @@
352369
}
353370
}
354371
},
355-
"Push To Edit" : {
372+
"Registered" : {
356373
"extractionState" : "manual",
357374
"localizations" : {
358375
"en" : {
359376
"stringUnit" : {
360377
"state" : "translated",
361-
"value" : "Push to Edit"
378+
"value" : "Registered"
362379
}
363380
},
364381
"ko" : {
365382
"stringUnit" : {
366383
"state" : "translated",
367-
"value" : "밀어올려서 편집하기"
384+
"value" : "등록 완료"
368385
}
369386
}
370387
}
371388
},
372-
"Registered" : {
389+
"Share" : {
373390
"extractionState" : "manual",
374391
"localizations" : {
375392
"en" : {
376393
"stringUnit" : {
377394
"state" : "translated",
378-
"value" : "Registered"
395+
"value" : "Share"
379396
}
380397
},
381398
"ko" : {
382399
"stringUnit" : {
383400
"state" : "translated",
384-
"value" : "등록 완료"
401+
"value" : "공유하기"
385402
}
386403
}
387404
}
388405
},
389-
"Share" : {
406+
"Show More" : {
390407
"extractionState" : "manual",
391408
"localizations" : {
392409
"en" : {
393410
"stringUnit" : {
394411
"state" : "translated",
395-
"value" : "Share"
412+
"value" : "Show more"
396413
}
397414
},
398415
"ko" : {
399416
"stringUnit" : {
400417
"state" : "translated",
401-
"value" : "공유하기"
418+
"value" : "더 보기"
402419
}
403420
}
404421
}
405422
},
406-
"Show More" : {
423+
"Sub Color" : {
407424
"extractionState" : "manual",
408425
"localizations" : {
409426
"en" : {
410427
"stringUnit" : {
411428
"state" : "translated",
412-
"value" : "Show more"
429+
"value" : "Sub Color"
413430
}
414431
},
415432
"ko" : {
416433
"stringUnit" : {
417434
"state" : "translated",
418-
"value" : "더 보기"
435+
"value" : "서브 컬러"
419436
}
420437
}
421438
}
422439
},
423-
"Sub Color" : {
440+
"Swipe to edit" : {
424441
"extractionState" : "manual",
425442
"localizations" : {
426443
"en" : {
427444
"stringUnit" : {
428445
"state" : "translated",
429-
"value" : "Sub Color"
446+
"value" : "Swipe to edit"
430447
}
431448
},
432449
"ko" : {
433450
"stringUnit" : {
434451
"state" : "translated",
435-
"value" : "서브 컬러"
452+
"value" : "밀어올려서 편집하기"
436453
}
437454
}
438455
}

Projects/App/Sources/MyApp.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import SwiftUI
1414
struct MyApp: App {
1515
var body: some Scene {
1616
WindowGroup {
17-
MainView(modelContext: teamContainer.mainContext)
18-
.modelContainer(teamContainer)
17+
MainView(modelContext: linableContainer.mainContext)
18+
.modelContainer(linableContainer)
1919
}
2020
}
2121
}

Projects/Common/Resources/Assets.xcassets/backgroundBlueClear.imageset/Contents.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"scale" : "2x"
1010
},
1111
{
12-
"filename" : "backgroundBlue.png",
12+
"filename" : "background.png",
1313
"idiom" : "universal",
1414
"scale" : "3x"
1515
}
1.91 MB
Loading
Binary file not shown.

Projects/Common/Resources/Assets.xcassets/backgroundNeon.imageset/Contents.json renamed to Projects/Common/Resources/Assets.xcassets/backgroundLight.imageset/Contents.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"scale" : "2x"
1010
},
1111
{
12-
"filename" : "backgroundNeon.png",
12+
"filename" : "Large.png",
1313
"idiom" : "universal",
1414
"scale" : "3x"
1515
}
17 KB
Loading
Binary file not shown.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x"
6+
},
7+
{
8+
"idiom" : "universal",
9+
"scale" : "2x"
10+
},
11+
{
12+
"filename" : "라이트그레이블루.png",
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"author" : "xcode",
19+
"version" : 1
20+
}
21+
}

0 commit comments

Comments
 (0)