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

Welcome fragment redesign again

Browse Source 
# Conflicts:
#	mastodon/src/main/res/values/strings.xml
#	mastodon/src/main/res/values/styles.xml
This commit is contained in:
Grishka
2023-04-07 22:40:00 +03:00
parent 915b0603d0
commit 4f8d8f0c8d
9 changed files with 303 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -439,4 +439,23 @@
<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
<string name="signup_email_domain_blocked">%1$s doesn\'t allow signups from %2$s. Try a different one or &lt;a>pick a different server&lt;/a>.</string>
<string name="signup_username_taken">This username is taken.</string>
<string name="spoiler_show">Show anyway</string>
<string name="spoiler_hide">Re-hide</string>
<string name="poll_multiple_choice">Choose one or more</string>
<string name="save_changes">Save changes</string>
<string name="profile_featured">Featured</string>
<string name="profile_timeline">Timeline</string>
<string name="view_all">View all</string>
<string name="profile_endorsed_accounts">Accounts</string>
<string name="verified_link">Verified link</string>
<string name="show">Show</string>
<string name="hide">Hide</string>
<string name="join_default_server">Join %s</string>
<string name="pick_server">Pick my own server</string>
<string name="signup_or_login">or</string>
<string name="learn_more">Learn more</string>
<string name="welcome_to_mastodon">Welcome to Mastodon</string>
<string name="welcome_paragraph1">Mastodon is a decentralized social network, meaning no single company controls it. It’s made up of many independently-run servers, all connected together.</string>
<string name="what_are_servers">What are servers?</string>
<string name="welcome_paragraph2"><![CDATA[Every Mastodon account is hosted on a server — each with its own values, rules, & admins. No matter which one you pick, you can follow and interact with people on any server.]]></string>
</resources>

7
mastodon/src/main/res/values/styles.xml
View File

@@ -319,6 +319,13 @@
<item name="android:paddingRight">24dp</item>
</style>
<style name="Widget.Mastodon.M3.Button.Outlined">
<item name="android:background">@drawable/bg_button_m3_outlined</item>
<item name="android:textColor">@color/button_text_m3_text</item>
<item name="android:paddingLeft">24dp</item>
<item name="android:paddingRight">24dp</item>
</style>
<style name="Widget.Mastodon.M3.EditText" parent="android:Widget.Material.EditText">
<item name="android:background">@drawable/bg_m3_outlined_text_field_nopad</item>
<item name="android:textAppearance">@style/m3_body_large</item>