Skip to content

Fix animations #125

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

Closed
StelianMorariu wants to merge 1 commit into from
Closed

Fix animations #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 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,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.anim.slide_in_right, R.animator.fadeout);
fragmentManager = getFragmentManager();
if (fragmentManager.findFragmentByTag(FilesListFragment.class.getName()) == null) {
FilesListFragment fragment = new FilesListFragment();
Expand Down Expand Up @@ -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.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(), R.anim.slide_in_right, R.animator.fadeout);
}
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, R.anim.slide_in_right, R.animator.fadeout);
}

@Override
Expand Down
7 changes: 3 additions & 4 deletions 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 @@ -29,7 +29,6 @@
import android.content.Intent;
import android.os.Bundle;
import android.os.Environment;
import android.preference.PreferenceManager;
import android.support.v4.app.NotificationCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.app.ActionBarActivity;
Expand All @@ -52,21 +51,21 @@

import com.doplgangr.secrecy.Config;
import com.doplgangr.secrecy.CustomApp;
import com.doplgangr.secrecy.R;
import com.doplgangr.secrecy.activities.FilesActivity;
import com.doplgangr.secrecy.adapters.FilesListAdapter;
import com.doplgangr.secrecy.events.AddingFileDoneEvent;
import com.doplgangr.secrecy.events.AddingFileEvent;
import com.doplgangr.secrecy.events.BackUpDoneEvent;
import com.doplgangr.secrecy.events.DecryptingFileDoneEvent;
import com.doplgangr.secrecy.events.NewFileEvent;
import com.doplgangr.secrecy.exceptions.SecrecyCipherStreamException;
import com.doplgangr.secrecy.filesystem.Storage;
import com.doplgangr.secrecy.filesystem.encryption.Vault;
import com.doplgangr.secrecy.filesystem.files.EncryptedFile;
import com.doplgangr.secrecy.filesystem.Storage;
import com.doplgangr.secrecy.jobs.BackupJob;
import com.doplgangr.secrecy.jobs.InitializeVaultJob;
import com.doplgangr.secrecy.R;
import com.doplgangr.secrecy.utils.Util;
import com.doplgangr.secrecy.adapters.FilesListAdapter;
import com.ipaulpro.afilechooser.FileChooserActivity;

import java.io.File;
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: 7 additions & 0 deletions app/src/main/res/animator/fadein.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="@android:integer/config_mediumAnimTime"
android:valueFrom="0.0"
android:interpolator="@android:anim/accelerate_interpolator"
android:valueTo="1.0"
android:propertyName="alpha"
android:zAdjustment="bottom" />
7 changes: 4 additions & 3 deletions app/src/main/res/anim/fadeout.xml → app/src/main/res/animator/fadeout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<alpha xmlns:android="http://schemas.android.com/apk/res/android"
<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="@android:integer/config_mediumAnimTime"
android:fromAlpha="1.0"
android:valueFrom="1.0"
android:interpolator="@android:anim/accelerate_interpolator"
android:toAlpha="0.0"
android:valueTo="0.0"
android:propertyName="alpha"
android:zAdjustment="bottom" />