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

Merge remote-tracking branch 'megalodon_main/main' into m3-merger

Browse Source 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/res/values-pl-rPL/strings_sk.xml
#	mastodon/src/main/res/values-ru-rRU/strings_sk.xml
#	metadata/ru/full_description.txt
This commit is contained in:
LucasGGamerM
2023-08-24 08:17:57 -03:00
parent 3db74fb958 40a033d692
commit afc401c1f2
65 changed files with 2604 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,8 +56,8 @@
<FrameLayout
android:id="@+id/avatar_border"
android:layout_width="104dp"
android:layout_height="104dp"
android:layout_width="108dp"
android:layout_height="108dp"
android:layout_below="@id/cover"
android:layout_alignParentStart="true"
android:layout_marginStart="12dp"
@@ -67,8 +67,8 @@
<ImageView
android:id="@+id/avatar"
android:layout_width="96dp"
android:layout_height="96dp"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="center"
android:contentDescription="@string/profile_picture"
android:scaleType="centerCrop"