Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'drawer' of https://github.com/osmandapp/Osmand into drawer

Browse source
This commit is contained in:
Denis 2014-10-24 18:27:25 +03:00
commit f7cb3b46a8
4 changed files with 59 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/layout/drawer_list_header.xml
View file

@ -10,6 +10,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView android:id="@+id/title"
android:layout_marginLeft="5dp"
android:textSize="20sp"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:layout_width="0dp"

70
OsmAnd/res/layout/drawer_list_layer.xml
View file

@ -1,30 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp">
<ImageView android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<LinearLayout android:layout_marginLeft="8dp"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content">
<TextView android:id="@+id/title"
android:textSize="18sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView android:id="@+id/descr"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:orientation="horizontal"
android:paddingLeft="16dp"
android:paddingRight="16dp">
<ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
android:layout_gravity="center_vertical"
tools:src="@drawable/ic_action_info_dark" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="11dp"
android:layout_weight="1"
android:layout_gravity="center_vertical" >
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"
tools:text="Some title text" />
<TextView
android:id="@+id/descr"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<CheckBox android:id="@+id/check_item"
android:focusable="false"
android:layout_marginLeft="11dp"
android:layout_marginRight="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<CheckBox
android:id="@+id/check_item"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="11dp"
android:focusable="false"
android:layout_gravity="center_vertical" />
</LinearLayout>

15
OsmAnd/res/layout/drawer_list_sub_header.xml
View file

@ -4,11 +4,20 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="16dp">
android:background="#fffc00"
android:paddingLeft="16dp">
<TextView android:id="@+id/title"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_marginLeft="8dp"
android:layout_height="wrap_content"/>
android:layout_marginTop="16dp"
android:layout_marginBottom="9dp"
android:capitalize="characters"
android:inputType="textCapCharacters"
android:textSize="14sp"
android:ellipsize="end"
android:background="#ff0202"
android:gravity="left|bottom"
android:layout_height="40dp"/>
<!-- android:maxLines="2" -->
</LinearLayout>

2
OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
View file

@ -253,7 +253,7 @@ public class ContextMenuAdapter {
v.setTag(lid);
}
TextView tv = (TextView) v.findViewById(R.id.title);
tv.setText(getItemName(position));
tv.setText(isCategory(position) ? getItemName(position).toUpperCase() : getItemName(position));
int imageId = getImageId(position, holoLight);
if (imageId != 0) {