diff --git a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/MainActivity.java b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/MainActivity.java
index 82aa28c..408e01d 100644
--- a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/MainActivity.java
+++ b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/MainActivity.java
@@ -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();
}
}
diff --git a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/AppListFragment.java b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/AppListFragment.java
index 5a674ff..6ae6eb9 100644
--- a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/AppListFragment.java
+++ b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/AppListFragment.java
@@ -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;
diff --git a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/ReportFragment.java b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/ReportFragment.java
index eacd0d5..5ddcd7c 100644
--- a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/ReportFragment.java
+++ b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/ReportFragment.java
@@ -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;
diff --git a/app/src/main/res/anim/slide_in_left.xml b/app/src/main/res/anim/slide_in_left.xml
new file mode 100644
index 0000000..bd9bc9e
--- /dev/null
+++ b/app/src/main/res/anim/slide_in_left.xml
@@ -0,0 +1,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_in_right.xml b/app/src/main/res/anim/slide_in_right.xml
new file mode 100644
index 0000000..44351ee
--- /dev/null
+++ b/app/src/main/res/anim/slide_in_right.xml
@@ -0,0 +1,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_out_left.xml b/app/src/main/res/anim/slide_out_left.xml
new file mode 100644
index 0000000..e95d387
--- /dev/null
+++ b/app/src/main/res/anim/slide_out_left.xml
@@ -0,0 +1,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_out_right.xml b/app/src/main/res/anim/slide_out_right.xml
new file mode 100644
index 0000000..55a56bc
--- /dev/null
+++ b/app/src/main/res/anim/slide_out_right.xml
@@ -0,0 +1,8 @@
+
+
+
+
\ No newline at end of file