Fixes some odd spacing in right-to-left direction and sets some icons to auto-mirror.

main
Vavassor 7 years ago
parent 98c91c772c
commit 8bc1955122
  1. 7
      app/src/main/java/com/keylesspalace/tusky/view/FlowLayout.java
  2. 3
      app/src/main/res/drawable/ic_play_48dp.xml
  3. 3
      app/src/main/res/drawable/ic_reply_24dp.xml
  4. 3
      app/src/main/res/drawable/ic_send_24dp.xml
  5. 2
      app/src/main/res/layout/item_follow.xml
  6. 9
      app/src/main/res/layout/item_status.xml

@ -64,16 +64,17 @@ public class FlowLayout extends ViewGroup {
if (child.getVisibility() != GONE) { if (child.getVisibility() != GONE) {
int widthSpec = MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST); int widthSpec = MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST);
child.measure(widthSpec, childHeightMeasureSpec); child.measure(widthSpec, childHeightMeasureSpec);
int childwidth = child.getMeasuredWidth(); child.getLayoutParams();
int childWidth = child.getMeasuredWidth();
int childHeight = child.getMeasuredHeight(); int childHeight = child.getMeasuredHeight();
if (x + childwidth > width) { if (x + childWidth > width) {
x = getPaddingLeft(); x = getPaddingLeft();
y += rowHeight; y += rowHeight;
rowHeight = childHeight + paddingVertical; rowHeight = childHeight + paddingVertical;
} else { } else {
rowHeight = Math.max(rowHeight, childHeight + paddingVertical); rowHeight = Math.max(rowHeight, childHeight + paddingVertical);
} }
x += childwidth + paddingHorizontal; x += childWidth + paddingHorizontal;
} }
} }
if (MeasureSpec.getMode(heightMeasureSpec) == MeasureSpec.UNSPECIFIED) { if (MeasureSpec.getMode(heightMeasureSpec) == MeasureSpec.UNSPECIFIED) {

@ -3,6 +3,7 @@
android:height="48dp" android:height="48dp"
android:width="48dp" android:width="48dp"
android:viewportWidth="24" android:viewportWidth="24"
android:viewportHeight="24"> android:viewportHeight="24"
android:autoMirrored="true">
<path android:fillColor="#FFF" android:pathData="M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M10,16.5L16,12L10,7.5V16.5Z" /> <path android:fillColor="#FFF" android:pathData="M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M10,16.5L16,12L10,7.5V16.5Z" />
</vector> </vector>

@ -2,7 +2,8 @@
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="24.0" android:viewportWidth="24.0"
android:viewportHeight="24.0"> android:viewportHeight="24.0"
android:autoMirrored="true">
<path <path
android:fillColor="@color/toolbar_icon_dark" android:fillColor="@color/toolbar_icon_dark"
android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/> android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/>

@ -2,7 +2,8 @@
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="24.0" android:viewportWidth="24.0"
android:viewportHeight="24.0"> android:viewportHeight="24.0"
android:autoMirrored="true">
<path <path
android:fillColor="@color/toolbar_icon_dark" android:fillColor="@color/toolbar_icon_dark"
android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/> android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>

@ -31,7 +31,7 @@
<TextView <TextView
android:id="@+id/notification_text" android:id="@+id/notification_text"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?android:textColorTertiary" android:textColor="?android:textColorTertiary"
android:layout_centerVertical="true" android:layout_centerVertical="true"

@ -68,6 +68,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginStart="4dp"
android:layout_marginLeft="4dp"
android:text="20m" android:text="20m"
android:textColor="?android:textColorSecondary" /> android:textColor="?android:textColorSecondary" />
@ -117,6 +119,7 @@
android:layout_toEndOf="@+id/status_avatar" android:layout_toEndOf="@+id/status_avatar"
android:layout_below="@+id/status_name_bar" android:layout_below="@+id/status_name_bar"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
app:paddingHorizontal="4dp"
android:focusable="true"> android:focusable="true">
<TextView <TextView
@ -124,11 +127,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/status_content_warning_description" android:id="@+id/status_content_warning_description"
android:text="Hello world" android:text="Hello world"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary" />
android:paddingStart="0dp"
android:paddingLeft="0dp"
android:paddingEnd="8dp"
android:paddingRight="8dp" />
<ToggleButton <ToggleButton
android:layout_width="wrap_content" android:layout_width="wrap_content"

Loading…
Cancel
Save