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

[android] fix: Another UI fixes with NavMenu.

Browse source
This commit is contained in:
Alexander Marchuk 2016-07-31 18:30:19 +03:00
parent 2eefc159c4
commit 6b1c57e9cb
17 changed files with 101 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/res/drawable-v21/button_default.xml → android/res/drawable-v21/button_red.xml
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?colorControlHighlight">
android:color="@color/button_pressed">
<item>
<shape android:shape="rectangle">
<solid android:color="?colorButtonNormal"/>
<solid android:color="@color/button_red"/>
<corners android:radius="2dp"/>
</shape>
</item>

26
android/res/drawable/button_default.xml
View file

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_pressed="true">
<shape android:shape="rectangle">
<!-- TODO customize with attr -->
<solid android:color="@color/button_pressed"/>
<corners android:radius="2dp"/>
</shape>
</item>
<item
android:state_enabled="true">
<shape android:shape="rectangle">
<solid android:color="@color/button"/>
<corners android:radius="2dp"/>
</shape>
</item>
<item>
<shape android:shape="rectangle">
<solid android:color="@color/button_disabled"/>
<corners android:radius="2dp"/>
</shape>
</item>
</selector>

10
android/res/drawable/button_red.xml Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/button_red_pressed"
android:state_pressed="true"/>
<item android:drawable="@drawable/button_red_normal"
android:state_enabled="true"/>
<item android:drawable="@drawable/button_red_disabled"/>
</selector>

6
android/res/drawable/button_red_disabled.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/button_red_disabled"/>
<corners android:radius="2dp"/>
</shape>

6
android/res/drawable/button_red_normal.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/button_red"/>
<corners android:radius="2dp"/>
</shape>

6
android/res/drawable/button_red_pressed.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/button_red_pressed"/>
<corners android:radius="2dp"/>
</shape>

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

@ -10,7 +10,7 @@
android:layout_gravity="bottom"
android:clickable="true"
android:visibility="invisible"
android:background="?cardBackground"
android:background="?menuBackgroundOpen"
tools:visibility="visible">
<FrameLayout
@ -28,7 +28,6 @@
android:background="?clickableBackground"
android:scaleType="center"
android:tint="?iconTint"
android:clickable="true"
tools:src="@drawable/ic_menu_close"/>
</FrameLayout>
@ -43,12 +42,12 @@
app:secondaryProgressColor="@color/bg_routing_progress"
app:secondaryProgressThickness="@dimen/nav_progress"/>
<LinearLayout
<FrameLayout
android:id="@+id/content_frame"
android:layout_width="match_parent"
android:layout_height="64dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false"
android:paddingTop="@dimen/margin_half_plus"
android:paddingBottom="@dimen/margin_half_plus"
android:paddingLeft="@dimen/nav_bottom_gap"
@ -56,13 +55,13 @@
android:paddingRight="@dimen/nav_bottom_gap"
android:paddingEnd="@dimen/nav_bottom_gap"
tools:background="#300000FF">
<ImageView
android:id="@+id/settings"
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:layout_gravity="center_vertical"
android:scaleType="center"
android:src="@drawable/ic_menu_settings"
android:background="?selectableItemBackgroundBorderless"
@ -70,17 +69,14 @@
<Button
android:id="@+id/stop"
android:theme="@style/MwmTheme.Button.Red"
android:layout_width="0dp"
android:layout_height="36dp"
android:layout_marginRight="@dimen/nav_bottom_gap"
android:layout_marginEnd="@dimen/nav_bottom_gap"
android:layout_weight="1"
android:background="@drawable/button_default"
android:layout_width="@dimen/nav_button_width"
android:layout_height="@dimen/nav_button_height"
android:layout_gravity="center"
android:background="?redButtonBackground"
android:text="@string/current_location_unknown_stop_button"
android:fontFamily="@string/robotoMedium"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body1.Light"
android:textAppearance="@style/MwmTextAppearance.Button.Red"
tools:ignore="UnusedAttribute"/>
<ImageView
@ -88,7 +84,8 @@
android:layout_width="@dimen/nav_icon_size"
android:layout_height="@dimen/nav_icon_size"
android:scaleType="center"
android:layout_gravity="center_vertical|right"
android:src="@drawable/ic_voice_on"
android:background="?selectableItemBackgroundBorderless"/>
</LinearLayout>
</FrameLayout>
</LinearLayout>

2
android/res/layout/layout_nav_bottom_numbers.xml
View file

@ -29,6 +29,7 @@
android:id="@+id/speed_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/neg_margin_quarter"
android:singleLine="true"
android:includeFontPadding="false"
android:textAppearance="@style/MwmTextAppearance.RoutingNumber"
@ -139,6 +140,7 @@
android:id="@+id/distance_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/neg_margin_quarter"
android:singleLine="true"
android:includeFontPadding="false"
android:textAppearance="@style/MwmTextAppearance.RoutingNumber"

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

