rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some constants

Browse Source
This commit is contained in:
Benoit Marty 2020-12-14 15:40:52 +01:00
parent 776d7699bc
commit 2f616cb6c5
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/SsoIdentityProvider.kt
View File

@ -39,4 +39,14 @@ data class SsoIdentityProvider(
* This should be hosted by the homeserver service provider to not leak the client's IP address unnecessarily. * This should be hosted by the homeserver service provider to not leak the client's IP address unnecessarily.
*/ */
@Json(name = "icon") val iconUrl: String? @Json(name = "icon") val iconUrl: String?
) : Parcelable ) : Parcelable {
companion object {
// Not really defined by the spec, but we may define some ids here
const val ID_GOOGLE = "google"
const val ID_GITHUB = "github"
const val ID_APPLE = "apple"
const val ID_FACEBOOK = "facebook"
const val ID_TWITTER = "twitter"
}
}

28
vector/src/main/java/im/vector/app/features/login/SocialLoginButtonsView.kt
View File

@ -16,7 +16,6 @@
package im.vector.app.features.login package im.vector.app.features.login
import android.annotation.SuppressLint
import android.content.Context import android.content.Context
import android.util.AttributeSet import android.util.AttributeSet
import android.util.TypedValue import android.util.TypedValue
@ -85,22 +84,22 @@ class SocialLoginButtonsView @JvmOverloads constructor(context: Context, attrs:
// Use some heuristic to render buttons according to branding guidelines // Use some heuristic to render buttons according to branding guidelines
val button: MaterialButton = cachedViews[identityProvider.id] val button: MaterialButton = cachedViews[identityProvider.id]
?: when (identityProvider.id) { ?: when (identityProvider.id) {
"google" -> { SsoIdentityProvider.ID_GOOGLE -> {
MaterialButton(context, null, R.attr.vctr_social_login_button_google_style) MaterialButton(context, null, R.attr.vctr_social_login_button_google_style)
} }
"github" -> { SsoIdentityProvider.ID_GITHUB -> {
MaterialButton(context, null, R.attr.vctr_social_login_button_github_style) MaterialButton(context, null, R.attr.vctr_social_login_button_github_style)
} }
"apple" -> { SsoIdentityProvider.ID_APPLE -> {
MaterialButton(context, null, R.attr.vctr_social_login_button_apple_style) MaterialButton(context, null, R.attr.vctr_social_login_button_apple_style)
} }
"facebook" -> { SsoIdentityProvider.ID_FACEBOOK -> {
MaterialButton(context, null, R.attr.vctr_social_login_button_facebook_style) MaterialButton(context, null, R.attr.vctr_social_login_button_facebook_style)
} }
"twitter" -> { SsoIdentityProvider.ID_TWITTER -> {
MaterialButton(context, null, R.attr.vctr_social_login_button_twitter_style) MaterialButton(context, null, R.attr.vctr_social_login_button_twitter_style)
} }
else -> { else -> {
// TODO Use iconUrl // TODO Use iconUrl
MaterialButton(context, null, R.attr.materialButtonStyle).apply { MaterialButton(context, null, R.attr.materialButtonStyle).apply {
transformationMethod = null transformationMethod = null
@ -119,8 +118,8 @@ class SocialLoginButtonsView @JvmOverloads constructor(context: Context, attrs:
private fun getButtonTitle(providerName: String?): String { private fun getButtonTitle(providerName: String?): String {
return when (mode) { return when (mode) {
Mode.MODE_SIGN_IN -> context.getString(R.string.login_social_signin_with, providerName) Mode.MODE_SIGN_IN -> context.getString(R.string.login_social_signin_with, providerName)
Mode.MODE_SIGN_UP -> context.getString(R.string.login_social_signup_with, providerName) Mode.MODE_SIGN_UP -> context.getString(R.string.login_social_signup_with, providerName)
Mode.MODE_CONTINUE -> context.getString(R.string.login_social_continue_with, providerName) Mode.MODE_CONTINUE -> context.getString(R.string.login_social_continue_with, providerName)
} }
} }
@ -130,14 +129,13 @@ class SocialLoginButtonsView @JvmOverloads constructor(context: Context, attrs:
gravity = Gravity.CENTER gravity = Gravity.CENTER
clipToPadding = false clipToPadding = false
clipChildren = false clipChildren = false
@SuppressLint("SetTextI18n")
if (isInEditMode) { if (isInEditMode) {
ssoIdentityProviders = listOf( ssoIdentityProviders = listOf(
SsoIdentityProvider("google", "Google", null), SsoIdentityProvider(SsoIdentityProvider.ID_GOOGLE, "Google", null),
SsoIdentityProvider("facebook", "Facebook", null), SsoIdentityProvider(SsoIdentityProvider.ID_FACEBOOK, "Facebook", null),
SsoIdentityProvider("apple", "Apple", null), SsoIdentityProvider(SsoIdentityProvider.ID_APPLE, "Apple", null),
SsoIdentityProvider("github", "GitHub", null), SsoIdentityProvider(SsoIdentityProvider.ID_GITHUB, "GitHub", null),
SsoIdentityProvider("twitter", "Twitter", null), SsoIdentityProvider(SsoIdentityProvider.ID_TWITTER, "Twitter", null),
SsoIdentityProvider("Custom_pro", "SSO", null) SsoIdentityProvider("Custom_pro", "SSO", null)
) )
} }