awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

When locking the app, try to clear the screenshot that is shown in the task switcher.

Browse Source
This commit is contained in:
B. Petersen
2017-02-23 20:30:15 +01:00
parent 8824b30c4a
commit 92d71ad150
5 changed files with 34 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MessengerProj/src/main/java/com/b44t/ui/Adapters/DrawerLayoutAdapter.java
-1
View File
@@ -30,7 +30,6 @@ import android.widget.BaseAdapter;
import com.b44t.messenger.AndroidUtilities;
import com.b44t.messenger.LocaleController;
import com.b44t.messenger.MessagesController;
import com.b44t.messenger.R;
import com.b44t.messenger.UserConfig;
import com.b44t.ui.Cells.DrawerActionCell;
MessengerProj/src/main/java/com/b44t/ui/Components/PasscodeView.java
+1 -345
View File
@@ -45,7 +45,6 @@ import android.text.Editable;
import android.text.InputFilter;
import android.text.InputType;
import android.text.TextWatcher;
import android.text.method.PasswordTransformationMethod;
import android.util.TypedValue;
import android.view.ActionMode;
import android.view.Gravity;
@@ -81,336 +80,6 @@ public class PasscodeView extends FrameLayout {
void didAcceptedPassword();
}
private class AnimatingTextView extends FrameLayout {
private ArrayList<TextView> characterTextViews;
private ArrayList<TextView> dotTextViews;
private StringBuilder stringBuilder;
private String DOT = "\u2022";
private AnimatorSet currentAnimation;
private Runnable dotRunnable;
public AnimatingTextView(Context context) {
super(context);
characterTextViews = new ArrayList<>(4);
dotTextViews = new ArrayList<>(4);
stringBuilder = new StringBuilder(4);
for (int a = 0; a < 4; a++) {
TextView textView = new TextView(context);
textView.setTextColor(0xffffffff);
textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 36);
textView.setGravity(Gravity.CENTER);
textView.setAlpha(0);
textView.setPivotX(AndroidUtilities.dp(25));
textView.setPivotY(AndroidUtilities.dp(25));
addView(textView);
LayoutParams layoutParams = (LayoutParams) textView.getLayoutParams();
layoutParams.width = AndroidUtilities.dp(50);
layoutParams.height = AndroidUtilities.dp(50);
layoutParams.gravity = Gravity.TOP | Gravity.LEFT;
textView.setLayoutParams(layoutParams);
characterTextViews.add(textView);
textView = new TextView(context);
textView.setTextColor(0xffffffff);
textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 36);
textView.setGravity(Gravity.CENTER);
textView.setAlpha(0);
textView.setText(DOT);
textView.setPivotX(AndroidUtilities.dp(25));
textView.setPivotY(AndroidUtilities.dp(25));
addView(textView);
layoutParams = (LayoutParams) textView.getLayoutParams();
layoutParams.width = AndroidUtilities.dp(50);
layoutParams.height = AndroidUtilities.dp(50);
layoutParams.gravity = Gravity.TOP | Gravity.LEFT;
textView.setLayoutParams(layoutParams);
dotTextViews.add(textView);
}
}
private int getXForTextView(int pos) {
return (getMeasuredWidth() - stringBuilder.length() * AndroidUtilities.dp(30)) / 2 + pos * AndroidUtilities.dp(30) - AndroidUtilities.dp(10);
}
public void appendCharacter(String c) {
if (stringBuilder.length() == 4) {
return;
}
try {
performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP);
} catch (Exception e) {
FileLog.e("messenger", e);
}
ArrayList<Animator> animators = new ArrayList<>();
final int newPos = stringBuilder.length();
stringBuilder.append(c);
TextView textView = characterTextViews.get(newPos);
textView.setText(c);
textView.setTranslationX(getXForTextView(newPos));
animators.add(ObjectAnimator.ofFloat(textView, "scaleX", 0, 1));
animators.add(ObjectAnimator.ofFloat(textView, "scaleY", 0, 1));
animators.add(ObjectAnimator.ofFloat(textView, "alpha", 0, 1));
animators.add(ObjectAnimator.ofFloat(textView, "translationY", AndroidUtilities.dp(20), 0));
textView = dotTextViews.get(newPos);
textView.setTranslationX(getXForTextView(newPos));
textView.setAlpha(0);
animators.add(ObjectAnimator.ofFloat(textView, "scaleX", 0, 1));
animators.add(ObjectAnimator.ofFloat(textView, "scaleY", 0, 1));
animators.add(ObjectAnimator.ofFloat(textView, "translationY", AndroidUtilities.dp(20), 0));
for (int a = newPos + 1; a < 4; a++) {
textView = characterTextViews.get(a);
if (textView.getAlpha() != 0) {
animators.add(ObjectAnimator.ofFloat(textView, "scaleX", 0));
animators.add(ObjectAnimator.ofFloat(textView, "scaleY", 0));
animators.add(ObjectAnimator.ofFloat(textView, "alpha", 0));
}
textView = dotTextViews.get(a);
if (textView.getAlpha() != 0) {
animators.add(ObjectAnimator.ofFloat(textView, "scaleX", 0));
animators.add(ObjectAnimator.ofFloat(textView, "scaleY", 0));
animators.add(ObjectAnimator.ofFloat(textView, "alpha", 0));
}
}
if (dotRunnable != null) {
AndroidUtilities.cancelRunOnUIThread(dotRunnable);
}
dotRunnable = new Runnable() {
@Override
public void run() {
if (dotRunnable != this) {
return;
}
ArrayList<Animator> animators = new ArrayList<>();
TextView textView = characterTextViews.get(newPos);
animators.add(ObjectAnimator.ofFloat(textView, "scaleX", 0));
animators.add(ObjectAnimator.ofFloat(textView, "scaleY", 0));
animators.add(ObjectAnimator.ofFloat(textView, "alpha", 0));
textView = dotTextViews.get(newPos);
animators.add(ObjectAnimator.ofFloat(textView, "scaleX", 1));
animators.add(ObjectAnimator.ofFloat(textView, "scaleY", 1));
animators.add(ObjectAnimator.ofFloat(textView, "alpha", 1));
currentAnimation = new AnimatorSet();
currentAnimation.setDuration(150);
currentAnimation.playTogether(animators);
currentAnimation.addListener(new AnimatorListenerAdapterProxy() {
@Override
public void onAnimationEnd(Animator animation) {
if (currentAnimation != null && currentAnimation.equals(animation)) {
currentAnimation = null;
}
}
});
currentAnimation.start();
}
};
AndroidUtilities.runOnUIThread(dotRunnable, 1500);
for (int a = 0; a < newPos; a++) {
textView = characterTextViews.get(a);
animators.add(ObjectAnimator.ofFloat(textView, "translationX", getXForTextView(a)));
animators.add(ObjectAnimator.ofFloat(textView, "scaleX", 0));
animators.add(ObjectAnimator.ofFloat(textView, "scaleY", 0));
animators.add(ObjectAnimator.ofFloat(textView, "alpha", 0));
animators.add(ObjectAnimator.ofFloat(textView, "translationY", 0));
textView = dotTextViews.get(a);
animators.add(ObjectAnimator.ofFloat(textView, "translationX", getXForTextView(a)));
animators.add(ObjectAnimator.ofFloat(textView, "scaleX", 1));
animators.add(ObjectAnimator.ofFloat(textView, "scaleY", 1));
animators.add(ObjectAnimator.ofFloat(textView, "alpha", 1));
animators.add(ObjectAnimator.ofFloat(textView, "translationY", 0));
}
if (currentAnimation != null) {
currentAnimation.cancel();
}
currentAnimation = new AnimatorSet();
currentAnimation.setDuration(150);
currentAnimation.playTogether(animators);
currentAnimation.addListener(new AnimatorListenerAdapterProxy() {
@Override
public void onAnimationEnd(Animator animation) {
if (currentAnimation != null && currentAnimation.equals(animation)) {
currentAnimation = null;
}
}
});
currentAnimation.start();
}
public String getString() {
return stringBuilder.toString();
}
public int lenght() {
return stringBuilder.length();
}
public void eraseLastCharacter() {
if (stringBuilder.length() == 0) {
return;
}
try {
performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP);
} catch (Exception e) {
FileLog.e("messenger", e);
}
ArrayList<Animator> animators = new ArrayList<>();
int deletingPos = stringBuilder.length() - 1;
if (deletingPos != 0) {
stringBuilder.deleteCharAt(deletingPos);
}
for (int a = deletingPos; a < 4; a++) {
TextView textView = characterTextViews.get(a);
if (textView.getAlpha() != 0) {
animators.add(ObjectAnimator.ofFloat(textView, "scaleX", 0));
animators.add(ObjectAnimator.ofFloat(textView, "scaleY", 0));
animators.add(ObjectAnimator.ofFloat(textView, "alpha", 0));
animators.add(ObjectAnimator.ofFloat(textView, "translationY", 0));
animators.add(ObjectAnimator.ofFloat(textView, "translationX", getXForTextView(a)));
}
textView = dotTextViews.get(a);
if (textView.getAlpha() != 0) {
animators.add(ObjectAnimator.ofFloat(textView, "scaleX", 0));
animators.add(ObjectAnimator.ofFloat(textView, "scaleY", 0));
animators.add(ObjectAnimator.ofFloat(textView, "alpha", 0));
animators.add(ObjectAnimator.ofFloat(textView, "translationY", 0));
animators.add(ObjectAnimator.ofFloat(textView, "translationX", getXForTextView(a)));
}
}
if (deletingPos == 0) {
stringBuilder.deleteCharAt(deletingPos);
}
for (int a = 0; a < deletingPos; a++) {
TextView textView = characterTextViews.get(a);
animators.add(ObjectAnimator.ofFloat(textView, "translationX", getXForTextView(a)));
textView = dotTextViews.get(a);
animators.add(ObjectAnimator.ofFloat(textView, "translationX", getXForTextView(a)));
}
if (dotRunnable != null) {
AndroidUtilities.cancelRunOnUIThread(dotRunnable);
dotRunnable = null;
}
if (currentAnimation != null) {
currentAnimation.cancel();
}
currentAnimation = new AnimatorSet();
currentAnimation.setDuration(150);
currentAnimation.playTogether(animators);
currentAnimation.addListener(new AnimatorListenerAdapterProxy() {
@Override
public void onAnimationEnd(Animator animation) {
if (currentAnimation != null && currentAnimation.equals(animation)) {
currentAnimation = null;
}
}
});
currentAnimation.start();
}
private void eraseAllCharacters(final boolean animated) {
if (stringBuilder.length() == 0) {
return;
}
if (dotRunnable != null) {
AndroidUtilities.cancelRunOnUIThread(dotRunnable);
dotRunnable = null;
}
if (currentAnimation != null) {
currentAnimation.cancel();
currentAnimation = null;
}
stringBuilder.delete(0, stringBuilder.length());
if (animated) {
ArrayList<Animator> animators = new ArrayList<>();
for (int a = 0; a < 4; a++) {
TextView textView = characterTextViews.get(a);
if (textView.getAlpha() != 0) {
animators.add(ObjectAnimator.ofFloat(textView, "scaleX", 0));
animators.add(ObjectAnimator.ofFloat(textView, "scaleY", 0));
animators.add(ObjectAnimator.ofFloat(textView, "alpha", 0));
}
textView = dotTextViews.get(a);
if (textView.getAlpha() != 0) {
animators.add(ObjectAnimator.ofFloat(textView, "scaleX", 0));
animators.add(ObjectAnimator.ofFloat(textView, "scaleY", 0));
animators.add(ObjectAnimator.ofFloat(textView, "alpha", 0));
}
}
currentAnimation = new AnimatorSet();
currentAnimation.setDuration(150);
currentAnimation.playTogether(animators);
currentAnimation.addListener(new AnimatorListenerAdapterProxy() {
@Override
public void onAnimationEnd(Animator animation) {
if (currentAnimation != null && currentAnimation.equals(animation)) {
currentAnimation = null;
}
}
});
currentAnimation.start();
} else {
for (int a = 0; a < 4; a++) {
characterTextViews.get(a).setAlpha(0);
dotTextViews.get(a).setAlpha(0);
}
}
}
@Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
if (dotRunnable != null) {
AndroidUtilities.cancelRunOnUIThread(dotRunnable);
dotRunnable = null;
}
if (currentAnimation != null) {
currentAnimation.cancel();
currentAnimation = null;
}
for (int a = 0; a < 4; a++) {
if (a < stringBuilder.length()) {
TextView textView = characterTextViews.get(a);
textView.setAlpha(0);
textView.setScaleX(1);
textView.setScaleY(1);
textView.setTranslationY(0);
textView.setTranslationX(getXForTextView(a));
textView = dotTextViews.get(a);
textView.setAlpha(1);
textView.setScaleX(1);
textView.setScaleY(1);
textView.setTranslationY(0);
textView.setTranslationX(getXForTextView(a));
} else {
characterTextViews.get(a).setAlpha(0);
dotTextViews.get(a).setAlpha(0);
}
}
super.onLayout(changed, left, top, right, bottom);
}
}
private Drawable backgroundDrawable;
private FrameLayout numbersFrameLayout;
private ArrayList<TextView> numberTextViews;
@@ -419,7 +88,6 @@ public class PasscodeView extends FrameLayout {
private FrameLayout passwordFrameLayout;
private ImageView eraseView;
private EditText passwordEditText;
private AnimatingTextView passwordEditText2;
private FrameLayout backgroundFrameLayout;
private TextView passcodeTextView;
private ImageView checkImage;
@@ -483,17 +151,6 @@ public class PasscodeView extends FrameLayout {
layoutParams.gravity = Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL;
passcodeTextView.setLayoutParams(layoutParams);
passwordEditText2 = new AnimatingTextView(context);
passwordFrameLayout.addView(passwordEditText2);
layoutParams = (FrameLayout.LayoutParams) passwordEditText2.getLayoutParams();
layoutParams.height = LayoutHelper.WRAP_CONTENT;
layoutParams.width = LayoutHelper.MATCH_PARENT;
layoutParams.leftMargin = AndroidUtilities.dp(70);
layoutParams.rightMargin = AndroidUtilities.dp(70);
layoutParams.bottomMargin = AndroidUtilities.dp(6);
layoutParams.gravity = Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL;
passwordEditText2.setLayoutParams(layoutParams);
passwordEditText = new EditText(context);
passwordEditText.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 36);
passwordEditText.setTextColor(0xffffffff);
@@ -675,7 +332,6 @@ public class PasscodeView extends FrameLayout {
@Override
public boolean onLongClick(View v) {
passwordEditText.setText("");
passwordEditText2.eraseAllCharacters(true);
return true;
}
});
@@ -990,7 +646,7 @@ public class PasscodeView extends FrameLayout {
checkImage.setVisibility(VISIBLE);
}
setVisibility(VISIBLE);
passwordEditText.setTransformationMethod(PasswordTransformationMethod.getInstance());
passwordEditText.setInputTypeionMethod(PasswordTransformationMethod.getInstance());
passwordEditText.setText("");
passwordEditText2.eraseAllCharacters(false);
MessengerProj/src/main/java/com/b44t/ui/DialogsActivity.java
+29 -4
View File
@@ -43,6 +43,7 @@ import android.view.MotionEvent;
import android.view.View;
import android.view.ViewOutlineProvider;
import android.view.ViewTreeObserver;
import android.view.WindowManager;
import android.view.animation.AccelerateDecelerateInterpolator;
import android.widget.EditText;
import android.widget.FrameLayout;
@@ -57,6 +58,7 @@ import com.b44t.messenger.LocaleController;
import com.b44t.messenger.MrChat;
import com.b44t.messenger.MrMailbox;
import com.b44t.messenger.MrMsg;
import com.b44t.messenger.Utilities;
import com.b44t.messenger.support.widget.LinearLayoutManager;
import com.b44t.messenger.support.widget.RecyclerView;
import com.b44t.messenger.FileLog;
@@ -118,6 +120,8 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
private DialogsActivityDelegate delegate;
private static final int ID_LOCK_APP = 1;
public interface DialogsActivityDelegate {
void didSelectDialog(DialogsActivity fragment, long dialog_id, boolean param);
}
@@ -187,7 +191,7 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
ActionBarMenu menu = actionBar.createMenu();
if (!onlySelect ) {
passcodeItem = menu.addItem(1, R.drawable.lock_close);
passcodeItem = menu.addItem(ID_LOCK_APP, R.drawable.lock_close);
updatePasscodeButton();
}
final ActionBarMenuItem item = menu.addItem(0, R.drawable.ic_ab_search).setIsSearchField(true, true).setActionBarMenuItemSearchListener(new ActionBarMenuItem.ActionBarMenuItemSearchListener() {
@@ -273,11 +277,32 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
} else if (parentLayout != null) {
parentLayout.getDrawerLayoutContainer().openDrawer(false);
}
} else if (id == 1) {
} else if (id == ID_LOCK_APP) {
listView.setVisibility(View.INVISIBLE);
UserConfig.appLocked = !UserConfig.appLocked;
UserConfig.saveConfig(false);
updatePasscodeButton();
getParentActivity().finish();
if( UserConfig.appLocked )
{
// hide list as it is visible in the "last app switcher" otherwise, save state
updatePasscodeButton();
// finish the activity after a little delay; 200 ms shoud be enough to
// let the system update its screenshots for the "last app switcher".
// FLAG_SECURE may be a little too much as it affects display and screenshots;
// it also does not really direct this problem.
Utilities.searchQueue.postRunnable(new Runnable() {
@Override
public void run() {
AndroidUtilities.runOnUIThread(new Runnable() {
@Override
public void run() {
getParentActivity().finish();
}
});
}
}, 200);
}
}
}
});
MessengerProj/src/main/java/com/b44t/ui/PasscodeActivity.java
+1
View File
@@ -381,6 +381,7 @@ public class PasscodeActivity extends BaseFragment implements NotificationCenter
return "";
}
});
numberPicker.setWrapSelectorWheel(false);
builder.setView(numberPicker);
builder.setNegativeButton(LocaleController.getString("Done", R.string.Done), new DialogInterface.OnClickListener() {
@Override
MessengerProj/src/main/java/com/b44t/ui/PrivacySettingsActivity.java
+3 -3
View File
@@ -77,11 +77,11 @@ public class PrivacySettingsActivity extends BaseFragment implements Notificatio
rowCount = 0;
privacySectionRow = -1;
e2eEncryptionRow = rowCount++;
readReceiptsRow = rowCount++;
blockedRow = rowCount++;
passcodeRow = rowCount++;
blockedRow = rowCount++;
showUnknownSendersRow = rowCount++;
readReceiptsRow = rowCount++;
e2eEncryptionRow = rowCount++;
manageKeysRow = rowCount++;
securitySectionRow = -1;
secretDetailRow = rowCount++;