From e02bd51887f273cf0c2dbeba534f953b3f26dffb Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Mon, 27 Nov 2017 11:15:32 +0200
Subject: [PATCH] Add animations for search and markers

---
 OsmAnd/res/anim/alpha_in.xml                                | 5 +++++
 OsmAnd/res/anim/alpha_out.xml                               | 5 +++++
 OsmAnd/res/values/styles.xml                                | 5 +++++
 .../osmand/plus/mapmarkers/MapMarkersDialogFragment.java    | 6 +++++-
 .../net/osmand/plus/search/QuickSearchDialogFragment.java   | 6 +++++-
 5 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 OsmAnd/res/anim/alpha_in.xml
 create mode 100644 OsmAnd/res/anim/alpha_out.xml

diff --git a/OsmAnd/res/anim/alpha_in.xml b/OsmAnd/res/anim/alpha_in.xml
new file mode 100644
index 0000000000..5a1c287cf1
--- /dev/null
+++ b/OsmAnd/res/anim/alpha_in.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
+           android:duration="@android:integer/config_shortAnimTime" />
+</set>
\ No newline at end of file
diff --git a/OsmAnd/res/anim/alpha_out.xml b/OsmAnd/res/anim/alpha_out.xml
new file mode 100644
index 0000000000..c01bfa52fb
--- /dev/null
+++ b/OsmAnd/res/anim/alpha_out.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
+           android:duration="@android:integer/config_shortAnimTime" />
+</set>
\ No newline at end of file
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index c3cb92058d..bf31b96ede 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -461,6 +461,11 @@
         <item name="android:windowExitAnimation">@anim/slide_out_bottom</item>
     </style>
 
+    <style name="Animations.Alpha">
+        <item name="android:windowEnterAnimation">@anim/alpha_in</item>
+        <item name="android:windowExitAnimation">@anim/alpha_out</item>
+    </style>
+
     <style name="create_poi_text_field">
         <item name="android:layout_marginTop">8dp</item>
         <item name="android:layout_marginRight">16dp</item>
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java
index e4db5be489..a0f612cb7d 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java
@@ -78,7 +78,7 @@ public class MapMarkersDialogFragment extends android.support.v4.app.DialogFragm
 	@NonNull
 	@Override
 	public Dialog onCreateDialog(Bundle savedInstanceState) {
-		return new Dialog(getActivity(), getTheme()) {
+		Dialog dialog = new Dialog(getActivity(), getTheme()) {
 			@Override
 			public void onBackPressed() {
 				if (!dismissOptionsMenuFragment()) {
@@ -86,6 +86,10 @@ public class MapMarkersDialogFragment extends android.support.v4.app.DialogFragm
 				}
 			}
 		};
+		if (!getMyApplication().getSettings().DO_NOT_USE_ANIMATIONS.get()) {
+			dialog.getWindow().getAttributes().windowAnimations = R.style.Animations_Alpha;
+		}
+		return dialog;
 	}
 
 	@Nullable
diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
index 50c6b870fb..ac4ad2cebd 100644
--- a/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
@@ -628,7 +628,7 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
 	@NonNull
 	@Override
 	public Dialog onCreateDialog(Bundle savedInstanceState) {
-		return new Dialog(getActivity(), getTheme()){
+		Dialog dialog = new Dialog(getActivity(), getTheme()){
 			@Override
 			public void onBackPressed() {
 				if (!processBackAction()) {
@@ -636,6 +636,10 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
 				}
 			}
 		};
+		if (!getMyApplication().getSettings().DO_NOT_USE_ANIMATIONS.get()) {
+			dialog.getWindow().getAttributes().windowAnimations = R.style.Animations_Alpha;
+		}
+		return dialog;
 	}
 
 	public void saveCustomFilter() {