mirror of
https://github.com/stom79/exodus-android-app
synced 2024-12-23 09:48:42 +01:00
Merge pull request #14 from stom79/animate_transitions
Animate transitions
This commit is contained in:
commit
9ec4af3ca7
@ -18,10 +18,10 @@
|
||||
|
||||
package org.eu.exodus_privacy.exodusprivacy;
|
||||
|
||||
import android.app.FragmentManager;
|
||||
import android.app.FragmentTransaction;
|
||||
import android.support.v4.app.FragmentManager;
|
||||
import android.databinding.DataBindingUtil;
|
||||
import android.support.design.widget.Snackbar;
|
||||
import android.support.v4.app.FragmentTransaction;
|
||||
import android.support.v7.app.AppCompatActivity;
|
||||
import android.os.Bundle;
|
||||
|
||||
@ -70,26 +70,28 @@ public class MainActivity extends AppCompatActivity {
|
||||
ApplicationListAdapter.OnAppClickListener onAppClickListener = packageInfo -> {
|
||||
|
||||
report = ReportFragment.newInstance(getPackageManager(),packageInfo);
|
||||
FragmentManager manager = getFragmentManager();
|
||||
FragmentManager manager = getSupportFragmentManager();
|
||||
FragmentTransaction transaction = manager.beginTransaction();
|
||||
transaction.addToBackStack(null);
|
||||
transaction.replace(R.id.fragment_container,report);
|
||||
transaction.commit();
|
||||
transaction.setCustomAnimations(R.anim.slide_in_right, R.anim.slide_out_right, R.anim.slide_in_left, R.anim.slide_out_left)
|
||||
.replace(R.id.fragment_container,report)
|
||||
.addToBackStack(null)
|
||||
.commit();
|
||||
};
|
||||
|
||||
appList = AppListFragment.newInstance(networkListener,onAppClickListener);
|
||||
|
||||
|
||||
FragmentManager manager = getFragmentManager();
|
||||
FragmentManager manager = getSupportFragmentManager();
|
||||
FragmentTransaction transaction = manager.beginTransaction();
|
||||
transaction.replace(R.id.fragment_container,appList);
|
||||
transaction.commit();
|
||||
transaction.replace(R.id.fragment_container,appList)
|
||||
.commit();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBackPressed() {
|
||||
super.onBackPressed();
|
||||
if(report != null)
|
||||
report = null;
|
||||
if (getSupportFragmentManager().getBackStackEntryCount() == 0)
|
||||
finish();
|
||||
else
|
||||
getSupportFragmentManager().popBackStack();
|
||||
}
|
||||
}
|
||||
|
@ -19,22 +19,17 @@
|
||||
package org.eu.exodus_privacy.exodusprivacy.fragments;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.Fragment;
|
||||
import android.content.Context;
|
||||
import android.content.pm.PackageInfo;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.databinding.DataBindingUtil;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.v4.widget.SwipeRefreshLayout;
|
||||
import android.support.v4.app.Fragment;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.ProgressBar;
|
||||
import android.widget.TextView;
|
||||
|
||||
import org.eu.exodus_privacy.exodusprivacy.R;
|
||||
import org.eu.exodus_privacy.exodusprivacy.adapters.ApplicationListAdapter;
|
||||
|
@ -19,13 +19,13 @@
|
||||
|
||||
package org.eu.exodus_privacy.exodusprivacy.fragments;
|
||||
|
||||
import android.app.Fragment;
|
||||
import android.content.Context;
|
||||
import android.content.pm.PackageInfo;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.content.pm.PermissionInfo;
|
||||
import android.databinding.DataBindingUtil;
|
||||
import android.os.Bundle;
|
||||
import android.support.v4.app.Fragment;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
|
8
app/src/main/res/anim/slide_in_left.xml
Normal file
8
app/src/main/res/anim/slide_in_left.xml
Normal file
@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set>
|
||||
<translate xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:fromXDelta="-100%"
|
||||
android:toXDelta="0%"
|
||||
android:interpolator="@android:anim/decelerate_interpolator"
|
||||
android:duration="500"/>
|
||||
</set>
|
8
app/src/main/res/anim/slide_in_right.xml
Normal file
8
app/src/main/res/anim/slide_in_right.xml
Normal file
@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set>
|
||||
<translate xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:fromXDelta="100%"
|
||||
android:toXDelta="0"
|
||||
android:interpolator="@android:anim/decelerate_interpolator"
|
||||
android:duration="500"/>
|
||||
</set>
|
8
app/src/main/res/anim/slide_out_left.xml
Normal file
8
app/src/main/res/anim/slide_out_left.xml
Normal file
@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set>
|
||||
<translate xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:fromXDelta="0%"
|
||||
android:toXDelta="100%"
|
||||
android:interpolator="@android:anim/decelerate_interpolator"
|
||||
android:duration="500"/>
|
||||
</set>
|
8
app/src/main/res/anim/slide_out_right.xml
Normal file
8
app/src/main/res/anim/slide_out_right.xml
Normal file
@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set>
|
||||
<translate xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:fromXDelta="0%"
|
||||
android:toXDelta="-100%"
|
||||
android:interpolator="@android:anim/decelerate_interpolator"
|
||||
android:duration="500"/>
|
||||
</set>
|
Loading…
Reference in New Issue
Block a user