Skip to content

Renamed anim folder to animator #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StelianMorariu merged 2 commits into from
Mar 20, 2015
Merged

Renamed anim folder to animator #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e681754
Renamed anim folder to animator
L-Henke Mar 18, 2015
6c5b71c
Removed custom animators
L-Henke Mar 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions app/src/main/java/com/doplgangr/secrecy/activities/FilesActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.anim.slide_in_right, R.anim.fadeout);
fragmentManager = getFragmentManager();
if (fragmentManager.findFragmentByTag(FilesListFragment.class.getName()) == null) {
FilesListFragment fragment = new FilesListFragment();
Expand Down Expand Up @@ -91,7 +90,6 @@ void switchFragment(final Fragment fragment) {

@Override
public void onPause() {
overridePendingTransition(R.anim.fadein, R.anim.slide_out_right);
super.onPause();
if (isChangingConfigurations())
onPauseDecision.startActivity();
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/doplgangr/secrecy/activities/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(), android.R.animator.fade_in, android.R.animator.fade_out);
}
mNavigation.addNavigationItem(
CustomApp.context.getString(R.string.Page_header__vaults),
Expand Down Expand Up @@ -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, android.R.animator.fade_in, android.R.animator.fade_out);
}

@Override
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/com/doplgangr/secrecy/adapters/FilesListAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@ public void onBindViewHolder(final ViewHolder viewHolder, int position) {

int viewIndex;
if (data.get(position).getIsDecrypting()){
viewHolder.animator.setInAnimation(context, R.anim.slide_down);
viewIndex = 1;
} else {
viewHolder.animator.setInAnimation(null);
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/com/doplgangr/secrecy/adapters/VaultsListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.anim.slide_down);

int viewIndex = 0;
switch (showView) {
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/com/doplgangr/secrecy/fragments/FilesListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ public void run() {
}
FilesListAdapter.ViewHolder holder = (FilesListAdapter.ViewHolder) frame.getTag();
ViewAnimator viewAnimator = holder.animator;
viewAnimator.setInAnimation(context, R.anim.slide_down);
int viewIndex = 0;
switch (showView) {
case R.id.dataLayout:
Expand Down
6 changes: 0 additions & 6 deletions app/src/main/res/anim/fadein.xml
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions app/src/main/res/anim/fadeout.xml
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions app/src/main/res/anim/slide_down.xml
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions app/src/main/res/anim/slide_in_right.xml
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions app/src/main/res/anim/slide_out_right.xml
View file
Open in desktop

This file was deleted.