diff options
Diffstat (limited to '')
34 files changed, 29 insertions, 7 deletions
diff --git a/src/main/res/drawable-hdpi/ic_delete_black_24dp.png b/src/main/res/drawable-hdpi/ic_delete_black_24dp.png Binary files differnew file mode 100644 index 000000000..789d96d42 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_delete_black_24dp.png diff --git a/src/main/res/drawable-hdpi/ic_menu_white_24dp.png b/src/main/res/drawable-hdpi/ic_menu_white_24dp.png Binary files differnew file mode 100644 index 000000000..aeb1e31a0 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_menu_white_24dp.png diff --git a/src/main/res/drawable-hdpi/ic_share_black_24dp.png b/src/main/res/drawable-hdpi/ic_share_black_24dp.png Binary files differnew file mode 100644 index 000000000..7331f79b3 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_share_black_24dp.png diff --git a/src/main/res/drawable-hdpi/ic_video_black_24dp.png b/src/main/res/drawable-hdpi/ic_video_black_24dp.png Binary files differnew file mode 100644 index 000000000..afd308697 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_video_black_24dp.png diff --git a/src/main/res/drawable-hdpi/ic_video_white_24dp.png b/src/main/res/drawable-hdpi/ic_video_white_24dp.png Binary files differnew file mode 100644 index 000000000..ca414b356 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_video_white_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_delete_black_24dp.png b/src/main/res/drawable-mdpi/ic_delete_black_24dp.png Binary files differnew file mode 100644 index 000000000..7981a3def --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_delete_black_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_menu_white_24dp.png b/src/main/res/drawable-mdpi/ic_menu_white_24dp.png Binary files differnew file mode 100644 index 000000000..60e4398a3 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_menu_white_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_share_black_24dp.png b/src/main/res/drawable-mdpi/ic_share_black_24dp.png Binary files differnew file mode 100644 index 000000000..d4ebebd06 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_share_black_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_video_black_24dp.png b/src/main/res/drawable-mdpi/ic_video_black_24dp.png Binary files differnew file mode 100644 index 000000000..c4be08a55 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_video_black_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_video_white_24dp.png b/src/main/res/drawable-mdpi/ic_video_white_24dp.png Binary files differnew file mode 100644 index 000000000..60cc35c42 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_video_white_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png b/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png Binary files differnew file mode 100644 index 000000000..16e6e7055 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png b/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png Binary files differnew file mode 100644 index 000000000..5b7f7480b --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_share_black_24dp.png b/src/main/res/drawable-xhdpi/ic_share_black_24dp.png Binary files differnew file mode 100644 index 000000000..5c058d4eb --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_share_black_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_video_black_24dp.png b/src/main/res/drawable-xhdpi/ic_video_black_24dp.png Binary files differnew file mode 100644 index 000000000..f695100bb --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_video_black_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_video_white_24dp.png b/src/main/res/drawable-xhdpi/ic_video_white_24dp.png Binary files differnew file mode 100644 index 000000000..2c764cbb5 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_video_white_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png Binary files differnew file mode 100644 index 000000000..d118ae77b --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png Binary files differnew file mode 100644 index 000000000..dcbdc6ac9 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png Binary files differnew file mode 100644 index 000000000..f52683b7f --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_video_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_video_black_24dp.png Binary files differnew file mode 100644 index 000000000..2cb46bf1a --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_video_black_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_video_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_video_white_24dp.png Binary files differnew file mode 100644 index 000000000..77ef5ec76 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_video_white_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png Binary files differnew file mode 100644 index 000000000..c49da5b4e --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png Binary files differnew file mode 100644 index 000000000..0966d1f16 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png Binary files differnew file mode 100644 index 000000000..484b6d474 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_video_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_video_black_24dp.png Binary files differnew file mode 100644 index 000000000..bd76e9db6 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_video_black_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_video_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_video_white_24dp.png Binary files differnew file mode 100644 index 000000000..d8ab46d9f --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_video_white_24dp.png diff --git a/src/main/res/layout/activity_fullscreen_message.xml b/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"> - <com.github.chrisbanes.photoview.PhotoView + <com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView android:id="@id/message_image_view" android:layout_width="match_parent" android:layout_height="match_parent" @@ -32,6 +32,6 @@ android:layout_height="wrap_content" android:layout_gravity="right|top" android:layout_margin="16dp" - android:src="?attr/icon_share" /> + android:src="@drawable/ic_menu_white_24dp" /> </FrameLayout> </RelativeLayout>
\ 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 @@ <item android:id="@+id/action_share" - android:icon="?attr/icon_share" + android:icon="@drawable/ic_share_white_24dp" android:orderInCategory="15" app:showAsAction="always" android:title="@string/share_uri_with"> 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 @@ <item android:id="@+id/action_share" android:title="@string/share_uri_with" - android:icon="?attr/icon_share" + android:icon="@drawable/ic_share_white_24dp" app:showAsAction="always"> <menu> <item diff --git a/src/main/res/menu/media_viewer.xml b/src/main/res/menu/media_viewer.xml new file mode 100644 index 000000000..c3898c79b --- /dev/null +++ b/src/main/res/menu/media_viewer.xml @@ -0,0 +1,17 @@ +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + + <item + android:id="@+id/action_share" + android:icon="?attr/icon_share" + android:orderInCategory="10" + android:title="@string/share" /> + <item + android:id="@+id/action_open" + android:orderInCategory="20" + android:title="@string/action_open" /> + <item + android:id="@+id/action_delete" + android:icon="?attr/icon_delete" + android:orderInCategory="30" + android:title="@string/action_delete" /> +</menu>
\ 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 @@ <item android:id="@+id/action_share" - android:icon="?attr/icon_share" + android:icon="@drawable/ic_share_white_24dp" android:orderInCategory="15" android:title="@string/share_uri_with" app:showAsAction="always"> 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> |