@ -17,12 +17,12 @@
<color name="base_yellow">#FFFFC30A</color>
<color name="base_green">#FF558B2F</color>
<color name="black_primary">#DE000000</color> <!-- 87% black -->
<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% white -->
<color name="black_lightest">#61000000</color> <!-- 38% black -->
<color name="white_primary">#FFFFFFFF</color> <!-- 100% white -->
<color name="white_secondary">#B3FFFFFF</color> <!-- 70% white -->
<color name="white_lightest">#4CFFFFFF</color> <!-- 50% black -->
<color name="white_lightest">#4CFFFFFF</color> <!-- 50% white -->
<color name="icon_tint">#FF757575</color>
<color name="icon_tint_night">#FFC4C6C7</color>
@ -86,6 +86,13 @@
<color name="button_accent_text_disabled">#42000000</color>
<color name="button_accent_text_disabled_night">#4CFFFFFF</color>
<color name="button_red">@color/button_red_normal</color>
<color name="button_red_normal">@color/base_red</color>
<color name="button_red_pressed">#FFC22219</color>
<color name="button_red_disabled">#FFB9332B</color>
<color name="button_red_text">#FFFFFFFF</color>
<color name="button_red_text_disabled">#FF606060</color>
<color name="downloader_gray">#FF999999</color>
<!-- Routing-->

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_button_width">200dp</dimen>
<dimen name="nav_button_height">36dp</dimen>
<dimen name="nav_icon_size">48dp</dimen>
<dimen name="nav_bottom_gap">12dp</dimen>

5
android/res/values/styles-text.xml
View file

@ -72,6 +72,11 @@
<item name="android:textAllCaps">true</item>
</style>
<style name="MwmTextAppearance.Button.Red">
<item name="android:textColor">@color/button_red_text</item>
<item name="android:textAllCaps">true</item>
</style>
<style name="MwmTextAppearance.Toolbar">
<item name="android:textSize">@dimen/text_size_toolbar</item>
<item name="android:textColor">@color/text_light</item>

4
android/res/values/themes-attrs.xml
View file

@ -39,6 +39,10 @@
<attr name="accentButtonTextColor" format="color"/>
<attr name="accentButtonTextColorDisabled" format="color"/>
<attr name="redButtonBackground" format="reference"/>
<attr name="redButtonTextColor" format="color"/>
<attr name="redButtonTextColorDisabled" format="color"/>
<attr name="circleAccent" format="reference"/>
<attr name="menuBackground" format="color"/>

8
android/res/values/themes-base.xml
View file

@ -55,6 +55,10 @@
<item name="accentButtonTextColor">@color/button_accent_text</item>
<item name="accentButtonTextColorDisabled">@color/button_accent_text_disabled</item>
<item name="redButtonBackground">@drawable/button_red</item>
<item name="redButtonTextColor">@color/button_red_text</item>
<item name="redButtonTextColorDisabled">@color/button_red_text_disabled</item>
<item name="circleAccent">@drawable/circle_accent</item>
<item name="menuBackground">@color/bg_menu</item>
@ -125,6 +129,10 @@
<item name="accentButtonTextColor">@color/button_accent_text_night</item>
<item name="accentButtonTextColorDisabled">@color/button_accent_text_disabled_night</item>
<item name="redButtonBackground">@drawable/button_red</item>
<item name="redButtonTextColor">@color/button_red_text</item>
<item name="redButtonTextColorDisabled">@color/button_red_text_disabled</item>
<item name="circleAccent">@drawable/circle_accent_night</item>
<item name="menuBackground">@color/bg_menu_night</item>

4
android/res/values/themes.xml
View file

@ -155,10 +155,6 @@
<item name="colorButtonNormal">?colorAccent</item>
</style>
<style name="MwmTheme.Button.Red">
<item name="colorButtonNormal">@color/base_red</item>
</style>
<style name="MwmTheme.Navigation">
<item name="iconTint">@color/white_primary</item>
<item name="newsMarker">@drawable/news_marker</item>

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

