Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
90d32a471b
1 changed files with 78 additions and 67 deletions
|
@ -1,5 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/widget_bg"
|
||||
android:layout_width="match_parent"
|
||||
|
@ -18,8 +19,8 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:gravity="center"
|
||||
android:layout_marginTop="2dp"
|
||||
android:gravity="center"
|
||||
android:textColor="@color/color_black"
|
||||
android:textSize="@dimen/map_widget_text_size"
|
||||
android:visibility="gone"/>
|
||||
|
@ -28,18 +29,17 @@
|
|||
android:id="@+id/widget_top_icon"
|
||||
android:layout_width="@dimen/map_widget_image"
|
||||
android:layout_height="@dimen/map_widget_image"
|
||||
android:layout_marginTop="2dp"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginTop="2dp"
|
||||
android:gravity="center"
|
||||
android:src="@drawable/ic_action_test_light"
|
||||
android:visibility="gone"/>
|
||||
</FrameLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/widget_bottom_layout"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="@dimen/map_widget_height"
|
||||
android:id="@+id/widget_bottom_layout"
|
||||
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
|
@ -53,67 +53,78 @@
|
|||
android:src="@drawable/ic_action_test_light"/>
|
||||
|
||||
<FrameLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="bottom"
|
||||
android:layout_marginBottom="@dimen/map_widget_text_bottom_margin"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginEnd="4dp"
|
||||
android:layout_marginLeft="@dimen/map_widget_icon_margin"
|
||||
android:layout_marginRight="@dimen/map_widget_icon_margin"
|
||||
android:layout_weight="1" >
|
||||
android:layout_marginRight="4dp"
|
||||
android:layout_marginStart="@dimen/map_widget_icon_margin">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/widget_text_shadow"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="bottom"
|
||||
android:layout_marginEnd="@dimen/map_widget_icon_margin"
|
||||
android:layout_marginRight="@dimen/map_widget_icon_margin"
|
||||
android:maxLines="1"
|
||||
android:singleLine="true"
|
||||
android:minWidth="10dp"
|
||||
tools:text="1048"
|
||||
android:textColor="@color/color_white"
|
||||
android:textSize="@dimen/map_widget_text_size" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/widget_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="bottom"
|
||||
android:maxLines="1"
|
||||
android:singleLine="true"
|
||||
android:minWidth="10dp"
|
||||
tools:text="1048"
|
||||
android:textColor="@color/color_black"
|
||||
android:textSize="@dimen/map_widget_text_size" />
|
||||
</FrameLayout>
|
||||
|
||||
<FrameLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="bottom"
|
||||
android:layout_marginBottom="@dimen/map_widget_text_small_bottom_margin"
|
||||
android:layout_marginLeft="4dp"
|
||||
android:layout_marginRight="4dp" >
|
||||
android:textSize="@dimen/map_widget_text_size"
|
||||
tools:text="1048"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/widget_text_small_shadow"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignBaseline="@+id/widget_text_shadow"
|
||||
android:layout_marginLeft="4dp"
|
||||
android:layout_marginStart="4dp"
|
||||
android:layout_toEndOf="@+id/widget_text_shadow"
|
||||
android:layout_toRightOf="@+id/widget_text_shadow"
|
||||
android:maxLines="1"
|
||||
android:singleLine="true"
|
||||
tools:text="km"
|
||||
android:textColor="@color/color_white"
|
||||
android:textSize="@dimen/map_widget_text_size_small" />
|
||||
android:textSize="@dimen/map_widget_text_size_small"
|
||||
tools:text="km"/>
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/widget_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/map_widget_icon_margin"
|
||||
android:layout_marginRight="@dimen/map_widget_icon_margin"
|
||||
android:maxLines="1"
|
||||
android:minWidth="10dp"
|
||||
android:textColor="@color/color_black"
|
||||
android:textSize="@dimen/map_widget_text_size"
|
||||
tools:text="1048"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/widget_text_small"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignBaseline="@+id/widget_text"
|
||||
android:layout_marginLeft="4dp"
|
||||
android:layout_marginStart="4dp"
|
||||
android:layout_toEndOf="@+id/widget_text"
|
||||
android:layout_toRightOf="@+id/widget_text"
|
||||
android:maxLines="1"
|
||||
android:singleLine="true"
|
||||
tools:text="km"
|
||||
android:textColor="@color/color_black"
|
||||
android:textSize="@dimen/map_widget_text_size_small" />
|
||||
android:textSize="@dimen/map_widget_text_size_small"
|
||||
tools:text="km"/>
|
||||
</RelativeLayout>
|
||||
|
||||
</FrameLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
Loading…
Reference in a new issue