From 8a4c162bba6ad568a2905013856f438bbee91da0 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 28 Sep 2016 13:33:09 -0300
Subject: [PATCH] Remove toolbar animation to fix the missing toolbar on first
start
---
.../android/NavDrawerActivity.java | 2 -
.../keyagreement/KeyAgreementActivity.java | 5 --
.../android/util/CustomAnimations.java | 58 -------------------
3 files changed, 65 deletions(-)
delete mode 100644 briar-android/src/org/briarproject/android/util/CustomAnimations.java
diff --git a/briar-android/src/org/briarproject/android/NavDrawerActivity.java b/briar-android/src/org/briarproject/android/NavDrawerActivity.java
index d4bacf55a9..3aa248716f 100644
--- a/briar-android/src/org/briarproject/android/NavDrawerActivity.java
+++ b/briar-android/src/org/briarproject/android/NavDrawerActivity.java
@@ -28,7 +28,6 @@ import org.briarproject.android.controller.TransportStateListener;
import org.briarproject.android.controller.handler.UiResultHandler;
import org.briarproject.android.forum.ForumListFragment;
import org.briarproject.android.fragment.BaseFragment;
-import org.briarproject.android.util.CustomAnimations;
import org.briarproject.api.TransportId;
import org.briarproject.api.identity.LocalAuthor;
@@ -241,7 +240,6 @@ public class NavDrawerActivity extends BriarFragmentActivity implements
if (isBlocking) {
// Disable navigation drawer slide to open
drawerLayout.setDrawerLockMode(LOCK_MODE_LOCKED_CLOSED);
- CustomAnimations.animateHeight(toolbar, false, 250);
}
progressTitle.setText(stringId);
progressViewGroup.setVisibility(View.VISIBLE);
diff --git a/briar-android/src/org/briarproject/android/keyagreement/KeyAgreementActivity.java b/briar-android/src/org/briarproject/android/keyagreement/KeyAgreementActivity.java
index ea6c9d4e8c..431f0f5916 100644
--- a/briar-android/src/org/briarproject/android/keyagreement/KeyAgreementActivity.java
+++ b/briar-android/src/org/briarproject/android/keyagreement/KeyAgreementActivity.java
@@ -12,7 +12,6 @@ import org.briarproject.android.ActivityComponent;
import org.briarproject.android.BriarFragmentActivity;
import org.briarproject.android.fragment.BaseFragment.BaseFragmentListener;
import org.briarproject.android.keyagreement.IntroFragment.IntroScreenSeenListener;
-import org.briarproject.android.util.CustomAnimations;
import org.briarproject.api.contact.ContactExchangeListener;
import org.briarproject.api.contact.ContactExchangeTask;
import org.briarproject.api.db.DbException;
@@ -123,16 +122,12 @@ public class KeyAgreementActivity extends BriarFragmentActivity implements
@Override
public void showLoadingScreen(boolean isBlocking, int stringId) {
- if (isBlocking) {
- CustomAnimations.animateHeight(toolbar, false, 250);
- }
progressTitle.setText(stringId);
progressContainer.setVisibility(View.VISIBLE);
}
@Override
public void hideLoadingScreen() {
- CustomAnimations.animateHeight(toolbar, true, 250);
progressContainer.setVisibility(View.INVISIBLE);
}
diff --git a/briar-android/src/org/briarproject/android/util/CustomAnimations.java b/briar-android/src/org/briarproject/android/util/CustomAnimations.java
deleted file mode 100644
index 50615f213d..0000000000
--- a/briar-android/src/org/briarproject/android/util/CustomAnimations.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.briarproject.android.util;
-
-import android.animation.Animator;
-import android.animation.ValueAnimator;
-import android.view.ViewGroup;
-
-import static android.view.View.GONE;
-import static android.view.View.MeasureSpec.UNSPECIFIED;
-import static android.view.View.VISIBLE;
-
-public class CustomAnimations {
-
- public static void animateHeight(final ViewGroup viewGroup,
- final boolean isExtending, int duration) {
- ValueAnimator anim;
- if (isExtending) {
- viewGroup.setVisibility(VISIBLE);
- viewGroup.measure(UNSPECIFIED, UNSPECIFIED);
- anim = ValueAnimator.ofInt(0, viewGroup.getMeasuredHeight());
- } else {
- anim = ValueAnimator.ofInt(viewGroup.getHeight(), 0);
- }
- anim.addListener(new Animator.AnimatorListener() {
-
- @Override
- public void onAnimationStart(Animator animation) {
- }
-
- @Override
- public void onAnimationEnd(Animator animation) {
- if (!isExtending) {
- viewGroup.setVisibility(GONE);
- }
- }
-
- @Override
- public void onAnimationCancel(Animator animation) {
- }
-
- @Override
- public void onAnimationRepeat(Animator animation) {
- }
- });
- anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
- @Override
- public void onAnimationUpdate(ValueAnimator valueAnimator) {
- int val = (Integer) valueAnimator.getAnimatedValue();
- ViewGroup.LayoutParams layoutParams =
- viewGroup.getLayoutParams();
- layoutParams.height = val;
- viewGroup.setLayoutParams(layoutParams);
- }
- });
- anim.setDuration(duration);
- anim.start();
- }
-
-}
--
GitLab