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/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/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/update-drawables.sh b/Graphics/update-drawables.sh index bfb62523e..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_search_cloud" "ic_cloud_search_24px" "ic_action_encrypt_file" "ic_action_encrypt_text" "ic_action_verified_cutout" +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" diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java index 4e8a14008..3ddaccad3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java @@ -88,6 +88,7 @@ public class ViewKeyActivity extends BaseActivity implements private ImageButton mActionEncryptText; private ImageButton mActionVerify; private ImageButton mActionEdit; + private ImageButton mActionNfc; private FloatingActionButton mFab; private AspectRatioImageView mPhoto; private ImageButton mQrCode; @@ -123,6 +124,7 @@ public class ViewKeyActivity extends BaseActivity implements mActionEncryptText = (ImageButton) findViewById(R.id.view_key_action_encrypt_text); mActionVerify = (ImageButton) findViewById(R.id.view_key_action_verify); mActionEdit = (ImageButton) findViewById(R.id.view_key_action_edit); + mActionNfc = (ImageButton) findViewById(R.id.view_key_action_nfc); mFab = (FloatingActionButton) findViewById(R.id.fab); mPhoto = (AspectRatioImageView) findViewById(R.id.view_key_photo); mQrCode = (ImageButton) findViewById(R.id.view_key_qr_code); @@ -187,6 +189,13 @@ public class ViewKeyActivity extends BaseActivity implements } }); + mActionNfc.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + invokeNfcBeam(); + } + }); + // Prepare the loaders. Either re-connect with an existing ones, // or start new ones. @@ -270,6 +279,15 @@ public class ViewKeyActivity extends BaseActivity implements return super.onOptionsItemSelected(item); } + @TargetApi(Build.VERSION_CODES.LOLLIPOP) + private void invokeNfcBeam() { + // Check for available NFC Adapter + mNfcAdapter = NfcAdapter.getDefaultAdapter(this); + if (mNfcAdapter != null) { + mNfcAdapter.invokeBeam(this); + } + } + private void scanQrCode() { Intent scanQrCode = new Intent(this, QrCodeScanActivity.class); scanQrCode.setAction(QrCodeScanActivity.ACTION_SCAN_WITH_RESULT); @@ -623,6 +641,7 @@ public class ViewKeyActivity extends BaseActivity implements mActionEncryptText.setVisibility(View.GONE); mActionVerify.setVisibility(View.GONE); mActionEdit.setVisibility(View.GONE); + mActionNfc.setVisibility(View.GONE); mFab.setVisibility(View.GONE); mQrCodeLayout.setVisibility(View.GONE); } else if (isExpired) { @@ -641,6 +660,7 @@ public class ViewKeyActivity extends BaseActivity implements mActionEncryptFile.setVisibility(View.GONE); mActionEncryptText.setVisibility(View.GONE); mActionVerify.setVisibility(View.GONE); + mActionNfc.setVisibility(View.GONE); mFab.setVisibility(View.GONE); mQrCodeLayout.setVisibility(View.GONE); } else if (mIsSecret) { @@ -675,6 +695,13 @@ public class ViewKeyActivity extends BaseActivity implements mActionEncryptText.setVisibility(View.VISIBLE); mActionVerify.setVisibility(View.GONE); mActionEdit.setVisibility(View.VISIBLE); + + // invokeBeam is available from API 21 + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + mActionNfc.setVisibility(View.VISIBLE); + } else { + mActionNfc.setVisibility(View.GONE); + } mFab.setVisibility(View.VISIBLE); mFab.setIconDrawable(getResources().getDrawable(R.drawable.ic_repeat_white_24dp)); } else { @@ -682,6 +709,7 @@ public class ViewKeyActivity extends BaseActivity implements mActionEncryptText.setVisibility(View.VISIBLE); mActionEdit.setVisibility(View.GONE); mQrCodeLayout.setVisibility(View.GONE); + mActionNfc.setVisibility(View.GONE); if (isVerified) { mStatusText.setText(R.string.view_key_verified); diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_nfc.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_nfc.png deleted file mode 100644 index 635633709..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_nfc.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_qr_code.png deleted file mode 100644 index ceb3b1645..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_qr_code.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_nfc_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_nfc_white_24dp.png new file mode 100644 index 000000000..1d87415c5 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_nfc_white_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_nfc.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_nfc.png deleted file mode 100644 index da5e267d0..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_nfc.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png deleted file mode 100644 index 21594e62f..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_nfc_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_nfc_white_24dp.png new file mode 100644 index 000000000..65ae04b7c Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_nfc_white_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_nfc.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_nfc.png deleted file mode 100644 index ff569927c..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_nfc.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_qr_code.png deleted file mode 100644 index 93bdac866..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_qr_code.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_nfc_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_nfc_white_24dp.png new file mode 100644 index 000000000..44b9006ab Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_nfc_white_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_nfc.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_nfc.png deleted file mode 100644 index 1f96ce37b..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_nfc.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_qr_code.png deleted file mode 100644 index 7ede90609..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_qr_code.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_nfc_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_nfc_white_24dp.png new file mode 100644 index 000000000..484856b3f Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_nfc_white_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_nfc_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_nfc_white_24dp.png new file mode 100644 index 000000000..c8f25bbf7 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_nfc_white_24dp.png differ diff --git a/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml index 1cc414dab..9007d2149 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml @@ -21,7 +21,7 @@ android:layout_height="match_parent" android:text="@string/import_qr_code_button" android:layout_weight="1" - android:drawableRight="@drawable/ic_action_qr_code" + android:drawableRight="@drawable/ic_qrcode_white_24dp" android:drawablePadding="8dp" android:gravity="center_vertical" /> @@ -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/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index bc46ac85f..94f0932f4 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -116,6 +116,14 @@ style="?android:attr/borderlessButtonStyle" android:src="@drawable/ic_mode_edit_white_24dp" /> + +