diff --git a/build.gradle b/build.gradle
index 72e2088e9..52df95a1f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -68,7 +68,7 @@ dependencies {
implementation "com.android.support:design:$supportLibVersion"
implementation "com.android.support:cardview-v7:$supportLibVersion"
implementation 'com.github.bumptech.glide:glide:3.8.0'
- implementation 'com.github.chrisbanes:PhotoView:2.0.0'
+ implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
implementation 'com.github.rtoshiro.fullscreenvideoview:fullscreenvideoview:1.1.3'
implementation 'pub.devrel:easypermissions:1.2.0'
implementation 'com.wefika:flowlayout:0.4.1'
@@ -156,7 +156,7 @@ android {
}
lintOptions {
- disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource'
+ disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource', 'RestrictedApi'
}
subprojects {
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index bfdb2ec3d..ce3bfc406 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -104,8 +104,8 @@
android:name=".ui.ConversationsActivity"
android:label="@string/app_name"
android:launchMode="singleTask"
- android:minHeight="300dp"
android:minWidth="300dp"
+ android:minHeight="300dp"
android:windowSoftInputMode="stateHidden">
{
switch (attachmentItem.getItemId()) {
diff --git a/src/main/java/de/pixart/messenger/ui/ShowFullscreenMessageActivity.java b/src/main/java/de/pixart/messenger/ui/MediaViewerActivity.java
similarity index 67%
rename from src/main/java/de/pixart/messenger/ui/ShowFullscreenMessageActivity.java
rename to src/main/java/de/pixart/messenger/ui/MediaViewerActivity.java
index b34e49653..a8285d594 100644
--- a/src/main/java/de/pixart/messenger/ui/ShowFullscreenMessageActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/MediaViewerActivity.java
@@ -4,6 +4,8 @@ import android.content.ActivityNotFoundException;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
import android.content.res.Configuration;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
@@ -13,37 +15,40 @@ import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.design.widget.FloatingActionButton;
import android.support.v7.app.ActionBar;
+import android.support.v7.view.menu.MenuBuilder;
+import android.support.v7.view.menu.MenuPopupHelper;
+import android.support.v7.widget.PopupMenu;
import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
import android.view.View;
import android.view.WindowManager;
import android.webkit.MimeTypeMap;
import android.widget.ImageView;
import android.widget.Toast;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.resource.drawable.GlideDrawable;
-import com.bumptech.glide.request.animation.GlideAnimation;
-import com.bumptech.glide.request.target.GlideDrawableImageViewTarget;
-import com.github.chrisbanes.photoview.PhotoView;
-import com.github.chrisbanes.photoview.PhotoViewAttacher;
+import com.davemorrissey.labs.subscaleview.ImageSource;
+import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
import com.github.rtoshiro.view.video.FullscreenVideoLayout;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
+import java.util.List;
import de.pixart.messenger.Config;
import de.pixart.messenger.R;
import de.pixart.messenger.persistance.FileBackend;
import de.pixart.messenger.utils.ExifHelper;
+import de.pixart.messenger.utils.MimeUtils;
import static de.pixart.messenger.persistance.FileBackend.close;
-public class ShowFullscreenMessageActivity extends XmppActivity {
+public class MediaViewerActivity extends XmppActivity {
Integer oldOrientation;
- PhotoView mImage;
+ SubsamplingScaleImageView mImage;
FullscreenVideoLayout mVideo;
ImageView mFullscreenbutton;
Uri mFileUri;
@@ -52,6 +57,22 @@ public class ShowFullscreenMessageActivity extends XmppActivity {
int height = 0;
int width = 0;
int rotation = 0;
+ boolean isImage = false;
+ boolean isVideo = false;
+
+ public static String getMimeType(String path) {
+ try {
+ String type = null;
+ String extension = path.substring(path.lastIndexOf(".") + 1, path.length());
+ if (extension != null) {
+ type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
+ }
+ return type;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -73,18 +94,59 @@ public class ShowFullscreenMessageActivity extends XmppActivity {
getWindow().setAttributes(layout);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
- setContentView(R.layout.activity_fullscreen_message);
+ setContentView(R.layout.activity_media_viewer);
mImage = findViewById(R.id.message_image_view);
mVideo = findViewById(R.id.message_video_view);
mFullscreenbutton = findViewById(R.id.vcv_img_fullscreen);
fab = findViewById(R.id.fab);
fab.setOnClickListener(v -> {
- mVideo.reset();
- shareWith(mFile);
+ PopupMenu popup = new PopupMenu(MediaViewerActivity.this, v);
+ popup.inflate(R.menu.media_viewer);
+ final Menu menu = popup.getMenu();
+ MenuItem delete = menu.findItem(R.id.action_delete);
+ MenuItem open = menu.findItem(R.id.action_open);
+ Log.d(Config.LOGTAG, "Path = " + mFile.toString());
+ if (mFile == null || !mFile.toString().startsWith("/") || mFile.toString().contains(FileBackend.getConversationsDirectory("null"))) {
+ delete.setVisible(true);
+ } else {
+ delete.setVisible(false);
+ }
+ if (isVideo) {
+ if (isDarkTheme()) {
+ open.setIcon(R.drawable.ic_video_white_24dp);
+ } else {
+ open.setIcon(R.drawable.ic_video_black_24dp);
+ }
+ } else if (isImage) {
+ if (isDarkTheme()) {
+ open.setIcon(R.drawable.ic_image_white_24dp);
+ } else {
+ open.setIcon(R.drawable.ic_image_black_24dp);
+ }
+ }
+ popup.setOnMenuItemClickListener(item -> {
+ switch (item.getItemId()) {
+ case R.id.action_share:
+ share();
+ break;
+ case R.id.action_open:
+ open();
+ break;
+ case R.id.action_delete:
+ deleteFile();
+ break;
+ default:
+ return false;
+ }
+ return true;
+ });
+ MenuPopupHelper menuHelper = new MenuPopupHelper(MediaViewerActivity.this, (MenuBuilder) menu, v);
+ menuHelper.setForceShowIcon(true);
+ menuHelper.show();
});
}
- private void shareWith(File mFile) {
+ private void share() {
Intent share = new Intent(Intent.ACTION_SEND);
share.setType(getMimeType(mFile.toString()));
share.putExtra(Intent.EXTRA_STREAM, FileBackend.getUriForFile(this, mFile));
@@ -96,18 +158,35 @@ public class ShowFullscreenMessageActivity extends XmppActivity {
}
}
- public static String getMimeType(String path) {
+ private void deleteFile() {
+ this.xmppConnectionService.getFileBackend().deleteFile(mFile);
+ finish();
+ }
+
+ private void open() {
+ Uri uri;
try {
- String type = null;
- String extension = path.substring(path.lastIndexOf(".") + 1, path.length());
- if (extension != null) {
- type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
- }
- return type;
- } catch (Exception e) {
- e.printStackTrace();
+ uri = FileBackend.getUriForFile(this, mFile);
+ } catch (SecurityException e) {
+ Log.d(Config.LOGTAG, "No permission to access " + mFile.getAbsolutePath(), e);
+ Toast.makeText(this, this.getString(R.string.no_permission_to_access_x, mFile.getAbsolutePath()), Toast.LENGTH_SHORT).show();
+ return;
+ }
+ String mime = MimeUtils.guessMimeTypeFromUri(this, uri);
+ Intent openIntent = new Intent(Intent.ACTION_VIEW);
+ openIntent.setDataAndType(uri, mime);
+ openIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+ PackageManager manager = this.getPackageManager();
+ List info = manager.queryIntentActivities(openIntent, 0);
+ if (info.size() == 0) {
+ openIntent.setDataAndType(uri, "*/*");
+ }
+ try {
+ this.startActivity(openIntent);
+ finish();
+ } catch (ActivityNotFoundException e) {
+ Toast.makeText(this, R.string.no_application_found_to_open_file, Toast.LENGTH_SHORT).show();
}
- return null;
}
@Override
@@ -125,34 +204,38 @@ public class ShowFullscreenMessageActivity extends XmppActivity {
mFile = new File(mFileUri.getPath());
if (mFileUri != null && mFile.exists() && mFile.length() > 0) {
try {
- DisplayImage(mFile);
+ isImage = true;
+ DisplayImage(mFile, mFileUri);
} catch (Exception e) {
+ isImage = false;
Log.d(Config.LOGTAG, "Illegal exeption :" + e);
- Toast.makeText(ShowFullscreenMessageActivity.this, getString(R.string.error_file_corrupt), Toast.LENGTH_SHORT).show();
+ Toast.makeText(MediaViewerActivity.this, getString(R.string.error_file_corrupt), Toast.LENGTH_SHORT).show();
finish();
}
} else {
- Toast.makeText(ShowFullscreenMessageActivity.this, getString(R.string.file_deleted), Toast.LENGTH_SHORT).show();
+ Toast.makeText(MediaViewerActivity.this, getString(R.string.file_deleted), Toast.LENGTH_SHORT).show();
}
} else if (intent.hasExtra("video")) {
mFileUri = intent.getParcelableExtra("video");
mFile = new File(mFileUri.getPath());
if (mFileUri != null && mFile.exists() && mFile.length() > 0) {
try {
+ isVideo = true;
DisplayVideo(mFileUri);
} catch (Exception e) {
+ isVideo = false;
Log.d(Config.LOGTAG, "Illegal exeption :" + e);
- Toast.makeText(ShowFullscreenMessageActivity.this, getString(R.string.error_file_corrupt), Toast.LENGTH_SHORT).show();
+ Toast.makeText(MediaViewerActivity.this, getString(R.string.error_file_corrupt), Toast.LENGTH_SHORT).show();
finish();
}
} else {
- Toast.makeText(ShowFullscreenMessageActivity.this, getString(R.string.file_deleted), Toast.LENGTH_SHORT).show();
+ Toast.makeText(MediaViewerActivity.this, getString(R.string.file_deleted), Toast.LENGTH_SHORT).show();
}
}
}
}
- private void DisplayImage(final File file) {
+ private void DisplayImage(final File file, final Uri FileUri) {
BitmapFactory.Options options = new BitmapFactory.Options();
options.inJustDecodeBounds = true;
BitmapFactory.decodeFile(new File(file.getPath()).getAbsolutePath(), options);
@@ -163,19 +246,9 @@ public class ShowFullscreenMessageActivity extends XmppActivity {
if (useAutoRotateScreen()) {
rotateScreen(width, height, rotation);
}
- final PhotoViewAttacher mAttacher = new PhotoViewAttacher(mImage);
mImage.setVisibility(View.VISIBLE);
try {
- Glide.with(this)
- .load(file)
- .dontAnimate()
- .into(new GlideDrawableImageViewTarget(mImage) {
- @Override
- public void onResourceReady(GlideDrawable resource, GlideAnimation animation) {
- super.onResourceReady(resource, animation);
- mAttacher.update();
- }
- });
+ mImage.setImage(ImageSource.uri(FileUri));
} catch (Exception e) {
Toast.makeText(this, getString(R.string.error_file_corrupt), Toast.LENGTH_LONG).show();
e.printStackTrace();
diff --git a/src/main/java/de/pixart/messenger/ui/util/ViewUtil.java b/src/main/java/de/pixart/messenger/ui/util/ViewUtil.java
index b1905479b..07e25e31d 100644
--- a/src/main/java/de/pixart/messenger/ui/util/ViewUtil.java
+++ b/src/main/java/de/pixart/messenger/ui/util/ViewUtil.java
@@ -15,7 +15,7 @@ import java.util.List;
import de.pixart.messenger.Config;
import de.pixart.messenger.R;
import de.pixart.messenger.persistance.FileBackend;
-import de.pixart.messenger.ui.ShowFullscreenMessageActivity;
+import de.pixart.messenger.ui.MediaViewerActivity;
public class ViewUtil {
@@ -36,7 +36,7 @@ public class ViewUtil {
}
// use internal viewer for images and videos
if (mime.startsWith("image/")) {
- Intent intent = new Intent(context, ShowFullscreenMessageActivity.class);
+ Intent intent = new Intent(context, MediaViewerActivity.class);
intent.putExtra("image", Uri.fromFile(file));
try {
context.startActivity(intent);
@@ -45,7 +45,7 @@ public class ViewUtil {
//ignored
}
} else if (mime.startsWith("video/")) {
- Intent intent = new Intent(context, ShowFullscreenMessageActivity.class);
+ Intent intent = new Intent(context, MediaViewerActivity.class);
intent.putExtra("video", Uri.fromFile(file));
try {
context.startActivity(intent);
diff --git a/src/main/res/drawable-hdpi/ic_delete_black_24dp.png b/src/main/res/drawable-hdpi/ic_delete_black_24dp.png
new file mode 100644
index 000000000..789d96d42
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_delete_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_menu_white_24dp.png b/src/main/res/drawable-hdpi/ic_menu_white_24dp.png
new file mode 100644
index 000000000..aeb1e31a0
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_menu_white_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_share_black_24dp.png b/src/main/res/drawable-hdpi/ic_share_black_24dp.png
new file mode 100644
index 000000000..7331f79b3
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_share_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_video_black_24dp.png b/src/main/res/drawable-hdpi/ic_video_black_24dp.png
new file mode 100644
index 000000000..afd308697
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_video_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_video_white_24dp.png b/src/main/res/drawable-hdpi/ic_video_white_24dp.png
new file mode 100644
index 000000000..ca414b356
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_video_white_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_delete_black_24dp.png b/src/main/res/drawable-mdpi/ic_delete_black_24dp.png
new file mode 100644
index 000000000..7981a3def
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_delete_black_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_menu_white_24dp.png b/src/main/res/drawable-mdpi/ic_menu_white_24dp.png
new file mode 100644
index 000000000..60e4398a3
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_menu_white_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_share_black_24dp.png b/src/main/res/drawable-mdpi/ic_share_black_24dp.png
new file mode 100644
index 000000000..d4ebebd06
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_share_black_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_video_black_24dp.png b/src/main/res/drawable-mdpi/ic_video_black_24dp.png
new file mode 100644
index 000000000..c4be08a55
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_video_black_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_video_white_24dp.png b/src/main/res/drawable-mdpi/ic_video_white_24dp.png
new file mode 100644
index 000000000..60cc35c42
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_video_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png b/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png
new file mode 100644
index 000000000..16e6e7055
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png b/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png
new file mode 100644
index 000000000..5b7f7480b
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_share_black_24dp.png b/src/main/res/drawable-xhdpi/ic_share_black_24dp.png
new file mode 100644
index 000000000..5c058d4eb
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_share_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_video_black_24dp.png b/src/main/res/drawable-xhdpi/ic_video_black_24dp.png
new file mode 100644
index 000000000..f695100bb
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_video_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_video_white_24dp.png b/src/main/res/drawable-xhdpi/ic_video_white_24dp.png
new file mode 100644
index 000000000..2c764cbb5
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_video_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png
new file mode 100644
index 000000000..d118ae77b
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png
new file mode 100644
index 000000000..dcbdc6ac9
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png
new file mode 100644
index 000000000..f52683b7f
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_video_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_video_black_24dp.png
new file mode 100644
index 000000000..2cb46bf1a
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_video_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_video_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_video_white_24dp.png
new file mode 100644
index 000000000..77ef5ec76
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_video_white_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png
new file mode 100644
index 000000000..c49da5b4e
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png
new file mode 100644
index 000000000..0966d1f16
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png
new file mode 100644
index 000000000..484b6d474
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_video_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_video_black_24dp.png
new file mode 100644
index 000000000..bd76e9db6
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_video_black_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_video_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_video_white_24dp.png
new file mode 100644
index 000000000..d8ab46d9f
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_video_white_24dp.png differ
diff --git a/src/main/res/layout/activity_fullscreen_message.xml b/src/main/res/layout/activity_media_viewer.xml
similarity index 90%
rename from src/main/res/layout/activity_fullscreen_message.xml
rename to src/main/res/layout/activity_media_viewer.xml
index c1a1bc619..2eaad0d04 100644
--- a/src/main/res/layout/activity_fullscreen_message.xml
+++ b/src/main/res/layout/activity_media_viewer.xml
@@ -13,7 +13,7 @@
android:layout_alignParentRight="true"
android:layout_alignParentTop="true">
-
+ android:src="@drawable/ic_menu_white_24dp" />
\ No newline at end of file
diff --git a/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml
index 50243150b..b9268e4f9 100644
--- a/src/main/res/menu/contact_details.xml
+++ b/src/main/res/menu/contact_details.xml
@@ -11,7 +11,7 @@
-
diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml
index fbc5841ea..cbdde1fce 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -9,7 +9,7 @@
-
\ No newline at end of file
diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml
index b5e74f271..9f12e7333 100644
--- a/src/main/res/menu/muc_details.xml
+++ b/src/main/res/menu/muc_details.xml
@@ -4,7 +4,7 @@
-
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 284e7d74b..c537fd248 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -75,6 +75,7 @@
+
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index e213ea773..51971bcfd 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -41,7 +41,7 @@
\n\nhttp://hc.apache.org/httpcomponents-client\n(Apache License, Version 2.0)
\n\nhttp://hc.apache.org/httpcomponents-core\n(Apache License, Version 2.0)
\n\nhttps://github.com/bumptech/glide\n(BSD, The MIT License (MIT) and Apache License, Version 2.0)
- \n\nhttps://github.com/chrisbanes/PhotoView\n(Apache License, Version 2.0)
+ \n\nhttps://github.com/davemorrissey/subsampling-scale-image-view\n(Apache License, Version 2.0)
\n\nhttps://github.com/rtoshiro/FullscreenVideoView\n(Apache License, Version 2.0)
\n\nhttps://github.com/mangstadt/ez-vcard\n(FreeBSD)
\n\nhttps://github.com/googlesamples/easypermissions\n(Apache License, Version 2.0)
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index d3f9eeb0c..28a0b3156 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -827,4 +827,6 @@
View media
Media browser
Stream opening error
+ Open
+ Delete
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 8abbbd1e9..a8bdf3e1d 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -99,7 +99,8 @@
- @drawable/ic_settings_black_24dp
- @drawable/ic_import_export_white_24dp
- - @drawable/ic_share_white_24dp
+ - @drawable/ic_delete_black_24dp
+ - @drawable/ic_share_black_24dp
- @drawable/ic_barcode_scan_white_24dp
- @drawable/ic_scroll_to_end_black
@@ -271,6 +272,7 @@
- @drawable/ic_settings_white_24dp
- @drawable/ic_import_export_white_24dp
+ - @drawable/ic_delete_white_24dp
- @drawable/ic_share_white_24dp
- @drawable/ic_barcode_scan_white_24dp
- @drawable/ic_scroll_to_end_white