@ -10,10 +10,6 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import java.text.DateFormat;
import java.util.Calendar;
import java.util.concurrent.TimeUnit;
import com.mapswithme.maps.Framework;
import com.mapswithme.maps.MwmActivity;
import com.mapswithme.maps.R;
@ -29,10 +25,13 @@ import com.mapswithme.util.Utils;
import com.mapswithme.util.statistics.AlohaHelper;
import com.mapswithme.util.statistics.Statistics;
import java.text.DateFormat;
import java.util.Calendar;
import java.util.concurrent.TimeUnit;
public class NavigationController
{
private final View mFrame;
private final View mTopFrame;
private final View mBottomFrame;
private final NavMenu mNavMenu;
@ -65,7 +64,6 @@ public class NavigationController
public NavigationController(Activity activity)
{
mFrame = activity.findViewById(R.id.navigation_frame);
mTopFrame = mFrame.findViewById(R.id.nav_top_frame);
mBottomFrame = mFrame.findViewById(R.id.nav_bottom_frame);
mBottomFrame.setOnClickListener(new View.OnClickListener()
{
@ -79,17 +77,18 @@ public class NavigationController
mNavMenu.refreshTts();
// Top frame
View turnFrame = mTopFrame.findViewById(R.id.nav_next_turn_frame);
View topFrame = mFrame.findViewById(R.id.nav_top_frame);
View turnFrame = topFrame.findViewById(R.id.nav_next_turn_frame);
mNextTurnImage = (ImageView) turnFrame.findViewById(R.id.turn);
mNextTurnDistance = (TextView) turnFrame.findViewById(R.id.distance);
mCircleExit = (TextView) turnFrame.findViewById(R.id.circle_exit);
mNextNextTurnFrame = mTopFrame.findViewById(R.id.nav_next_next_turn_frame);
mNextNextTurnFrame = topFrame.findViewById(R.id.nav_next_next_turn_frame);
mNextNextTurnImage = (ImageView) mNextNextTurnFrame.findViewById(R.id.turn);
mStreetFrame = mTopFrame.findViewById(R.id.street_frame);
mStreetFrame = topFrame.findViewById(R.id.street_frame);
mNextStreet = (TextView) mStreetFrame.findViewById(R.id.street);
View shadow = mTopFrame.findViewById(R.id.shadow_top);
View shadow = topFrame.findViewById(R.id.shadow_top);
UiUtils.showIf(Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP, shadow);
// Bottom frame
@ -221,17 +220,12 @@ public class NavigationController
private void updateTime(int seconds)
{
if (mShowTimeLeft)
{
updateTimeLeft(seconds);
mDotTimeLeft.setEnabled(true);
mDotTimeArrival.setEnabled(false);
}
else
{
updateTimeEstimate(seconds);
mDotTimeLeft.setEnabled(false);
mDotTimeArrival.setEnabled(true);
}
mDotTimeLeft.setEnabled(mShowTimeLeft);
mDotTimeArrival.setEnabled(!mShowTimeLeft);
}
private void updateTimeLeft(int seconds)

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

@ -3,16 +3,17 @@ package com.mapswithme.maps.widget.menu;
import android.animation.ValueAnimator;
import android.support.annotation.Nullable;
import android.view.View;
import android.widget.Button;
import android.widget.ImageView;
import com.mapswithme.maps.R;
import com.mapswithme.maps.sound.TtsPlayer;
import com.mapswithme.maps.widget.RotateDrawable;
import com.mapswithme.util.Graphics;
import com.mapswithme.util.UiUtils;
public class NavMenu extends BaseMenu
{
private ImageView mToggle;
private final RotateDrawable mToggleImage;
private final ImageView mTts;
@ -42,15 +43,16 @@ public class NavMenu extends BaseMenu
{
super(frame, listener);
mToggle = (ImageView) mLineFrame.findViewById(R.id.toggle);
mToggleImage = new RotateDrawable(Graphics.tint(
mFrame.getContext(), R.drawable.ic_menu_close, R.attr.iconTint));
mToggle.setImageDrawable(mToggleImage);
mToggleImage = new RotateDrawable(Graphics.tint(mFrame.getContext(), R.drawable.ic_menu_close, R.attr.iconTintLight));
ImageView toggle = (ImageView) mLineFrame.findViewById(R.id.toggle);
toggle.setImageDrawable(mToggleImage);
setToggleState(false, false);
mapItem(Item.TOGGLE, mLineFrame);
mapItem(Item.STOP, mFrame);
Button stop = (Button) mapItem(Item.STOP, mFrame);
UiUtils.updateRedButton(stop);
mapItem(Item.SETTINGS, mFrame);
mTts = (ImageView) mapItem(Item.TTS_VOLUME, mFrame);
}

6
android/src/com/mapswithme/util/UiUtils.java
View file

@ -294,6 +294,12 @@ public final class UiUtils
: R.attr.buttonTextColorDisabled));
}
public static void updateRedButton(Button button)
{
button.setTextColor(ThemeUtils.getColor(button.getContext(), button.isEnabled() ? R.attr.redButtonTextColor
: R.attr.redButtonTextColorDisabled));
}
public static void updateAccentButton(Button button)
{
button.setTextColor(ThemeUtils.getColor(button.getContext(), button.isEnabled() ? R.attr.accentButtonTextColor