Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #4799 from osmandapp/dashboard_animation

Browse source 
Dashboard animation
This commit is contained in:
Alexander Sytnyk 2017-11-23 14:12:03 +02:00 committed by GitHub
commit 6d9b58ecd1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 56 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
OsmAnd/res/layout-land/dashboard_over_map.xml
View file

@ -23,13 +23,12 @@
android:background="#70000000" android:background="#70000000"
android:orientation="vertical"> android:orientation="vertical">
<include layout="@layout/dashboard_toolbar"/>
<com.github.ksoichiro.android.observablescrollview.ObservableScrollView <com.github.ksoichiro.android.observablescrollview.ObservableScrollView
android:id="@+id/main_scroll" android:id="@+id/main_scroll"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="start" android:layout_gravity="start"
android:layout_marginTop="@dimen/dashboard_map_toolbar"
android:fadeScrollbars="true"> android:fadeScrollbars="true">
<LinearLayout <LinearLayout
@ -90,4 +89,8 @@
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>
<include layout="@layout/dashboard_toolbar"
android:layout_height="@dimen/dashboard_map_toolbar"
android:layout_width="@dimen/dashboard_land_width"/>
</FrameLayout> </FrameLayout>

3
OsmAnd/res/layout/dashboard_over_map.xml
View file

@ -86,9 +86,8 @@
android:fadeScrollbars="true"/> android:fadeScrollbars="true"/>
</FrameLayout> </FrameLayout>
<include layout="@layout/dashboard_toolbar"/>
</FrameLayout> </FrameLayout>
<include layout="@layout/dashboard_toolbar"/>
</FrameLayout> </FrameLayout>

68
OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
View file

