diff --git a/.github/workflows/testflight.yml b/.github/workflows/testflight.yml index dca5719..1710328 100644 --- a/.github/workflows/testflight.yml +++ b/.github/workflows/testflight.yml @@ -1,7 +1,9 @@ name: 테스트 플라이트 배포 🚀 on: - push: + # main 브랜치로 PR 시 테스트 플라이트 업로드 + # CD 성공 여부로 워크플로우 수정 진행 + pull_request: branches: - main @@ -26,10 +28,10 @@ jobs: # - name: Set up Xcode # uses: maxim-lobanov/setup-xcode@v1.6.0 # with: - # xcode-version: '16.2' + # xcode-version: '16.3' - name: Select Xcode version - run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer + run: sudo xcode-select -s /Applications/Xcode_16.3.app/Contents/Developer - name: Check Xcode version run: xcodebuild -version diff --git a/Run Mile.xcodeproj/project.pbxproj b/Run Mile.xcodeproj/project.pbxproj index b09dae7..9745616 100644 --- a/Run Mile.xcodeproj/project.pbxproj +++ b/Run Mile.xcodeproj/project.pbxproj @@ -444,7 +444,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "Run Mile/Run Mile.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 202506231; DEVELOPMENT_TEAM = ""; @@ -473,7 +473,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.mooni.Run-Mile"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.mooni.Run-Mile"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.mooni.Run-Mile"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; @@ -491,7 +491,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "Run Mile/Run Mile.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 202506231; DEVELOPMENT_TEAM = ""; @@ -520,7 +520,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.mooni.Run-Mile"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.mooni.Run-Mile"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.mooni.Run-Mile"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; diff --git a/Run Mile/Presentation/2.Workout/WorkoutListView.swift b/Run Mile/Presentation/2.Workout/WorkoutListView.swift index 98ff086..3ee11c3 100644 --- a/Run Mile/Presentation/2.Workout/WorkoutListView.swift +++ b/Run Mile/Presentation/2.Workout/WorkoutListView.swift @@ -21,16 +21,20 @@ struct WorkoutListView: View { WorkoutNavigationView(viewModel: viewModel) switch viewModel.viewStatus { - case .none, .selection: + case .none, .selection, .loading: WorkoutScrollView(viewModel: $viewModel) - case .loading: - WorkoutLoadingView() case .empty: WorkoutEmptyView( viewModel: viewModel ) } } + .overlay { + if viewModel.viewStatus == .loading { + ProgressView() + .progressViewStyle(.circular) + } + } .task { await viewModel.onAppear() } @@ -119,18 +123,6 @@ private struct WorkoutScrollView: View { } -private struct WorkoutLoadingView: View { - var body: some View { - Group { - Spacer() - ProgressView() - .progressViewStyle(.circular) - Spacer() - } - } -} - - private struct WorkoutEmptyView: View { let viewModel: WorkoutListViewModel