Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
tom79 2019-11-13 09:05:28 +01:00
parent 8b32f9c19b 528e86deb3
commit 1556f23fca
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/res/layout/drawer_status.xml
View File

@ -60,7 +60,10 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
android:layout_margin="4dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="2dp"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:id="@+id/main_card_container"
app:layout_constraintStart_toEndOf="@id/reply_indicator_dot"
app:layout_constraintBottom_toBottomOf="parent"
@ -262,9 +265,11 @@
android:layout_marginStart="5dp"
android:drawablePadding="2dp"
android:maxLines="1"
android:ellipsize="end"
android:textAlignment="viewStart"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/status_account_username"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toStartOf="@id/cached_status"
app:layout_constraintStart_toEndOf="@id/guide_account_image_end"
app:layout_constraintTop_toBottomOf="@id/status_boosted_by_info"
app:layout_constraintVertical_chainStyle="packed" />
@ -290,6 +295,7 @@
android:layout_marginStart="5dp"
android:ellipsize="end"
android:maxLines="1"
android:textAlignment="viewStart"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@id/barrier_account_info_bottom"
app:layout_constraintEnd_toStartOf="@id/status_toot_date"

10
app/src/main/res/layout/drawer_status_compact.xml
View File

@ -60,10 +60,10 @@
android:id="@+id/main_card_container"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:layout_marginTop="3dp"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
android:layout_marginBottom="3dp"
android:layout_marginBottom="2dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/reply_indicator_dot"
@ -215,6 +215,7 @@
android:drawablePadding="2dp"
android:ellipsize="end"
android:maxLines="1"
android:textAlignment="viewStart"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/status_account_username"
app:layout_constraintEnd_toStartOf="@id/cached_status"
@ -226,11 +227,12 @@
android:id="@+id/status_account_username"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_gravity="start|center_vertical"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:ellipsize="end"
android:maxLines="1"
android:textAlignment="viewStart"
android:textSize="12sp"
app:layout_constraintBottom_toTopOf="@id/barrier_status_account_info"
app:layout_constraintEnd_toStartOf="@id/status_toot_date"

2
app/src/main/res/layout/drawer_status_focused.xml
View File

@ -176,6 +176,7 @@
android:layout_height="wrap_content"
android:drawablePadding="2dp"
android:maxLines="1"
android:textAlignment="viewStart"
android:textStyle="bold" />
<LinearLayout
@ -198,6 +199,7 @@
android:layout_height="wrap_content"
android:drawablePadding="2dp"
android:maxLines="1"
android:textAlignment="viewStart"
android:textStyle="bold" />
</LinearLayout>