From e68175441f61ca2a1f6aea24dde583225f4eb543 Mon Sep 17 00:00:00 2001 From: L-Henke Date: Wed, 18 Mar 2015 13:02:41 +0100 Subject: [PATCH 1/2] Renamed anim folder to animator Fixup for 81051c6. Since getSupportFragmentManager has been replaced with getFragmentManager, anim folder has to be renamed to animator or animations can not be found. --- .../java/com/doplgangr/secrecy/activities/FilesActivity.java | 4 ++-- .../java/com/doplgangr/secrecy/activities/MainActivity.java | 4 ++-- .../java/com/doplgangr/secrecy/adapters/FilesListAdapter.java | 2 +- .../com/doplgangr/secrecy/adapters/VaultsListFragment.java | 2 +- .../com/doplgangr/secrecy/fragments/FilesListFragment.java | 2 +- app/src/main/res/{anim => animator}/fadein.xml | 0 app/src/main/res/{anim => animator}/fadeout.xml | 0 app/src/main/res/{anim => animator}/slide_down.xml | 0 app/src/main/res/{anim => animator}/slide_in_right.xml | 0 app/src/main/res/{anim => animator}/slide_out_right.xml | 0 10 files changed, 7 insertions(+), 7 deletions(-) rename app/src/main/res/{anim => animator}/fadein.xml (100%) rename app/src/main/res/{anim => animator}/fadeout.xml (100%) rename app/src/main/res/{anim => animator}/slide_down.xml (100%) rename app/src/main/res/{anim => animator}/slide_in_right.xml (100%) rename app/src/main/res/{anim => animator}/slide_out_right.xml (100%) diff --git a/app/src/main/java/com/doplgangr/secrecy/activities/FilesActivity.java b/app/src/main/java/com/doplgangr/secrecy/activities/FilesActivity.java index 272b3b6..0c4441c 100644 --- a/app/src/main/java/com/doplgangr/secrecy/activities/FilesActivity.java +++ b/app/src/main/java/com/doplgangr/secrecy/activities/FilesActivity.java @@ -37,7 +37,7 @@ protected void onCreate(Bundle savedInstanceState) { String vault = extras.getString(Config.vault_extra); String password = extras.getString(Config.password_extra); - overridePendingTransition(R.anim.slide_in_right, R.anim.fadeout); + overridePendingTransition(R.animator.slide_in_right, R.animator.fadeout); fragmentManager = getFragmentManager(); if (fragmentManager.findFragmentByTag(FilesListFragment.class.getName()) == null) { FilesListFragment fragment = new FilesListFragment(); @@ -91,7 +91,7 @@ void switchFragment(final Fragment fragment) { @Override public void onPause() { - overridePendingTransition(R.anim.fadein, R.anim.slide_out_right); + overridePendingTransition(R.animator.fadein, R.animator.slide_out_right); super.onPause(); if (isChangingConfigurations()) onPauseDecision.startActivity(); diff --git a/app/src/main/java/com/doplgangr/secrecy/activities/MainActivity.java b/app/src/main/java/com/doplgangr/secrecy/activities/MainActivity.java index 83c1f21..be48844 100644 --- a/app/src/main/java/com/doplgangr/secrecy/activities/MainActivity.java +++ b/app/src/main/java/com/doplgangr/secrecy/activities/MainActivity.java @@ -102,7 +102,7 @@ public void onCreate(Bundle savedInstanceState) { } if (pInfo != null) { if (pInfo.versionCode != versionNumber) - addFragment(new UpdateManager(), R.anim.slide_in_right, R.anim.fadeout); + addFragment(new UpdateManager(), R.animator.slide_in_right, R.animator.fadeout); } mNavigation.addNavigationItem( CustomApp.context.getString(R.string.Page_header__vaults), @@ -284,7 +284,7 @@ public void onFinish(Fragment fragment) { @Override public void onNew(Bundle bundle, Fragment fragment) { fragment.setArguments(bundle); - addFragment(fragment, R.anim.slide_in_right, R.anim.fadeout); + addFragment(fragment, R.animator.slide_in_right, R.animator.fadeout); } @Override diff --git a/app/src/main/java/com/doplgangr/secrecy/adapters/FilesListAdapter.java b/app/src/main/java/com/doplgangr/secrecy/adapters/FilesListAdapter.java index d67f160..6b060ab 100644 --- a/app/src/main/java/com/doplgangr/secrecy/adapters/FilesListAdapter.java +++ b/app/src/main/java/com/doplgangr/secrecy/adapters/FilesListAdapter.java @@ -243,7 +243,7 @@ public void onBindViewHolder(final ViewHolder viewHolder, int position) { int viewIndex; if (data.get(position).getIsDecrypting()){ - viewHolder.animator.setInAnimation(context, R.anim.slide_down); + viewHolder.animator.setInAnimation(context, R.animator.slide_down); viewIndex = 1; } else { viewHolder.animator.setInAnimation(null); diff --git a/app/src/main/java/com/doplgangr/secrecy/adapters/VaultsListFragment.java b/app/src/main/java/com/doplgangr/secrecy/adapters/VaultsListFragment.java index ee092d6..a0689bb 100644 --- a/app/src/main/java/com/doplgangr/secrecy/adapters/VaultsListFragment.java +++ b/app/src/main/java/com/doplgangr/secrecy/adapters/VaultsListFragment.java @@ -466,7 +466,7 @@ public void run() { EditText passwordView = (EditText) parentView.findViewById(R.id.open_password); final View renameView = parentView.findViewById(R.id.rename_name); ViewAnimator viewAnimator = (ViewAnimator) parentView.findViewById(R.id.viewAnimator); - viewAnimator.setInAnimation(context, R.anim.slide_down); + viewAnimator.setInAnimation(context, R.animator.slide_down); int viewIndex = 0; switch (showView) { diff --git a/app/src/main/java/com/doplgangr/secrecy/fragments/FilesListFragment.java b/app/src/main/java/com/doplgangr/secrecy/fragments/FilesListFragment.java index 542c1c1..c4ecc2c 100644 --- a/app/src/main/java/com/doplgangr/secrecy/fragments/FilesListFragment.java +++ b/app/src/main/java/com/doplgangr/secrecy/fragments/FilesListFragment.java @@ -238,7 +238,7 @@ public void run() { } FilesListAdapter.ViewHolder holder = (FilesListAdapter.ViewHolder) frame.getTag(); ViewAnimator viewAnimator = holder.animator; - viewAnimator.setInAnimation(context, R.anim.slide_down); + viewAnimator.setInAnimation(context, R.animator.slide_down); int viewIndex = 0; switch (showView) { case R.id.dataLayout: diff --git a/app/src/main/res/anim/fadein.xml b/app/src/main/res/animator/fadein.xml similarity index 100% rename from app/src/main/res/anim/fadein.xml rename to app/src/main/res/animator/fadein.xml diff --git a/app/src/main/res/anim/fadeout.xml b/app/src/main/res/animator/fadeout.xml similarity index 100% rename from app/src/main/res/anim/fadeout.xml rename to app/src/main/res/animator/fadeout.xml diff --git a/app/src/main/res/anim/slide_down.xml b/app/src/main/res/animator/slide_down.xml similarity index 100% rename from app/src/main/res/anim/slide_down.xml rename to app/src/main/res/animator/slide_down.xml diff --git a/app/src/main/res/anim/slide_in_right.xml b/app/src/main/res/animator/slide_in_right.xml similarity index 100% rename from app/src/main/res/anim/slide_in_right.xml rename to app/src/main/res/animator/slide_in_right.xml diff --git a/app/src/main/res/anim/slide_out_right.xml b/app/src/main/res/animator/slide_out_right.xml similarity index 100% rename from app/src/main/res/anim/slide_out_right.xml rename to app/src/main/res/animator/slide_out_right.xml From 6c5b71c49de70c417b0cb55586ba14c22621e6e8 Mon Sep 17 00:00:00 2001 From: L-Henke Date: Wed, 18 Mar 2015 21:33:18 +0100 Subject: [PATCH 2/2] Removed custom animators The animators doesn't work with the native FragmentManager. Instead of figuring out how to adapt them, I just removed them. --- .../secrecy/activities/FilesActivity.java | 2 -- .../doplgangr/secrecy/activities/MainActivity.java | 4 ++-- .../secrecy/adapters/FilesListAdapter.java | 1 - .../secrecy/adapters/VaultsListFragment.java | 1 - .../secrecy/fragments/FilesListFragment.java | 1 - app/src/main/res/animator/fadein.xml | 6 ------ app/src/main/res/animator/fadeout.xml | 7 ------- app/src/main/res/animator/slide_down.xml | 10 ---------- app/src/main/res/animator/slide_in_right.xml | 14 -------------- app/src/main/res/animator/slide_out_right.xml | 14 -------------- 10 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 app/src/main/res/animator/fadein.xml delete mode 100644 app/src/main/res/animator/fadeout.xml delete mode 100644 app/src/main/res/animator/slide_down.xml delete mode 100644 app/src/main/res/animator/slide_in_right.xml delete mode 100644 app/src/main/res/animator/slide_out_right.xml diff --git a/app/src/main/java/com/doplgangr/secrecy/activities/FilesActivity.java b/app/src/main/java/com/doplgangr/secrecy/activities/FilesActivity.java index 0c4441c..795348a 100644 --- a/app/src/main/java/com/doplgangr/secrecy/activities/FilesActivity.java +++ b/app/src/main/java/com/doplgangr/secrecy/activities/FilesActivity.java @@ -37,7 +37,6 @@ protected void onCreate(Bundle savedInstanceState) { String vault = extras.getString(Config.vault_extra); String password = extras.getString(Config.password_extra); - overridePendingTransition(R.animator.slide_in_right, R.animator.fadeout); fragmentManager = getFragmentManager(); if (fragmentManager.findFragmentByTag(FilesListFragment.class.getName()) == null) { FilesListFragment fragment = new FilesListFragment(); @@ -91,7 +90,6 @@ void switchFragment(final Fragment fragment) { @Override public void onPause() { - overridePendingTransition(R.animator.fadein, R.animator.slide_out_right); super.onPause(); if (isChangingConfigurations()) onPauseDecision.startActivity(); diff --git a/app/src/main/java/com/doplgangr/secrecy/activities/MainActivity.java b/app/src/main/java/com/doplgangr/secrecy/activities/MainActivity.java index be48844..d57b0ba 100644 --- a/app/src/main/java/com/doplgangr/secrecy/activities/MainActivity.java +++ b/app/src/main/java/com/doplgangr/secrecy/activities/MainActivity.java @@ -102,7 +102,7 @@ public void onCreate(Bundle savedInstanceState) { } if (pInfo != null) { if (pInfo.versionCode != versionNumber) - addFragment(new UpdateManager(), R.animator.slide_in_right, R.animator.fadeout); + addFragment(new UpdateManager(), android.R.animator.fade_in, android.R.animator.fade_out); } mNavigation.addNavigationItem( CustomApp.context.getString(R.string.Page_header__vaults), @@ -284,7 +284,7 @@ public void onFinish(Fragment fragment) { @Override public void onNew(Bundle bundle, Fragment fragment) { fragment.setArguments(bundle); - addFragment(fragment, R.animator.slide_in_right, R.animator.fadeout); + addFragment(fragment, android.R.animator.fade_in, android.R.animator.fade_out); } @Override diff --git a/app/src/main/java/com/doplgangr/secrecy/adapters/FilesListAdapter.java b/app/src/main/java/com/doplgangr/secrecy/adapters/FilesListAdapter.java index 6b060ab..27908cf 100644 --- a/app/src/main/java/com/doplgangr/secrecy/adapters/FilesListAdapter.java +++ b/app/src/main/java/com/doplgangr/secrecy/adapters/FilesListAdapter.java @@ -243,7 +243,6 @@ public void onBindViewHolder(final ViewHolder viewHolder, int position) { int viewIndex; if (data.get(position).getIsDecrypting()){ - viewHolder.animator.setInAnimation(context, R.animator.slide_down); viewIndex = 1; } else { viewHolder.animator.setInAnimation(null); diff --git a/app/src/main/java/com/doplgangr/secrecy/adapters/VaultsListFragment.java b/app/src/main/java/com/doplgangr/secrecy/adapters/VaultsListFragment.java index a0689bb..2bbf6d9 100644 --- a/app/src/main/java/com/doplgangr/secrecy/adapters/VaultsListFragment.java +++ b/app/src/main/java/com/doplgangr/secrecy/adapters/VaultsListFragment.java @@ -466,7 +466,6 @@ public void run() { EditText passwordView = (EditText) parentView.findViewById(R.id.open_password); final View renameView = parentView.findViewById(R.id.rename_name); ViewAnimator viewAnimator = (ViewAnimator) parentView.findViewById(R.id.viewAnimator); - viewAnimator.setInAnimation(context, R.animator.slide_down); int viewIndex = 0; switch (showView) { diff --git a/app/src/main/java/com/doplgangr/secrecy/fragments/FilesListFragment.java b/app/src/main/java/com/doplgangr/secrecy/fragments/FilesListFragment.java index c4ecc2c..24915f8 100644 --- a/app/src/main/java/com/doplgangr/secrecy/fragments/FilesListFragment.java +++ b/app/src/main/java/com/doplgangr/secrecy/fragments/FilesListFragment.java @@ -238,7 +238,6 @@ public void run() { } FilesListAdapter.ViewHolder holder = (FilesListAdapter.ViewHolder) frame.getTag(); ViewAnimator viewAnimator = holder.animator; - viewAnimator.setInAnimation(context, R.animator.slide_down); int viewIndex = 0; switch (showView) { case R.id.dataLayout: diff --git a/app/src/main/res/animator/fadein.xml b/app/src/main/res/animator/fadein.xml deleted file mode 100644 index 38e73ae..0000000 --- a/app/src/main/res/animator/fadein.xml +++ /dev/null @@ -1,6 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/res/animator/fadeout.xml b/app/src/main/res/animator/fadeout.xml deleted file mode 100644 index a002af4..0000000 --- a/app/src/main/res/animator/fadeout.xml +++ /dev/null @@ -1,7 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/animator/slide_down.xml b/app/src/main/res/animator/slide_down.xml deleted file mode 100644 index 73c445c..0000000 --- a/app/src/main/res/animator/slide_down.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - diff --git a/app/src/main/res/animator/slide_in_right.xml b/app/src/main/res/animator/slide_in_right.xml deleted file mode 100644 index 65fc033..0000000 --- a/app/src/main/res/animator/slide_in_right.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/animator/slide_out_right.xml b/app/src/main/res/animator/slide_out_right.xml deleted file mode 100644 index 47c7ad4..0000000 --- a/app/src/main/res/animator/slide_out_right.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - \ No newline at end of file