diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java index 01835cd1..bae06e6c 100644 --- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java @@ -345,6 +345,7 @@ public class ComposeActivity extends BaseActivity implements ComposeOptionsFragm setStatusVisibility(startingVisibility); postProgress.setVisibility(View.INVISIBLE); updateHideMediaToggleColor(); + updateVisibleCharactersLeft(); final ParserUtils parser = new ParserUtils(this); diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusViewHolder.java index 12d321ab..c532dcbd 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusViewHolder.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusViewHolder.java @@ -17,6 +17,7 @@ package com.keylesspalace.tusky.adapter; import android.content.Context; import android.graphics.drawable.Drawable; +import android.os.Build; import android.preference.PreferenceManager; import android.support.annotation.DrawableRes; import android.support.annotation.NonNull; @@ -129,7 +130,12 @@ public class StatusViewHolder extends RecyclerView.ViewHolder { Context context = avatar.getContext(); boolean hasReblog = rebloggedUrl != null && !rebloggedUrl.isEmpty(); int padding = hasReblog ? Utils.dpToPx(context, 12) : 0; - avatar.setPadding(0, 0, padding, padding); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && + avatar.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) { + avatar.setPadding(padding, 0, 0, padding); + } else { + avatar.setPadding(0, 0, padding, padding); + } if (url.isEmpty()) { avatar.setImageResource(R.drawable.avatar_default); diff --git a/app/src/main/java/com/keylesspalace/tusky/util/DateUtils.java b/app/src/main/java/com/keylesspalace/tusky/util/DateUtils.java index b2cc49a2..7142b5fd 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/DateUtils.java +++ b/app/src/main/java/com/keylesspalace/tusky/util/DateUtils.java @@ -15,6 +15,8 @@ package com.keylesspalace.tusky.util; +import java.text.NumberFormat; + public class DateUtils { /* This is a rough duplicate of android.text.format.DateUtils.getRelativeTimeSpanString, * but even with the FORMAT_ABBREV_RELATIVE flag it wasn't abbreviating enough. */ @@ -45,6 +47,6 @@ public class DateUtils { span /= YEAR; unit = "y"; } - return prefix + span + unit; + return prefix + NumberFormat.getIntegerInstance().format(span) + unit; } } diff --git a/app/src/main/res/layout/activity_compose.xml b/app/src/main/res/layout/activity_compose.xml index 63d5b3cf..d479e93d 100644 --- a/app/src/main/res/layout/activity_compose.xml +++ b/app/src/main/res/layout/activity_compose.xml @@ -152,7 +152,6 @@ android:id="@+id/characters_left" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="500" android:textColor="?android:textColorPrimary" />