Skip to content

Commit 76c385f

Browse files
Merge release branch release/v1.1.4 into main
2 parents 9de7724 + d23f6df commit 76c385f

6 files changed

Lines changed: 39 additions & 13 deletions

File tree

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
- name: Checkout
2222
uses: actions/checkout@v4
2323
with:
24+
ssh-key: ${{ secrets.DEPLOY_KEY_SECRET }}
2425
fetch-depth: 0
2526

2627
- name: Parse Version

CHANGELOG.md

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,24 @@
1919

2020
### Security
2121

22+
## [1.1.4] - 2026-01-08
23+
24+
### Added
25+
26+
### Changed
27+
28+
- Dynamic Type을 일시적으로 지원하지 않음
29+
30+
### Deprecated
31+
32+
### Removed
33+
34+
### Fixed
35+
36+
- 재연결 상태에서 상단 바에서 연결 종료하기 버튼을 눌러도 재연결이 중단되지 않던 문제 수정
37+
38+
### Security
39+
2240
## [1.1.3] - 2025-12-29
2341

2442
### Added
@@ -323,7 +341,8 @@
323341
- Wi-Fi Aware 연결 후, 라이브 포토 촬영 시 앱이 크래시되는 문제
324342
- 레퍼런스 삭제 후 재등록에 관한 상태 초기화 문제
325343

326-
[Unreleased]: https://github.com/DeveloperAcademy-POSTECH/2025-C6-A11-QueendomJaerim/compare/v1.1.3...HEAD
344+
[Unreleased]: https://github.com/DeveloperAcademy-POSTECH/2025-C6-A11-QueendomJaerim/compare/v1.1.4...HEAD
345+
[1.1.4]: https://github.com/DeveloperAcademy-POSTECH/2025-C6-A11-QueendomJaerim/compare/v1.1.3...v1.1.4
327346
[1.1.3]: https://github.com/DeveloperAcademy-POSTECH/2025-C6-A11-QueendomJaerim/compare/v1.1.2...v1.1.3
328347
[1.1.2]: https://github.com/DeveloperAcademy-POSTECH/2025-C6-A11-QueendomJaerim/compare/v1.1.1...v1.1.2
329348
[1.1.1]: https://github.com/DeveloperAcademy-POSTECH/2025-C6-A11-QueendomJaerim/compare/v1.1.0...v1.1.1

