diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
index a110b2c54..89a7d7eb7 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
@@ -9,6 +9,7 @@ import android.graphics.drawable.Drawable;
import android.text.Spanned;
import android.text.TextUtils;
import android.text.format.DateUtils;
+import android.view.Gravity;
import android.view.Menu;
import android.view.View;
import android.view.ViewGroup;
@@ -21,10 +22,10 @@ import android.widget.TextView;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
import androidx.appcompat.widget.PopupMenu;
import androidx.appcompat.widget.TooltipCompat;
import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.core.content.ContextCompat;
import androidx.core.text.HtmlCompat;
import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.LinearLayoutManager;
@@ -535,7 +536,8 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
final Attachment.Type type = attachment.getType();
if (showingContent && (type == Attachment.Type.VIDEO || type == Attachment.Type.GIFV)) {
- imageView.setForeground(ContextCompat.getDrawable(itemView.getContext(), R.drawable.play_indicator_overlay));
+ imageView.setForegroundGravity(Gravity.CENTER);
+ imageView.setForeground(AppCompatResources.getDrawable(itemView.getContext(), R.drawable.ic_play_indicator));
} else {
imageView.setForeground(null);
}
@@ -611,7 +613,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
// Set the icon next to the label.
int drawableId = getLabelIcon(attachments.get(0).getType());
- mediaLabel.setCompoundDrawablesWithIntrinsicBounds(drawableId, 0, 0, 0);
+ mediaLabel.setCompoundDrawablesRelativeWithIntrinsicBounds(drawableId, 0, 0, 0);
setAttachmentClickListener(mediaLabel, listener, i, mediaDescriptions[i], false);
} else {
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ComposeScheduleView.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ComposeScheduleView.kt
index a68906d9e..c7f6a503f 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ComposeScheduleView.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ComposeScheduleView.kt
@@ -18,8 +18,8 @@ import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.content.res.AppCompatResources
import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.content.ContextCompat
import com.google.android.material.datepicker.CalendarConstraints
import com.google.android.material.datepicker.DateValidatorPointForward
import com.google.android.material.datepicker.MaterialDatePicker
@@ -89,10 +89,10 @@ class ComposeScheduleView
}
private fun setEditIcons() {
- val icon = ContextCompat.getDrawable(context, R.drawable.ic_create_24dp) ?: return
+ val icon = AppCompatResources.getDrawable(context, R.drawable.ic_create_24dp) ?: return
val size = binding.scheduledDateTime.lineHeight
icon.setBounds(0, 0, size, size)
- binding.scheduledDateTime.setCompoundDrawables(null, null, icon, null)
+ binding.scheduledDateTime.setCompoundDrawablesRelative(null, null, icon, null)
}
fun setResetOnClickListener(listener: OnClickListener?) {
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/notifications/StatusNotificationViewHolder.kt b/app/src/main/java/com/keylesspalace/tusky/components/notifications/StatusNotificationViewHolder.kt
index 89657fcac..e1a51c3c6 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/notifications/StatusNotificationViewHolder.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/notifications/StatusNotificationViewHolder.kt
@@ -27,7 +27,7 @@ import android.text.style.StyleSpan
import android.view.View
import androidx.annotation.ColorRes
import androidx.annotation.DrawableRes
-import androidx.core.content.ContextCompat
+import androidx.appcompat.content.res.AppCompatResources
import androidx.core.text.toSpannable
import androidx.recyclerview.widget.RecyclerView
import at.connyduck.sparkbutton.helpers.Utils
@@ -173,7 +173,7 @@ internal class StatusNotificationViewHolder(
@DrawableRes drawable: Int,
@ColorRes color: Int
): Drawable? {
- val icon = ContextCompat.getDrawable(context, drawable)
+ val icon = AppCompatResources.getDrawable(context, drawable)
icon?.setTint(context.getColor(color))
return icon
}
@@ -247,7 +247,7 @@ internal class StatusNotificationViewHolder(
format = context.getString(R.string.notification_favourite_format)
}
}
- binding.notificationTopText.setCompoundDrawablesWithIntrinsicBounds(
+ binding.notificationTopText.setCompoundDrawablesRelativeWithIntrinsicBounds(
icon,
null,
null,
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/StatusViewHelper.kt b/app/src/main/java/com/keylesspalace/tusky/util/StatusViewHelper.kt
index db56aea4f..ee575ce66 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/StatusViewHelper.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/util/StatusViewHelper.kt
@@ -243,7 +243,7 @@ class StatusViewHelper(private val itemView: View) {
// Set the icon next to the label.
val drawableId = getLabelIcon(attachments[0].type)
- mediaLabel.setCompoundDrawablesWithIntrinsicBounds(drawableId, 0, 0, 0)
+ mediaLabel.setCompoundDrawablesRelativeWithIntrinsicBounds(drawableId, 0, 0, 0)
mediaLabel.setOnClickListener { listener.onViewMedia(null, 0) }
}
diff --git a/app/src/main/res/drawable/background_circle.xml b/app/src/main/res/drawable/background_circle.xml
deleted file mode 100644
index 923aaee68..000000000
--- a/app/src/main/res/drawable/background_circle.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_arrow_back.xml b/app/src/main/res/drawable/ic_arrow_back.xml
deleted file mode 100644
index 89d18543f..000000000
--- a/app/src/main/res/drawable/ic_arrow_back.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_arrow_back_with_background.xml b/app/src/main/res/drawable/ic_arrow_back_with_background.xml
index 1a4d711f0..5253e68ff 100644
--- a/app/src/main/res/drawable/ic_arrow_back_with_background.xml
+++ b/app/src/main/res/drawable/ic_arrow_back_with_background.xml
@@ -1,12 +1,13 @@
-
-
-