aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-10-03 22:31:55 +0200
committerChristian Schneppe <christian@pix-art.de>2018-10-03 22:31:55 +0200
commit26cc9dcbea89b5767c4c4c7dd3cfeb11a7ab168d (patch)
treee41b4f1b2521c325270600387dccd4091cb9a959 /src/main/res/values
parent8e088ccdb71495cf8bbd86919011296d2f7acde0 (diff)
rework MediaViewerActivity
Diffstat (limited to 'src/main/res/values')
-rw-r--r--src/main/res/values/attrs.xml1
-rw-r--r--src/main/res/values/defaults.xml2
-rw-r--r--src/main/res/values/strings.xml2
-rw-r--r--src/main/res/values/themes.xml4
4 files changed, 7 insertions, 2 deletions
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 @@
<attr name="icon_secure" format="reference" />
<attr name="icon_settings" format="reference" />
<attr name="icon_share" format="reference" />
+ <attr name="icon_delete" format="reference" />
<attr name="icon_import_export" format="reference" />
<attr name="icon_scan_qr_code" format="reference" />
<attr name="icon_enable_undecided_device" format="reference" />
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 @@
<string name="view_media">View media</string>
<string name="media_browser">Media browser</string>
<string name="account_status_stream_opening_error">Stream opening error</string>
+ <string name="action_open">Open</string>
+ <string name="action_delete">Delete</string>
</resources>
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 @@
<item name="icon_settings" type="reference">@drawable/ic_settings_black_24dp</item>
<item name="icon_import_export" type="reference">@drawable/ic_import_export_white_24dp
</item>
- <item name="icon_share" type="reference">@drawable/ic_share_white_24dp</item>
+ <item name="icon_delete" type="reference">@drawable/ic_delete_black_24dp</item>
+ <item name="icon_share" type="reference">@drawable/ic_share_black_24dp</item>
<item name="icon_scan_qr_code" type="reference">@drawable/ic_barcode_scan_white_24dp</item>
<item name="icon_scroll_down" type="reference">@drawable/ic_scroll_to_end_black</item>
@@ -271,6 +272,7 @@
<item name="icon_settings" type="reference">@drawable/ic_settings_white_24dp</item>
<item name="icon_import_export" type="reference">@drawable/ic_import_export_white_24dp
</item>
+ <item name="icon_delete" type="reference">@drawable/ic_delete_white_24dp</item>
<item name="icon_share" type="reference">@drawable/ic_share_white_24dp</item>
<item name="icon_scan_qr_code" type="reference">@drawable/ic_barcode_scan_white_24dp</item>
<item name="icon_scroll_down" type="reference">@drawable/ic_scroll_to_end_white</item>