diff --git a/SodaLive/Resources/Assets.xcassets/ic_login_line.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/ic_login_line.imageset/Contents.json new file mode 100644 index 0000000..17e5bf3 --- /dev/null +++ b/SodaLive/Resources/Assets.xcassets/ic_login_line.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ic_login_line.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SodaLive/Resources/Assets.xcassets/ic_login_line.imageset/ic_login_line.png b/SodaLive/Resources/Assets.xcassets/ic_login_line.imageset/ic_login_line.png new file mode 100644 index 0000000..d348a38 Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/ic_login_line.imageset/ic_login_line.png differ diff --git a/SodaLive/Resources/Assets.xcassets/ic_login_x.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/ic_login_x.imageset/Contents.json new file mode 100644 index 0000000..ff82554 --- /dev/null +++ b/SodaLive/Resources/Assets.xcassets/ic_login_x.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ic_login_x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SodaLive/Resources/Assets.xcassets/ic_login_x.imageset/ic_login_x.png b/SodaLive/Resources/Assets.xcassets/ic_login_x.imageset/ic_login_x.png new file mode 100644 index 0000000..78d23a5 Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/ic_login_x.imageset/ic_login_x.png differ diff --git a/SodaLive/Sources/User/Login/LoginView.swift b/SodaLive/Sources/User/Login/LoginView.swift index d118d42..1eb6b14 100644 --- a/SodaLive/Sources/User/Login/LoginView.swift +++ b/SodaLive/Sources/User/Login/LoginView.swift @@ -15,10 +15,15 @@ struct LoginView: View { } @ObservedObject var viewModel = LoginViewModel() + @Environment(\.locale) private var locale @State private var isPasswordVisible: Bool = false @FocusState private var focusedField: FocusField? + private var isJapaneseLanguage: Bool { + locale.identifier.hasPrefix("ja") + } + var body: some View { BaseView(isLoading: $viewModel.isLoading) { ZStack { @@ -129,12 +134,6 @@ struct LoginView: View { AppState.shared.setAppStep(step: .signUp) } - Image("ic_login_kakao") - .onTapGesture { - hideKeyboard() - viewModel.loginWithKakao() - } - Image("ic_login_google") .onTapGesture { hideKeyboard() @@ -146,6 +145,24 @@ struct LoginView: View { hideKeyboard() viewModel.loginWithApple() } + + if isJapaneseLanguage { + Image("ic_login_line") + .onTapGesture { + hideKeyboard() + } + + Image("ic_login_x") + .onTapGesture { + hideKeyboard() + } + } else { + Image("ic_login_kakao") + .onTapGesture { + hideKeyboard() + viewModel.loginWithKakao() + } + } } .padding(.top, 20)