@ -22,6 +22,7 @@ import android.util.TypedValue;
import android.view.Gravity; import android.view.Gravity;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewAnimationUtils;
import android.view.ViewTreeObserver; import android.view.ViewTreeObserver;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.widget.AbsListView; import android.widget.AbsListView;
@ -168,6 +169,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
private boolean portrait; private boolean portrait;
private long lastUpOrCancelMotionEventTime; private long lastUpOrCancelMotionEventTime;
private TextView listEmptyTextView; private TextView listEmptyTextView;
private int[] animationCoordinates;
int baseColor; int baseColor;
@ -877,13 +879,13 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
updateToolbarActions(); updateToolbarActions();
//fabButton.showFloatingActionButton(); //fabButton.showFloatingActionButton();
open(dashboardView.findViewById(R.id.animateContent), animation, animationCoordinates); open(animation, animationCoordinates);
updateLocation(true, true, false); updateLocation(true, true, false);
// addOrUpdateDashboardFragments(); // addOrUpdateDashboardFragments();
mapActivity.getRoutingHelper().addListener(this); mapActivity.getRoutingHelper().addListener(this);
} else { } else {
mapActivity.getMapViewTrackingUtilities().setDashboard(null); mapActivity.getMapViewTrackingUtilities().setDashboard(null);
hide(dashboardView.findViewById(R.id.animateContent), animation); hide(animation);
if (!MapRouteInfoMenu.isVisible()) { if (!MapRouteInfoMenu.isVisible()) {
AndroidUiHelper.updateVisibility(mapActivity.findViewById(R.id.map_route_land_left_margin_external), false); AndroidUiHelper.updateVisibility(mapActivity.findViewById(R.id.map_route_land_left_margin_external), false);
@ -1211,54 +1213,84 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
// To animate view slide out from right to left // To animate view slide out from right to left
private void open(final View view, boolean animation, int[] animationCoordinates) { private void open(boolean animation, int[] animationCoordinates) {
final View content = dashboardView.findViewById(R.id.animateContent);
final View toolbar = dashboardView.findViewById(R.id.toolbar);
if (animation) { if (animation) {
AnimatorSet set = new AnimatorSet(); AnimatorSet set = new AnimatorSet();
List<Animator> animators = new ArrayList<>(); List<Animator> animators = new ArrayList<>();
if (animationCoordinates != null) { if (animationCoordinates != null) {
int screenHeight = mapActivity.getResources().getDisplayMetrics().heightPixels; int screenHeight = mapActivity.getResources().getDisplayMetrics().heightPixels;
int screenWidth = mapActivity.getResources().getDisplayMetrics().widthPixels; int screenWidth = mapActivity.getResources().getDisplayMetrics().widthPixels;
animators.add(ObjectAnimator.ofFloat(view, View.TRANSLATION_X, animationCoordinates[0] - screenWidth / 2, 0)); animators.add(ObjectAnimator.ofFloat(content, View.TRANSLATION_X, animationCoordinates[0] - screenWidth / 2, 0));
animators.add(ObjectAnimator.ofFloat(view, View.TRANSLATION_Y, animationCoordinates[1] - screenHeight / 2, 0)); animators.add(ObjectAnimator.ofFloat(content, View.TRANSLATION_Y, animationCoordinates[1] - screenHeight / 2, 0));
} }
animators.add(ObjectAnimator.ofFloat(view, View.ALPHA, 0f, 1f)); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
animators.add(ObjectAnimator.ofFloat(view, View.SCALE_X, 0.2f, 1f)); int centerX = content.getMeasuredWidth() / 2;
animators.add(ObjectAnimator.ofFloat(view, View.SCALE_Y, 0.2f, 1f)); int centerY = content.getMeasuredHeight() / 2;
float finalRadius = (float) Math.sqrt(Math.pow(content.getWidth() / 2, 2) + Math.pow(content.getHeight() / 2, 2));
Animator circleAnimator = ViewAnimationUtils.createCircularReveal(content, centerX, centerY, 0, finalRadius);
animators.add(circleAnimator);
}
animators.add(ObjectAnimator.ofFloat(content, View.SCALE_X, 0f, 1f));
animators.add(ObjectAnimator.ofFloat(content, View.SCALE_Y, 0f, 1f));
animators.add(ObjectAnimator.ofFloat(toolbar, View.TRANSLATION_Y, -toolbar.getHeight(), 0));
set.setDuration(300).playTogether(animators); set.setDuration(300).playTogether(animators);
set.addListener(new AnimatorListenerAdapter() { set.addListener(new AnimatorListenerAdapter() {
@Override @Override
public void onAnimationStart(Animator animation) { public void onAnimationStart(Animator animation) {
super.onAnimationStart(animation); super.onAnimationStart(animation);
view.setVisibility(View.VISIBLE); content.setVisibility(View.VISIBLE);
toolbar.setVisibility(View.VISIBLE);
} }
}); });
set.start(); set.start();
} else { } else {
view.setVisibility(View.VISIBLE); content.setVisibility(View.VISIBLE);
toolbar.setVisibility(View.VISIBLE);
} }
this.animationCoordinates = animationCoordinates;
} }
private void hide(final View view, boolean animation) { private void hide(boolean animation) {
final View content = dashboardView.findViewById(R.id.animateContent);
final View toolbar = dashboardView.findViewById(R.id.toolbar);
if (compassButton != null) { if (compassButton != null) {
mapActivity.getMapLayers().getMapControlsLayer().restoreCompassButton(nightMode); mapActivity.getMapLayers().getMapControlsLayer().restoreCompassButton(nightMode);
compassButton = null; compassButton = null;
} }
if (!animation) { if (!animation) {
dashboardView.setVisibility(View.GONE); dashboardView.setVisibility(View.GONE);
view.setVisibility(View.GONE); content.setVisibility(View.GONE);
toolbar.setVisibility(View.GONE);
} else { } else {
AnimatorSet set = new AnimatorSet(); AnimatorSet set = new AnimatorSet();
set.setDuration(300).playTogether( List<Animator> animators = new ArrayList<>();
ObjectAnimator.ofFloat(view, View.ALPHA, 1f, 0f), if (animationCoordinates != null) {
ObjectAnimator.ofFloat(view, View.TRANSLATION_Y, 0, view.getHeight()) int screenHeight = mapActivity.getResources().getDisplayMetrics().heightPixels;
); int screenWidth = mapActivity.getResources().getDisplayMetrics().widthPixels;
animators.add(ObjectAnimator.ofFloat(content, View.TRANSLATION_X, 0, animationCoordinates[0] - screenWidth / 2));
animators.add(ObjectAnimator.ofFloat(content, View.TRANSLATION_Y, 0, animationCoordinates[1] - screenHeight / 2));
animationCoordinates = null;
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
int centerX = content.getMeasuredWidth() / 2;
int centerY = content.getMeasuredHeight() / 2;
float initialRadius = (float) Math.sqrt(Math.pow(content.getWidth() / 2, 2) + Math.pow(content.getHeight() / 2, 2));
Animator circleAnimator = ViewAnimationUtils.createCircularReveal(content, centerX, centerY, initialRadius, 0);
animators.add(circleAnimator);
}
animators.add(ObjectAnimator.ofFloat(content, View.SCALE_X, 1f, 0f));
animators.add(ObjectAnimator.ofFloat(content, View.SCALE_Y, 1f, 0f));
animators.add(ObjectAnimator.ofFloat(toolbar, View.TRANSLATION_Y, 0, -toolbar.getHeight()));
set.setDuration(300).playTogether(animators);
set.addListener(new AnimatorListenerAdapter() { set.addListener(new AnimatorListenerAdapter() {
@Override @Override
public void onAnimationEnd(Animator animation) { public void onAnimationEnd(Animator animation) {
super.onAnimationEnd(animation); super.onAnimationEnd(animation);
dashboardView.setVisibility(View.GONE); dashboardView.setVisibility(View.GONE);
view.setVisibility(View.GONE); content.setVisibility(View.GONE);
view.setTranslationY(0); toolbar.setVisibility(View.GONE);
} }
}); });
set.start(); set.start();