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

[android] Changed markup a bit.

Browse source
This commit is contained in:
Dmitry Yunitsky 2016-03-22 01:42:29 +03:00 • committed by Sergey Yershov
parent fe0f4fb8cf
commit 2768ca69a9
3 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
android/res/layout/fragment_editor.xml
View file

@ -89,19 +89,19 @@
android:src="@drawable/ic_coordinates"/>
<TextView
android:id="@+id/street_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/editor_margin_left"
android:layout_marginStart="@dimen/editor_margin_left"
android:gravity="center_vertical"
android:text="@string/street"
android:textAppearance="@style/MwmTextAppearance.Body4"/>
<TextView
android:id="@+id/street"
style="@style/MwmWidget.Editor.FieldLayout"
android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/margin_base"
android:layout_below="@id/street_title"
android:layout_marginTop="@dimen/margin_quarter"
android:drawableEnd="@drawable/ic_arrow_down"
android:drawableRight="@drawable/ic_arrow_down"
android:gravity="center_vertical"
@ -112,9 +112,9 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_alignLeft="@id/street"
android:layout_alignParentBottom="true"
android:layout_alignStart="@id/street"
android:layout_marginBottom="@dimen/margin_half"
android:layout_below="@id/street"
android:layout_marginTop="6dp"
android:background="@color/divider"/>
</RelativeLayout>
@ -248,23 +248,32 @@
android:src="@drawable/ic_cuisine"/>
<TextView
android:id="@+id/tv__cuisine"
android:id="@+id/title_cuisine"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/editor_margin_left"
android:layout_marginStart="@dimen/editor_margin_left"
android:text="@string/street"
android:textAppearance="@style/MwmTextAppearance.Body4"/>
<TextView
android:id="@+id/cuisine"
style="@style/MwmWidget.Editor.FieldLayout"
android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/margin_base"
android:layout_below="@id/title_cuisine"
android:layout_marginTop="@dimen/margin_quarter"
android:drawableEnd="@drawable/ic_arrow_down"
android:drawableRight="@drawable/ic_arrow_down"
android:gravity="center_vertical"
android:textAppearance="@style/MwmTextAppearance.Body1"
tools:text="Italian, russian."/>
tools:text="Italian, russian, russian, russian, russian, russian, russian, russian, russian"/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_alignLeft="@id/tv__cuisine"
android:layout_alignParentBottom="true"
android:layout_alignStart="@id/tv__cuisine"
android:layout_marginBottom="@dimen/margin_half"
android:layout_alignLeft="@id/cuisine"
android:layout_alignStart="@id/cuisine"
android:layout_below="@id/cuisine"
android:layout_marginTop="6dp"
android:background="@color/divider"/>
</RelativeLayout>

4
android/res/values/styles-editor.xml
View file

@ -20,7 +20,8 @@
<style name="MwmWidget.Editor.MetadataBlock">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">@dimen/editor_height_field</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:minHeight">@dimen/editor_height_field</item>
<item name="android:layout_marginBottom">@dimen/margin_base</item>
</style>
@ -58,7 +59,6 @@
<style name="MwmWidget.Editor.FieldLayout">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:lines">1</item>
<item name="android:ellipsize">end</item>
<item name="android:layout_marginLeft">@dimen/editor_margin_left</item>
<item name="android:layout_marginStart" tools:targetApi="jelly_bean_mr1">@dimen/editor_margin_left</item>

2
android/src/com/mapswithme/maps/editor/EditorFragment.java
View file

@ -212,7 +212,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
mEtEmail = findInput(mEmailBlock);
mCuisineBlock = view.findViewById(R.id.block_cuisine);
mCuisineBlock.setOnClickListener(this);
mTvCuisine = (TextView) view.findViewById(R.id.tv__cuisine);
mTvCuisine = (TextView) view.findViewById(R.id.cuisine);
mWifiBlock = view.findViewById(R.id.block_wifi);
mSwWifi = (SwitchCompat) view.findViewById(R.id.sw__wifi);
mWifiBlock.setOnClickListener(this);