diff --git a/Graphics/android-icon-copier/.gitignore b/Graphics/android-icon-copier/.gitignore new file mode 100644 index 000000000..3336b9152 --- /dev/null +++ b/Graphics/android-icon-copier/.gitignore @@ -0,0 +1,81 @@ +# Python + +*.py[cod] + +# Options +/options.json + +# Packages +*.egg +*.egg-info +/dist +/build +/eggs +/parts +/bin +/var +/sdist +/develop-eggs +/lib +/lib64 +.installed.cfg + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.coverage +.tox +nosetests.xml + +# Translations +*.mo + +# Mr Developer +.mr.developer.cfg +.project +.pydevproject + +### Generic + +*.log +*.sqlite? + +### Compiled binaries + +*.class +*.jar + +*.o +*.bin +*.a +*.lib +*.so +*.out + +*.obj +*.exe +*.dll +*.com + +### *nix OS / apps + +*.swp +*~ + +### Mac OS generated + +__MACOSX +Icon? +*.DS_Store +*.DS_Store? +._* +.Spotlight* +.Trashes + +### Windows generated + +ehthumbs.db +thumbs.db +Thumbs.db + diff --git a/Graphics/android-icon-copier/LICENSE b/Graphics/android-icon-copier/LICENSE new file mode 100644 index 000000000..4dc1175a5 --- /dev/null +++ b/Graphics/android-icon-copier/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2015 Lucas Tan + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/Graphics/android-icon-copier/README.md b/Graphics/android-icon-copier/README.md new file mode 100644 index 000000000..3e12ae472 --- /dev/null +++ b/Graphics/android-icon-copier/README.md @@ -0,0 +1,109 @@ +[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-android--icon--copier-brightgreen.svg?style=flat)](https://android-arsenal.com/details/1/1325) + +What is this +============ +A commandline tool to copy Android Material Design and FontAwesome icons to your + project folders: `drawable-ldpi`, `drawable-mdpi`, and etc. + +How it works +============ +It downloads from these repos: +- Material design: https://github.com/google/material-design-icons +- FontAwesome and "Classic" Android: https://github.com/svenkapudija/Android-Action-Bar-Icons + +Resolution supported +==================== + | l | m | h | xh | xxh | xxxh | +--------|---|---|---|----|-----|------| +FA | Y | Y | Y | Y | Y | - | +Classic | - | Y | Y | Y | Y | - | +Material| - | Y | Y | Y | Y | Y | + +Sizes supported +=============== +Material: 18, 24, 36, 48 dp. +FA and Classic: 32 dp only. + + +Usage +===== +
+Usage:
+Material      : ./copy {proj path} {category} {color} {icon name} [size]
+Classic and FA: ./copy {proj path} {fa/classic} {color} {icon name}
+
+ +`[]` denotes optional args. +**Args are case sensitive!** + +- `proj path`: Path to project folder relative to `base path`. + - `base path` can be defined in options file (see below). + - Auto-detects new or old project structure: `MyProject/src/main/res` or + `MyProject/res`. +- `category`: Either "classic", "fa", or Material category. +- `color`: Color of icon: Either "white", "grey" or "black". + - For Classic and FA, "white" refers to the Holo Dark theme (dark background). + "Grey" refers to the Holo Light theme. + - For Material, "grey" refers to grey600. +- `icon name`: Name of icon (must replace spaces and dashes with underscores). + - Without any prefix. Examples: FontAwesome "thumbs_up", Classic "search". +- `size` (integer): for Material only, Size in dp, defaults to 24 which is the + action bar icon size for material design. + +Examples +-------- +- `./copy MyProject maps white place` + - Downloads to `BasePath/MyProject/{src/main}/res/drawable-{m,h,xh,xxh,xxh}dpi +- `./copy MyProject maps white place 48` +- `./copy Path/to/MyProject fa grey thumbs_up` + +Windows users need to use `python copy` instead (I think). + +Filename mapping +================ +The tool also supports filename mapping of destination png files. (see options) +Mapping vars: + +- `cat`: category +- `name`: name as specified in commandline. +- `color`: color as specified: white, black, grey. +- `size`: integer only. +- `bg`: derived from color. black => bright, white => dark, grey => light. +- `bgSuffix`: "_dark" if bg is dark else empty string. + +Options file +============ +Named `options.json` in same dir. Sample: +```json +{ + "basePath": "~/Documents", + "filenameMap": { + "classic": "ic_action_{name}{bgSuffix}.png", + "fa": "ic_action_fa_{name}{bgSuffix}.png", + "material": "ic_{name}_{color}_{size}dp.png" + } +} +``` + +~ is expanded to the user home dir. + +`./copy Path/to/MyProject fa white thumbs_up` results in the +target filename of `ic_action_fa_thumbs_up_dark.png`. + +Installation +============ +- Python >= 2.7 (older or newer ver might work, you may try.) +- Python Requests package: `pip install requests` +- Git clone this repo or download the script. + +Icon cheatsheet +=============== +- Material: http://google.github.io/material-design-icons/ +- FA: http://fortawesome.github.io/Font-Awesome/icons/ (icons in 4.2 not supported) +- Classic: coming soon. + +License +======= +This project is under the MIT License. (see LICENSE) + +Please refer to the respective icon library for its licensing info. diff --git a/Graphics/android-icon-copier/classic.py b/Graphics/android-icon-copier/classic.py new file mode 100644 index 000000000..17ae1aac4 --- /dev/null +++ b/Graphics/android-icon-copier/classic.py @@ -0,0 +1,146 @@ +# Maps icon name to the dir name. +CLASSIC_MAP = { + 'about': '13_extra_actions_about', + 'accept': '01_core_accept', + 'accounts': '10_device_access_accounts', + 'add_alarm': '10_device_access_add_alarm', + 'add_group': '06_social_add_group', + 'add_person': '06_social_add_person', + 'add_to_queue': '09_media_add_to_queue', + 'airplane_mode_off': '10_device_access_airplane_mode_off', + 'airplane_mode_on': '10_device_access_airplane_mode_on', + 'alarms': '10_device_access_alarms', + 'attachment': '05_content_attachment', + 'back': '02_navigation_back', + 'backspace': '05_content_backspace', + 'bad': '03_rating_bad', + 'battery': '10_device_access_battery', + 'bightness_low': '10_device_access_bightness_low', + 'bluetooth': '10_device_access_bluetooth', + 'bluetooth_connected': '10_device_access_bluetooth_connected', + 'bluetooth_searching': '10_device_access_bluetooth_searching', + 'brightness_auto': '10_device_access_brightness_auto', + 'brightness_high': '10_device_access_brightness_high', + 'brightness_medium': '10_device_access_brightness_medium', + 'call': '01_core_call', + 'camera': '08_camera_camera', + 'cancel': '01_core_cancel', + 'cast': '09_media_cast', + 'cc_bcc': '06_social_cc_bcc', + 'chat': '06_social_chat', + 'cloud': '04_collections_cloud', + 'collapse': '02_navigation_collapse', + 'collection': '04_collections_collection', + 'computer': '11_hardware_computer', + 'copy': '01_core_copy', + 'crop': '08_camera_crop', + 'cut': '01_core_cut', + 'data_usage': '10_device_access_data_usage', + 'dial_pad': '10_device_access_dial_pad', + 'directions': '07_location_directions', + 'discard': '01_core_discard', + 'dock': '11_hardware_dock', + 'download': '09_media_download', + 'edit': '01_core_edit', + 'email': '05_content_email', + 'end_call': '10_device_access_end_call', + 'error': '12_alerts_and_states_error', + 'event': '05_content_event', + 'expand': '02_navigation_expand', + 'fast_forward': '09_media_fast_forward', + 'favorite': '03_rating_favorite', + 'flash_automatic': '08_camera_flash_automatic', + 'flash_off': '08_camera_flash_off', + 'flash_on': '08_camera_flash_on', + 'forward': '06_social_forward', + 'full_screen': '09_media_full_screen', + 'gamepad': '11_hardware_gamepad', + 'go_to_today': '04_collections_go_to_today', + 'good': '03_rating_good', + 'group': '06_social_group', + 'half_important': '03_rating_half_important', + 'headphones': '11_hardware_headphones', + 'headset': '11_hardware_headset', + 'help': '13_extra_actions_help', + 'import_export': '05_content_import_export', + 'important': '03_rating_important', + 'keyboard': '11_hardware_keyboard', + 'labels': '04_collections_labels', + 'location_found': '07_location_location_found', + 'location_off': '07_location_location_off', + 'location_searching': '07_location_location_searching', + 'make_available_offline': '09_media_make_available_offline', + 'map': '07_location_map', + 'merge': '05_content_merge', + 'mic': '08_camera_mic', + 'mic_muted': '08_camera_mic_muted', + 'mouse': '11_hardware_mouse', + 'network_cell': '10_device_access_network_cell', + 'network_wifi': '10_device_access_network_wifi', + 'new': '01_core_new', + 'new_account': '10_device_access_new_account', + 'new_attachment': '05_content_new_attachment', + 'new_email': '05_content_new_email', + 'new_event': '05_content_new_event', + 'new_label': '04_collections_new_label', + 'new_picture': '05_content_new_picture', + 'next': '09_media_next', + 'next_item': '02_navigation_next_item', + 'not_important': '03_rating_not_important', + 'not_secure': '10_device_access_not_secure', + 'overflow': '01_core_overflow', + 'paste': '01_core_paste', + 'pause': '09_media_pause', + 'pause_over_video': '09_media_pause_over_video', + 'person': '06_social_person', + 'phone': '11_hardware_phone', + 'picture': '05_content_picture', + 'place': '07_location_place', + 'play': '09_media_play', + 'play_over_video': '09_media_play_over_video', + 'previous': '09_media_previous', + 'previous_item': '02_navigation_previous_item', + 'read': '05_content_read', + 'refresh': '01_core_refresh', + 'remove': '01_core_remove', + 'repeat': '09_media_repeat', + 'replay': '09_media_replay', + 'reply': '06_social_reply', + 'reply_all': '06_social_reply_all', + 'return_from_full_screen': '09_media_return_from_full_screen', + 'rewind': '09_media_rewind', + 'ring_volume': '10_device_access_ring_volume', + 'rotate_left': '08_camera_rotate_left', + 'rotate_right': '08_camera_rotate_right', + 'save': '05_content_save', + 'screen_locked_to_landscape': '10_device_access_screen_locked_to_landscape', + 'screen_locked_to_portrait': '10_device_access_screen_locked_to_portrait', + 'screen_rotation': '10_device_access_screen_rotation', + 'sd_storage': '10_device_access_sd_storage', + 'search': '01_core_search', + 'secure': '10_device_access_secure', + 'select_all': '01_core_select_all', + 'send_now': '06_social_send_now', + 'settings': '13_extra_actions_settings', + 'share': '01_core_share', + 'shuffle': '09_media_shuffle', + 'slideshow': '09_media_slideshow', + 'sort_by_size': '04_collections_sort_by_size', + 'split': '05_content_split', + 'stop': '09_media_stop', + 'storage': '10_device_access_storage', + 'switch_camera': '08_camera_switch_camera', + 'switch_video': '08_camera_switch_video', + 'time': '10_device_access_time', + 'undo': '01_core_undo', + 'unread': '05_content_unread', + 'upload': '09_media_upload', + 'usb': '10_device_access_usb', + 'video': '08_camera_video', + 'view_as_grid': '04_collections_view_as_grid', + 'view_as_list': '04_collections_view_as_list', + 'volume_muted': '09_media_volume_muted', + 'volume_on': '09_media_volume_on', + 'warning': '12_alerts_and_states_warning', + 'web_site': '07_location_web_site', +} diff --git a/Graphics/android-icon-copier/copy b/Graphics/android-icon-copier/copy new file mode 100755 index 000000000..995a8789e --- /dev/null +++ b/Graphics/android-icon-copier/copy @@ -0,0 +1,162 @@ +#!/usr/bin/env python + +import os +import sys +import shutil +import requests +from os.path import expanduser +import classic + +resolutions = { + 'material': ("m", "h", "xh", "xxh", "xxxh"), + 'fa': ("l", "m", "h", "xh", "xxh"), + 'classic': ("m", "h", "xh", "xxh"), +} + + +class AppError(Exception): + pass + + +def make_filename(filename_format, cat, name, color, size): + args = { + 'cat': cat or '', + 'name': name, + 'color': color, + 'size': size, + } + bg = {'white': 'dark', 'grey': 'light', 'black': 'bright'}.get(color) or '' + bg_suffix = '_dark' if bg == 'dark' else '' + args['bgSuffix'] = bg_suffix + args['bg'] = bg + return filename_format.format(**args) + + +def download_url(url, target_path): + print("Downloading {} to {} ...".format(url, target_path)) + print("") + #r = requests.get(url, stream=True) + r = requests.get(url) + if r.status_code != 200: + raise AppError("url not found, perhaps invalid name, size or color") + with open(target_path, 'wb') as fd: + for chunk in r.iter_content(4096): + fd.write(chunk) + + +def make_material_icon_url(cat, res, name, color, size): + if color == 'grey': + color = 'grey600' + elif color not in ('white', 'black'): + raise AppError('invalid color') + return ('https://raw.githubusercontent.com/google/material-design-icons/master/' + + '{}/drawable-{}dpi/ic_{}_{}_{}dp.png').format(cat, res, name, color, size) + + +def make_fa_icon_url(res, name, color): + if color == 'white': + holo = 'dark' + elif color == 'grey': + holo = 'light' + else: + raise AppError('invalid color') + return ('https://raw.githubusercontent.com/svenkapudija/Android-Action-Bar-Icons/' + + 'master/Font Awesome/holo_{2}/ic_fa_{1}/drawable-{0}dpi/ic_fa_{1}.png').format(res, name, holo) + + +def make_classic_icon_url(res, name, color): + dirname = classic.CLASSIC_MAP.get(name) + if not dirname: + raise AppError('invalid name') + if color == 'white': + holo = 'dark' + elif color == 'grey': + holo = 'light' + else: + raise AppError('invalid color') + return ('https://raw.githubusercontent.com/svenkapudija/Android-Action-Bar-Icons/' + + 'master/Android Stock/holo_{2}/{3}/drawable-{0}dpi/ic_action_{1}.png').format(res, name, holo, dirname) + + +def make_target_path(base_path, proj, res, filename): + res_path1 = os.path.join(base_path, proj, 'src', 'main', 'res') + res_path2 = os.path.join(base_path, proj, 'res') + if os.path.isdir(res_path1): + res_path = res_path1 + elif os.path.isdir(res_path2): + res_path = res_path2 + else: + raise AppError('missing res dir') + res_specific_path = os.path.join(res_path, 'drawable-' + res + 'dpi') + try: + os.mkdir(res_specific_path) + except OSError: + pass + return os.path.join(res_specific_path, filename) + + +def do_material(options, proj_path, cat, name, color, size): + base_path = expanduser(options['basePath']) + filename_map = options['filenameMap'] + + for res in resolutions['material']: + filename = make_filename(filename_map['material'], cat, name, color, size) + target_path = make_target_path(base_path, proj_path, res, filename) + url = make_material_icon_url(cat, res, name, color, size) + download_url(url, target_path) + + +def do_classic_or_fa(options, proj_path, cat, name, color): + base_path = expanduser(options['basePath']) + filename_map = options['filenameMap'] + + for res in resolutions[cat]: + filename = make_filename(filename_map[cat], cat, name, color, size=32) + target_path = make_target_path(base_path, proj_path, res, filename) + url = globals()['make_' + cat + '_icon_url'](res, name, color) + download_url(url, target_path) + + +def print_usage(): + print("Usage:") + print("Material : ./copy [size]") + print("Classic & FA: ./copy ") + print("") + + +def main(): + import json + + if len(sys.argv) < 5: + print_usage() + return + + option_filename = 'options.json' + if not os.path.exists(option_filename): + option_filename = 'options.templ.json' + print("WARNING: using the template options file") + print("You should create your own options.json") + + with open(option_filename, 'r') as fd: + options = json.load(fd) + + proj_path = sys.argv[1] + cat = sys.argv[2] + color = sys.argv[3] + name = sys.argv[4] + + if cat == 'classic' or cat == 'fa': + do_classic_or_fa(options, proj_path, cat, name, color) + else: + size = sys.argv[5] if len(sys.argv) >= 6 else 0 + size = int(size) or 24 + do_material(options, proj_path, cat, name, color, size) + + +if __name__ == "__main__": + try: + main() + except AppError as e: + print(e.message) + + diff --git a/Graphics/android-icon-copier/options.templ.json b/Graphics/android-icon-copier/options.templ.json new file mode 100644 index 000000000..319d90f42 --- /dev/null +++ b/Graphics/android-icon-copier/options.templ.json @@ -0,0 +1,8 @@ +{ + "basePath": "~/Documents", + "filenameMap": { + "classic": "ic_action_{name}{bgSuffix}.png", + "fa": "ic_action_fa_{name}{bgSuffix}.png", + "material": "ic_{name}_{color}_{size}dp.png" + } +} diff --git a/Resources/graphics/All_Icons.svg b/Graphics/drawables/All_Icons.svg similarity index 100% rename from Resources/graphics/All_Icons.svg rename to Graphics/drawables/All_Icons.svg diff --git a/Resources/graphics/create_key_robot.svg b/Graphics/drawables/create_key_robot.svg similarity index 100% rename from Resources/graphics/create_key_robot.svg rename to Graphics/drawables/create_key_robot.svg diff --git a/Resources/graphics/first_time_1.png b/Graphics/drawables/first_time_1.png similarity index 100% rename from Resources/graphics/first_time_1.png rename to Graphics/drawables/first_time_1.png diff --git a/Resources/graphics/first_time_1.svg b/Graphics/drawables/first_time_1.svg similarity index 100% rename from Resources/graphics/first_time_1.svg rename to Graphics/drawables/first_time_1.svg diff --git a/Resources/graphics/function.png b/Graphics/drawables/function.png similarity index 100% rename from Resources/graphics/function.png rename to Graphics/drawables/function.png diff --git a/Resources/graphics/function.svg b/Graphics/drawables/function.svg similarity index 100% rename from Resources/graphics/function.svg rename to Graphics/drawables/function.svg diff --git a/Resources/graphics/ic_action_nfc.svg b/Graphics/drawables/ic_action_nfc.svg similarity index 100% rename from Resources/graphics/ic_action_nfc.svg rename to Graphics/drawables/ic_action_nfc.svg diff --git a/Resources/graphics/ic_action_qr_code.svg b/Graphics/drawables/ic_action_qr_code.svg similarity index 100% rename from Resources/graphics/ic_action_qr_code.svg rename to Graphics/drawables/ic_action_qr_code.svg diff --git a/Resources/graphics/ic_action_safeslinger.svg b/Graphics/drawables/ic_action_safeslinger.svg similarity index 100% rename from Resources/graphics/ic_action_safeslinger.svg rename to Graphics/drawables/ic_action_safeslinger.svg diff --git a/Resources/graphics/ic_action_search_cloud.svg b/Graphics/drawables/ic_action_search_cloud.svg similarity index 100% rename from Resources/graphics/ic_action_search_cloud.svg rename to Graphics/drawables/ic_action_search_cloud.svg diff --git a/Resources/graphics/ic_launcher_old.svg b/Graphics/drawables/ic_launcher_old.svg similarity index 100% rename from Resources/graphics/ic_launcher_old.svg rename to Graphics/drawables/ic_launcher_old.svg diff --git a/Resources/graphics/icon_sizes.txt b/Graphics/drawables/icon_sizes.txt similarity index 100% rename from Resources/graphics/icon_sizes.txt rename to Graphics/drawables/icon_sizes.txt diff --git a/Resources/graphics/key_flag_authenticate.svg b/Graphics/drawables/key_flag_authenticate.svg similarity index 100% rename from Resources/graphics/key_flag_authenticate.svg rename to Graphics/drawables/key_flag_authenticate.svg diff --git a/Resources/graphics/key_flag_certify.svg b/Graphics/drawables/key_flag_certify.svg similarity index 100% rename from Resources/graphics/key_flag_certify.svg rename to Graphics/drawables/key_flag_certify.svg diff --git a/Resources/graphics/key_flag_encrypt.svg b/Graphics/drawables/key_flag_encrypt.svg similarity index 100% rename from Resources/graphics/key_flag_encrypt.svg rename to Graphics/drawables/key_flag_encrypt.svg diff --git a/Resources/graphics/key_flag_sign.svg b/Graphics/drawables/key_flag_sign.svg similarity index 100% rename from Resources/graphics/key_flag_sign.svg rename to Graphics/drawables/key_flag_sign.svg diff --git a/Resources/graphics/originals/gnupg-infographic/README b/Graphics/drawables/originals/gnupg-infographic/README similarity index 100% rename from Resources/graphics/originals/gnupg-infographic/README rename to Graphics/drawables/originals/gnupg-infographic/README diff --git a/Resources/graphics/originals/gnupg-infographic/gnupg-infographic.png b/Graphics/drawables/originals/gnupg-infographic/gnupg-infographic.png similarity index 100% rename from Resources/graphics/originals/gnupg-infographic/gnupg-infographic.png rename to Graphics/drawables/originals/gnupg-infographic/gnupg-infographic.png diff --git a/Resources/graphics/originals/gnupg-infographic/gnupg-infographic.svg b/Graphics/drawables/originals/gnupg-infographic/gnupg-infographic.svg similarity index 100% rename from Resources/graphics/originals/gnupg-infographic/gnupg-infographic.svg rename to Graphics/drawables/originals/gnupg-infographic/gnupg-infographic.svg diff --git a/Resources/graphics/originals/ic_action_nfc/NFC.png b/Graphics/drawables/originals/ic_action_nfc/NFC.png similarity index 100% rename from Resources/graphics/originals/ic_action_nfc/NFC.png rename to Graphics/drawables/originals/ic_action_nfc/NFC.png diff --git a/Resources/graphics/originals/ic_action_qr_code/ic_menu_qr_code.svg b/Graphics/drawables/originals/ic_action_qr_code/ic_menu_qr_code.svg similarity index 100% rename from Resources/graphics/originals/ic_action_qr_code/ic_menu_qr_code.svg rename to Graphics/drawables/originals/ic_action_qr_code/ic_menu_qr_code.svg diff --git a/Resources/graphics/originals/ic_launcher/AUTHORS b/Graphics/drawables/originals/ic_launcher/AUTHORS similarity index 100% rename from Resources/graphics/originals/ic_launcher/AUTHORS rename to Graphics/drawables/originals/ic_launcher/AUTHORS diff --git a/Resources/graphics/originals/ic_launcher/COPYING b/Graphics/drawables/originals/ic_launcher/COPYING similarity index 100% rename from Resources/graphics/originals/ic_launcher/COPYING rename to Graphics/drawables/originals/ic_launcher/COPYING diff --git a/Resources/graphics/originals/ic_launcher/kgpg_key2_kopete.svgz b/Graphics/drawables/originals/ic_launcher/kgpg_key2_kopete.svgz similarity index 100% rename from Resources/graphics/originals/ic_launcher/kgpg_key2_kopete.svgz rename to Graphics/drawables/originals/ic_launcher/kgpg_key2_kopete.svgz diff --git a/Resources/graphics/originals/modernpgp-icons/README.md b/Graphics/drawables/originals/modernpgp-icons/README.md similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/README.md rename to Graphics/drawables/originals/modernpgp-icons/README.md diff --git a/Resources/graphics/originals/modernpgp-icons/encryption/lock-closed.png b/Graphics/drawables/originals/modernpgp-icons/encryption/lock-closed.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/encryption/lock-closed.png rename to Graphics/drawables/originals/modernpgp-icons/encryption/lock-closed.png diff --git a/Resources/graphics/originals/modernpgp-icons/encryption/lock-closed.svg b/Graphics/drawables/originals/modernpgp-icons/encryption/lock-closed.svg similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/encryption/lock-closed.svg rename to Graphics/drawables/originals/modernpgp-icons/encryption/lock-closed.svg diff --git a/Resources/graphics/originals/modernpgp-icons/encryption/lock-closed@200.png b/Graphics/drawables/originals/modernpgp-icons/encryption/lock-closed@200.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/encryption/lock-closed@200.png rename to Graphics/drawables/originals/modernpgp-icons/encryption/lock-closed@200.png diff --git a/Resources/graphics/originals/modernpgp-icons/encryption/lock-closed@300.png b/Graphics/drawables/originals/modernpgp-icons/encryption/lock-closed@300.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/encryption/lock-closed@300.png rename to Graphics/drawables/originals/modernpgp-icons/encryption/lock-closed@300.png diff --git a/Resources/graphics/originals/modernpgp-icons/encryption/lock-closed@512x.png b/Graphics/drawables/originals/modernpgp-icons/encryption/lock-closed@512x.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/encryption/lock-closed@512x.png rename to Graphics/drawables/originals/modernpgp-icons/encryption/lock-closed@512x.png diff --git a/Resources/graphics/originals/modernpgp-icons/encryption/lock-error.png b/Graphics/drawables/originals/modernpgp-icons/encryption/lock-error.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/encryption/lock-error.png rename to Graphics/drawables/originals/modernpgp-icons/encryption/lock-error.png diff --git a/Resources/graphics/originals/modernpgp-icons/encryption/lock-error.svg b/Graphics/drawables/originals/modernpgp-icons/encryption/lock-error.svg similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/encryption/lock-error.svg rename to Graphics/drawables/originals/modernpgp-icons/encryption/lock-error.svg diff --git a/Resources/graphics/originals/modernpgp-icons/encryption/lock-error@200.png b/Graphics/drawables/originals/modernpgp-icons/encryption/lock-error@200.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/encryption/lock-error@200.png rename to Graphics/drawables/originals/modernpgp-icons/encryption/lock-error@200.png diff --git a/Resources/graphics/originals/modernpgp-icons/encryption/lock-error@300.png b/Graphics/drawables/originals/modernpgp-icons/encryption/lock-error@300.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/encryption/lock-error@300.png rename to Graphics/drawables/originals/modernpgp-icons/encryption/lock-error@300.png diff --git a/Resources/graphics/originals/modernpgp-icons/encryption/lock-error@512x.png b/Graphics/drawables/originals/modernpgp-icons/encryption/lock-error@512x.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/encryption/lock-error@512x.png rename to Graphics/drawables/originals/modernpgp-icons/encryption/lock-error@512x.png diff --git a/Resources/graphics/originals/modernpgp-icons/encryption/lock-open.png b/Graphics/drawables/originals/modernpgp-icons/encryption/lock-open.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/encryption/lock-open.png rename to Graphics/drawables/originals/modernpgp-icons/encryption/lock-open.png diff --git a/Resources/graphics/originals/modernpgp-icons/encryption/lock-open.svg b/Graphics/drawables/originals/modernpgp-icons/encryption/lock-open.svg similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/encryption/lock-open.svg rename to Graphics/drawables/originals/modernpgp-icons/encryption/lock-open.svg diff --git a/Resources/graphics/originals/modernpgp-icons/encryption/lock-open@200.png b/Graphics/drawables/originals/modernpgp-icons/encryption/lock-open@200.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/encryption/lock-open@200.png rename to Graphics/drawables/originals/modernpgp-icons/encryption/lock-open@200.png diff --git a/Resources/graphics/originals/modernpgp-icons/encryption/lock-open@300.png b/Graphics/drawables/originals/modernpgp-icons/encryption/lock-open@300.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/encryption/lock-open@300.png rename to Graphics/drawables/originals/modernpgp-icons/encryption/lock-open@300.png diff --git a/Resources/graphics/originals/modernpgp-icons/encryption/lock-open@512x.png b/Graphics/drawables/originals/modernpgp-icons/encryption/lock-open@512x.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/encryption/lock-open@512x.png rename to Graphics/drawables/originals/modernpgp-icons/encryption/lock-open@512x.png diff --git a/Resources/graphics/originals/modernpgp-icons/keys/icon-fingerprint.png b/Graphics/drawables/originals/modernpgp-icons/keys/icon-fingerprint.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/keys/icon-fingerprint.png rename to Graphics/drawables/originals/modernpgp-icons/keys/icon-fingerprint.png diff --git a/Resources/graphics/originals/modernpgp-icons/keys/icon-fingerprint.svg b/Graphics/drawables/originals/modernpgp-icons/keys/icon-fingerprint.svg similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/keys/icon-fingerprint.svg rename to Graphics/drawables/originals/modernpgp-icons/keys/icon-fingerprint.svg diff --git a/Resources/graphics/originals/modernpgp-icons/keys/icon-fingerprint@200.png b/Graphics/drawables/originals/modernpgp-icons/keys/icon-fingerprint@200.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/keys/icon-fingerprint@200.png rename to Graphics/drawables/originals/modernpgp-icons/keys/icon-fingerprint@200.png diff --git a/Resources/graphics/originals/modernpgp-icons/keys/icon-fingerprint@300.png b/Graphics/drawables/originals/modernpgp-icons/keys/icon-fingerprint@300.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/keys/icon-fingerprint@300.png rename to Graphics/drawables/originals/modernpgp-icons/keys/icon-fingerprint@300.png diff --git a/Resources/graphics/originals/modernpgp-icons/keys/icon-fingerprint@512x.png b/Graphics/drawables/originals/modernpgp-icons/keys/icon-fingerprint@512x.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/keys/icon-fingerprint@512x.png rename to Graphics/drawables/originals/modernpgp-icons/keys/icon-fingerprint@512x.png diff --git a/Resources/graphics/originals/modernpgp-icons/keys/icon-key.png b/Graphics/drawables/originals/modernpgp-icons/keys/icon-key.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/keys/icon-key.png rename to Graphics/drawables/originals/modernpgp-icons/keys/icon-key.png diff --git a/Resources/graphics/originals/modernpgp-icons/keys/icon-key.svg b/Graphics/drawables/originals/modernpgp-icons/keys/icon-key.svg similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/keys/icon-key.svg rename to Graphics/drawables/originals/modernpgp-icons/keys/icon-key.svg diff --git a/Resources/graphics/originals/modernpgp-icons/keys/icon-key@200.png b/Graphics/drawables/originals/modernpgp-icons/keys/icon-key@200.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/keys/icon-key@200.png rename to Graphics/drawables/originals/modernpgp-icons/keys/icon-key@200.png diff --git a/Resources/graphics/originals/modernpgp-icons/keys/icon-key@300.png b/Graphics/drawables/originals/modernpgp-icons/keys/icon-key@300.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/keys/icon-key@300.png rename to Graphics/drawables/originals/modernpgp-icons/keys/icon-key@300.png diff --git a/Resources/graphics/originals/modernpgp-icons/keys/icon-key@512x.png b/Graphics/drawables/originals/modernpgp-icons/keys/icon-key@512x.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/keys/icon-key@512x.png rename to Graphics/drawables/originals/modernpgp-icons/keys/icon-key@512x.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-expired-cutout.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-expired-cutout.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-expired-cutout.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-expired-cutout.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-expired-cutout.svg b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-expired-cutout.svg similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-expired-cutout.svg rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-expired-cutout.svg diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-expired-cutout@200.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-expired-cutout@200.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-expired-cutout@200.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-expired-cutout@200.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-expired-cutout@300.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-expired-cutout@300.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-expired-cutout@300.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-expired-cutout@300.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-expired-cutout@512x.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-expired-cutout@512x.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-expired-cutout@512x.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-expired-cutout@512x.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-expired.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-expired.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-expired.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-expired.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-expired.svg b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-expired.svg similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-expired.svg rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-expired.svg diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-expired@200.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-expired@200.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-expired@200.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-expired@200.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-expired@300.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-expired@300.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-expired@300.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-expired@300.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-expired@512x.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-expired@512x.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-expired@512x.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-expired@512x.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-invalid-cutout.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-invalid-cutout.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-invalid-cutout.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-invalid-cutout.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-invalid-cutout.svg b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-invalid-cutout.svg similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-invalid-cutout.svg rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-invalid-cutout.svg diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-invalid-cutout@200.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-invalid-cutout@200.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-invalid-cutout@200.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-invalid-cutout@200.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-invalid-cutout@300.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-invalid-cutout@300.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-invalid-cutout@300.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-invalid-cutout@300.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-invalid-cutout@512x.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-invalid-cutout@512x.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-invalid-cutout@512x.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-invalid-cutout@512x.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-invalid.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-invalid.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-invalid.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-invalid.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-invalid.svg b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-invalid.svg similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-invalid.svg rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-invalid.svg diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-invalid@200.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-invalid@200.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-invalid@200.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-invalid@200.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-invalid@300.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-invalid@300.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-invalid@300.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-invalid@300.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-invalid@512x.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-invalid@512x.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-invalid@512x.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-invalid@512x.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-revoked-cutout.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-revoked-cutout.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-revoked-cutout.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-revoked-cutout.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-revoked-cutout.svg b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-revoked-cutout.svg similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-revoked-cutout.svg rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-revoked-cutout.svg diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-revoked-cutout@200.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-revoked-cutout@200.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-revoked-cutout@200.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-revoked-cutout@200.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-revoked-cutout@300.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-revoked-cutout@300.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-revoked-cutout@300.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-revoked-cutout@300.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-revoked-cutout@512x.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-revoked-cutout@512x.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-revoked-cutout@512x.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-revoked-cutout@512x.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-revoked.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-revoked.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-revoked.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-revoked.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-revoked.svg b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-revoked.svg similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-revoked.svg rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-revoked.svg diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-revoked@200.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-revoked@200.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-revoked@200.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-revoked@200.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-revoked@300.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-revoked@300.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-revoked@300.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-revoked@300.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-revoked@512x.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-revoked@512x.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-revoked@512x.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-revoked@512x.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-unknown-cutout.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-unknown-cutout.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-unknown-cutout.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-unknown-cutout.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-unknown-cutout.svg b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-unknown-cutout.svg similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-unknown-cutout.svg rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-unknown-cutout.svg diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-unknown-cutout@200.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-unknown-cutout@200.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-unknown-cutout@200.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-unknown-cutout@200.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-unknown-cutout@300.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-unknown-cutout@300.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-unknown-cutout@300.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-unknown-cutout@300.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-unknown-cutout@512x.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-unknown-cutout@512x.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-unknown-cutout@512x.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-unknown-cutout@512x.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-unknown.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-unknown.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-unknown.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-unknown.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-unknown.svg b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-unknown.svg similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-unknown.svg rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-unknown.svg diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-unknown@200.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-unknown@200.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-unknown@200.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-unknown@200.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-unknown@300.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-unknown@300.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-unknown@300.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-unknown@300.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-unknown@512x.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-unknown@512x.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-unknown@512x.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-unknown@512x.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-unverified-cutout.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-unverified-cutout.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-unverified-cutout.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-unverified-cutout.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-unverified-cutout.svg b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-unverified-cutout.svg similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-unverified-cutout.svg rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-unverified-cutout.svg diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-unverified-cutout@200.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-unverified-cutout@200.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-unverified-cutout@200.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-unverified-cutout@200.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-unverified-cutout@300.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-unverified-cutout@300.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-unverified-cutout@300.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-unverified-cutout@300.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-unverified-cutout@512x.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-unverified-cutout@512x.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-unverified-cutout@512x.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-unverified-cutout@512x.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-unverified.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-unverified.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-unverified.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-unverified.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-unverified.svg b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-unverified.svg similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-unverified.svg rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-unverified.svg diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-unverified@200.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-unverified@200.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-unverified@200.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-unverified@200.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-unverified@300.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-unverified@300.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-unverified@300.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-unverified@300.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-unverified@512x.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-unverified@512x.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-unverified@512x.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-unverified@512x.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-verified-cutout.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-verified-cutout.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-verified-cutout.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-verified-cutout.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-verified-cutout.svg b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-verified-cutout.svg similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-verified-cutout.svg rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-verified-cutout.svg diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-verified-cutout@200.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-verified-cutout@200.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-verified-cutout@200.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-verified-cutout@200.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-verified-cutout@300.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-verified-cutout@300.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-verified-cutout@300.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-verified-cutout@300.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-verified-cutout@512x.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-verified-cutout@512x.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-verified-cutout@512x.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-verified-cutout@512x.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-verified.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-verified.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-verified.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-verified.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-verified.svg b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-verified.svg similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-verified.svg rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-verified.svg diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-verified@200.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-verified@200.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-verified@200.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-verified@200.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-verified@300.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-verified@300.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-verified@300.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-verified@300.png diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-verified@512x.png b/Graphics/drawables/originals/modernpgp-icons/signatures/signature-verified@512x.png similarity index 100% rename from Resources/graphics/originals/modernpgp-icons/signatures/signature-verified@512x.png rename to Graphics/drawables/originals/modernpgp-icons/signatures/signature-verified@512x.png diff --git a/Resources/graphics/originals/tango or oxygen/1270234450.svg b/Graphics/drawables/originals/tango or oxygen/1270234450.svg similarity index 100% rename from Resources/graphics/originals/tango or oxygen/1270234450.svg rename to Graphics/drawables/originals/tango or oxygen/1270234450.svg diff --git a/Resources/graphics/originals/tango or oxygen/application-pgp-signature.svg b/Graphics/drawables/originals/tango or oxygen/application-pgp-signature.svg similarity index 100% rename from Resources/graphics/originals/tango or oxygen/application-pgp-signature.svg rename to Graphics/drawables/originals/tango or oxygen/application-pgp-signature.svg diff --git a/Resources/graphics/originals/tango or oxygen/application-pkcs7-signature.svg b/Graphics/drawables/originals/tango or oxygen/application-pkcs7-signature.svg similarity index 100% rename from Resources/graphics/originals/tango or oxygen/application-pkcs7-signature.svg rename to Graphics/drawables/originals/tango or oxygen/application-pkcs7-signature.svg diff --git a/Resources/graphics/originals/tango or oxygen/osa_id_card.svg b/Graphics/drawables/originals/tango or oxygen/osa_id_card.svg similarity index 100% rename from Resources/graphics/originals/tango or oxygen/osa_id_card.svg rename to Graphics/drawables/originals/tango or oxygen/osa_id_card.svg diff --git a/Resources/graphics/originals/tango or oxygen/osa_padlock.svg b/Graphics/drawables/originals/tango or oxygen/osa_padlock.svg similarity index 100% rename from Resources/graphics/originals/tango or oxygen/osa_padlock.svg rename to Graphics/drawables/originals/tango or oxygen/osa_padlock.svg diff --git a/Resources/graphics/originals/tango or oxygen/tango-style-pen.svg b/Graphics/drawables/originals/tango or oxygen/tango-style-pen.svg similarity index 100% rename from Resources/graphics/originals/tango or oxygen/tango-style-pen.svg rename to Graphics/drawables/originals/tango or oxygen/tango-style-pen.svg diff --git a/Resources/graphics/status_lock_closed.svg b/Graphics/drawables/status_lock_closed.svg similarity index 100% rename from Resources/graphics/status_lock_closed.svg rename to Graphics/drawables/status_lock_closed.svg diff --git a/Resources/graphics/status_lock_error.svg b/Graphics/drawables/status_lock_error.svg similarity index 100% rename from Resources/graphics/status_lock_error.svg rename to Graphics/drawables/status_lock_error.svg diff --git a/Resources/graphics/status_lock_open.svg b/Graphics/drawables/status_lock_open.svg similarity index 100% rename from Resources/graphics/status_lock_open.svg rename to Graphics/drawables/status_lock_open.svg diff --git a/Resources/graphics/status_signature_expired.svg b/Graphics/drawables/status_signature_expired.svg similarity index 100% rename from Resources/graphics/status_signature_expired.svg rename to Graphics/drawables/status_signature_expired.svg diff --git a/Resources/graphics/status_signature_expired_cutout.svg b/Graphics/drawables/status_signature_expired_cutout.svg similarity index 100% rename from Resources/graphics/status_signature_expired_cutout.svg rename to Graphics/drawables/status_signature_expired_cutout.svg diff --git a/Resources/graphics/status_signature_invalid.svg b/Graphics/drawables/status_signature_invalid.svg similarity index 100% rename from Resources/graphics/status_signature_invalid.svg rename to Graphics/drawables/status_signature_invalid.svg diff --git a/Resources/graphics/status_signature_invalid_cutout.svg b/Graphics/drawables/status_signature_invalid_cutout.svg similarity index 100% rename from Resources/graphics/status_signature_invalid_cutout.svg rename to Graphics/drawables/status_signature_invalid_cutout.svg diff --git a/Resources/graphics/status_signature_revoked.svg b/Graphics/drawables/status_signature_revoked.svg similarity index 100% rename from Resources/graphics/status_signature_revoked.svg rename to Graphics/drawables/status_signature_revoked.svg diff --git a/Resources/graphics/status_signature_revoked_cutout.svg b/Graphics/drawables/status_signature_revoked_cutout.svg similarity index 100% rename from Resources/graphics/status_signature_revoked_cutout.svg rename to Graphics/drawables/status_signature_revoked_cutout.svg diff --git a/Resources/graphics/status_signature_unknown.svg b/Graphics/drawables/status_signature_unknown.svg similarity index 100% rename from Resources/graphics/status_signature_unknown.svg rename to Graphics/drawables/status_signature_unknown.svg diff --git a/Resources/graphics/status_signature_unknown_cutout.svg b/Graphics/drawables/status_signature_unknown_cutout.svg similarity index 100% rename from Resources/graphics/status_signature_unknown_cutout.svg rename to Graphics/drawables/status_signature_unknown_cutout.svg diff --git a/Resources/graphics/status_signature_unverified.svg b/Graphics/drawables/status_signature_unverified.svg similarity index 100% rename from Resources/graphics/status_signature_unverified.svg rename to Graphics/drawables/status_signature_unverified.svg diff --git a/Resources/graphics/status_signature_unverified_cutout.svg b/Graphics/drawables/status_signature_unverified_cutout.svg similarity index 100% rename from Resources/graphics/status_signature_unverified_cutout.svg rename to Graphics/drawables/status_signature_unverified_cutout.svg diff --git a/Resources/graphics/status_signature_verified.svg b/Graphics/drawables/status_signature_verified.svg similarity index 100% rename from Resources/graphics/status_signature_verified.svg rename to Graphics/drawables/status_signature_verified.svg diff --git a/Resources/graphics/status_signature_verified_cutout.svg b/Graphics/drawables/status_signature_verified_cutout.svg similarity index 100% rename from Resources/graphics/status_signature_verified_cutout.svg rename to Graphics/drawables/status_signature_verified_cutout.svg diff --git a/Graphics/get-material-icons.sh b/Graphics/get-material-icons.sh new file mode 100755 index 000000000..2fcad6c1d --- /dev/null +++ b/Graphics/get-material-icons.sh @@ -0,0 +1,2 @@ +cd ./android-icon-copier/ +python copy OpenKeychain action white search 24 \ No newline at end of file diff --git a/Resources/new icon/Feature Graphic.psd b/Graphics/material-launcher/Feature Graphic.psd similarity index 100% rename from Resources/new icon/Feature Graphic.psd rename to Graphics/material-launcher/Feature Graphic.psd diff --git a/Resources/new icon/Feature-Graphic.png b/Graphics/material-launcher/Feature-Graphic.png similarity index 100% rename from Resources/new icon/Feature-Graphic.png rename to Graphics/material-launcher/Feature-Graphic.png diff --git a/Resources/new icon/preview.psd b/Graphics/material-launcher/preview.psd similarity index 100% rename from Resources/new icon/preview.psd rename to Graphics/material-launcher/preview.psd diff --git a/Resources/new icon/preview1.png b/Graphics/material-launcher/preview1.png similarity index 100% rename from Resources/new icon/preview1.png rename to Graphics/material-launcher/preview1.png diff --git a/Resources/new icon/preview2.png b/Graphics/material-launcher/preview2.png similarity index 100% rename from Resources/new icon/preview2.png rename to Graphics/material-launcher/preview2.png diff --git a/Resources/new icon/preview3.png b/Graphics/material-launcher/preview3.png similarity index 100% rename from Resources/new icon/preview3.png rename to Graphics/material-launcher/preview3.png diff --git a/Resources/new icon/ready-launcher-icons/144/vector-src-blue.png b/Graphics/material-launcher/ready-launcher-icons/144/vector-src-blue.png similarity index 100% rename from Resources/new icon/ready-launcher-icons/144/vector-src-blue.png rename to Graphics/material-launcher/ready-launcher-icons/144/vector-src-blue.png diff --git a/Resources/new icon/ready-launcher-icons/144/vector-src-purple.png b/Graphics/material-launcher/ready-launcher-icons/144/vector-src-purple.png similarity index 100% rename from Resources/new icon/ready-launcher-icons/144/vector-src-purple.png rename to Graphics/material-launcher/ready-launcher-icons/144/vector-src-purple.png diff --git a/Resources/new icon/ready-launcher-icons/144/vector-src.png b/Graphics/material-launcher/ready-launcher-icons/144/vector-src.png similarity index 100% rename from Resources/new icon/ready-launcher-icons/144/vector-src.png rename to Graphics/material-launcher/ready-launcher-icons/144/vector-src.png diff --git a/Resources/new icon/ready-launcher-icons/192/vector-src-blue.png b/Graphics/material-launcher/ready-launcher-icons/192/vector-src-blue.png similarity index 100% rename from Resources/new icon/ready-launcher-icons/192/vector-src-blue.png rename to Graphics/material-launcher/ready-launcher-icons/192/vector-src-blue.png diff --git a/Resources/new icon/ready-launcher-icons/192/vector-src-purple.png b/Graphics/material-launcher/ready-launcher-icons/192/vector-src-purple.png similarity index 100% rename from Resources/new icon/ready-launcher-icons/192/vector-src-purple.png rename to Graphics/material-launcher/ready-launcher-icons/192/vector-src-purple.png diff --git a/Resources/new icon/ready-launcher-icons/192/vector-src.png b/Graphics/material-launcher/ready-launcher-icons/192/vector-src.png similarity index 100% rename from Resources/new icon/ready-launcher-icons/192/vector-src.png rename to Graphics/material-launcher/ready-launcher-icons/192/vector-src.png diff --git a/Resources/new icon/ready-launcher-icons/48/vector-src-blue.png b/Graphics/material-launcher/ready-launcher-icons/48/vector-src-blue.png similarity index 100% rename from Resources/new icon/ready-launcher-icons/48/vector-src-blue.png rename to Graphics/material-launcher/ready-launcher-icons/48/vector-src-blue.png diff --git a/Resources/new icon/ready-launcher-icons/48/vector-src-purple.png b/Graphics/material-launcher/ready-launcher-icons/48/vector-src-purple.png similarity index 100% rename from Resources/new icon/ready-launcher-icons/48/vector-src-purple.png rename to Graphics/material-launcher/ready-launcher-icons/48/vector-src-purple.png diff --git a/Resources/new icon/ready-launcher-icons/48/vector-src.png b/Graphics/material-launcher/ready-launcher-icons/48/vector-src.png similarity index 100% rename from Resources/new icon/ready-launcher-icons/48/vector-src.png rename to Graphics/material-launcher/ready-launcher-icons/48/vector-src.png diff --git a/Resources/new icon/ready-launcher-icons/512/vector-src-blue.png b/Graphics/material-launcher/ready-launcher-icons/512/vector-src-blue.png similarity index 100% rename from Resources/new icon/ready-launcher-icons/512/vector-src-blue.png rename to Graphics/material-launcher/ready-launcher-icons/512/vector-src-blue.png diff --git a/Resources/new icon/ready-launcher-icons/512/vector-src-purple.png b/Graphics/material-launcher/ready-launcher-icons/512/vector-src-purple.png similarity index 100% rename from Resources/new icon/ready-launcher-icons/512/vector-src-purple.png rename to Graphics/material-launcher/ready-launcher-icons/512/vector-src-purple.png diff --git a/Resources/new icon/ready-launcher-icons/512/vector-src.png b/Graphics/material-launcher/ready-launcher-icons/512/vector-src.png similarity index 100% rename from Resources/new icon/ready-launcher-icons/512/vector-src.png rename to Graphics/material-launcher/ready-launcher-icons/512/vector-src.png diff --git a/Resources/new icon/ready-launcher-icons/72/vector-src-blue.png b/Graphics/material-launcher/ready-launcher-icons/72/vector-src-blue.png similarity index 100% rename from Resources/new icon/ready-launcher-icons/72/vector-src-blue.png rename to Graphics/material-launcher/ready-launcher-icons/72/vector-src-blue.png diff --git a/Resources/new icon/ready-launcher-icons/72/vector-src-purple.png b/Graphics/material-launcher/ready-launcher-icons/72/vector-src-purple.png similarity index 100% rename from Resources/new icon/ready-launcher-icons/72/vector-src-purple.png rename to Graphics/material-launcher/ready-launcher-icons/72/vector-src-purple.png diff --git a/Resources/new icon/ready-launcher-icons/72/vector-src.png b/Graphics/material-launcher/ready-launcher-icons/72/vector-src.png similarity index 100% rename from Resources/new icon/ready-launcher-icons/72/vector-src.png rename to Graphics/material-launcher/ready-launcher-icons/72/vector-src.png diff --git a/Resources/new icon/ready-launcher-icons/96/vector-src-blue.png b/Graphics/material-launcher/ready-launcher-icons/96/vector-src-blue.png similarity index 100% rename from Resources/new icon/ready-launcher-icons/96/vector-src-blue.png rename to Graphics/material-launcher/ready-launcher-icons/96/vector-src-blue.png diff --git a/Resources/new icon/ready-launcher-icons/96/vector-src-purple.png b/Graphics/material-launcher/ready-launcher-icons/96/vector-src-purple.png similarity index 100% rename from Resources/new icon/ready-launcher-icons/96/vector-src-purple.png rename to Graphics/material-launcher/ready-launcher-icons/96/vector-src-purple.png diff --git a/Resources/new icon/ready-launcher-icons/96/vector-src.png b/Graphics/material-launcher/ready-launcher-icons/96/vector-src.png similarity index 100% rename from Resources/new icon/ready-launcher-icons/96/vector-src.png rename to Graphics/material-launcher/ready-launcher-icons/96/vector-src.png diff --git a/Resources/new icon/vector-src blue.ai b/Graphics/material-launcher/vector-src blue.ai similarity index 100% rename from Resources/new icon/vector-src blue.ai rename to Graphics/material-launcher/vector-src blue.ai diff --git a/Resources/new icon/vector-src purple.ai b/Graphics/material-launcher/vector-src purple.ai similarity index 100% rename from Resources/new icon/vector-src purple.ai rename to Graphics/material-launcher/vector-src purple.ai diff --git a/Resources/new icon/vector-src purple.psd b/Graphics/material-launcher/vector-src purple.psd similarity index 100% rename from Resources/new icon/vector-src purple.psd rename to Graphics/material-launcher/vector-src purple.psd diff --git a/Resources/new icon/vector-src.ai b/Graphics/material-launcher/vector-src.ai similarity index 100% rename from Resources/new icon/vector-src.ai rename to Graphics/material-launcher/vector-src.ai diff --git a/Resources/new icon/vector-src.psd b/Graphics/material-launcher/vector-src.psd similarity index 100% rename from Resources/new icon/vector-src.psd rename to Graphics/material-launcher/vector-src.psd diff --git a/Resources/new icon/vector-src.svg b/Graphics/material-launcher/vector-src.svg similarity index 100% rename from Resources/new icon/vector-src.svg rename to Graphics/material-launcher/vector-src.svg diff --git a/Resources/new icon/vector.psd b/Graphics/material-launcher/vector.psd similarity index 100% rename from Resources/new icon/vector.psd rename to Graphics/material-launcher/vector.psd diff --git a/Graphics/update-drawables.sh b/Graphics/update-drawables.sh new file mode 100755 index 000000000..f1ab94fb4 --- /dev/null +++ b/Graphics/update-drawables.sh @@ -0,0 +1,66 @@ +#!/bin/bash + +APP_DIR=../OpenKeychain/src/main +MDPI_DIR=$APP_DIR/res/drawable-mdpi +HDPI_DIR=$APP_DIR/res/drawable-hdpi +XDPI_DIR=$APP_DIR/res/drawable-xhdpi +XXDPI_DIR=$APP_DIR/res/drawable-xxhdpi +XXXDPI_DIR=$APP_DIR/res/drawable-xxxhdpi +PLAY_DIR=./drawables/ +SRC_DIR=./drawables/ + + + +# Launcher Icon: +# ----------------------- +# mdpi: 48x48 +# hdpi: 72x72 +# xhdpi: 96x96 +# xxhdpi: 144x144. +# xxxhdpi 192x192. +# google play: 512x512 + +# Adobe Illustrator (.ai) exports by Tha Phlash are way better than the Inkscape exports (.svg) + +#NAME="ic_launcher" + +#inkscape -w 48 -h 48 -e "$MDPI_DIR/$NAME.png" $NAME.svg +#inkscape -w 72 -h 72 -e "$HDPI_DIR/$NAME.png" $NAME.svg +#inkscape -w 96 -h 96 -e "$XDPI_DIR/$NAME.png" $NAME.svg +#inkscape -w 144 -h 144 -e "$XXDPI_DIR/$NAME.png" $NAME.svg +#inkscape -w 192 -h 192 -e "$XXXDPI_DIR/$NAME.png" $NAME.svg +#inkscape -w 512 -h 512 -e "$PLAY_DIR/$NAME.png" $NAME.svg + +# Actionbar Icons +# ----------------------- +# mdpi: 32x32 +# hdpi: 48x48 +# xhdpi: 64x64 +# xxhdpi: 96x96 + +for NAME in "ic_action_nfc" "ic_action_qr_code" "ic_action_safeslinger" "ic_action_search_cloud" +do +echo $NAME +inkscape -w 32 -h 32 -e "$MDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" +inkscape -w 48 -h 48 -e "$HDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" +inkscape -w 64 -h 64 -e "$XDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" +inkscape -w 96 -h 96 -e "$XXDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" +done + +for NAME in "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_expired" "status_signature_invalid_cutout" "status_signature_invalid" "status_signature_revoked_cutout" "status_signature_revoked" "status_signature_unknown_cutout" "status_signature_unknown" "status_signature_unverified_cutout" "status_signature_unverified" "status_signature_verified_cutout" "status_signature_verified" "key_flag_authenticate" "key_flag_certify" "key_flag_encrypt" "key_flag_sign" +do +echo $NAME +inkscape -w 24 -h 24 -e "$MDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" +inkscape -w 32 -h 32 -e "$MDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" +inkscape -w 48 -h 48 -e "$MDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" +inkscape -w 64 -h 64 -e "$MDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" +done + +for NAME in "create_key_robot" +do +echo $NAME +inkscape -w 48 -h 48 -e "$MDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" +inkscape -w 64 -h 64 -e "$HDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" +inkscape -w 96 -h 96 -e "$XDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" +inkscape -w 128 -h 128 -e "$XXDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" +done \ No newline at end of file diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_search_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_search_white_24dp.png new file mode 100644 index 000000000..a2fc5b2e7 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_search_white_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png deleted file mode 100644 index 9d4ed6e84..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png deleted file mode 100644 index e76393659..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png deleted file mode 100644 index 3c2f8c09c..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png deleted file mode 100644 index 046424643..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_search_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_search_white_24dp.png new file mode 100644 index 000000000..dff1e3a8a Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_search_white_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png index ed1ba24d2..d786dc72f 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png and b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png index d54d461fa..4bb97f992 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png and b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png index 81c1b3dfa..fe0c8e41b 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png and b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png index 9afc43901..51ab367a9 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png and b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png index cfc39f0e7..5a9664d59 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png index 824dc2672..608f065af 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png index 9bca59ae3..ee34dd396 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png index 81a900147..f475c9d84 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png index bc91094b5..33a3efed1 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png index baa78f795..f21c2cf52 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png index bc2f56e2a..bc39d3496 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png index 7cf985274..be1a1d9dc 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png index 2d2593194..58929661f 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png index 3d4665320..841cfa958 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png index 0fc74d07e..3020357a4 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png index 8348b32b3..525d1cf6b 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png index 96a2d1413..3829bb3a0 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png index 02e53ac8a..54eee5ba0 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png index 9f7cf837c..3548ee2b6 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_search_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_search_white_24dp.png new file mode 100644 index 000000000..043759acd Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_search_white_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png deleted file mode 100644 index 8d36d7202..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png deleted file mode 100644 index 01a74bcc0..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png deleted file mode 100644 index ff07bd0a4..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png deleted file mode 100644 index b8002162a..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png new file mode 100644 index 000000000..0bbeab150 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png deleted file mode 100644 index d786dc72f..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png deleted file mode 100644 index 4bb97f992..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png deleted file mode 100644 index fe0c8e41b..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png deleted file mode 100644 index 51ab367a9..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_search_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_search_white_24dp.png new file mode 100644 index 000000000..70c21baf7 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_search_white_24dp.png differ diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml index aab6c2e60..f61172a0a 100644 --- a/OpenKeychain/src/main/res/menu/key_list.xml +++ b/OpenKeychain/src/main/res/menu/key_list.xml @@ -5,7 +5,7 @@ diff --git a/Resources/graphics/update-drawables.sh b/Resources/graphics/update-drawables.sh deleted file mode 100755 index f5c84a6bd..000000000 --- a/Resources/graphics/update-drawables.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash - -APP_DIR=../../OpenKeychain/src/main -MDPI_DIR=$APP_DIR/res/drawable-mdpi -HDPI_DIR=$APP_DIR/res/drawable-hdpi -XDPI_DIR=$APP_DIR/res/drawable-xhdpi -XXDPI_DIR=$APP_DIR/res/drawable-xxhdpi -XXXDPI_DIR=$APP_DIR/res/drawable-xxxhdpi -PLAY_DIR=./ - - -# Launcher Icon: -# ----------------------- -# mdpi: 48x48 -# hdpi: 72x72 -# xhdpi: 96x96 -# xxhdpi: 144x144. -# xxxhdpi 192x192. -# google play: 512x512 - -# Adobe Illustrator (.ai) exports by Tha Phlash are way better than the Inkscape exports (.svg) - -#NAME="ic_launcher" - -#inkscape -w 48 -h 48 -e "$MDPI_DIR/$NAME.png" $NAME.svg -#inkscape -w 72 -h 72 -e "$HDPI_DIR/$NAME.png" $NAME.svg -#inkscape -w 96 -h 96 -e "$XDPI_DIR/$NAME.png" $NAME.svg -#inkscape -w 144 -h 144 -e "$XXDPI_DIR/$NAME.png" $NAME.svg -#inkscape -w 192 -h 192 -e "$XXXDPI_DIR/$NAME.png" $NAME.svg -#inkscape -w 512 -h 512 -e "$PLAY_DIR/$NAME.png" $NAME.svg - -# Actionbar Icons -# ----------------------- -# mdpi: 32x32 -# hdpi: 48x48 -# xhdpi: 64x64 -# xxhdpi: 96x96 - -for NAME in "ic_action_nfc" "ic_action_qr_code" "ic_action_safeslinger" "ic_action_search_cloud" -do -echo $NAME -inkscape -w 32 -h 32 -e "$MDPI_DIR/$NAME.png" $NAME.svg -inkscape -w 48 -h 48 -e "$HDPI_DIR/$NAME.png" $NAME.svg -inkscape -w 64 -h 64 -e "$XDPI_DIR/$NAME.png" $NAME.svg -inkscape -w 96 -h 96 -e "$XXDPI_DIR/$NAME.png" $NAME.svg -done - -for NAME in status*.svg -do -echo $NAME -inkscape -w 24 -h 24 -e "$MDPI_DIR/${NAME%%.*}.png" $NAME -inkscape -w 32 -h 32 -e "$HDPI_DIR/${NAME%%.*}.png" $NAME -inkscape -w 48 -h 48 -e "$XDPI_DIR/${NAME%%.*}.png" $NAME -inkscape -w 64 -h 64 -e "$XXDPI_DIR/${NAME%%.*}.png" $NAME -done - -for NAME in key_flag*.svg -do -echo $NAME -inkscape -w 24 -h 24 -e "$MDPI_DIR/${NAME%%.*}.png" $NAME -inkscape -w 32 -h 32 -e "$HDPI_DIR/${NAME%%.*}.png" $NAME -inkscape -w 48 -h 48 -e "$XDPI_DIR/${NAME%%.*}.png" $NAME -inkscape -w 64 -h 64 -e "$XXDPI_DIR/${NAME%%.*}.png" $NAME -done - -for NAME in "create_key_robot" -do -echo $NAME -inkscape -w 48 -h 48 -e "$MDPI_DIR/$NAME.png" $NAME.svg -inkscape -w 64 -h 64 -e "$HDPI_DIR/$NAME.png" $NAME.svg -inkscape -w 96 -h 96 -e "$XDPI_DIR/$NAME.png" $NAME.svg -inkscape -w 128 -h 128 -e "$XXDPI_DIR/$NAME.png" $NAME.svg -done \ No newline at end of file diff --git a/Resources/material_icons_list.txt b/Resources/material_icons_list.txt deleted file mode 100644 index 5204bab86..000000000 --- a/Resources/material_icons_list.txt +++ /dev/null @@ -1,4 +0,0 @@ -https://github.com/google/material-design-icons - -action: -ic_search_white_24dp.png