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

Animation + color fix.

Browse source
This commit is contained in:
Dmitry Kunin 2014-02-27 14:09:05 +03:00 • committed by Alex Zolotarev
parent d26f974e8d
commit fdee892f5e
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
android/res/layout/info_box.xml
View file

@ -3,7 +3,7 @@
android:id="@+id/info_box_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/background_holo_light"
android:background="@color/ui_20_background_grey"
android:orientation="vertical" >
<LinearLayout
@ -25,10 +25,9 @@
style="@style/Holo.TextAppearance.Large.Light"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@string/robotoLight"
android:text="title" />
android:fontFamily="@string/robotoLight" />
<TextView
<TextViews
android:id="@+id/info_subtitle"
style="@style/Holo.TextAppearance.Medium.Light"
android:layout_width="wrap_content"
@ -37,27 +36,25 @@
android:fontFamily="@string/robotoRegular"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:text="subtitle"
android:textColor="@android:color/white" />
</LinearLayout>
<CheckBox
android:id="@+id/info_box_is_bookmarked"
android:button="@drawable/info_box_add_to_bookmarks_btn_selector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0" />
android:layout_weight="0"
android:button="@drawable/info_box_add_to_bookmarks_btn_selector" />
</LinearLayout>
<!-- Will have dynamic height -->
<LinearLayout
android:id="@+id/body"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="500dp"
android:background="@drawable/background_holo_light"
android:orientation="vertical" >
android:orientation="vertical"
android:visibility="gone" >
<View
style="@style/drawerSeparator"

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

@ -27,6 +27,8 @@
<color name="ui_20_text_green">#53d769</color>
<color name="ui_20_background_grey">#efeff4</color>
<color name="ui_20_green">#3dca6a</color>
<drawable name="ui_20_green">#3dca6a</drawable>

4
android/src/com/mapswithme/maps/widget/MapInfoView.java
View file

@ -217,7 +217,7 @@ public class MapInfoView extends LinearLayout
if (mIsBodyVisible == show)
return; // if state is already same as we need
final long duration = 200;
final long duration = 400;
// Calculate translate offset
final int headHeight = mHeaderGroup.getHeight();
@ -248,6 +248,8 @@ public class MapInfoView extends LinearLayout
Animation.RELATIVE_TO_SELF, 1 - offset);
slideDown.setDuration(duration);
slideDown.setFillEnabled(true);
slideDown.setFillBefore(true);
slideDown.setAnimationListener(new UiUtils.SimpleAnimationListener()
{
@Override