mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-10-24 19:57:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4522 from vector-im/feature/bma/sso_providers_icons

Browse source 
Small fix in sso providers icons
This commit is contained in:
Benoit Marty 2021-11-22 17:50:44 +01:00 committed by GitHub
commit e2f9498d2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 117 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

113
library/ui-styles/src/debug/res/layout/debug_social_login.xml Normal file
View file

@ -0,0 +1,113 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#DDD"
android:orientation="vertical"
android:padding="16dp"
tools:ignore="HardcodedText">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Light" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:background="@color/element_background_light"
android:orientation="vertical"
android:padding="16dp">
<Button
style="@style/Widget.Vector.Button.Outlined.SocialLogin.Google.Light"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Continue with XXX" />
<Button
style="@style/Widget.Vector.Button.Outlined.SocialLogin.Facebook.Light"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Continue with XXX" />
<Button
style="@style/Widget.Vector.Button.Outlined.SocialLogin.Github.Light"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Continue with XXX" />
<Button
style="@style/Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Light"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Continue with XXX" />
<Button
style="@style/Widget.Vector.Button.Outlined.SocialLogin.Apple.Light"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Continue with XXX" />
<Button
style="@style/Widget.Vector.Button.Outlined.SocialLogin.Twitter.Light"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Continue with XXX" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="Dark" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:background="@color/element_background_dark"
android:orientation="vertical"
android:padding="16dp">
<Button
style="@style/Widget.Vector.Button.Outlined.SocialLogin.Google.Dark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Continue with XXX" />
<Button
style="@style/Widget.Vector.Button.Outlined.SocialLogin.Facebook.Dark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Continue with XXX" />
<Button
style="@style/Widget.Vector.Button.Outlined.SocialLogin.Github.Dark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Continue with XXX" />
<Button
style="@style/Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Dark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Continue with XXX" />
<Button
style="@style/Widget.Vector.Button.Outlined.SocialLogin.Apple.Dark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Continue with XXX" />
<Button
style="@style/Widget.Vector.Button.Outlined.SocialLogin.Twitter.Dark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Continue with XXX" />
</LinearLayout>
</LinearLayout>

2
library/ui-styles/src/main/res/values/styles_social_login.xml
View file

@ -9,7 +9,7 @@
<item name="iconGravity">start</item>
<item name="android:textSize">14sp</item>
<item name="android:textAlignment">center</item>
<item name="android:paddingStart">2dp</item>
<item name="android:paddingStart">4dp</item>
<!-- Compensate icon size to center text correctly-->
<item name="android:paddingEnd">38dp</item>
<item name="android:clipToPadding">false</item>

4
library/ui-styles/src/main/res/values/theme_dark.xml
View file

@ -129,7 +129,9 @@
<item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
<item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
<item name="vctr_social_login_button_google_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Google.Dark</item>
<!-- For Google button style, use same values than for light theme, for a better rendering (white background)
see https://github.com/vector-im/element-android/issues/4285#issuecomment-974270998 -->
<item name="vctr_social_login_button_google_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Google.Light</item>
<item name="vctr_social_login_button_github_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Github.Dark</item>
<item name="vctr_social_login_button_facebook_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Facebook.Dark</item>
<item name="vctr_social_login_button_twitter_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Twitter.Dark</item>