QueenCam/QueenCam.xcodeproj/project.pbxproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@
462462
CODE_SIGN_IDENTITY = "Apple Development";
463463
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
464464
CODE_SIGN_STYLE = Manual;
465-
CURRENT_PROJECT_VERSION = 16;
465+
CURRENT_PROJECT_VERSION = 17;
466466
DEVELOPMENT_TEAM = "";
467467
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = D22ZM93S77;
468468
ENABLE_PREVIEWS = YES;
@@ -485,7 +485,7 @@
485485
"$(inherited)",
486486
"@executable_path/Frameworks",
487487
);
488-
MARKETING_VERSION = 1.1.3;
488+
MARKETING_VERSION = 1.1.4;
489489
PRODUCT_BUNDLE_IDENTIFIER = com.queendom.QueenCam;
490490
PRODUCT_NAME = "$(TARGET_NAME)";
491491
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -512,7 +512,7 @@
512512
CODE_SIGN_ENTITLEMENTS = QueenCam/QueenCam.entitlements;
513513
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
514514
CODE_SIGN_STYLE = Manual;
515-
CURRENT_PROJECT_VERSION = 16;
515+
CURRENT_PROJECT_VERSION = 17;
516516
DEVELOPMENT_TEAM = "";
517517
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = D22ZM93S77;
518518
ENABLE_PREVIEWS = YES;
@@ -535,7 +535,7 @@
535535
"$(inherited)",
536536
"@executable_path/Frameworks",
537537
);
538-
MARKETING_VERSION = 1.1.3;
538+
MARKETING_VERSION = 1.1.4;
539539
PRODUCT_BUNDLE_IDENTIFIER = com.queendom.QueenCam;
540540
PRODUCT_NAME = "$(TARGET_NAME)";
541541
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -559,10 +559,10 @@
559559
buildSettings = {
560560
BUNDLE_LOADER = "$(TEST_HOST)";
561561
CODE_SIGN_STYLE = Automatic;
562-
CURRENT_PROJECT_VERSION = 16;
562+
CURRENT_PROJECT_VERSION = 17;
563563
GENERATE_INFOPLIST_FILE = YES;
564564
IPHONEOS_DEPLOYMENT_TARGET = 26.0;
565-
MARKETING_VERSION = 1.1.3;
565+
MARKETING_VERSION = 1.1.4;
566566
PRODUCT_BUNDLE_IDENTIFIER = com.queendom.QueenCamTests;
567567
PRODUCT_NAME = "$(TARGET_NAME)";
568568
STRING_CATALOG_GENERATE_SYMBOLS = NO;
@@ -580,10 +580,10 @@
580580
buildSettings = {
581581
BUNDLE_LOADER = "$(TEST_HOST)";
582582
CODE_SIGN_STYLE = Automatic;
583-
CURRENT_PROJECT_VERSION = 16;
583+
CURRENT_PROJECT_VERSION = 17;
584584
GENERATE_INFOPLIST_FILE = YES;
585585
IPHONEOS_DEPLOYMENT_TARGET = 26.0;
586-
MARKETING_VERSION = 1.1.3;
586+
MARKETING_VERSION = 1.1.4;
587587
PRODUCT_BUNDLE_IDENTIFIER = com.queendom.QueenCamTests;
588588
PRODUCT_NAME = "$(TARGET_NAME)";
589589
STRING_CATALOG_GENERATE_SYMBOLS = NO;
@@ -600,9 +600,9 @@
600600
isa = XCBuildConfiguration;
601601
buildSettings = {
602602
CODE_SIGN_STYLE = Automatic;
603-
CURRENT_PROJECT_VERSION = 16;
603+
CURRENT_PROJECT_VERSION = 17;
604604
GENERATE_INFOPLIST_FILE = YES;
605-
MARKETING_VERSION = 1.1.3;
605+
MARKETING_VERSION = 1.1.4;
606606
PRODUCT_BUNDLE_IDENTIFIER = com.queendom.QueenCamUITests;
607607
PRODUCT_NAME = "$(TARGET_NAME)";
608608
STRING_CATALOG_GENERATE_SYMBOLS = NO;
@@ -619,9 +619,9 @@
619619
isa = XCBuildConfiguration;
620620
buildSettings = {
621621
CODE_SIGN_STYLE = Automatic;
622-
CURRENT_PROJECT_VERSION = 16;
622+
CURRENT_PROJECT_VERSION = 17;
623623
GENERATE_INFOPLIST_FILE = YES;
624-
MARKETING_VERSION = 1.1.3;
624+
MARKETING_VERSION = 1.1.4;
625625
PRODUCT_BUNDLE_IDENTIFIER = com.queendom.QueenCamUITests;
626626
PRODUCT_NAME = "$(TARGET_NAME)";
627627
STRING_CATALOG_GENERATE_SYMBOLS = NO;

QueenCam/QueenCam/Presentation/ViewModels/WifiAware/ConnectionViewModel.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,9 @@ extension ConnectionViewModel {
197197
func disconnectButtonDidTap() {
198198
networkService.disconnect()
199199
role = nil // 정상 종료인 경우 역할 초기화
200+
lastConnectedDevice = nil // 재연결 관련 상태 초기화
201+
connectionLost = false
202+
reconnectingDeviceName = nil
200203
notificationService.registerNotification(.make(type: .disconnected))
201204
}
202205

QueenCam/QueenCam/Presentation/Views/Camera/CameraView.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,9 +287,11 @@ extension CameraView: View {
287287
isShowPhotoPicker = false
288288
}
289289
.presentationDetents([.medium, .large])
290+
.dynamicTypeSize(.medium) // FIXME: Dynamic Type 정책 결정 후 수정
290291
}
291292
.fullScreenCover(isPresented: $isShowConnectionView) {
292293
ConnectionView(viewModel: connectionViewModel, previewStreamingViewModel: previewModel)
294+
.dynamicTypeSize(.medium) // FIXME: Dynamic Type 정책 결정 후 수정
293295
}
294296
.onChange(of: connectionViewModel.connections) { oldValue, newValue in
295297
if !newValue.isEmpty && newValue.count > oldValue.count && connectionViewModel.role == .photographer {

QueenCam/QueenCam/Presentation/Views/Main/MainView.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ struct MainView: View {
4444
frameViewModel: frameViewModel,
4545
thumbsUpViewModel: thumbsUpViewModel
4646
)
47+
.dynamicTypeSize(.medium) // FIXME: Dynamic Type 정책 결정 후 수정
4748
#if DEBUG
4849
.alert(
4950
"Ping 메시지 도착",

0 commit comments

Comments
 (0)