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

Merge branch 'feature/copy-username' into fork

Browse Source
This commit is contained in:
sk
2022-11-21 20:58:25 +01:00
parent 0100967597 c2c44ab25e
commit 95d6e51ae0
5 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mastodon/src/main/res/layout/fragment_profile.xml
View File

@@ -240,22 +240,29 @@
android:textAlignment="viewStart"
tools:text="Eugen" />
<TextView
android:id="@+id/username"
<FrameLayout
android:id="@+id/username_wrap"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/name"
android:layout_marginStart="16dp"
android:layout_toStartOf="@id/profile_action_btn_wrap"
android:textAppearance="@style/m3_title_medium"
android:textColor="?android:textColorSecondary"
tools:text="\@Gargron"/>
android:layout_toStartOf="@id/profile_action_btn_wrap" >
<TextView
android:id="@+id/username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:selectableItemBackground"
android:textAppearance="@style/m3_title_medium"
android:textColor="?android:textColorSecondary"
tools:text="\@Gargron" />
</FrameLayout>
<org.joinmastodon.android.ui.views.LinkedTextView
android:id="@+id/bio"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/username"
android:layout_below="@id/username_wrap"
android:layout_marginLeft="16dp"
android:layout_marginTop="8dp"
android:layout_marginRight="16dp"
@@ -284,7 +291,7 @@
android:id="@+id/bio_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/username"
android:layout_below="@id/username_wrap"
android:layout_marginLeft="16dp"
android:layout_marginTop="8dp"
android:layout_marginRight="16dp"

1
mastodon/src/main/res/values-de-rDE/strings.xml
View File

@@ -415,4 +415,5 @@
<string name="i_agree">Ich stimme zu</string>
<string name="settings_always_reveal_content_warnings">Inhaltswarnungen immer ausklappen</string>
<string name="disable_marquee">Laufschrift in Titelleisten deaktivieren</string>
<string name="copied_to_clipboard">In die Zwischenablage kopiert</string>
</resources>

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

@@ -424,4 +424,5 @@
<string name="instance_signup_closed">This server does not accept new registrations.</string>
<string name="settings_always_reveal_content_warnings">Always reveal content warnings</string>
<string name="disable_marquee">Disable scrolling text in title bars</string>
<string name="copied_to_clipboard">Copied to clipboard</string>
</resources>