Skip to content

Commit

Permalink
Merge pull request #186 from GSM-MSG/167-animation-add
Browse files Browse the repository at this point in the history
167 animation add
  • Loading branch information
baekteun authored Jun 12, 2023
2 parents 62a5ead + 7f2f265 commit fd83f52
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Projects/App/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ let targets: [Target] = [
name: env.name,
platform: env.platform,
product: .app,
bundleId: "\(env.organizationName).\(env.name)",
bundleId: "\(env.organizationName).\(env.name)-iOS",
deploymentTarget: env.deploymentTarget,
infoPlist: .file(path: "Support/Info.plist"),
sources: ["Sources/**"],
Expand Down
2 changes: 1 addition & 1 deletion Projects/App/Sources/Application/NeedleGenerated.swift
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ private func registerProviderFactory(_ componentPath: String, _ factory: @escapi

#if !NEEDLE_DYNAMIC

private func register1() {
@inline(never) private func register1() {
registerProviderFactory("^->AppComponent->JwtStoreComponent", factoryb27d5aae1eb7e73575a6f47b58f8f304c97af4d5)
registerProviderFactory("^->AppComponent", factoryEmptyDependencyProvider)
registerProviderFactory("^->AppComponent->KeychainComponent", factoryEmptyDependencyProvider)
Expand Down
18 changes: 10 additions & 8 deletions Projects/App/Support/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSCameraUsageDescription</key>
<string>프로필 사진을 설정하기 위해서는 카메라 권한이 필요합니다.</string>
<key>UIUserInterfaceStyle</key>
<string>Light</string>
<key>CLIENT_ID</key>
<string>$(CLIENT_ID)</string>
<key>REDIRECT_URI</key>
<string>$(REDIRECT_URI)</string>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
Expand All @@ -26,8 +18,16 @@
<string>1.0</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>CLIENT_ID</key>
<string>$(CLIENT_ID)</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSCameraUsageDescription</key>
<string>프로필 사진을 설정하기 위해서는 카메라 권한이 필요합니다.</string>
<key>REDIRECT_URI</key>
<string>$(REDIRECT_URI)</string>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
Expand Down Expand Up @@ -64,5 +64,7 @@
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UIUserInterfaceStyle</key>
<string>Light</string>
</dict>
</plist>
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ struct SMSBottomSheet<T: View>: ViewModifier {
}
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .bottom)
.ignoresSafeArea()
.animation(.default, value: isShowing)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ struct InputInformationView: View {
.eraseToAnyView()
.tag(InformationPhase.language)
}
.ignoresSafeArea()
.smsAlert(
title: "정보입력 실패",
description: state.errorMessage,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ struct InputProfileInfoView: View {
.offset(x: 5, y: 4)
}
.buttonWrapper {
intent.imageMethodPickerIsRequired()
withAnimation {
intent.imageMethodPickerIsRequired()
}
}
.titleWrapper("사진")

Expand Down
2 changes: 1 addition & 1 deletion Projects/Feature/MainFeature/Sources/Scene/MainView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ struct MainView: View {
.eraseToAnyView()
}
}
.navigationViewStyle(.stack)
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .navigationBarTrailing) {
Expand Down Expand Up @@ -177,6 +176,7 @@ struct MainView: View {
}
])
}
.navigationViewStyle(.stack)
}

@ViewBuilder
Expand Down

0 comments on commit fd83f52

Please sign in to comment.