From 425cea41f23bdd725827b24ead59d29a1ed79ac0 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Wed, 24 Sep 2014 02:43:45 +0200 Subject: add subtle attention seeker to decryptactivity with available clipboard data Thanks Cyril Mottier https://plus.google.com/+CyrilMottier/posts/FABaJhRMCuy --- .../keychain/ui/DecryptActivity.java | 52 +++++++++++++ .../keychain/ui/util/SubtleAttentionSeeker.java | 86 ++++++++++++++++++++++ .../src/main/res/layout/decrypt_content.xml | 1 + 3 files changed, 139 insertions(+) create mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/SubtleAttentionSeeker.java (limited to 'OpenKeychain/src/main') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java index 2f3978dad..46c99878b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2014 Dominik Schürmann + * Copyright (C) 2014 Vincent Breitmoser * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,12 +18,22 @@ package org.sufficientlysecure.keychain.ui; +import android.annotation.TargetApi; import android.content.Intent; +import android.os.AsyncTask; +import android.os.Build; +import android.os.Build.VERSION; +import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.view.View; import org.sufficientlysecure.keychain.R; +import org.sufficientlysecure.keychain.compatibility.ClipboardReflection; +import org.sufficientlysecure.keychain.pgp.PgpHelper; import org.sufficientlysecure.keychain.service.results.OperationResult; +import org.sufficientlysecure.keychain.ui.util.SubtleAttentionSeeker; + +import java.util.regex.Matcher; public class DecryptActivity extends DrawerActivity { @@ -56,6 +67,47 @@ public class DecryptActivity extends DrawerActivity { }); } + @TargetApi(VERSION_CODES.HONEYCOMB) + @Override + protected void onResume() { + super.onResume(); + + // This is an eye candy ice cream sandwich feature, nvm on versions below + if (Build.VERSION.SDK_INT >= VERSION_CODES.ICE_CREAM_SANDWICH) { + + // get text from clipboard + final String clipboardText = + ClipboardReflection.getClipboardText(DecryptActivity.this).toString(); + + new AsyncTask() { + @Override + protected Boolean doInBackground(Void... params) { + + // see if it looks like a pgp thing + Matcher matcher = PgpHelper.PGP_MESSAGE.matcher(clipboardText); + boolean animate = matcher.matches(); + + // see if it looks like another pgp thing + if(!animate) { + matcher = PgpHelper.PGP_CLEARTEXT_SIGNATURE.matcher(clipboardText); + animate = matcher.matches(); + } + return animate; + } + + @Override + protected void onPostExecute(Boolean animate) { + super.onPostExecute(animate); + + // if so, animate the clipboard icon just a bit~ + if(animate) { + SubtleAttentionSeeker.tada(findViewById(R.id.clipboard_icon), 1.5f).start(); + } + } + }.execute(); + } + } + @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { // if a result has been returned, display a notify diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/SubtleAttentionSeeker.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/SubtleAttentionSeeker.java new file mode 100644 index 000000000..87444c226 --- /dev/null +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/SubtleAttentionSeeker.java @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2014 Vincent Breitmoser + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package org.sufficientlysecure.keychain.ui.util; + +import android.animation.Keyframe; +import android.animation.ObjectAnimator; +import android.animation.PropertyValuesHolder; +import android.annotation.TargetApi; +import android.os.Build.VERSION_CODES; +import android.view.View; + +@TargetApi(VERSION_CODES.ICE_CREAM_SANDWICH) +/** Simple animation helper for subtle attention seeker stuff. + * + * Code borrowed from Cyril Mottier: https://plus.google.com/+CyrilMottier/posts/FABaJhRMCuy + */ +public class SubtleAttentionSeeker { + + public static ObjectAnimator tada(View view) { + return tada(view, 1f); + } + + public static ObjectAnimator tada(View view, float shakeFactor) { + + PropertyValuesHolder pvhScaleX = PropertyValuesHolder.ofKeyframe(View.SCALE_X, + Keyframe.ofFloat(0f, 1f), + Keyframe.ofFloat(.1f, .9f), + Keyframe.ofFloat(.2f, .9f), + Keyframe.ofFloat(.3f, 1.1f), + Keyframe.ofFloat(.4f, 1.1f), + Keyframe.ofFloat(.5f, 1.1f), + Keyframe.ofFloat(.6f, 1.1f), + Keyframe.ofFloat(.7f, 1.1f), + Keyframe.ofFloat(.8f, 1.1f), + Keyframe.ofFloat(.9f, 1.1f), + Keyframe.ofFloat(1f, 1f) + ); + + PropertyValuesHolder pvhScaleY = PropertyValuesHolder.ofKeyframe(View.SCALE_Y, + Keyframe.ofFloat(0f, 1f), + Keyframe.ofFloat(.1f, .9f), + Keyframe.ofFloat(.2f, .9f), + Keyframe.ofFloat(.3f, 1.1f), + Keyframe.ofFloat(.4f, 1.1f), + Keyframe.ofFloat(.5f, 1.1f), + Keyframe.ofFloat(.6f, 1.1f), + Keyframe.ofFloat(.7f, 1.1f), + Keyframe.ofFloat(.8f, 1.1f), + Keyframe.ofFloat(.9f, 1.1f), + Keyframe.ofFloat(1f, 1f) + ); + + PropertyValuesHolder pvhRotate = PropertyValuesHolder.ofKeyframe(View.ROTATION, + Keyframe.ofFloat(0f, 0f), + Keyframe.ofFloat(.1f, -3f * shakeFactor), + Keyframe.ofFloat(.2f, -3f * shakeFactor), + Keyframe.ofFloat(.3f, 3f * shakeFactor), + Keyframe.ofFloat(.4f, -3f * shakeFactor), + Keyframe.ofFloat(.5f, 3f * shakeFactor), + Keyframe.ofFloat(.6f, -3f * shakeFactor), + Keyframe.ofFloat(.7f, 3f * shakeFactor), + Keyframe.ofFloat(.8f, -3f * shakeFactor), + Keyframe.ofFloat(.9f, 3f * shakeFactor), + Keyframe.ofFloat(1f, 0) + ); + + return ObjectAnimator.ofPropertyValuesHolder(view, pvhScaleX, pvhScaleY, pvhRotate). + setDuration(1400); + } + +} diff --git a/OpenKeychain/src/main/res/layout/decrypt_content.xml b/OpenKeychain/src/main/res/layout/decrypt_content.xml index 7cd066b5b..5e7cda4f9 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_content.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_content.xml @@ -88,6 +88,7 @@