x 로그인 버튼 제거, 언어에 관계없이 Line 로그인 버튼 보이도록 수정
This commit is contained in:
@@ -1,6 +1,5 @@
|
|||||||
package kr.co.vividnext.sodalive.user.login
|
package kr.co.vividnext.sodalive.user.login
|
||||||
|
|
||||||
import android.app.Service
|
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.os.Handler
|
import android.os.Handler
|
||||||
@@ -101,7 +100,7 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>(ActivityLoginBinding::i
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
imm = getSystemService(Service.INPUT_METHOD_SERVICE) as InputMethodManager
|
imm = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
|
||||||
|
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
bindData()
|
bindData()
|
||||||
@@ -138,23 +137,6 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>(ActivityLoginBinding::i
|
|||||||
binding.tvSignUp.setOnClickListener { startSignUp() }
|
binding.tvSignUp.setOnClickListener { startSignUp() }
|
||||||
binding.ivSignUpEmail.setOnClickListener { startSignUp() }
|
binding.ivSignUpEmail.setOnClickListener { startSignUp() }
|
||||||
|
|
||||||
val language = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
|
|
||||||
resources.configuration.locales[0].language
|
|
||||||
} else {
|
|
||||||
@Suppress("DEPRECATION")
|
|
||||||
resources.configuration.locale.language
|
|
||||||
}
|
|
||||||
|
|
||||||
if (language == "ja") {
|
|
||||||
binding.ivLoginLine.visibility = android.view.View.VISIBLE
|
|
||||||
binding.ivLoginX.visibility = android.view.View.VISIBLE
|
|
||||||
binding.ivLoginKakao.visibility = android.view.View.GONE
|
|
||||||
} else {
|
|
||||||
binding.ivLoginLine.visibility = android.view.View.GONE
|
|
||||||
binding.ivLoginX.visibility = android.view.View.GONE
|
|
||||||
binding.ivLoginKakao.visibility = android.view.View.VISIBLE
|
|
||||||
}
|
|
||||||
|
|
||||||
binding.ivLoginGoogle.setOnClickListener {
|
binding.ivLoginGoogle.setOnClickListener {
|
||||||
loadingDialog.show(width = screenWidth)
|
loadingDialog.show(width = screenWidth)
|
||||||
val credentialManager = CredentialManager.create(this)
|
val credentialManager = CredentialManager.create(this)
|
||||||
|
|||||||
@@ -146,8 +146,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="13.3dp"
|
android:layout_marginStart="13.3dp"
|
||||||
android:contentDescription="@null"
|
android:contentDescription="@null"
|
||||||
android:src="@drawable/ic_login_kakao"
|
android:src="@drawable/ic_login_kakao" />
|
||||||
android:visibility="gone" />
|
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/iv_login_line"
|
android:id="@+id/iv_login_line"
|
||||||
@@ -155,17 +154,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="13.3dp"
|
android:layout_marginStart="13.3dp"
|
||||||
android:contentDescription="@null"
|
android:contentDescription="@null"
|
||||||
android:src="@drawable/ic_login_line"
|
android:src="@drawable/ic_login_line" />
|
||||||
android:visibility="gone" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/iv_login_x"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="13.3dp"
|
|
||||||
android:contentDescription="@null"
|
|
||||||
android:src="@drawable/ic_login_x"
|
|
||||||
android:visibility="gone" />
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|||||||
Reference in New Issue
Block a user