changed transition between frags
diff --git a/res/anim/enter.xml b/res/anim/enter.xml
new file mode 100644
index 0000000..8c9e912
--- /dev/null
+++ b/res/anim/enter.xml
@@ -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/accelerate_decelerate_interpolator"
+ android:duration="250"/>
+</set>
\ No newline at end of file
diff --git a/res/anim/exit.xml b/res/anim/exit.xml
new file mode 100644
index 0000000..3f6bf1c
--- /dev/null
+++ b/res/anim/exit.xml
@@ -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/accelerate_decelerate_interpolator"
+ android:duration="250"/>
+</set>
\ No newline at end of file
diff --git a/res/anim/pop_enter.xml b/res/anim/pop_enter.xml
new file mode 100644
index 0000000..ad10da6
--- /dev/null
+++ b/res/anim/pop_enter.xml
@@ -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/accelerate_decelerate_interpolator"
+ android:duration="250"/>
+</set>
\ No newline at end of file
diff --git a/res/anim/pop_exit.xml b/res/anim/pop_exit.xml
new file mode 100644
index 0000000..6b3976a
--- /dev/null
+++ b/res/anim/pop_exit.xml
@@ -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/accelerate_decelerate_interpolator"
+ android:duration="250"/>
+</set>
\ No newline at end of file
diff --git a/res/layout/activity_updater.xml b/res/layout/activity_updater.xml
index 17f6a34..0e59608 100644
--- a/res/layout/activity_updater.xml
+++ b/res/layout/activity_updater.xml
@@ -2,13 +2,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background"
+ android:animateLayoutChanges="true"
android:orientation="vertical">
- <include layout="@layout/header" />
+ <include layout="@layout/header"/>
<FrameLayout
android:id="@+id/fragment_holder"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent"/>
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/fragment_app_store_options_list.xml b/res/layout/fragment_app_store_options_list.xml
index 1fd853b..c59d8a3 100644
--- a/res/layout/fragment_app_store_options_list.xml
+++ b/res/layout/fragment_app_store_options_list.xml
@@ -1,16 +1,16 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/older_versions_group"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginTop="@dimen/main_padding"
- android:layout_weight="1"
- android:gravity="center_horizontal"
- android:orientation="vertical" >
+ android:id="@+id/older_versions_group"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="@dimen/main_padding"
+ android:layout_weight="1"
+ android:gravity="center_horizontal"
+ android:orientation="vertical">
<LinearLayout
android:id="@+id/version_list_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
- android:orientation="vertical" />
+ android:orientation="vertical"/>
</ScrollView>
diff --git a/res/layout/fragment_main.xml b/res/layout/fragment_main.xml
index f4256b9..329f58a 100644
--- a/res/layout/fragment_main.xml
+++ b/res/layout/fragment_main.xml
@@ -76,7 +76,8 @@
android:background="@color/background_other_os_options"
android:gravity="center_horizontal"
android:orientation="vertical"
- android:padding="@dimen/main_padding" >
+ android:paddingTop="@dimen/main_padding"
+ android:paddingBottom="@dimen/main_padding" >
<TextView
style="@style/TextRegular14GreyLight"
@@ -86,7 +87,7 @@
<Button
android:id="@+id/other_os_options_button"
- style="@style/ButtonTextBlue"
+ style="@style/ButtonTextBackgroundBlue"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/other_os_options" />
diff --git a/res/layout/header.xml b/res/layout/header.xml
index 72e3d82..4cf2ef1 100644
--- a/res/layout/header.xml
+++ b/res/layout/header.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
- >
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
<FrameLayout
android:layout_width="match_parent"
diff --git a/src/com/fairphone/updater/FairphoneUpdater.java b/src/com/fairphone/updater/FairphoneUpdater.java
index b53d844..f9f1ea6 100644
--- a/src/com/fairphone/updater/FairphoneUpdater.java
+++ b/src/com/fairphone/updater/FairphoneUpdater.java
@@ -543,7 +543,7 @@
// and add the transaction to the back stack so the user can
// navigate
// back
- transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
+ transaction.setCustomAnimations(R.anim.enter, R.anim.exit, R.anim.pop_enter, R.anim.pop_exit);
transaction.replace(R.id.fragment_holder, newFragment);
transaction.addToBackStack(null);