organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[android] fix: Review fixes.

Browse source
This commit is contained in:
Alexander Marchuk 2016-08-03 01:03:45 +03:00
parent 6b1c57e9cb
commit fe9ca71e11
11 changed files with 25 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
android/res/layout-land/layout_nav_bottom_numbers.xml
View file

@ -9,7 +9,6 @@
android:paddingStart="@dimen/nav_numbers_margin"
android:layout_marginRight="@dimen/nav_toggle"
android:layout_marginEnd="@dimen/nav_toggle"
android:paddingBottom="@dimen/margin_quarter"
android:background="?clickableBackground"
tools:background="#3000FF00"
tools:ignore="RtlSymmetry">
@ -47,20 +46,19 @@
android:layout_weight="1"/>
<!-- Time -->
<LinearLayout
<FrameLayout
android:id="@+id/time_frame"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="@dimen/nav_menu_height"
android:minWidth="@dimen/nav_numbers_center_min_width"
android:orientation="vertical"
android:paddingTop="@dimen/margin_eighth"
android:gravity="center_horizontal"
tools:background="#20FF0000">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_horizontal">
android:layout_gravity="center_horizontal"
android:gravity="bottom">
<TextView
android:id="@+id/time_hour_value"
android:layout_width="wrap_content"
@ -99,6 +97,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:theme="?navigationTheme"
android:layout_marginTop="28dp"
android:layout_gravity="center_horizontal"
android:orientation="horizontal">
<ImageView
android:id="@+id/dot_left"
@ -114,7 +114,7 @@
android:layout_height="wrap_content"
android:src="?newsMarker"/>
</LinearLayout>
</LinearLayout>
</FrameLayout>
<Space android:layout_width="0dp"
android:layout_height="0dp"

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

@ -17,7 +17,6 @@
android:id="@+id/line_frame"
android:layout_width="match_parent"
android:layout_height="@dimen/nav_menu_height">
<include layout="@layout/layout_nav_bottom_numbers"/>
<ImageView
@ -45,11 +44,9 @@
<FrameLayout
android:id="@+id/content_frame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/nav_menu_content_height"
android:clipChildren="false"
android:clipToPadding="false"
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"
@ -75,7 +72,6 @@
android:background="?redButtonBackground"
android:text="@string/current_location_unknown_stop_button"
android:fontFamily="@string/robotoMedium"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Button.Red"
tools:ignore="UnusedAttribute"/>

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

@ -9,7 +9,6 @@
android:paddingStart="@dimen/nav_numbers_margin"
android:layout_marginRight="@dimen/nav_toggle"
android:layout_marginEnd="@dimen/nav_toggle"
android:paddingBottom="@dimen/margin_quarter"
android:background="?clickableBackground"
tools:background="#3000FF00"
tools:ignore="RtlSymmetry">
@ -49,20 +48,18 @@
android:layout_weight="1"/>
<!-- Time -->
<LinearLayout
<FrameLayout
android:id="@+id/time_frame"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:minWidth="@dimen/nav_numbers_center_min_width"
android:orientation="vertical"
android:paddingTop="@dimen/margin_eighth"
android:gravity="center_horizontal"
tools:background="#20FF0000">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_horizontal">
android:layout_gravity="center_horizontal">
<TextView
android:id="@+id/time_hour_value"
android:layout_width="wrap_content"
@ -103,7 +100,8 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:theme="?navigationTheme"
android:layout_marginTop="@dimen/margin_quarter">
android:layout_gravity="center_horizontal"
android:layout_marginTop="30dp">
<ImageView
android:id="@+id/dot_left"
android:layout_width="wrap_content"
@ -118,7 +116,7 @@
android:layout_height="wrap_content"
android:src="?newsMarker"/>
</LinearLayout>
</LinearLayout>
</FrameLayout>
<Space android:layout_width="0dp"
android:layout_height="0dp"

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

