From dc8b04a79333d13f3e9903757502521348ccec57 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Thu, 26 Mar 2015 16:30:49 +0100 Subject: more linked id ui fine tuning --- Graphics/drawables/linked_dns.svg | 608 +-------------------- Graphics/drawables/linked_github.svg | 6 +- Graphics/drawables/linked_https.svg | 298 +--------- Graphics/drawables/linked_twitter.svg | 54 +- .../keychain/ui/linked/LinkedIdViewFragment.java | 2 + .../src/main/res/drawable-hdpi/linked_dns.png | Bin 8141 -> 667 bytes .../src/main/res/drawable-hdpi/linked_github.png | Bin 1464 -> 1437 bytes .../src/main/res/drawable-hdpi/linked_https.png | Bin 2526 -> 1345 bytes .../src/main/res/drawable-hdpi/linked_twitter.png | Bin 1785 -> 1265 bytes .../src/main/res/drawable-mdpi/linked_dns.png | Bin 5238 -> 371 bytes .../src/main/res/drawable-mdpi/linked_github.png | Bin 1107 -> 999 bytes .../src/main/res/drawable-mdpi/linked_https.png | Bin 1836 -> 1010 bytes .../src/main/res/drawable-mdpi/linked_twitter.png | Bin 1353 -> 880 bytes .../src/main/res/drawable-xhdpi/linked_dns.png | Bin 14798 -> 736 bytes .../src/main/res/drawable-xhdpi/linked_github.png | Bin 2376 -> 2153 bytes .../src/main/res/drawable-xhdpi/linked_https.png | Bin 3620 -> 1955 bytes .../src/main/res/drawable-xhdpi/linked_twitter.png | Bin 2125 -> 1916 bytes .../src/main/res/drawable-xxhdpi/linked_dns.png | Bin 22410 -> 1498 bytes .../src/main/res/drawable-xxhdpi/linked_github.png | Bin 3404 -> 3179 bytes .../src/main/res/drawable-xxhdpi/linked_https.png | Bin 4811 -> 3222 bytes .../main/res/drawable-xxhdpi/linked_twitter.png | Bin 2840 -> 2666 bytes 21 files changed, 10 insertions(+), 958 deletions(-) diff --git a/Graphics/drawables/linked_dns.svg b/Graphics/drawables/linked_dns.svg index 743334793..c04c265c2 100644 --- a/Graphics/drawables/linked_dns.svg +++ b/Graphics/drawables/linked_dns.svg @@ -1,608 +1,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/Graphics/drawables/linked_github.svg b/Graphics/drawables/linked_github.svg index e107a97cf..11f4076d5 100644 --- a/Graphics/drawables/linked_github.svg +++ b/Graphics/drawables/linked_github.svg @@ -1,6 +1,4 @@ - - - - + + diff --git a/Graphics/drawables/linked_https.svg b/Graphics/drawables/linked_https.svg index 10cdd9728..876f46276 100644 --- a/Graphics/drawables/linked_https.svg +++ b/Graphics/drawables/linked_https.svg @@ -1,298 +1,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - Read Only Emblem - - - emblem - read-only - nowrite - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/Graphics/drawables/linked_twitter.svg b/Graphics/drawables/linked_twitter.svg index af980c761..38028f2e9 100644 --- a/Graphics/drawables/linked_twitter.svg +++ b/Graphics/drawables/linked_twitter.svg @@ -1,54 +1,4 @@ - - - - - image/svg+xml - - - - - - - + + diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java index aa99a2907..2efafc086 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java @@ -478,6 +478,7 @@ public class LinkedIdViewFragment extends Fragment implements if (result.success()) { mViewHolder.vText.setText(getString(mLinkedResource.getVerifiedText(mIsSecret))); mViewHolder.setVerifyingState(mContext, VerifyState.VERIFY_OK, mIsSecret); + } else { mViewHolder.setVerifyingState(mContext, VerifyState.VERIFY_ERROR, mIsSecret); result.createNotify(getActivity()).show(); @@ -498,6 +499,7 @@ public class LinkedIdViewFragment extends Fragment implements long certifyKeyId = mViewHolder.vKeySpinner.getSelectedItemId(); if (certifyKeyId == key.none || certifyKeyId == key.symmetric) { Notify.create(getActivity(), R.string.select_key_to_certify, Style.ERROR).show(); + return; } Passphrase passphrase; diff --git a/OpenKeychain/src/main/res/drawable-hdpi/linked_dns.png b/OpenKeychain/src/main/res/drawable-hdpi/linked_dns.png index 898160fd1..41719efd6 100644 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/linked_dns.png and b/OpenKeychain/src/main/res/drawable-hdpi/linked_dns.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/linked_github.png b/OpenKeychain/src/main/res/drawable-hdpi/linked_github.png index bba0729ff..2a1ae67d7 100644 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/linked_github.png and b/OpenKeychain/src/main/res/drawable-hdpi/linked_github.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/linked_https.png b/OpenKeychain/src/main/res/drawable-hdpi/linked_https.png index 83585a890..278fac4f8 100644 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/linked_https.png and b/OpenKeychain/src/main/res/drawable-hdpi/linked_https.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/linked_twitter.png b/OpenKeychain/src/main/res/drawable-hdpi/linked_twitter.png index f80f9cc07..dd0fce197 100644 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/linked_twitter.png and b/OpenKeychain/src/main/res/drawable-hdpi/linked_twitter.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/linked_dns.png b/OpenKeychain/src/main/res/drawable-mdpi/linked_dns.png index 6dbbf6fd6..c6f3e9a06 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/linked_dns.png and b/OpenKeychain/src/main/res/drawable-mdpi/linked_dns.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/linked_github.png b/OpenKeychain/src/main/res/drawable-mdpi/linked_github.png index a2dd32029..ba3d2e4b7 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/linked_github.png and b/OpenKeychain/src/main/res/drawable-mdpi/linked_github.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/linked_https.png b/OpenKeychain/src/main/res/drawable-mdpi/linked_https.png index 6ffd0bef7..54b085aaf 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/linked_https.png and b/OpenKeychain/src/main/res/drawable-mdpi/linked_https.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/linked_twitter.png b/OpenKeychain/src/main/res/drawable-mdpi/linked_twitter.png index 5b0ca3f40..86ca9d46e 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/linked_twitter.png and b/OpenKeychain/src/main/res/drawable-mdpi/linked_twitter.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/linked_dns.png b/OpenKeychain/src/main/res/drawable-xhdpi/linked_dns.png index 5056cb0b1..ec87cdd1c 100644 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/linked_dns.png and b/OpenKeychain/src/main/res/drawable-xhdpi/linked_dns.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/linked_github.png b/OpenKeychain/src/main/res/drawable-xhdpi/linked_github.png index b5a861ad1..0934f1840 100644 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/linked_github.png and b/OpenKeychain/src/main/res/drawable-xhdpi/linked_github.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/linked_https.png b/OpenKeychain/src/main/res/drawable-xhdpi/linked_https.png index 9973bfde2..f627d2b3b 100644 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/linked_https.png and b/OpenKeychain/src/main/res/drawable-xhdpi/linked_https.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/linked_twitter.png b/OpenKeychain/src/main/res/drawable-xhdpi/linked_twitter.png index 35e22cafe..35bb1fd3b 100644 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/linked_twitter.png and b/OpenKeychain/src/main/res/drawable-xhdpi/linked_twitter.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/linked_dns.png b/OpenKeychain/src/main/res/drawable-xxhdpi/linked_dns.png index f28ebc695..9b3ee8572 100644 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/linked_dns.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/linked_dns.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/linked_github.png b/OpenKeychain/src/main/res/drawable-xxhdpi/linked_github.png index 38d7a12f4..19a3421bf 100644 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/linked_github.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/linked_github.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/linked_https.png b/OpenKeychain/src/main/res/drawable-xxhdpi/linked_https.png index 25e1baf28..c41ab6c1c 100644 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/linked_https.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/linked_https.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/linked_twitter.png b/OpenKeychain/src/main/res/drawable-xxhdpi/linked_twitter.png index 62116fd34..0710a12f1 100644 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/linked_twitter.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/linked_twitter.png differ -- cgit v1.2.3