Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
1556f23fca
|
@ -60,7 +60,10 @@
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
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"
|
android:id="@+id/main_card_container"
|
||||||
app:layout_constraintStart_toEndOf="@id/reply_indicator_dot"
|
app:layout_constraintStart_toEndOf="@id/reply_indicator_dot"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
@ -262,9 +265,11 @@
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:drawablePadding="2dp"
|
android:drawablePadding="2dp"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:textAlignment="viewStart"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
app:layout_constraintBottom_toTopOf="@id/status_account_username"
|
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_constraintStart_toEndOf="@id/guide_account_image_end"
|
||||||
app:layout_constraintTop_toBottomOf="@id/status_boosted_by_info"
|
app:layout_constraintTop_toBottomOf="@id/status_boosted_by_info"
|
||||||
app:layout_constraintVertical_chainStyle="packed" />
|
app:layout_constraintVertical_chainStyle="packed" />
|
||||||
|
@ -290,6 +295,7 @@
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:ellipsize="end"
|
android:ellipsize="end"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
|
android:textAlignment="viewStart"
|
||||||
android:textSize="12sp"
|
android:textSize="12sp"
|
||||||
app:layout_constraintBottom_toBottomOf="@id/barrier_account_info_bottom"
|
app:layout_constraintBottom_toBottomOf="@id/barrier_account_info_bottom"
|
||||||
app:layout_constraintEnd_toStartOf="@id/status_toot_date"
|
app:layout_constraintEnd_toStartOf="@id/status_toot_date"
|
||||||
|
|
|
@ -60,10 +60,10 @@
|
||||||
android:id="@+id/main_card_container"
|
android:id="@+id/main_card_container"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="3dp"
|
android:layout_marginStart="4dp"
|
||||||
android:layout_marginTop="3dp"
|
android:layout_marginTop="4dp"
|
||||||
android:layout_marginEnd="4dp"
|
android:layout_marginEnd="4dp"
|
||||||
android:layout_marginBottom="3dp"
|
android:layout_marginBottom="2dp"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toEndOf="@id/reply_indicator_dot"
|
app:layout_constraintStart_toEndOf="@id/reply_indicator_dot"
|
||||||
|
@ -215,6 +215,7 @@
|
||||||
android:drawablePadding="2dp"
|
android:drawablePadding="2dp"
|
||||||
android:ellipsize="end"
|
android:ellipsize="end"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
|
android:textAlignment="viewStart"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
app:layout_constraintBottom_toTopOf="@id/status_account_username"
|
app:layout_constraintBottom_toTopOf="@id/status_account_username"
|
||||||
app:layout_constraintEnd_toStartOf="@id/cached_status"
|
app:layout_constraintEnd_toStartOf="@id/cached_status"
|
||||||
|
@ -226,11 +227,12 @@
|
||||||
android:id="@+id/status_account_username"
|
android:id="@+id/status_account_username"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_gravity="start|center_vertical"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:layout_marginEnd="5dp"
|
android:layout_marginEnd="5dp"
|
||||||
android:ellipsize="end"
|
android:ellipsize="end"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
|
android:textAlignment="viewStart"
|
||||||
android:textSize="12sp"
|
android:textSize="12sp"
|
||||||
app:layout_constraintBottom_toTopOf="@id/barrier_status_account_info"
|
app:layout_constraintBottom_toTopOf="@id/barrier_status_account_info"
|
||||||
app:layout_constraintEnd_toStartOf="@id/status_toot_date"
|
app:layout_constraintEnd_toStartOf="@id/status_toot_date"
|
||||||
|
|
|
@ -176,6 +176,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:drawablePadding="2dp"
|
android:drawablePadding="2dp"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
|
android:textAlignment="viewStart"
|
||||||
android:textStyle="bold" />
|
android:textStyle="bold" />
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
@ -198,6 +199,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:drawablePadding="2dp"
|
android:drawablePadding="2dp"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
|
android:textAlignment="viewStart"
|
||||||
android:textStyle="bold" />
|
android:textStyle="bold" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue