diff --git a/.gitmodules b/.gitmodules index a971b6060..f8db64f0a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,6 +34,3 @@ [submodule "extern/safeslinger-exchange"] path = extern/safeslinger-exchange url = https://github.com/open-keychain/exchange-android -[submodule "extern/android-lockpattern"] - path = extern/android-lockpattern - url = https://github.com/open-keychain/android-lockpattern.git diff --git a/Graphics/drawables/comment-text.svg b/Graphics/drawables/comment-text.svg new file mode 100644 index 000000000..b881741b1 --- /dev/null +++ b/Graphics/drawables/comment-text.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Graphics/drawables/drawer_header.svg b/Graphics/drawables/drawer_header.svg index a431b5ac5..b8896d6ad 100644 --- a/Graphics/drawables/drawer_header.svg +++ b/Graphics/drawables/drawer_header.svg @@ -231,14 +231,14 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1.979899" - inkscape:cx="546.50452" - inkscape:cy="96.739494" + inkscape:zoom="0.9899495" + inkscape:cx="554.63796" + inkscape:cy="-13.509829" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="2558" - inkscape:window-height="1419" + inkscape:window-width="1918" + inkscape:window-height="1179" inkscape:window-x="0" inkscape:window-y="19" inkscape:window-maximized="1" /> @@ -259,295 +259,6 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-764.36218)"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - %#&$! - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="g3310" + transform="matrix(1.3814851,0,0,1.3814851,-594.7198,-687.84793)"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="g3333"> + + + + + + + + + + + + + + + + + + + + + Open + Keychain - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Open - Keychain diff --git a/Graphics/drawables/drawer_header2.svg b/Graphics/drawables/drawer_header2.svg new file mode 100644 index 000000000..a431b5ac5 --- /dev/null +++ b/Graphics/drawables/drawer_header2.svg @@ -0,0 +1,1636 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %#&$! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Open + Keychain + + diff --git a/Graphics/drawables/ic_action_encrypt_file.svg b/Graphics/drawables/ic_action_encrypt_file.svg new file mode 100644 index 000000000..06575fea0 --- /dev/null +++ b/Graphics/drawables/ic_action_encrypt_file.svg @@ -0,0 +1,60 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/Graphics/drawables/ic_action_encrypt_text.svg b/Graphics/drawables/ic_action_encrypt_text.svg new file mode 100644 index 000000000..92811bc94 --- /dev/null +++ b/Graphics/drawables/ic_action_encrypt_text.svg @@ -0,0 +1,60 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/Graphics/drawables/ic_action_nfc.svg b/Graphics/drawables/ic_action_nfc.svg deleted file mode 100644 index 23ec040ff..000000000 --- a/Graphics/drawables/ic_action_nfc.svg +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/Graphics/drawables/ic_action_qr_code.svg b/Graphics/drawables/ic_action_qr_code.svg deleted file mode 100644 index ebd147888..000000000 --- a/Graphics/drawables/ic_action_qr_code.svg +++ /dev/null @@ -1,826 +0,0 @@ - - - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Graphics/drawables/ic_action_verified_cutout.svg b/Graphics/drawables/ic_action_verified_cutout.svg new file mode 100644 index 000000000..c50b64a4b --- /dev/null +++ b/Graphics/drawables/ic_action_verified_cutout.svg @@ -0,0 +1,74 @@ + + + + + + image/svg+xml + + + + + + + signature-verified-cutout + Created with Sketch. + + + + + + + diff --git a/Graphics/material-launcher/Feature Graphic.psd b/Graphics/drawables/material-launcher/Feature Graphic.psd similarity index 100% rename from Graphics/material-launcher/Feature Graphic.psd rename to Graphics/drawables/material-launcher/Feature Graphic.psd diff --git a/Graphics/material-launcher/Feature-Graphic.png b/Graphics/drawables/material-launcher/Feature-Graphic.png similarity index 100% rename from Graphics/material-launcher/Feature-Graphic.png rename to Graphics/drawables/material-launcher/Feature-Graphic.png diff --git a/Graphics/material-launcher/preview.psd b/Graphics/drawables/material-launcher/preview.psd similarity index 100% rename from Graphics/material-launcher/preview.psd rename to Graphics/drawables/material-launcher/preview.psd diff --git a/Graphics/material-launcher/preview1.png b/Graphics/drawables/material-launcher/preview1.png similarity index 100% rename from Graphics/material-launcher/preview1.png rename to Graphics/drawables/material-launcher/preview1.png diff --git a/Graphics/material-launcher/preview2.png b/Graphics/drawables/material-launcher/preview2.png similarity index 100% rename from Graphics/material-launcher/preview2.png rename to Graphics/drawables/material-launcher/preview2.png diff --git a/Graphics/material-launcher/preview3.png b/Graphics/drawables/material-launcher/preview3.png similarity index 100% rename from Graphics/material-launcher/preview3.png rename to Graphics/drawables/material-launcher/preview3.png diff --git a/Graphics/material-launcher/ready-launcher-icons/144/vector-src-blue.png b/Graphics/drawables/material-launcher/ready-launcher-icons/144/vector-src-blue.png similarity index 100% rename from Graphics/material-launcher/ready-launcher-icons/144/vector-src-blue.png rename to Graphics/drawables/material-launcher/ready-launcher-icons/144/vector-src-blue.png diff --git a/Graphics/material-launcher/ready-launcher-icons/144/vector-src-purple.png b/Graphics/drawables/material-launcher/ready-launcher-icons/144/vector-src-purple.png similarity index 100% rename from Graphics/material-launcher/ready-launcher-icons/144/vector-src-purple.png rename to Graphics/drawables/material-launcher/ready-launcher-icons/144/vector-src-purple.png diff --git a/Graphics/material-launcher/ready-launcher-icons/144/vector-src.png b/Graphics/drawables/material-launcher/ready-launcher-icons/144/vector-src.png similarity index 100% rename from Graphics/material-launcher/ready-launcher-icons/144/vector-src.png rename to Graphics/drawables/material-launcher/ready-launcher-icons/144/vector-src.png diff --git a/Graphics/material-launcher/ready-launcher-icons/192/vector-src-blue.png b/Graphics/drawables/material-launcher/ready-launcher-icons/192/vector-src-blue.png similarity index 100% rename from Graphics/material-launcher/ready-launcher-icons/192/vector-src-blue.png rename to Graphics/drawables/material-launcher/ready-launcher-icons/192/vector-src-blue.png diff --git a/Graphics/material-launcher/ready-launcher-icons/192/vector-src-purple.png b/Graphics/drawables/material-launcher/ready-launcher-icons/192/vector-src-purple.png similarity index 100% rename from Graphics/material-launcher/ready-launcher-icons/192/vector-src-purple.png rename to Graphics/drawables/material-launcher/ready-launcher-icons/192/vector-src-purple.png diff --git a/Graphics/material-launcher/ready-launcher-icons/192/vector-src.png b/Graphics/drawables/material-launcher/ready-launcher-icons/192/vector-src.png similarity index 100% rename from Graphics/material-launcher/ready-launcher-icons/192/vector-src.png rename to Graphics/drawables/material-launcher/ready-launcher-icons/192/vector-src.png diff --git a/Graphics/material-launcher/ready-launcher-icons/48/vector-src-blue.png b/Graphics/drawables/material-launcher/ready-launcher-icons/48/vector-src-blue.png similarity index 100% rename from Graphics/material-launcher/ready-launcher-icons/48/vector-src-blue.png rename to Graphics/drawables/material-launcher/ready-launcher-icons/48/vector-src-blue.png diff --git a/Graphics/material-launcher/ready-launcher-icons/48/vector-src-purple.png b/Graphics/drawables/material-launcher/ready-launcher-icons/48/vector-src-purple.png similarity index 100% rename from Graphics/material-launcher/ready-launcher-icons/48/vector-src-purple.png rename to Graphics/drawables/material-launcher/ready-launcher-icons/48/vector-src-purple.png diff --git a/Graphics/material-launcher/ready-launcher-icons/48/vector-src.png b/Graphics/drawables/material-launcher/ready-launcher-icons/48/vector-src.png similarity index 100% rename from Graphics/material-launcher/ready-launcher-icons/48/vector-src.png rename to Graphics/drawables/material-launcher/ready-launcher-icons/48/vector-src.png diff --git a/Graphics/material-launcher/ready-launcher-icons/512/vector-src-blue.png b/Graphics/drawables/material-launcher/ready-launcher-icons/512/vector-src-blue.png similarity index 100% rename from Graphics/material-launcher/ready-launcher-icons/512/vector-src-blue.png rename to Graphics/drawables/material-launcher/ready-launcher-icons/512/vector-src-blue.png diff --git a/Graphics/material-launcher/ready-launcher-icons/512/vector-src-purple.png b/Graphics/drawables/material-launcher/ready-launcher-icons/512/vector-src-purple.png similarity index 100% rename from Graphics/material-launcher/ready-launcher-icons/512/vector-src-purple.png rename to Graphics/drawables/material-launcher/ready-launcher-icons/512/vector-src-purple.png diff --git a/Graphics/material-launcher/ready-launcher-icons/512/vector-src.png b/Graphics/drawables/material-launcher/ready-launcher-icons/512/vector-src.png similarity index 100% rename from Graphics/material-launcher/ready-launcher-icons/512/vector-src.png rename to Graphics/drawables/material-launcher/ready-launcher-icons/512/vector-src.png diff --git a/Graphics/material-launcher/ready-launcher-icons/72/vector-src-blue.png b/Graphics/drawables/material-launcher/ready-launcher-icons/72/vector-src-blue.png similarity index 100% rename from Graphics/material-launcher/ready-launcher-icons/72/vector-src-blue.png rename to Graphics/drawables/material-launcher/ready-launcher-icons/72/vector-src-blue.png diff --git a/Graphics/material-launcher/ready-launcher-icons/72/vector-src-purple.png b/Graphics/drawables/material-launcher/ready-launcher-icons/72/vector-src-purple.png similarity index 100% rename from Graphics/material-launcher/ready-launcher-icons/72/vector-src-purple.png rename to Graphics/drawables/material-launcher/ready-launcher-icons/72/vector-src-purple.png diff --git a/Graphics/material-launcher/ready-launcher-icons/72/vector-src.png b/Graphics/drawables/material-launcher/ready-launcher-icons/72/vector-src.png similarity index 100% rename from Graphics/material-launcher/ready-launcher-icons/72/vector-src.png rename to Graphics/drawables/material-launcher/ready-launcher-icons/72/vector-src.png diff --git a/Graphics/material-launcher/ready-launcher-icons/96/vector-src-blue.png b/Graphics/drawables/material-launcher/ready-launcher-icons/96/vector-src-blue.png similarity index 100% rename from Graphics/material-launcher/ready-launcher-icons/96/vector-src-blue.png rename to Graphics/drawables/material-launcher/ready-launcher-icons/96/vector-src-blue.png diff --git a/Graphics/material-launcher/ready-launcher-icons/96/vector-src-purple.png b/Graphics/drawables/material-launcher/ready-launcher-icons/96/vector-src-purple.png similarity index 100% rename from Graphics/material-launcher/ready-launcher-icons/96/vector-src-purple.png rename to Graphics/drawables/material-launcher/ready-launcher-icons/96/vector-src-purple.png diff --git a/Graphics/material-launcher/ready-launcher-icons/96/vector-src.png b/Graphics/drawables/material-launcher/ready-launcher-icons/96/vector-src.png similarity index 100% rename from Graphics/material-launcher/ready-launcher-icons/96/vector-src.png rename to Graphics/drawables/material-launcher/ready-launcher-icons/96/vector-src.png diff --git a/Graphics/material-launcher/vector-src blue.ai b/Graphics/drawables/material-launcher/vector-src blue.ai similarity index 100% rename from Graphics/material-launcher/vector-src blue.ai rename to Graphics/drawables/material-launcher/vector-src blue.ai diff --git a/Graphics/material-launcher/vector-src purple.ai b/Graphics/drawables/material-launcher/vector-src purple.ai similarity index 100% rename from Graphics/material-launcher/vector-src purple.ai rename to Graphics/drawables/material-launcher/vector-src purple.ai diff --git a/Graphics/material-launcher/vector-src purple.psd b/Graphics/drawables/material-launcher/vector-src purple.psd similarity index 100% rename from Graphics/material-launcher/vector-src purple.psd rename to Graphics/drawables/material-launcher/vector-src purple.psd diff --git a/Graphics/material-launcher/vector-src.ai b/Graphics/drawables/material-launcher/vector-src.ai similarity index 100% rename from Graphics/material-launcher/vector-src.ai rename to Graphics/drawables/material-launcher/vector-src.ai diff --git a/Graphics/material-launcher/vector-src.psd b/Graphics/drawables/material-launcher/vector-src.psd similarity index 100% rename from Graphics/material-launcher/vector-src.psd rename to Graphics/drawables/material-launcher/vector-src.psd diff --git a/Graphics/material-launcher/vector-src.svg b/Graphics/drawables/material-launcher/vector-src.svg similarity index 100% rename from Graphics/material-launcher/vector-src.svg rename to Graphics/drawables/material-launcher/vector-src.svg diff --git a/Graphics/material-launcher/vector.psd b/Graphics/drawables/material-launcher/vector.psd similarity index 100% rename from Graphics/material-launcher/vector.psd rename to Graphics/drawables/material-launcher/vector.psd diff --git a/Graphics/drawables/originals/ic_action_nfc/NFC.png b/Graphics/drawables/originals/ic_action_nfc/NFC.png deleted file mode 100644 index 96af64049..000000000 Binary files a/Graphics/drawables/originals/ic_action_nfc/NFC.png and /dev/null differ diff --git a/Graphics/drawables/originals/ic_launcher/AUTHORS b/Graphics/drawables/originals/ic_launcher-old/AUTHORS similarity index 100% rename from Graphics/drawables/originals/ic_launcher/AUTHORS rename to Graphics/drawables/originals/ic_launcher-old/AUTHORS diff --git a/Graphics/drawables/originals/ic_launcher/COPYING b/Graphics/drawables/originals/ic_launcher-old/COPYING similarity index 100% rename from Graphics/drawables/originals/ic_launcher/COPYING rename to Graphics/drawables/originals/ic_launcher-old/COPYING diff --git a/Graphics/drawables/originals/ic_launcher/kgpg_key2_kopete.svgz b/Graphics/drawables/originals/ic_launcher-old/kgpg_key2_kopete.svgz similarity index 100% rename from Graphics/drawables/originals/ic_launcher/kgpg_key2_kopete.svgz rename to Graphics/drawables/originals/ic_launcher-old/kgpg_key2_kopete.svgz diff --git a/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_black_18dp.png b/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_black_18dp.png new file mode 100644 index 000000000..2f4925ed0 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_black_18dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_black_24dp.png b/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_black_24dp.png new file mode 100644 index 000000000..684c2cb81 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_black_24dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_black_36dp.png b/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_black_36dp.png new file mode 100644 index 000000000..f05f51239 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_black_36dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_black_48dp.png b/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_black_48dp.png new file mode 100644 index 000000000..5789581cc Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_black_48dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_grey600_18dp.png b/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_grey600_18dp.png new file mode 100644 index 000000000..01cc481bf Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_grey600_18dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_grey600_24dp.png b/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_grey600_24dp.png new file mode 100644 index 000000000..fedf39013 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_grey600_24dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_grey600_36dp.png b/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_grey600_36dp.png new file mode 100644 index 000000000..e97bebf0e Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_grey600_36dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_grey600_48dp.png b/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_grey600_48dp.png new file mode 100644 index 000000000..7e8fa6ba2 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_grey600_48dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_white_18dp.png b/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_white_18dp.png new file mode 100644 index 000000000..b22411115 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_white_18dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_white_24dp.png b/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_white_24dp.png new file mode 100644 index 000000000..1d87415c5 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_white_24dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_white_36dp.png b/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_white_36dp.png new file mode 100644 index 000000000..1ef58907d Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_white_36dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_white_48dp.png b/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_white_48dp.png new file mode 100644 index 000000000..484856b3f Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-hdpi/ic_nfc_white_48dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_black_18dp.png b/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_black_18dp.png new file mode 100644 index 000000000..18b1f33c4 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_black_18dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_black_24dp.png b/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_black_24dp.png new file mode 100644 index 000000000..21f86d95e Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_black_24dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_black_36dp.png b/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_black_36dp.png new file mode 100644 index 000000000..684c2cb81 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_black_36dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_black_48dp.png b/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_black_48dp.png new file mode 100644 index 000000000..c987c1249 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_black_48dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_grey600_18dp.png b/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_grey600_18dp.png new file mode 100644 index 000000000..a2eb50380 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_grey600_18dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_grey600_24dp.png b/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_grey600_24dp.png new file mode 100644 index 000000000..f8f6c3812 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_grey600_24dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_grey600_36dp.png b/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_grey600_36dp.png new file mode 100644 index 000000000..fedf39013 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_grey600_36dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_grey600_48dp.png b/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_grey600_48dp.png new file mode 100644 index 000000000..04e0bf781 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_grey600_48dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_white_18dp.png b/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_white_18dp.png new file mode 100644 index 000000000..71e38338d Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_white_18dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_white_24dp.png b/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_white_24dp.png new file mode 100644 index 000000000..65ae04b7c Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_white_24dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_white_36dp.png b/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_white_36dp.png new file mode 100644 index 000000000..1d87415c5 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_white_36dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_white_48dp.png b/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_white_48dp.png new file mode 100644 index 000000000..44b9006ab Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-mdpi/ic_nfc_white_48dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_black_18dp.png b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_black_18dp.png new file mode 100644 index 000000000..684c2cb81 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_black_18dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_black_24dp.png b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_black_24dp.png new file mode 100644 index 000000000..c987c1249 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_black_24dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_black_36dp.png b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_black_36dp.png new file mode 100644 index 000000000..5789581cc Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_black_36dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_black_48dp.png b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_black_48dp.png new file mode 100644 index 000000000..aabd4c0b6 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_black_48dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_grey600_18dp.png b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_grey600_18dp.png new file mode 100644 index 000000000..fedf39013 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_grey600_18dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_grey600_24dp.png b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_grey600_24dp.png new file mode 100644 index 000000000..04e0bf781 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_grey600_24dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_grey600_36dp.png b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_grey600_36dp.png new file mode 100644 index 000000000..7e8fa6ba2 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_grey600_36dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_grey600_48dp.png b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_grey600_48dp.png new file mode 100644 index 000000000..ee00975dc Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_grey600_48dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_white_18dp.png b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_white_18dp.png new file mode 100644 index 000000000..1d87415c5 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_white_18dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_white_24dp.png b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_white_24dp.png new file mode 100644 index 000000000..44b9006ab Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_white_24dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_white_36dp.png b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_white_36dp.png new file mode 100644 index 000000000..484856b3f Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_white_36dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_white_48dp.png b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_white_48dp.png new file mode 100644 index 000000000..c8f25bbf7 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_white_48dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_black_18dp.png b/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_black_18dp.png new file mode 100644 index 000000000..f05f51239 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_black_18dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_black_24dp.png b/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_black_24dp.png new file mode 100644 index 000000000..5789581cc Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_black_24dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_black_36dp.png b/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_black_36dp.png new file mode 100644 index 000000000..2f6bc956b Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_black_36dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_black_48dp.png b/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_black_48dp.png new file mode 100644 index 000000000..e9caeea57 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_black_48dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_grey600_18dp.png b/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_grey600_18dp.png new file mode 100644 index 000000000..e97bebf0e Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_grey600_18dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_grey600_24dp.png b/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_grey600_24dp.png new file mode 100644 index 000000000..7e8fa6ba2 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_grey600_24dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_grey600_36dp.png b/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_grey600_36dp.png new file mode 100644 index 000000000..b3bb585a5 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_grey600_36dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_grey600_48dp.png b/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_grey600_48dp.png new file mode 100644 index 000000000..c31ee82b6 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_grey600_48dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_white_18dp.png b/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_white_18dp.png new file mode 100644 index 000000000..1ef58907d Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_white_18dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_white_24dp.png b/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_white_24dp.png new file mode 100644 index 000000000..484856b3f Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_white_24dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_white_36dp.png b/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_white_36dp.png new file mode 100644 index 000000000..adc28d66c Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_white_36dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_white_48dp.png b/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_white_48dp.png new file mode 100644 index 000000000..5cd14b5cf Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xxhdpi/ic_nfc_white_48dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_black_18dp.png b/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_black_18dp.png new file mode 100644 index 000000000..5789581cc Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_black_18dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_black_24dp.png b/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_black_24dp.png new file mode 100644 index 000000000..aabd4c0b6 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_black_24dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_black_36dp.png b/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_black_36dp.png new file mode 100644 index 000000000..e9caeea57 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_black_36dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_black_48dp.png b/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_black_48dp.png new file mode 100644 index 000000000..841d1a80a Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_black_48dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_grey600_18dp.png b/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_grey600_18dp.png new file mode 100644 index 000000000..7e8fa6ba2 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_grey600_18dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_grey600_24dp.png b/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_grey600_24dp.png new file mode 100644 index 000000000..ee00975dc Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_grey600_24dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_grey600_36dp.png b/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_grey600_36dp.png new file mode 100644 index 000000000..c31ee82b6 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_grey600_36dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_grey600_48dp.png b/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_grey600_48dp.png new file mode 100644 index 000000000..721f42e4b Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_grey600_48dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_white_18dp.png b/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_white_18dp.png new file mode 100644 index 000000000..484856b3f Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_white_18dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_white_24dp.png b/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_white_24dp.png new file mode 100644 index 000000000..c8f25bbf7 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_white_24dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_white_36dp.png b/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_white_36dp.png new file mode 100644 index 000000000..5cd14b5cf Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_white_36dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_white_48dp.png b/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_white_48dp.png new file mode 100644 index 000000000..4ac095cc3 Binary files /dev/null and b/Graphics/drawables/originals/nfc/drawable-xxxhdpi/ic_nfc_white_48dp.png differ diff --git a/Graphics/drawables/originals/nfc/drawable/nfc.xml b/Graphics/drawables/originals/nfc/drawable/nfc.xml new file mode 100644 index 000000000..a0ce6f228 --- /dev/null +++ b/Graphics/drawables/originals/nfc/drawable/nfc.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/Graphics/drawables/originals/nfc/readme.txt b/Graphics/drawables/originals/nfc/readme.txt new file mode 100644 index 000000000..cc9018452 --- /dev/null +++ b/Graphics/drawables/originals/nfc/readme.txt @@ -0,0 +1,5 @@ +Thanks for visiting MaterialDesignIcons.com +Check back often for new icons and follow @MaterialIcons for updates. + +Icon: nfc +By: Austin Andrews \ No newline at end of file diff --git a/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_black_18dp.png b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_black_18dp.png new file mode 100644 index 000000000..d5e2bffeb Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_black_18dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_black_24dp.png b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_black_24dp.png new file mode 100644 index 000000000..75231c4c4 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_black_24dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_black_36dp.png b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_black_36dp.png new file mode 100644 index 000000000..0e59ee75a Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_black_36dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_black_48dp.png b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_black_48dp.png new file mode 100644 index 000000000..063776cb6 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_black_48dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_grey600_18dp.png b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_grey600_18dp.png new file mode 100644 index 000000000..97a120be1 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_grey600_18dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_grey600_24dp.png b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_grey600_24dp.png new file mode 100644 index 000000000..956eb886c Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_grey600_24dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_grey600_36dp.png b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_grey600_36dp.png new file mode 100644 index 000000000..b171b7142 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_grey600_36dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_grey600_48dp.png b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_grey600_48dp.png new file mode 100644 index 000000000..1a2d6ed75 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_grey600_48dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_white_18dp.png b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_white_18dp.png new file mode 100644 index 000000000..667202070 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_white_18dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_white_24dp.png b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_white_24dp.png new file mode 100644 index 000000000..261f4a5ab Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_white_24dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_white_36dp.png b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_white_36dp.png new file mode 100644 index 000000000..2b1fea929 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_white_36dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_white_48dp.png b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_white_48dp.png new file mode 100644 index 000000000..c4f2f57c9 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_white_48dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_18dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_18dp.png new file mode 100644 index 000000000..b9dfb309c Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_18dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_24dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_24dp.png new file mode 100644 index 000000000..f2e6ad3e7 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_24dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_36dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_36dp.png new file mode 100644 index 000000000..75231c4c4 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_36dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_48dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_48dp.png new file mode 100644 index 000000000..593aa8f2a Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_48dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_18dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_18dp.png new file mode 100644 index 000000000..7ecef0044 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_18dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_24dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_24dp.png new file mode 100644 index 000000000..af36e585c Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_24dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_36dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_36dp.png new file mode 100644 index 000000000..956eb886c Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_36dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_48dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_48dp.png new file mode 100644 index 000000000..347b0378a Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_48dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_18dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_18dp.png new file mode 100644 index 000000000..be2f80974 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_18dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_24dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_24dp.png new file mode 100644 index 000000000..5cf552b13 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_24dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_36dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_36dp.png new file mode 100644 index 000000000..261f4a5ab Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_36dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_48dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_48dp.png new file mode 100644 index 000000000..a2c6ade61 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_48dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_black_18dp.png b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_black_18dp.png new file mode 100644 index 000000000..75231c4c4 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_black_18dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_black_24dp.png b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_black_24dp.png new file mode 100644 index 000000000..593aa8f2a Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_black_24dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_black_36dp.png b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_black_36dp.png new file mode 100644 index 000000000..063776cb6 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_black_36dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_black_48dp.png b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_black_48dp.png new file mode 100644 index 000000000..43daf96e6 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_black_48dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_grey600_18dp.png b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_grey600_18dp.png new file mode 100644 index 000000000..956eb886c Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_grey600_18dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_grey600_24dp.png b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_grey600_24dp.png new file mode 100644 index 000000000..347b0378a Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_grey600_24dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_grey600_36dp.png b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_grey600_36dp.png new file mode 100644 index 000000000..1a2d6ed75 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_grey600_36dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_grey600_48dp.png b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_grey600_48dp.png new file mode 100644 index 000000000..bd6700d03 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_grey600_48dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_white_18dp.png b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_white_18dp.png new file mode 100644 index 000000000..261f4a5ab Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_white_18dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_white_24dp.png b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_white_24dp.png new file mode 100644 index 000000000..a2c6ade61 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_white_24dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_white_36dp.png b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_white_36dp.png new file mode 100644 index 000000000..c4f2f57c9 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_white_36dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_white_48dp.png b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_white_48dp.png new file mode 100644 index 000000000..e795f80a5 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_white_48dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_black_18dp.png b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_black_18dp.png new file mode 100644 index 000000000..0e59ee75a Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_black_18dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_black_24dp.png b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_black_24dp.png new file mode 100644 index 000000000..063776cb6 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_black_24dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_black_36dp.png b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_black_36dp.png new file mode 100644 index 000000000..f87c96984 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_black_36dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_black_48dp.png b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_black_48dp.png new file mode 100644 index 000000000..d52c08b40 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_black_48dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_grey600_18dp.png b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_grey600_18dp.png new file mode 100644 index 000000000..b171b7142 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_grey600_18dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_grey600_24dp.png b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_grey600_24dp.png new file mode 100644 index 000000000..1a2d6ed75 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_grey600_24dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_grey600_36dp.png b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_grey600_36dp.png new file mode 100644 index 000000000..59cb56370 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_grey600_36dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_grey600_48dp.png b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_grey600_48dp.png new file mode 100644 index 000000000..8ff5607c4 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_grey600_48dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_white_18dp.png b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_white_18dp.png new file mode 100644 index 000000000..2b1fea929 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_white_18dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_white_24dp.png b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_white_24dp.png new file mode 100644 index 000000000..c4f2f57c9 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_white_24dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_white_36dp.png b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_white_36dp.png new file mode 100644 index 000000000..f138dfa61 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_white_36dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_white_48dp.png b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_white_48dp.png new file mode 100644 index 000000000..3b15d3fcc Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_white_48dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_black_18dp.png b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_black_18dp.png new file mode 100644 index 000000000..063776cb6 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_black_18dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_black_24dp.png b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_black_24dp.png new file mode 100644 index 000000000..43daf96e6 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_black_24dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_black_36dp.png b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_black_36dp.png new file mode 100644 index 000000000..d52c08b40 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_black_36dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_black_48dp.png b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_black_48dp.png new file mode 100644 index 000000000..0ac5a7987 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_black_48dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_18dp.png b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_18dp.png new file mode 100644 index 000000000..1a2d6ed75 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_18dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_24dp.png b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_24dp.png new file mode 100644 index 000000000..bd6700d03 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_24dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_36dp.png b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_36dp.png new file mode 100644 index 000000000..8ff5607c4 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_36dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_48dp.png b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_48dp.png new file mode 100644 index 000000000..9412036dd Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_48dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_white_18dp.png b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_white_18dp.png new file mode 100644 index 000000000..c4f2f57c9 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_white_18dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_white_24dp.png b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_white_24dp.png new file mode 100644 index 000000000..e795f80a5 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_white_24dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_white_36dp.png b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_white_36dp.png new file mode 100644 index 000000000..3b15d3fcc Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_white_36dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_white_48dp.png b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_white_48dp.png new file mode 100644 index 000000000..5de99e5c4 Binary files /dev/null and b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_white_48dp.png differ diff --git a/Graphics/drawables/originals/qrcode/drawable/qrcode.xml b/Graphics/drawables/originals/qrcode/drawable/qrcode.xml new file mode 100644 index 000000000..7d59b50e9 --- /dev/null +++ b/Graphics/drawables/originals/qrcode/drawable/qrcode.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/Graphics/drawables/originals/qrcode/readme.txt b/Graphics/drawables/originals/qrcode/readme.txt new file mode 100644 index 000000000..cc545383e --- /dev/null +++ b/Graphics/drawables/originals/qrcode/readme.txt @@ -0,0 +1,5 @@ +Thanks for visiting MaterialDesignIcons.com +Check back often for new icons and follow @MaterialIcons for updates. + +Icon: qrcode +By: Austin Andrews \ No newline at end of file diff --git a/Graphics/get-material-icons.sh b/Graphics/get-material-icons.sh index b26e73c9c..f24735642 100755 --- a/Graphics/get-material-icons.sh +++ b/Graphics/get-material-icons.sh @@ -7,6 +7,9 @@ python copy OpenKeychain navigation white check 24 python copy OpenKeychain navigation black expand_less 24 python copy OpenKeychain navigation black expand_more 24 python copy OpenKeychain navigation white refresh 24 +python copy OpenKeychain av white repeat 24 +python copy OpenKeychain av grey repeat 24 +python copy OpenKeychain editor white mode_edit 24 # navigation drawer sections python copy OpenKeychain communication black vpn_key 24 @@ -16,4 +19,10 @@ python copy OpenKeychain action black help 24 python copy OpenKeychain action black settings 24 # floating action button -python copy OpenKeychain av white play_arrow 24 \ No newline at end of file +python copy OpenKeychain av white play_arrow 24 + +# small floating action button +python copy OpenKeychain file white folder 24 + +# multi select +python copy OpenKeychain action white lock 24 \ No newline at end of file diff --git a/Graphics/screenshots/device-2015-02-20-110958-device.png b/Graphics/screenshots/device-2015-02-20-110958-device.png new file mode 100644 index 000000000..092744127 Binary files /dev/null and b/Graphics/screenshots/device-2015-02-20-110958-device.png differ diff --git a/Graphics/screenshots/device-2015-02-20-110958.png b/Graphics/screenshots/device-2015-02-20-110958.png new file mode 100644 index 000000000..cc522b7a4 Binary files /dev/null and b/Graphics/screenshots/device-2015-02-20-110958.png differ diff --git a/Graphics/update-drawables.sh b/Graphics/update-drawables.sh index 750a6ee97..2e73641f5 100755 --- a/Graphics/update-drawables.sh +++ b/Graphics/update-drawables.sh @@ -39,7 +39,7 @@ SRC_DIR=./drawables/ # xhdpi: 64x64 # xxhdpi: 96x96 -for NAME in "ic_action_nfc" "ic_action_qr_code" "ic_action_safeslinger" "ic_action_search_cloud" "ic_cloud_search_24px" +for NAME in "ic_action_search_cloud" "ic_cloud_search_24px" "ic_action_encrypt_file" "ic_action_encrypt_text" "ic_action_verified_cutout" do echo $NAME inkscape -w 32 -h 32 -e "$MDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" @@ -48,13 +48,22 @@ 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" +for NAME in "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "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 "$HDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" -inkscape -w 48 -h 48 -e "$XDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" -inkscape -w 64 -h 64 -e "$XXDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" +inkscape -w 24 -h 24 -e "$MDPI_DIR/${NAME}_24px.png" "$SRC_DIR/$NAME.svg" +inkscape -w 32 -h 32 -e "$HDPI_DIR/${NAME}_24px.png" "$SRC_DIR/$NAME.svg" +inkscape -w 48 -h 48 -e "$XDPI_DIR/${NAME}_24px.png" "$SRC_DIR/$NAME.svg" +inkscape -w 64 -h 64 -e "$XXDPI_DIR/${NAME}_24px.png" "$SRC_DIR/$NAME.svg" +done + +for NAME in "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" +do +echo $NAME +inkscape -w 96 -h 96 -e "$MDPI_DIR/${NAME}_96px.png" "$SRC_DIR/$NAME.svg" +inkscape -w 128 -h 128 -e "$HDPI_DIR/${NAME}_96px.png" "$SRC_DIR/$NAME.svg" +inkscape -w 192 -h 192 -e "$XDPI_DIR/${NAME}_96px.png" "$SRC_DIR/$NAME.svg" +inkscape -w 256 -h 256 -e "$XXDPI_DIR/${NAME}_96px.png" "$SRC_DIR/$NAME.svg" done for NAME in "create_key_robot" diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java index ba7a31e65..d782230c7 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java +++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java @@ -22,6 +22,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.openintents.openpgp.OpenPgpMetadata; import org.openintents.openpgp.OpenPgpSignatureResult; import org.robolectric.*; import org.robolectric.shadows.ShadowLog; @@ -162,6 +163,10 @@ public class PgpEncryptDecryptTest { Assert.assertArrayEquals("decrypted ciphertext should equal plaintext", out.toByteArray(), plaintext.getBytes()); Assert.assertNull("signature should be an error", result.getSignatureResult()); + + OpenPgpMetadata metadata = result.getDecryptMetadata(); + Assert.assertEquals("filesize must be correct", + out.toByteArray().length, metadata.getOriginalSize()); } { // decryption with a bad passphrase should fail @@ -239,6 +244,11 @@ public class PgpEncryptDecryptTest { Assert.assertArrayEquals("decrypted ciphertext with provided passphrase should equal plaintext", out.toByteArray(), plaintext.getBytes()); Assert.assertNull("signature be empty", result.getSignatureResult()); + + OpenPgpMetadata metadata = result.getDecryptMetadata(); + Assert.assertEquals("filesize must be correct", + out.toByteArray().length, metadata.getOriginalSize()); + } // TODO how to test passphrase cache? @@ -318,6 +328,10 @@ public class PgpEncryptDecryptTest { Assert.assertArrayEquals("decrypted ciphertext with cached passphrase should equal plaintext", out.toByteArray(), plaintext.getBytes()); Assert.assertNull("signature should be empty", result.getSignatureResult()); + + OpenPgpMetadata metadata = result.getDecryptMetadata(); + Assert.assertEquals("filesize must be correct", + out.toByteArray().length, metadata.getOriginalSize()); } { // decryption with passphrase cached should succeed for the first key @@ -411,6 +425,10 @@ public class PgpEncryptDecryptTest { out.toByteArray(), plaintext.getBytes()); Assert.assertEquals("signature should be verified and certified", OpenPgpSignatureResult.SIGNATURE_SUCCESS_CERTIFIED, result.getSignatureResult().getStatus()); + + OpenPgpMetadata metadata = result.getDecryptMetadata(); + Assert.assertEquals("filesize must be correct", + out.toByteArray().length, metadata.getOriginalSize()); } { // decryption with passphrase cached should succeed for the other key if first is gone diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index c5d2bbcff..3d852621c 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -6,6 +6,7 @@ dependencies { compile 'com.android.support:support-v4:21.0.3' compile 'com.android.support:appcompat-v7:21.0.3' compile 'com.android.support:recyclerview-v7:21.0.3' + compile 'com.android.support:cardview-v7:21.0.3' compile project(':extern:openpgp-api-lib') compile project(':extern:openkeychain-api-lib') compile project(':extern:html-textview') @@ -19,16 +20,16 @@ dependencies { compile project(':extern:KeybaseLib:Lib') compile project(':extern:TokenAutoComplete:library') compile project(':extern:safeslinger-exchange') - compile project(':extern:android-lockpattern:code') - // TODO: include as submodule?: + // TODO: Pin! + compile 'com.eftimoff:android-patternview:1.0.0@aar' compile 'com.journeyapps:zxing-android-embedded:2.0.1@aar' compile 'com.journeyapps:zxing-android-integration:2.0.1@aar' compile 'com.google.zxing:core:3.0.1' - compile 'com.jpardogo.materialtabstrip:library:1.0.8' - compile 'it.neokree:MaterialNavigationDrawer:1.3' + compile 'com.jpardogo.materialtabstrip:library:1.0.9' + compile 'it.neokree:MaterialNavigationDrawer:1.3.1' compile 'com.nispok:snackbar:2.7.4' - compile 'com.getbase:floatingactionbutton:1.7.0' + compile 'com.getbase:floatingactionbutton:1.8.0' } android { diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index d47729127..29b748410 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -67,8 +67,10 @@ + + android:windowSoftInputMode="stateHidden" + android:parentActivityName=".ui.MainActivity"> + @@ -174,7 +180,11 @@ android:name=".ui.EncryptTextActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_encrypt_text" - android:windowSoftInputMode="stateHidden"> + android:windowSoftInputMode="stateHidden" + android:parentActivityName=".ui.MainActivity"> + @@ -403,10 +413,9 @@ android:value=".ui.ViewKeyActivity" /> - + android:label="@string/title_advanced_key_info"/> + + + - - + - - - - - diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_btn_check_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_btn_check_holo_light.xml deleted file mode 100644 index 62567cb98..000000000 --- a/OpenKeychain/src/main/res/drawable/keychaintheme_btn_check_holo_light.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_btn_default_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_btn_default_holo_light.xml deleted file mode 100644 index c9261f53b..000000000 --- a/OpenKeychain/src/main/res/drawable/keychaintheme_btn_default_holo_light.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_btn_radio_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_btn_radio_holo_light.xml deleted file mode 100644 index eeba95d4f..000000000 --- a/OpenKeychain/src/main/res/drawable/keychaintheme_btn_radio_holo_light.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_btn_toggle_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_btn_toggle_holo_light.xml deleted file mode 100644 index 733728e79..000000000 --- a/OpenKeychain/src/main/res/drawable/keychaintheme_btn_toggle_holo_light.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_edit_text_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_edit_text_holo_light.xml deleted file mode 100644 index 7acab984d..000000000 --- a/OpenKeychain/src/main/res/drawable/keychaintheme_edit_text_holo_light.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_fastscroll_thumb_holo.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_fastscroll_thumb_holo.xml deleted file mode 100644 index 51b376345..000000000 --- a/OpenKeychain/src/main/res/drawable/keychaintheme_fastscroll_thumb_holo.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_item_background_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_item_background_holo_light.xml deleted file mode 100644 index b385d2f92..000000000 --- a/OpenKeychain/src/main/res/drawable/keychaintheme_item_background_holo_light.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_list_selector_background_transition_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_list_selector_background_transition_holo_light.xml deleted file mode 100644 index 2a5561b22..000000000 --- a/OpenKeychain/src/main/res/drawable/keychaintheme_list_selector_background_transition_holo_light.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_list_selector_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_list_selector_holo_light.xml deleted file mode 100644 index 17164fd1d..000000000 --- a/OpenKeychain/src/main/res/drawable/keychaintheme_list_selector_holo_light.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_progress_horizontal_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_progress_horizontal_holo_light.xml deleted file mode 100644 index a99f756f6..000000000 --- a/OpenKeychain/src/main/res/drawable/keychaintheme_progress_horizontal_holo_light.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_progress_indeterminate_horizontal_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_progress_indeterminate_horizontal_holo_light.xml deleted file mode 100644 index 79c050e47..000000000 --- a/OpenKeychain/src/main/res/drawable/keychaintheme_progress_indeterminate_horizontal_holo_light.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_scrubber_control_selector_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_scrubber_control_selector_holo_light.xml deleted file mode 100644 index a3b3530ac..000000000 --- a/OpenKeychain/src/main/res/drawable/keychaintheme_scrubber_control_selector_holo_light.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_scrubber_progress_horizontal_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_scrubber_progress_horizontal_holo_light.xml deleted file mode 100644 index 4ecf8a6c1..000000000 --- a/OpenKeychain/src/main/res/drawable/keychaintheme_scrubber_progress_horizontal_holo_light.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_searchview_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_searchview_holo_light.xml deleted file mode 100644 index e82b1c2f3..000000000 --- a/OpenKeychain/src/main/res/drawable/keychaintheme_searchview_holo_light.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_spinner_background_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_spinner_background_holo_light.xml deleted file mode 100644 index 9fbb83f95..000000000 --- a/OpenKeychain/src/main/res/drawable/keychaintheme_spinner_background_holo_light.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - diff --git a/OpenKeychain/src/main/res/drawable/section_header.xml b/OpenKeychain/src/main/res/drawable/section_header.xml index a4468484e..04d3d4957 100644 --- a/OpenKeychain/src/main/res/drawable/section_header.xml +++ b/OpenKeychain/src/main/res/drawable/section_header.xml @@ -6,6 +6,6 @@ android:height="2dp" android:width="1000dp" /> - + \ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/alp_42447968_lock_pattern_fragment.xml b/OpenKeychain/src/main/res/layout/alp_42447968_lock_pattern_fragment.xml deleted file mode 100644 index 6a154fa55..000000000 --- a/OpenKeychain/src/main/res/layout/alp_42447968_lock_pattern_fragment.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml index c7b8c9b3a..6df5c84f5 100644 --- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml +++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml @@ -18,7 +18,7 @@ - - - - - - - - - - - - - - diff --git a/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml b/OpenKeychain/src/main/res/layout/certify_fingerprint_activity.xml similarity index 75% rename from OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml rename to OpenKeychain/src/main/res/layout/certify_fingerprint_activity.xml index c7f0f50d9..ec91d1455 100644 --- a/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml +++ b/OpenKeychain/src/main/res/layout/certify_fingerprint_activity.xml @@ -1,5 +1,7 @@ @@ -9,11 +11,9 @@ - - + android:layout_height="match_parent" + android:orientation="vertical"> diff --git a/OpenKeychain/src/main/res/layout/certify_fingerprint_fragment.xml b/OpenKeychain/src/main/res/layout/certify_fingerprint_fragment.xml new file mode 100644 index 000000000..9b6b35012 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/certify_fingerprint_fragment.xml @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml index a55a8ea0c..2df3755a4 100644 --- a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml @@ -95,7 +95,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="8dp" - android:src="@drawable/status_signature_verified_cutout" + android:src="@drawable/status_signature_verified_cutout_24px" android:layout_gravity="center_vertical" /> diff --git a/OpenKeychain/src/main/res/layout/create_key_activity.xml b/OpenKeychain/src/main/res/layout/create_key_activity.xml index e8422fb37..c42fd4d4b 100644 --- a/OpenKeychain/src/main/res/layout/create_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/create_key_activity.xml @@ -7,19 +7,15 @@ android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> - - - + android:layout_height="match_parent" /> - + \ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml index 189579f91..97eba9cd1 100644 --- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml @@ -159,7 +159,7 @@ android:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical" android:clickable="true" - style="@style/SelectableItem" + style="?android:attr/borderlessButtonStyle" android:layout_gravity="center_vertical" /> diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml index d92988111..026d98004 100644 --- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml index 9140ad07b..659d1c207 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml @@ -24,7 +24,7 @@ android:id="@+id/result_encryption_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/status_lock_open" + android:src="@drawable/status_lock_open_24px" android:layout_gravity="center_vertical" /> + android:background="@color/primary"> + android:layout_height="@dimen/statusbar_height" /> + android:textColor="@color/header_text" /> + android:textColor="@color/tab_text" + app:pstsTextColorSelected="@color/tab_text_selected" + app:pstsIndicatorColor="@color/tab_indicator" /> @@ -38,7 +38,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="8dp" - android:src="@drawable/ic_action_nfc" + android:src="@drawable/ic_nfc_white_24dp" android:layout_gravity="center_vertical" style="@style/SelectableItem" /> diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml index 0c3c6404a..3c46b4f9c 100644 --- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml +++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml @@ -52,8 +52,8 @@ android:layout_alignParentRight="true" android:layout_alignParentEnd="true" android:layout_alignParentBottom="true" - fab:fab_addButtonColorNormal="@color/fab" - fab:fab_addButtonColorPressed="@color/fab_pressed" + fab:fab_addButtonColorNormal="@color/primary" + fab:fab_addButtonColorPressed="@color/primary_dark" fab:fab_addButtonSize="normal" fab:fab_addButtonPlusIconColor="@color/icons" fab:fab_expandDirection="up" @@ -63,20 +63,22 @@ android:layout_marginEnd="16dp"> @@ -84,8 +86,9 @@ android:id="@+id/fab_add_file" android:layout_width="wrap_content" android:layout_height="wrap_content" - fab:fab_colorNormal="@color/fab" - fab:fab_colorPressed="@color/fab_pressed" + fab:fab_icon="@drawable/ic_folder_white_24dp" + fab:fab_colorNormal="@color/primary" + fab:fab_colorPressed="@color/primary_dark" fab:fab_title="Import from File" fab:fab_size="mini" /> diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml index df69e4237..27444a260 100644 --- a/OpenKeychain/src/main/res/layout/key_list_item.xml +++ b/OpenKeychain/src/main/res/layout/key_list_item.xml @@ -58,7 +58,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="center" - android:src="@drawable/ic_action_safeslinger" + android:src="@drawable/ic_repeat_grey_24dp" android:padding="12dp" style="@style/SelectableItem" /> @@ -69,7 +69,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:src="@drawable/status_signature_revoked_cutout" + android:src="@drawable/status_signature_revoked_cutout_24px" android:padding="16dp" /> diff --git a/OpenKeychain/src/main/res/layout/keyspinner_item.xml b/OpenKeychain/src/main/res/layout/keyspinner_item.xml index b75bb808e..757dae5be 100644 --- a/OpenKeychain/src/main/res/layout/keyspinner_item.xml +++ b/OpenKeychain/src/main/res/layout/keyspinner_item.xml @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:src="@drawable/status_signature_revoked_cutout" + android:src="@drawable/status_signature_revoked_cutout_24px" android:paddingLeft="16dp" android:paddingRight="16dp" /> diff --git a/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_passphrase.xml b/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_passphrase.xml index 61bd4572d..de957cc74 100644 --- a/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_passphrase.xml +++ b/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_passphrase.xml @@ -7,13 +7,12 @@ tools:context="pSontag.testopenkeychain.Passphrase"> - - + + + android:layout_weight="1" /> + + android:text="@string/passphrase" /> + + android:layout_weight="6" /> + + android:layout_weight="1" /> + + android:layout_weight="6" /> + -