owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VQA fixes part 1

Browse Source
This commit is contained in:
Grishka
2024-06-08 14:49:39 +03:00
parent 1b4afe7ba9
commit bf44f7ef13
11 changed files with 168 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mastodon/src/main/res/color/m3_on_surface_variant_alpha40.xml Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorM3OnSurfaceVariant" android:alpha="0.4"/>
</selector>

5
mastodon/src/main/res/layout/alert_invite_link.xml
View File

@@ -39,14 +39,15 @@
android:layout_height="56dp"
android:background="@drawable/bg_m3_filled_text_field"
android:paddingHorizontal="16dp"
android:textColorHint="?colorM3OnSurfaceVariant"
android:textColorHint="@color/m3_on_surface_variant_alpha40"
android:textColor="?colorM3OnSurface"
android:gravity="start|bottom"
android:paddingBottom="8dp"
android:singleLine="true"
android:inputType="textUri"
android:textAppearance="@style/m3_body_large"
android:hint="example.social/invite/AbC123"/>
android:hint="example.social/invite/AbC123"
tools:ignore="HardcodedText" />
<TextView
android:id="@+id/label"

33
mastodon/src/main/res/layout/fragment_onboarding_signup.xml
View File

@@ -56,10 +56,12 @@
<org.joinmastodon.android.ui.views.FloatingHintEditTextLayout
android:id="@+id/username_wrap"
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:paddingBottom="12dp"
app:labelTextColor="@color/m3_outlined_text_field_label"
android:foreground="@drawable/bg_m3_outlined_text_field">
android:foreground="@drawable/bg_m3_outlined_text_field"
tools:ignore="RtlHardcoded">
<EditText
android:id="@+id/username"
@@ -91,6 +93,20 @@
android:textColor="?colorM3OnSurface"
tools:text="\@mastodon.social"/>
<TextView
android:id="@+id/at_sign"
android:layout_width="wrap_content"
android:layout_height="56dp"
android:layout_gravity="left|top"
android:layout_marginLeft="56dp"
android:layout_marginTop="8dp"
android:paddingLeft="8dp"
android:paddingRight="2dp"
android:textAppearance="@style/m3_body_large"
android:gravity="center_vertical"
android:textColor="?colorM3OnSurface"
android:text="\@"/>
</org.joinmastodon.android.ui.views.FloatingHintEditTextLayout>
<org.joinmastodon.android.ui.views.FloatingHintEditTextLayout
@@ -191,19 +207,6 @@
</org.joinmastodon.android.ui.views.FloatingHintEditTextLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="56dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="-8dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:textAppearance="@style/m3_body_small"
android:textColor="?colorM3OnSurfaceVariant"
android:text="@string/password_note"/>
<org.joinmastodon.android.ui.views.FloatingHintEditTextLayout
android:id="@+id/reason_wrap"
android:layout_width="match_parent"

5
mastodon/src/main/res/layout/header_onboarding_login.xml
View File

@@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_body_large"
android:paddingStart="56dp"
android:paddingStart="80dp"
android:paddingEnd="24dp"
android:textColor="?colorM3OnSurface"
android:text="@string/login_subtitle"/>
@@ -38,7 +38,7 @@
android:textColorHint="?colorM3OnSurfaceVariant"
android:inputType="textUri"
android:importantForAutofill="no"
android:paddingStart="48dp"
android:paddingStart="64dp"
android:layout_marginEnd="52dp"
android:drawablePadding="16dp"
android:textAppearance="@style/m3_body_large"
@@ -47,6 +47,7 @@
<ImageView
android:layout_width="44dp"
android:layout_height="20dp"
android:layout_marginStart="8dp"
android:layout_gravity="start|center_vertical"
android:scaleType="center"
android:importantForAccessibility="no"

9
mastodon/src/main/res/values/strings.xml
View File

@@ -157,7 +157,6 @@
<string name="email">Email</string>
<string name="password">Password</string>
<string name="confirm_password">Confirm password</string>
<string name="password_note">Include capital letters, special characters, and numbers to increase your password strength.</string>
<string name="category_general">General</string>
<string name="confirm_email_title">Check your inbox</string>
<!-- %s is the email address -->
@@ -321,9 +320,9 @@
<string name="login_subtitle">Log in with the server where you created your account.</string>
<string name="server_url">Server URL</string>
<string name="server_filter_any_language">Any language</string>
<string name="server_filter_instant_signup">Instant sign-up</string>
<string name="server_filter_instant_signup">Instant sign up</string>
<string name="server_filter_manual_review">Manual review</string>
<string name="server_filter_any_signup_speed">Any sign-up speed</string>
<string name="server_filter_any_signup_speed">Any sign up speed</string>
<string name="server_filter_region_europe">Europe</string>
<string name="server_filter_region_north_america">North America</string>
<string name="server_filter_region_south_america">South America</string>
@@ -759,4 +758,8 @@
<string name="connection_timed_out">The request timed out. Check your connection and try again?</string>
<string name="server_error">Something went wrong talking with your server. It’s probably not your fault. Try again?</string>
<string name="not_found">It could’ve been deleted, or maybe it never existed at all.</string>
<string name="no_servers_found">No servers found for “%s”</string>
<string name="signup_username_taken">This username is taken. Try a different one or &lt;a>pick a different server&lt;/a>.</string>
<string name="signup_email_invalid">That doesn’t look like a valid email address.</string>
<string name="signup_email_taken">Email address is already in use. Did you &lt;a>forget your password&lt;/a>?</string>
</resources>