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

[android] More UI fixes.

Browse source
This commit is contained in:
Dmitry Yunitsky 2016-07-31 15:08:41 +03:00 • committed by Alexander Marchuk
parent 0fde46f391
commit 2eefc159c4
10 changed files with 48 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
android/res/layout-land/activity_map.xml
View file

@ -32,6 +32,13 @@
android:visibility="gone"
tools:visibility="visible"/>
<com.mapswithme.maps.widget.FadeView
android:id="@+id/fade_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/black"
android:visibility="gone"/>
<include
layout="@layout/layout_nav"
android:layout_width="match_parent"
@ -45,13 +52,6 @@
layout="@layout/routing_plan"
android:visibility="invisible"/>
<com.mapswithme.maps.widget.FadeView
android:id="@+id/fade_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/black"
android:visibility="gone"/>
<include
android:id="@+id/menu_frame"
layout="@layout/menu"

14
android/res/layout-w1020dp/activity_map.xml
View file

@ -23,6 +23,13 @@
android:id="@+id/navigation_buttons"
layout="@layout/map_navigation_buttons"/>
<com.mapswithme.maps.widget.FadeView
android:id="@+id/fade_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/black"
android:visibility="gone"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -59,13 +66,6 @@
placePage:floating="true"/>
</LinearLayout>
<com.mapswithme.maps.widget.FadeView
android:id="@+id/fade_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/black"
android:visibility="gone"/>
<include
android:id="@+id/menu_frame"
layout="@layout/menu"

14
android/res/layout/activity_map.xml
View file

@ -30,6 +30,13 @@
android:visibility="gone"
tools:visibility="visible"/>
<com.mapswithme.maps.widget.FadeView
android:id="@+id/fade_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/black"
android:visibility="gone"/>
<include
layout="@layout/layout_nav"
android:layout_width="match_parent"
@ -42,13 +49,6 @@
layout="@layout/routing_plan"
android:visibility="invisible"/>
<com.mapswithme.maps.widget.FadeView
android:id="@+id/fade_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/black"
android:visibility="gone"/>
<include
android:id="@+id/menu_frame"
layout="@layout/menu"

23
android/res/layout/layout_nav_bottom.xml
View file

@ -49,15 +49,20 @@
android:layout_height="64dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="@dimen/margin_half_plus"
android:paddingTop="@dimen/margin_half_plus"
android:paddingBottom="@dimen/margin_half_plus"
android:paddingLeft="@dimen/nav_bottom_gap"
android:paddingStart="@dimen/nav_bottom_gap"
android:paddingRight="@dimen/nav_bottom_gap"
android:paddingEnd="@dimen/nav_bottom_gap"
tools:background="#300000FF">
<ImageView
android:id="@+id/settings"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="@dimen/margin_half_plus"
android:layout_marginRight="@dimen/margin_half_plus"
android:layout_width="@dimen/nav_icon_size"
android:layout_height="@dimen/nav_icon_size"
android:layout_marginRight="@dimen/nav_bottom_gap"
android:layout_marginEnd="@dimen/nav_bottom_gap"
android:scaleType="center"
android:src="@drawable/ic_menu_settings"
android:background="?selectableItemBackgroundBorderless"
@ -68,8 +73,8 @@
android:theme="@style/MwmTheme.Button.Red"
android:layout_width="0dp"
android:layout_height="36dp"
android:layout_marginRight="@dimen/margin_half_plus"
android:layout_marginEnd="@dimen/margin_half_plus"
android:layout_marginRight="@dimen/nav_bottom_gap"
android:layout_marginEnd="@dimen/nav_bottom_gap"
android:layout_weight="1"
android:background="@drawable/button_default"
android:text="@string/current_location_unknown_stop_button"
@ -80,8 +85,8 @@
<ImageView
android:id="@+id/tts_volume"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="@dimen/nav_icon_size"
android:layout_height="@dimen/nav_icon_size"
android:scaleType="center"
android:src="@drawable/ic_voice_on"
android:background="?selectableItemBackgroundBorderless"/>

