mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-11-04 16:25:05 -05:00
add subtle attention seeker to decryptactivity with available clipboard data
Thanks Cyril Mottier https://plus.google.com/+CyrilMottier/posts/FABaJhRMCuy
This commit is contained in:
parent
382ae968d6
commit
425cea41f2
@ -1,5 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
|
* Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
|
||||||
|
* Copyright (C) 2014 Vincent Breitmoser <v.breitmoser@mugenguild.com>
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -17,12 +18,22 @@
|
|||||||
|
|
||||||
package org.sufficientlysecure.keychain.ui;
|
package org.sufficientlysecure.keychain.ui;
|
||||||
|
|
||||||
|
import android.annotation.TargetApi;
|
||||||
import android.content.Intent;
|
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.os.Bundle;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
|
||||||
import org.sufficientlysecure.keychain.R;
|
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.service.results.OperationResult;
|
||||||
|
import org.sufficientlysecure.keychain.ui.util.SubtleAttentionSeeker;
|
||||||
|
|
||||||
|
import java.util.regex.Matcher;
|
||||||
|
|
||||||
public class DecryptActivity extends DrawerActivity {
|
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<Void,Void,Boolean>() {
|
||||||
|
@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
|
@Override
|
||||||
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||||
// if a result has been returned, display a notify
|
// if a result has been returned, display a notify
|
||||||
|
@ -0,0 +1,86 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2014 Vincent Breitmoser <v.breitmoser@mugenguild.com>
|
||||||
|
*
|
||||||
|
* 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 <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -88,6 +88,7 @@
|
|||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
|
android:id="@+id/clipboard_icon"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:padding="8dp"
|
android:padding="8dp"
|
||||||
|
Loading…
Reference in New Issue
Block a user