pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] remove custom search activity fade

Browse source 
Signed-off-by: Arnaud Vergnet <arnaud.vergnet@mailo.com>
This commit is contained in:
Arnaud Vergnet 2022-09-05 17:49:56 +02:00 • committed by Viktor Govako
parent dd508d46b7
commit 60b1e5e41e
5 changed files with 0 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
android/res/anim/search_fade_in.xml
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<alpha
xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:interpolator/decelerate_quad"
android:fromAlpha="0.0"
android:toAlpha="1.0"
android:duration="@integer/search_fade_in_anim_time"/>

7
android/res/anim/search_fade_out.xml
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<alpha
xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:interpolator/accelerate_quad"
android:fromAlpha="1.0"
android:toAlpha="0.0"
android:duration="@integer/search_fade_out_anim_time"/>

2
android/res/values/integer.xml
View file

@ -6,8 +6,6 @@
<integer name="sharing_initial_rows">2</integer>
<integer name="search_fade_in_anim_time">200</integer>
<integer name="search_fade_out_anim_time">150</integer>
<integer name="opaque">255</integer>
<integer name="bookmark_all_subs_pager_text_max_lines">3</integer>
</resources>

33
android/src/com/mapswithme/maps/search/SearchActivity.java
View file

@ -7,18 +7,11 @@ import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StyleRes;
import androidx.core.app.NavUtils;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmFragmentActivity;
import com.mapswithme.maps.base.CustomNavigateUpListener;
import com.mapswithme.maps.base.OnBackPressListener;
import com.mapswithme.util.ThemeUtils;
public class SearchActivity extends BaseMwmFragmentActivity
implements CustomNavigateUpListener
{
public static final String EXTRA_QUERY = "search_query";
public static final String EXTRA_LOCALE = "locale";
@ -39,7 +32,6 @@ public class SearchActivity extends BaseMwmFragmentActivity
args.putBoolean(EXTRA_SEARCH_ON_MAP, isSearchOnMap);
i.putExtras(args);
activity.startActivity(i);
activity.overridePendingTransition(R.anim.search_fade_in, R.anim.search_fade_out);
}
@Override
@ -66,29 +58,4 @@ public class SearchActivity extends BaseMwmFragmentActivity
{
return true;
}
@Override
public void customOnNavigateUp()
{
final FragmentManager manager = getSupportFragmentManager();
if (manager.getBackStackEntryCount() == 0)
{
NavUtils.navigateUpFromSameTask(this);
overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
return;
}
manager.popBackStack();
}
@Override
public void onBackPressed()
{
for (Fragment f : getSupportFragmentManager().getFragments())
if ((f instanceof OnBackPressListener) && ((OnBackPressListener)f).onBackPressed())
return;
super.onBackPressed();
overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
}
}

1
android/src/com/mapswithme/maps/search/SearchFragment.java
View file

@ -559,7 +559,6 @@ public class SearchFragment extends BaseMwmFragment
{
final Activity activity = requireActivity();
activity.finish();
activity.overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
}
public void setRecyclerScrollListener(RecyclerView recycler)