1
android/res/values-land/dimens.xml
View file

@ -11,4 +11,5 @@
<dimen name="nav_zoom_bottom">80dp</dimen>
<dimen name="nav_toggle_margin">16dp</dimen>
<dimen name="nav_numbers_margin">16dp</dimen>
<dimen name="nav_bottom_gap">24dp</dimen>
</resources>

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

@ -20,7 +20,7 @@
<color name="black_primary">#DE000000</color> <!-- 87% black -->
<color name="black_secondary">#8A000000</color> <!-- 54% black -->
<color name="black_lightest">#61000000</color> <!-- 38% black -->
<color name="white_primary">@android:color/white</color> <!-- 100% black -->
<color name="white_primary">@android:color/white</color> <!-- 100% white -->
<color name="white_secondary">#B3FFFFFF</color> <!-- 70% white -->
<color name="white_lightest">#4CFFFFFF</color> <!-- 50% black -->

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

@ -100,6 +100,8 @@
<dimen name="nav_progress_head">2dp</dimen>
<dimen name="nav_toggle">40dp</dimen>
<dimen name="nav_toggle_margin">8dp</dimen>
<dimen name="nav_icon_size">48dp</dimen>
<dimen name="nav_bottom_gap">12dp</dimen>
<dimen name="nav_frame_padding">@dimen/margin_half</dimen>
<dimen name="nav_button">28dp</dimen>

6
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -406,7 +406,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
@Override
public boolean onTouch()
{
return mMainMenu.close(true);
return getCurrentMenu().close(true);
}
});
@ -504,7 +504,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
refreshFade();
}
protected void refreshFade()
public void refreshFade()
{
if (getCurrentMenu().isOpen())
mFadeView.fadeIn();
@ -872,7 +872,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
@Override
public void onBackPressed()
{
if (mMainMenu.close(true))
if (getCurrentMenu().close(true))
{
mFadeView.fadeOut();
return;

6
android/src/com/mapswithme/maps/routing/NavigationController.java
View file

@ -113,15 +113,16 @@ public class NavigationController
@Override
public void onItemClick(NavMenu.Item item)
{
final MwmActivity parent = ((MwmActivity) mFrame.getContext());
switch (item)
{
case STOP:
RoutingController.get().cancel();
Statistics.INSTANCE.trackEvent(Statistics.EventName.ROUTING_CLOSE);
AlohaHelper.logClick(AlohaHelper.ROUTING_CLOSE);
parent.refreshFade();
break;
case SETTINGS:
final MwmActivity parent = ((MwmActivity) mFrame.getContext());
parent.closeMenu(Statistics.EventName.ROUTING_SETTINGS, AlohaHelper.MENU_SETTINGS, new Runnable()
{
@Override
@ -137,6 +138,9 @@ public class NavigationController
Statistics.INSTANCE.trackEvent(Statistics.EventName.ROUTING_CLOSE);
AlohaHelper.logClick(AlohaHelper.ROUTING_CLOSE);
break;
case TOGGLE:
mNavMenu.toggle(true);
parent.refreshFade();
}
}
});

9
android/src/com/mapswithme/maps/widget/menu/NavMenu.java
View file

@ -46,17 +46,10 @@ public class NavMenu extends BaseMenu
mToggleImage = new RotateDrawable(Graphics.tint(
mFrame.getContext(), R.drawable.ic_menu_close, R.attr.iconTint));
mToggle.setImageDrawable(mToggleImage);
mToggle.setOnClickListener(new View.OnClickListener()
{
@Override
public void onClick(View v)
{
toggle(true);
}
});
setToggleState(false, false);
mapItem(Item.TOGGLE, mLineFrame);
mapItem(Item.STOP, mFrame);
mapItem(Item.SETTINGS, mFrame);
mTts = (ImageView) mapItem(Item.TTS_VOLUME, mFrame);