@ -8,6 +8,7 @@
<!-- Nav menu -->
<dimen name="nav_menu_height">36dp</dimen>
<dimen name="nav_menu_content_height">48dp</dimen>
<dimen name="nav_zoom_bottom">80dp</dimen>
<dimen name="nav_toggle_margin">16dp</dimen>
<dimen name="nav_numbers_margin">16dp</dimen>

3
android/res/values-sw720dp-land/dimens.xml
View file

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Nav menu -->
<dimen name="nav_menu_height">36dp</dimen>
<dimen name="nav_menu_height">40dp</dimen>
<dimen name="nav_menu_content_height">64dp</dimen>
<dimen name="nav_progress">8dp</dimen>
<dimen name="nav_numbers_margin">32dp</dimen>
</resources>

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

@ -1,6 +1,8 @@
<resources>
<dimen name="dialog_max_height">600dp</dimen>
<dimen name="nav_menu_height">40dp</dimen>
<dimen name="nav_menu_content_height">64dp</dimen>
<dimen name="nav_street_height">56dp</dimen>
<dimen name="nav_street_left">152dp</dimen>
<dimen name="nav_next_turn_frame">132dp</dimen>

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

@ -93,6 +93,7 @@
<dimen name="nav_next_turn_sign">64dp</dimen>
<dimen name="nav_next_next_turn_frame">32dp</dimen>
<dimen name="nav_menu_height">48dp</dimen>
<dimen name="nav_menu_content_height">64dp</dimen>
<dimen name="nav_numbers_margin">8dp</dimen>
<dimen name="nav_numbers_side_min_width">90dp</dimen>
<dimen name="nav_numbers_center_min_width">130dp</dimen>

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

@ -74,7 +74,6 @@
<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">

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

@ -22,9 +22,6 @@ import android.view.View.OnClickListener;
import android.view.WindowManager;
import android.widget.ImageButton;
import java.io.Serializable;
import java.util.Stack;
import com.mapswithme.maps.Framework.MapObjectListener;
import com.mapswithme.maps.activity.CustomNavigateUpListener;
import com.mapswithme.maps.ads.LikesManager;
@ -86,6 +83,9 @@ import com.mapswithme.util.statistics.Statistics;
import ru.mail.android.mytarget.nativeads.NativeAppwallAd;
import ru.mail.android.mytarget.nativeads.banners.NativeAppwallBanner;
import java.io.Serializable;
import java.util.Stack;
public class MwmActivity extends BaseMwmFragmentActivity
implements MapObjectListener,
View.OnTouchListener,
@ -1340,9 +1340,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
RoutingInfo info = Framework.nativeGetRouteFollowingInfo();
mNavigationController.update(info);
// TODO (trashkalmar or yunikkk): Update anything else
//mMainMenu.updateRoutingInfo(info);
TtsPlayer.INSTANCE.playTurnNotifications();
}

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

@ -17,6 +17,7 @@ public abstract class BaseMenu
public static final int ANIMATION_DURATION = MwmApplication.get().getResources().getInteger(R.integer.anim_menu);
private boolean mIsOpen;
private boolean mAnimating;
final View mFrame;
final View mLineFrame;
@ -27,7 +28,6 @@ public abstract class BaseMenu
int mContentHeight;
boolean mLayoutMeasured;
boolean mAnimating;
public interface Item
@ -85,7 +85,7 @@ public abstract class BaseMenu
procAfterCorrection.run();
}
protected void measureContent(@Nullable final Runnable procAfterMeasurement)
void measureContent(@Nullable final Runnable procAfterMeasurement)
{
if (mLayoutMeasured)
return;

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

@ -22,7 +22,6 @@ public class NavMenu extends BaseMenu
TOGGLE(R.id.toggle),
TTS_VOLUME(R.id.tts_volume),
STOP(R.id.stop),
//OVERVIEW(R.id.), TODO
SETTINGS(R.id.settings);
private final int mViewId;