diff --git a/res/drawable-hdpi/ic_audio_dark.png b/res/drawable-hdpi/ic_audio_dark.png
deleted file mode 100644
index 6b865ebd6..000000000
Binary files a/res/drawable-hdpi/ic_audio_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_audio_light.png b/res/drawable-hdpi/ic_audio_light.png
deleted file mode 100644
index 45c439e07..000000000
Binary files a/res/drawable-hdpi/ic_audio_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_video_dark.png b/res/drawable-hdpi/ic_video_dark.png
deleted file mode 100644
index ae43e5f84..000000000
Binary files a/res/drawable-hdpi/ic_video_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_video_light.png b/res/drawable-hdpi/ic_video_light.png
deleted file mode 100644
index 90830d110..000000000
Binary files a/res/drawable-hdpi/ic_video_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_audio_dark.png b/res/drawable-mdpi/ic_audio_dark.png
deleted file mode 100644
index 256c04bab..000000000
Binary files a/res/drawable-mdpi/ic_audio_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_audio_light.png b/res/drawable-mdpi/ic_audio_light.png
deleted file mode 100644
index fd2d3d06d..000000000
Binary files a/res/drawable-mdpi/ic_audio_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_video_dark.png b/res/drawable-mdpi/ic_video_dark.png
deleted file mode 100644
index 4390851ed..000000000
Binary files a/res/drawable-mdpi/ic_video_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_video_light.png b/res/drawable-mdpi/ic_video_light.png
deleted file mode 100644
index da0a760d3..000000000
Binary files a/res/drawable-mdpi/ic_video_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_audio_dark.png b/res/drawable-xhdpi/ic_audio_dark.png
deleted file mode 100644
index 907ff68a1..000000000
Binary files a/res/drawable-xhdpi/ic_audio_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_audio_light.png b/res/drawable-xhdpi/ic_audio_light.png
deleted file mode 100644
index 3fe1d58cb..000000000
Binary files a/res/drawable-xhdpi/ic_audio_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_video_dark.png b/res/drawable-xhdpi/ic_video_dark.png
deleted file mode 100644
index 76c3e8883..000000000
Binary files a/res/drawable-xhdpi/ic_video_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_video_light.png b/res/drawable-xhdpi/ic_video_light.png
deleted file mode 100644
index 12c8a6d12..000000000
Binary files a/res/drawable-xhdpi/ic_video_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_audio_dark.png b/res/drawable-xxhdpi/ic_audio_dark.png
deleted file mode 100644
index 85f999841..000000000
Binary files a/res/drawable-xxhdpi/ic_audio_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_audio_light.png b/res/drawable-xxhdpi/ic_audio_light.png
deleted file mode 100644
index d53eef6ff..000000000
Binary files a/res/drawable-xxhdpi/ic_audio_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_video_dark.png b/res/drawable-xxhdpi/ic_video_dark.png
deleted file mode 100644
index b7e9e10fa..000000000
Binary files a/res/drawable-xxhdpi/ic_video_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_video_light.png b/res/drawable-xxhdpi/ic_video_light.png
deleted file mode 100644
index caedec825..000000000
Binary files a/res/drawable-xxhdpi/ic_video_light.png and /dev/null differ
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 4f9caa0e6..867a1a137 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -91,9 +91,6 @@
-
-
-
diff --git a/res/values/themes.xml b/res/values/themes.xml
index c9bb143a2..5cd86a882 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -205,9 +205,6 @@
- @drawable/ic_save_white_24dp
- @drawable/ic_reply_white_24dp
- - @drawable/ic_audio_light
- - @drawable/ic_video_light
-
- #ff1d85d7
- @color/delta_primary_dark
@@ -359,9 +356,6 @@
- @drawable/ic_save_white_24dp
- @drawable/ic_reply_white_24dp
- - @drawable/ic_audio_dark
- - @drawable/ic_video_dark
-
- @color/delta_primary_dark
- @color/core_white
diff --git a/src/org/thoughtcrime/securesms/components/ThumbnailView.java b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
index 993e8cf04..a4431788e 100644
--- a/src/org/thoughtcrime/securesms/components/ThumbnailView.java
+++ b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
@@ -227,10 +227,10 @@ public class ThumbnailView extends FrameLayout {
public ListenableFuture setImageResource(@NonNull GlideRequests glideRequests, @NonNull Slide slide,
int naturalWidth, int naturalHeight)
{
- if (slide.getThumbnailUri() != null && slide.hasPlayOverlay())
- {
+ if (slide.hasPlayOverlay()) {
this.playOverlay.setVisibility(View.VISIBLE);
- } else {
+ }
+ else {
this.playOverlay.setVisibility(View.GONE);
}
@@ -289,10 +289,6 @@ public class ThumbnailView extends FrameLayout {
request.into(new GlideDrawableListeningTarget(image, result));
}
}
- else if (slide.hasPlaceholder())
- {
- buildPlaceholderGlideRequest(glideRequests, slide).into(new GlideBitmapListeningTarget(image, result));
- }
else
{
glideRequests.clear(image);
@@ -324,12 +320,6 @@ public class ThumbnailView extends FrameLayout {
slide = null;
}
- private RequestBuilder buildPlaceholderGlideRequest(@NonNull GlideRequests glideRequests, @NonNull Slide slide) {
- return applySizing(glideRequests.asBitmap()
- .load(slide.getPlaceholderRes(getContext().getTheme()))
- .diskCacheStrategy(DiskCacheStrategy.NONE), new FitCenter());
- }
-
private GlideRequest applySizing(@NonNull GlideRequest request, @NonNull BitmapTransformation fitting) {
int[] size = new int[2];
fillTargetDimensions(size, dimens, bounds);
diff --git a/src/org/thoughtcrime/securesms/mms/AudioSlide.java b/src/org/thoughtcrime/securesms/mms/AudioSlide.java
index a20c85099..8708aeeca 100644
--- a/src/org/thoughtcrime/securesms/mms/AudioSlide.java
+++ b/src/org/thoughtcrime/securesms/mms/AudioSlide.java
@@ -59,11 +59,6 @@ public class AudioSlide extends Slide {
return null;
}
- @Override
- public boolean hasPlaceholder() {
- return true;
- }
-
@Override
public boolean hasImage() {
return true;
@@ -73,15 +68,4 @@ public class AudioSlide extends Slide {
public boolean hasAudio() {
return true;
}
-
- @NonNull
- @Override
- public String getContentDescription() {
- return context.getString(R.string.audio);
- }
-
- @Override
- public @DrawableRes int getPlaceholderRes(Theme theme) {
- return ResUtil.getDrawableRes(theme, R.attr.conversation_icon_attach_audio);
- }
}
diff --git a/src/org/thoughtcrime/securesms/mms/ImageSlide.java b/src/org/thoughtcrime/securesms/mms/ImageSlide.java
index 94bd850be..32cdae449 100644
--- a/src/org/thoughtcrime/securesms/mms/ImageSlide.java
+++ b/src/org/thoughtcrime/securesms/mms/ImageSlide.java
@@ -47,11 +47,6 @@ public class ImageSlide extends Slide {
super(context, constructAttachmentFromUri(context, uri, MediaUtil.IMAGE_JPEG, size, width, height, uri, null, false));
}
- @Override
- public @DrawableRes int getPlaceholderRes(Theme theme) {
- return 0;
- }
-
@Override
public @Nullable Uri getThumbnailUri() {
return getUri();
@@ -61,10 +56,4 @@ public class ImageSlide extends Slide {
public boolean hasImage() {
return true;
}
-
- @NonNull
- @Override
- public String getContentDescription() {
- return context.getString(R.string.image);
- }
}
diff --git a/src/org/thoughtcrime/securesms/mms/MmsSlide.java b/src/org/thoughtcrime/securesms/mms/MmsSlide.java
index c9f8885c1..b90b55a87 100644
--- a/src/org/thoughtcrime/securesms/mms/MmsSlide.java
+++ b/src/org/thoughtcrime/securesms/mms/MmsSlide.java
@@ -17,11 +17,4 @@ public class MmsSlide extends ImageSlide {
public MmsSlide(@NonNull Context context, @NonNull Attachment attachment) {
super(context, attachment);
}
-
- @NonNull
- @Override
- public String getContentDescription() {
- return "MMS";
- }
-
}
diff --git a/src/org/thoughtcrime/securesms/mms/Slide.java b/src/org/thoughtcrime/securesms/mms/Slide.java
index 264ec511e..8bc90846b 100644
--- a/src/org/thoughtcrime/securesms/mms/Slide.java
+++ b/src/org/thoughtcrime/securesms/mms/Slide.java
@@ -102,8 +102,6 @@ public abstract class Slide {
return false;
}
- public @NonNull String getContentDescription() { return ""; }
-
public Attachment asAttachment() {
return attachment;
}
@@ -112,14 +110,6 @@ public abstract class Slide {
return attachment.getTransferState();
}
- public @DrawableRes int getPlaceholderRes(Theme theme) {
- throw new AssertionError("getPlaceholderRes() called for non-drawable slide");
- }
-
- public boolean hasPlaceholder() {
- return false;
- }
-
public boolean hasPlayOverlay() {
return false;
}
diff --git a/src/org/thoughtcrime/securesms/mms/VideoSlide.java b/src/org/thoughtcrime/securesms/mms/VideoSlide.java
index fee89c0f5..41edce4f1 100644
--- a/src/org/thoughtcrime/securesms/mms/VideoSlide.java
+++ b/src/org/thoughtcrime/securesms/mms/VideoSlide.java
@@ -61,18 +61,6 @@ public class VideoSlide extends Slide {
return true;
}
- @Override
- public boolean hasPlaceholder() {
- return true;
- }
-
- @Override
- public @DrawableRes int getPlaceholderRes(Theme theme) {
- // the placeholder is shown when a video is staged before sending.
- // TODO: VIDEO: not needed, we should show the normal thumbnail plus transparent play or edit buttons
- return ResUtil.getDrawableRes(theme, R.attr.conversation_icon_attach_video);
- }
-
@Override
public boolean hasImage() {
return true;
@@ -82,9 +70,4 @@ public class VideoSlide extends Slide {
public boolean hasVideo() {
return true;
}
-
- @NonNull @Override
- public String getContentDescription() {
- return context.getString(R.string.video);
- }
}