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

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

Browse source
This commit is contained in:
xmd5a2 2014-11-19 12:32:54 +03:00
commit c2fcf5e7b0
135 changed files with 3003 additions and 1917 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,5 +1,6 @@
*.render.xml *.render.xml
*.render_template.xml *.render_template.xml
poi_types.xml
*.map_styles_presets.xml *.map_styles_presets.xml
routing*.xml routing*.xml
rendering_types.xml rendering_types.xml

3
OsmAnd-java/build.xml
View file

@ -43,6 +43,9 @@
<fileset dir="../../resources/obf_creation/"> <fileset dir="../../resources/obf_creation/">
<include name="rendering_types.xml" /> <include name="rendering_types.xml" />
</fileset> </fileset>
<fileset dir="../../resources/poi/">
<include name="poi_types.xml" />
</fileset>
</copy> </copy>
<copy todir="${src.absolute.dir}/net/osmand/map/"> <copy todir="${src.absolute.dir}/net/osmand/map/">
<fileset dir="../../resources/countries-info/"> <fileset dir="../../resources/countries-info/">

29
OsmAnd-java/src/net/osmand/map/MapTileDownloader.java
View file

@ -8,16 +8,21 @@ import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingDeque;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import net.osmand.PlatformUtil; import net.osmand.PlatformUtil;
import net.osmand.util.Algorithms; import net.osmand.util.Algorithms;
import net.osmand.util.LIFOBlockingDeque;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -106,14 +111,34 @@ public class MapTileDownloader {
public MapTileDownloader(int numberOfThreads){ public MapTileDownloader(int numberOfThreads){
threadPoolExecutor = new ThreadPoolExecutor(numberOfThreads, numberOfThreads, TILE_DOWNLOAD_SECONDS_TO_WORK, threadPoolExecutor = new ThreadPoolExecutor(numberOfThreads, numberOfThreads, TILE_DOWNLOAD_SECONDS_TO_WORK,
TimeUnit.SECONDS, new LIFOBlockingDeque<Runnable>()); TimeUnit.SECONDS, createQueue());
// 1.6 method but very useful to kill non-running threads // 1.6 method but very useful to kill non-running threads
// threadPoolExecutor.allowCoreThreadTimeOut(true); // threadPoolExecutor.allowCoreThreadTimeOut(true);
pendingToDownload = Collections.synchronizedSet(new HashSet<File>()); pendingToDownload = Collections.synchronizedSet(new HashSet<File>());
currentlyDownloaded = Collections.synchronizedSet(new HashSet<File>()); currentlyDownloaded = Collections.synchronizedSet(new HashSet<File>());
} }
protected BlockingQueue<Runnable> createQueue() {
boolean loaded = false;
try {
Class<?> cl = Class.forName("java.util.concurrent.LinkedBlockingDeque");
loaded = cl != null;
} catch (Throwable e) {
e.printStackTrace();
}
if(!loaded) {
// for Android 2.2
return new LinkedBlockingQueue<Runnable>();
}
return createDeque();
}
protected static BlockingQueue<Runnable> createDeque() {
return new net.osmand.util.LIFOBlockingDeque<Runnable>();
}
public void addDownloaderCallback(IMapDownloaderCallback callback){ public void addDownloaderCallback(IMapDownloaderCallback callback){
callbacks.add(callback); callbacks.add(callback);

72
OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java Normal file
View file

@ -0,0 +1,72 @@
package net.osmand.osm;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import net.osmand.PlatformUtil;
import org.apache.commons.logging.Log;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
public class MapPoiTypes {
private static MapPoiTypes DEFAULT_INSTANCE = null;
private static final Log log = PlatformUtil.getLog(MapRenderingTypes.class);
private String resourceName;
public MapPoiTypes(String fileName){
this.resourceName = fileName;
}
public static MapPoiTypes getDefault() {
if(DEFAULT_INSTANCE == null){
DEFAULT_INSTANCE = new MapPoiTypes(null);
}
return DEFAULT_INSTANCE;
}
protected void init(){
InputStream is;
try {
if(resourceName == null){
is = MapRenderingTypes.class.getResourceAsStream("poi_types.xml"); //$NON-NLS-1$
} else {
is = new FileInputStream(resourceName);
}
long time = System.currentTimeMillis();
XmlPullParser parser = PlatformUtil.newXMLPullParser();
int tok;
parser.setInput(is, "UTF-8");
String parentCategory = null;
String poiParentCategory = null;
String poiParentPrefix = null;
String order = null;
while ((tok = parser.next()) != XmlPullParser.END_DOCUMENT) {
if (tok == XmlPullParser.START_TAG) {
String name = parser.getName();
if (name.equals("category")) { //$NON-NLS-1$
parentCategory = parser.getAttributeValue("","name");
poiParentCategory = parser.getAttributeValue("","poi_category");
poiParentPrefix = parser.getAttributeValue("","poi_prefix");
order = parser.getAttributeValue("","order");
}
}
}
log.info("Time to init " + (System.currentTimeMillis() - time)); //$NON-NLS-1$
is.close();
} catch (IOException e) {
log.error("Unexpected error", e); //$NON-NLS-1$
e.printStackTrace();
throw new RuntimeException(e);
} catch (RuntimeException e) {
log.error("Unexpected error", e); //$NON-NLS-1$
e.printStackTrace();
throw e;
} catch (XmlPullParserException e) {
log.error("Unexpected error", e); //$NON-NLS-1$
e.printStackTrace();
throw new RuntimeException(e);
}
}
}

2
OsmAnd-java/src/net/osmand/osm/edit/OsmMapUtils.java
View file

@ -349,7 +349,7 @@ public class OsmMapUtils {
*/ */
public static double polygonAreaPixels(List<Node> nodes, int zoom) { public static double polygonAreaPixels(List<Node> nodes, int zoom) {
double area = 0.; double area = 0.;
double mult = 1 / MapUtils.getPowZoom(Math.max(31 - (zoom + 8), 0)); double mult = 1 / MapUtils.getPowZoom((double)Math.max(31 - (zoom + 8), 0));
int j = nodes.size() - 1; int j = nodes.size() - 1;
for (int i = 0; i < nodes.size(); i++) { for (int i = 0; i < nodes.size(); i++) {
Node x = nodes.get(i); Node x = nodes.get(i);

3
OsmAnd/build.xml
View file

@ -97,6 +97,9 @@
<fileset dir="../../resources/obf_creation/"> <fileset dir="../../resources/obf_creation/">
<include name="rendering_types.xml" /> <include name="rendering_types.xml" />
</fileset> </fileset>
<fileset dir="../../resources/poi/">
<include name="poi_types.xml" />
</fileset>
</copy> </copy>
<copy todir="${src.absolute.dir}/net/osmand/map/"> <copy todir="${src.absolute.dir}/net/osmand/map/">
<fileset dir="../../resources/countries-info/"> <fileset dir="../../resources/countries-info/">

BIN
OsmAnd/res/drawable-large/Thumbs.db Normal file
View file

Binary file not shown.

47
OsmAnd/res/layout/action_item.xml
View file

@ -1,28 +1,27 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical"
android:orientation="vertical" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:gravity="center_vertical|center_horizontal"
android:gravity="center_vertical|center_horizontal" android:paddingTop="0dip"
android:paddingTop="0dip" android:paddingBottom="0dip"
android:paddingBottom="0dip" android:paddingLeft="12dip"
android:paddingLeft="12dip" android:paddingRight="12dip"
android:paddingRight="12dip" android:clickable="true"
android:clickable="true" android:background="@drawable/quickaction_slider_btn">
android:background="@drawable/quickaction_slider_btn">
<ImageView <ImageView
android:id="@+id/icon" android:id="@+id/icon"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content" />
<TextView
android:id="@+id/title"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center_vertical|center_horizontal"
android:textSize="12sp"
android:textColor="#666" />
<TextView
android:id="@+id/title"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center_vertical|center_horizontal"
android:textSize="12sp"
android:textColor="#666"/>
</LinearLayout> </LinearLayout>

20
OsmAnd/res/layout/alert.xml
View file

@ -1,12 +1,18 @@
<?xml version="1.0" encoding="utf-8"?> <?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"
android:id="@+id/layout" android:id="@+id/layout"
android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_width="fill_parent"
android:orientation="vertical"> android:layout_height="fill_parent"
android:orientation="vertical">
<TextView android:id="@+id/message" android:focusable="true" <TextView
android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:id="@+id/message"
android:layout_width="fill_parent" android:layout_height="fill_parent" android:focusable="true"
android:textSize="18sp" android:gravity="fill_horizontal"/> android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:textSize="18sp"
android:gravity="fill_horizontal" />
</LinearLayout> </LinearLayout>

87
OsmAnd/res/layout/animate_route.xml
View file

@ -1,9 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:layout_height="fill_parent" android:orientation="vertical"> android:orientation="vertical">
<RadioGroup android:layout_width="fill_parent" android:layout_height="wrap_content">
<RadioGroup
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<RadioButton <RadioButton
android:id="@+id/radio_route" android:id="@+id/radio_route"
android:text="@string/animate_routing_route" android:text="@string/animate_routing_route"
@ -12,30 +16,63 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_weight="1" /> android:layout_weight="1" />
<RadioButton
<RadioButton
android:id="@+id/radio_gpx" android:id="@+id/radio_gpx"
android:text="@string/animate_routing_gpx" android:text="@string/animate_routing_gpx"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_weight="1" /> android:layout_weight="1" />
</RadioGroup> </RadioGroup>
<LinearLayout android:layout_width="fill_parent" android:id="@+id/layout_animate_gpx"
android:layout_height="fill_parent" android:orientation="vertical" android:visibility="gone"> <LinearLayout
android:layout_width="fill_parent"
<TextView android:text="@string/select_animate_speedup" android:gravity="left" android:id="@+id/layout_animate_gpx"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_height="fill_parent"
android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:layout_marginTop="5dp"/> android:orientation="vertical"
<SeekBar android:id="@+id/Speedup" android:layout_width="fill_parent" android:layout_height="wrap_content" android:visibility="gone">
android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:layout_marginTop="5dp"/>
<LinearLayout <TextView
android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/select_animate_speedup"
android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:layout_marginTop="5dp"> android:gravity="left"
<TextView android:text="10" android:gravity="left" android:layout_weight="0.5" android:id="@+id/MinSpeedup" android:layout_width="fill_parent"
android:layout_width="wrap_content" android:layout_height="wrap_content"/> android:layout_height="wrap_content"
<TextView android:text="15" android:gravity="right" android:layout_weight="0.5" android:id="@+id/MaxSpeedup" android:layout_marginLeft="10dp"
android:layout_width="wrap_content" android:layout_height="wrap_content"/> android:layout_marginRight="10dp"
</LinearLayout> android:layout_marginTop="5dp" />
</LinearLayout>
<SeekBar
android:id="@+id/Speedup"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="5dp" />
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="5dp">
<TextView
android:text="10"
android:gravity="left"
android:layout_weight="0.5"
android:id="@+id/MinSpeedup"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:text="15"
android:gravity="right"
android:layout_weight="0.5"
android:id="@+id/MaxSpeedup"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>

48
OsmAnd/res/layout/calculate_route.xml
View file

@ -2,15 +2,24 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical" > android:orientation="vertical">
<TextView android:id="@+id/ValidateTextView" android:textSize="16sp" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content"
android:text="" android:gravity="center" android:textColor="@color/color_invalid"></TextView> <TextView
android:id="@+id/ValidateTextView"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text=""
android:textColor="@color/color_invalid"
android:textSize="16sp"
android:visibility="gone" />
<LinearLayout <LinearLayout
android:id="@+id/LinearLayout" android:id="@+id/LinearLayout"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:orientation="horizontal" > android:orientation="horizontal">
</LinearLayout> </LinearLayout>
@ -20,24 +29,23 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_marginTop="5dp" > android:layout_marginTop="5dp">
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" > android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" > android:layout_height="wrap_content">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="3dp" android:layout_marginLeft="3dp"
android:text="@string/route_from" android:text="@string/route_from"
android:textSize="18sp" > android:textSize="18sp" />
</TextView>
<Spinner <Spinner
android:id="@+id/FromSpinner" android:id="@+id/FromSpinner"
@ -45,8 +53,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:textSize="18sp" > android:textSize="18sp" />
</Spinner>
</LinearLayout> </LinearLayout>
<TextView <TextView
@ -56,19 +63,19 @@
android:layout_marginLeft="3dp" android:layout_marginLeft="3dp"
android:gravity="left" android:gravity="left"
android:textSize="18sp" /> android:textSize="18sp" />
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" > android:layout_height="wrap_content">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="3dp" android:layout_marginLeft="3dp"
android:text="@string/route_to" android:text="@string/route_to"
android:textSize="18sp" > android:textSize="18sp">
</TextView> </TextView>
<Spinner <Spinner
@ -76,11 +83,10 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:textSize="18sp" > android:textSize="18sp" />
</Spinner>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

21
OsmAnd/res/layout/change_order_item.xml
View file

@ -7,10 +7,15 @@
android:layout_marginTop="2dip" android:layout_marginTop="2dip"
android:layout_marginLeft="5dip" android:layout_marginLeft="5dip"
android:layout_marginRight="5dip" android:layout_marginRight="5dip"
android:weightSum="1" android:background="@color/color_white"> android:weightSum="1"
android:background="@color/color_white">
<ImageButton
android:src="@drawable/av_download"
android:id="@+id/down"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<ImageButton android:src="@drawable/av_download" android:id="@+id/down" android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="0dp" android:layout_width="0dp"
@ -19,9 +24,13 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/layer_poi" android:text="@string/layer_poi"
android:textSize="18sp" android:textSize="18sp"
android:textColor="@color/color_black" android:layout_weight="1"/> android:textColor="@color/color_black"
<ImageButton android:src="@drawable/av_upload" android:id="@+id/up" android:layout_weight="1" />
<ImageButton
android:src="@drawable/av_upload"
android:id="@+id/up"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>

4
OsmAnd/res/layout/check_item_rel.xml
View file

@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" > android:layout_gravity="center_vertical">
<CheckBox <CheckBox
android:id="@+id/check_item" android:id="@+id/check_item"
@ -14,6 +14,6 @@
android:layout_marginTop="3dp" android:layout_marginTop="3dp"
android:layout_marginBottom="3dp" android:layout_marginBottom="3dp"
android:focusable="false" android:focusable="false"
android:gravity="center_vertical" /> android:gravity="center_vertical" />
</RelativeLayout> </RelativeLayout>

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

@ -2,16 +2,19 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" > android:orientation="vertical">
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center_horizontal" android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:id="@+id/TopBar" /> android:id="@+id/TopBar" />
<ListView <ListView
android:id="@android:id/list" android:id="@android:id/list"
style="@style/OsmandListView" style="@style/OsmandListView"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" > android:layout_height="fill_parent"></ListView>
</ListView>
</LinearLayout> </LinearLayout>

23
OsmAnd/res/layout/download_build_list_item.xml
View file

@ -1,11 +1,22 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"> android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:id="@+id/download_tag" android:gravity="center_vertical" android:layout_width="0dp" android:layout_height="wrap_content" <TextView
android:layout_weight="1" android:textSize="19sp"></TextView> android:id="@+id/download_tag"
android:gravity="center_vertical"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textSize="19sp"></TextView>
<TextView android:id="@+id/download_descr" android:layout_marginLeft="3dp" android:gravity="center_vertical" android:layout_width="105dp" <TextView
android:layout_height="wrap_content" android:textSize="19sp" ></TextView> android:id="@+id/download_descr"
android:layout_marginLeft="3dp"
android:gravity="center_vertical"
android:layout_width="105dp"
android:layout_height="wrap_content"
android:textSize="19sp"></TextView>
</LinearLayout> </LinearLayout>

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

@ -3,7 +3,7 @@
android:id="@+id/MainLayout" android:id="@+id/MainLayout"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical" > android:orientation="vertical">
<EditText <EditText

43
OsmAnd/res/layout/download_index_list_item.xml
View file

@ -1,15 +1,38 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content" android:paddingTop="1dp" android:paddingBottom="1dp" android:paddingRight="8dp"> android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingTop="1dp"
android:paddingBottom="1dp"
android:paddingRight="8dp">
<LinearLayout android:layout_width="wrap_content" android:layout_height="fill_parent"> <LinearLayout
<CheckBox android:id="@+id/check_download_item" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_width="wrap_content"
android:gravity="center_vertical" android:focusable="false" /> android:layout_height="fill_parent">
</LinearLayout>
<TextView android:id="@+id/download_item" android:gravity="center_vertical" android:layout_width="0dp" android:layout_height="wrap_content"
android:maxLines="7" android:layout_weight="1" style="@style/ListText.Small"/>
<TextView android:id="@+id/download_descr" android:layout_marginLeft="3dp" android:gravity="right" android:layout_width="wrap_content" <CheckBox
android:layout_height="wrap_content" style="@style/ListText.Small"/> android:id="@+id/check_download_item"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:focusable="false" />
</LinearLayout>
<TextView
android:id="@+id/download_item"
android:gravity="center_vertical"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:maxLines="7"
android:layout_weight="1"
style="@style/ListText.Small" />
<TextView
android:id="@+id/download_descr"
android:layout_marginLeft="3dp"
android:gravity="right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/ListText.Small" />
</LinearLayout> </LinearLayout>

84
OsmAnd/res/layout/download_tiles.xml
View file

@ -1,25 +1,63 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:layout_height="fill_parent" android:orientation="vertical"> android:orientation="vertical">
<TextView android:text="@string/select_max_zoom_preload_area" android:gravity="center"
android:layout_width="fill_parent" android:layout_height="wrap_content" <TextView
android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:layout_marginTop="5dp"/> android:text="@string/select_max_zoom_preload_area"
<SeekBar android:id="@+id/ZoomToDownload" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center"
android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:layout_marginTop="5dp"/> android:layout_width="fill_parent"
<LinearLayout android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="10dp"
android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:layout_marginTop="5dp"> android:layout_marginRight="10dp"
<TextView android:text="10" android:gravity="left" android:layout_weight="0.5" android:id="@+id/MinZoom" android:layout_marginTop="5dp" />
android:layout_width="wrap_content" android:layout_height="wrap_content"/>
<TextView android:text="15" android:gravity="right" android:layout_weight="0.5" android:id="@+id/MaxZoom" <SeekBar
android:layout_width="wrap_content" android:layout_height="wrap_content"/> android:id="@+id/ZoomToDownload"
</LinearLayout> android:layout_width="fill_parent"
<TextView android:text="@string/tiles_to_download_estimated_size" android:gravity="center" android:id="@+id/DownloadDescription" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_height="wrap_content"/> android:layout_marginLeft="10dp"
<ImageView android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginRight="10dp"
android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:layout_marginTop="5dp" android:layout_marginTop="5dp" />
android:layout_marginBottom="5dp"
android:id="@+id/AreaPreview"/> <LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="5dp">
<TextView
android:text="10"
android:gravity="left"
android:layout_weight="0.5"
android:id="@+id/MinZoom"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:text="15"
android:gravity="right"
android:layout_weight="0.5"
android:id="@+id/MaxZoom"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<TextView
android:text="@string/tiles_to_download_estimated_size"
android:gravity="center"
android:id="@+id/DownloadDescription"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<ImageView
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:id="@+id/AreaPreview" />
</LinearLayout> </LinearLayout>

66
OsmAnd/res/layout/drawer_list_doubleitem.xml
View file

@ -1,43 +1,49 @@
<?xml version="1.0" encoding="utf-8"?> <?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"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingLeft="24dp" android:paddingLeft="24dp"
android:paddingRight="16dp"> android:paddingRight="16dp">
<LinearLayout android:layout_width="0dp" <LinearLayout
android:layout_weight="1" android:layout_width="0dp"
android:orientation="horizontal" android:layout_weight="1"
android:layout_height="48dp"> android:orientation="horizontal"
<TextView android:id="@+id/title" android:layout_height="48dp">
android:textSize="18sp"
android:layout_width="wrap_content" <TextView
android:layout_weight="1" android:id="@+id/title"
android:layout_gravity="center_vertical" android:textSize="18sp"
android:gravity="center_vertical" android:layout_width="wrap_content"
android:maxLines="2" android:layout_weight="1"
android:layout_height="wrap_content"/> android:layout_gravity="center_vertical"
<TextView android:id="@+id/descr" android:gravity="center_vertical"
android:textSize="14sp" android:maxLines="2"
android:layout_weight="1" android:layout_height="wrap_content" />
android:textColor="#bebebe"
android:layout_width="64dp" <TextView
android:layout_marginLeft="4dp" android:id="@+id/descr"
android:gravity="right" android:textSize="14sp"
android:maxLines="1" android:layout_weight="1"
android:ellipsize="end" android:textColor="#bebebe"
android:layout_gravity="center_vertical|right" android:layout_width="64dp"
android:layout_height="wrap_content"/> android:layout_marginLeft="4dp"
android:gravity="right"
android:maxLines="1"
android:ellipsize="end"
android:layout_gravity="center_vertical|right"
android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
<CheckBox
<CheckBox
android:id="@+id/check_item" android:id="@+id/check_item"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="11dp" android:layout_marginLeft="11dp"
android:focusable="false" android:focusable="false"
android:layout_gravity="center_vertical" /> android:layout_gravity="center_vertical" />
</LinearLayout> </LinearLayout>

20
OsmAnd/res/layout/drawer_list_item.xml
View file

@ -18,16 +18,16 @@
tools:src="@drawable/ic_action_info_dark" /> tools:src="@drawable/ic_action_info_dark" />
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="18sp" android:textSize="18sp"
android:layout_weight="1" android:layout_weight="1"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginLeft="11dp" android:layout_marginLeft="11dp"
tools:text="Some title text" /> tools:text="Some title text" />
<CheckBox <CheckBox
android:id="@+id/check_item" android:id="@+id/check_item"

63
OsmAnd/res/layout/drawer_list_radius.xml
View file

@ -1,35 +1,38 @@
<?xml version="1.0" encoding="utf-8"?> <?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"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:minHeight="40dp" android:minHeight="40dp"
android:layout_marginBottom="5dp"> android:layout_marginBottom="5dp">
<ImageView android:id="@+id/waypoint_icon" <ImageView
android:layout_marginLeft="8dp" android:id="@+id/waypoint_icon"
android:layout_height="wrap_content" android:layout_marginLeft="8dp"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"/> android:layout_width="wrap_content"
android:layout_gravity="center_vertical" />
<TextView android:id="@+id/title"
android:text="@string/search_radius_proximity" <TextView
android:layout_width="0dp" android:id="@+id/title"
android:layout_marginLeft="8dp" android:text="@string/search_radius_proximity"
android:layout_height="wrap_content" android:layout_width="0dp"
android:layout_weight="1" android:layout_marginLeft="8dp"
android:layout_gravity="center_vertical" android:layout_height="wrap_content"
android:textSize="20sp"/> android:layout_weight="1"
android:layout_gravity="center_vertical"
android:textSize="20sp" />
<TextView
android:id="@+id/descr"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="20sp"
android:textColor="@color/sherpafy_selection"
android:layout_gravity="center_vertical"
android:layout_marginRight="8dp" />
<TextView android:id="@+id/descr"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="20sp"
android:textColor="@color/sherpafy_selection"
android:layout_gravity="center_vertical"
android:layout_marginRight="8dp"/>
</LinearLayout> </LinearLayout>

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

@ -1,20 +1,22 @@
<?xml version="1.0" encoding="utf-8"?> <?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"
android:orientation="horizontal" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="match_parent"
android:layout_height="match_parent" android:orientation="horizontal"
android:paddingLeft="24dp" android:paddingBottom="4dp"
android:paddingBottom="4dp"> android:paddingLeft="24dp">
<TextView android:id="@+id/title"
android:layout_weight="1" <TextView
android:layout_width="0dp" android:id="@+id/title"
android:layout_height="36dp" android:layout_width="0dp"
android:capitalize="characters" android:layout_height="36dp"
android:inputType="textCapCharacters" android:layout_weight="1"
android:textColor="#858585" android:capitalize="characters"
android:textSize="14sp" android:ellipsize="end"
android:ellipsize="end" android:gravity="left|bottom"
android:gravity="left|bottom"/> android:inputType="textCapCharacters"
<!-- android:maxLines="2" --> android:textColor="#858585"
android:textSize="14sp" />
<!-- android:maxLines="2" -->
</LinearLayout> </LinearLayout>

412
OsmAnd/res/layout/editing_poi.xml
View file

@ -1,213 +1,249 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="fill_parent" >
android:orientation="vertical" >
<TextView <LinearLayout
android:id="@+id/LinkToOsmDoc" android:layout_width="fill_parent"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/create_poi_link_to_osm_doc" />
<TableLayout android:layout_width="fill_parent" android:layout_height="wrap_content"
android:stretchColumns="1" >
<TableRow>
<TextView
android:id="@+id/TextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:orientation="vertical" >
android:text="@string/poi_dialog_name" />
<!-- bug with width set it to 100 -->
<EditText <TextView
android:id="@+id/Name" android:id="@+id/LinkToOsmDoc"
android:layout_width="250dp" android:layout_width="fill_parent"
android:minWidth="250dp" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginLeft="5dp"
android:layout_marginLeft="5dp" android:text="@string/create_poi_link_to_osm_doc" />
android:layout_marginRight="5dp"
android:text="" >
<requestFocus /> <TableLayout
</EditText> android:layout_width="fill_parent"
</TableRow> android:layout_height="wrap_content"
<TableRow> android:stretchColumns="1" >
<Button
android:id="@+id/TypeButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="&lt;Type>" />
<AutoCompleteTextView <TableRow>
android:id="@+id/Type"
android:layout_width="250dp"
android:minWidth="250dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:text="" />
</TableRow>
<TableRow> <TextView
<Button android:id="@+id/TextView"
android:id="@+id/OpenHoursButton" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginLeft="5dp"
android:text="@string/poi_dialog_opening_hours" /> android:text="@string/poi_dialog_name" />
<!-- bug with width set it to 100 -->
<EditText <EditText
android:id="@+id/OpeningHours" android:id="@+id/Name"
android:layout_width="250dp" android:layout_width="250dp"
android:minWidth="250dp" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginLeft="5dp"
android:layout_marginLeft="5dp" android:layout_marginRight="5dp"
android:layout_marginRight="5dp" android:minWidth="250dp"
android:hint="Mo-Su 08:00-20:00" android:text="" >
android:text="" >
</EditText>
</TableRow>
<TableRow> <requestFocus />
<TextView </EditText>
android:layout_width="wrap_content" </TableRow>
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/street_name" />
<EditText <TableRow>
android:id="@+id/StreetName"
android:layout_width="250dp"
android:minWidth="250dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" >
</EditText>
</TableRow>
<TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/hno" />
<EditText <Button
android:id="@+id/HouseNumber" android:id="@+id/TypeButton"
android:layout_width="250dp" android:layout_width="wrap_content"
android:minWidth="250dp" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:text="&lt;Type>" />
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" >
</EditText>
</TableRow>
<TableRow> <AutoCompleteTextView
<TextView android:id="@+id/Type"
android:layout_width="wrap_content" android:layout_width="250dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:text="@string/phone" /> android:layout_marginRight="5dp"
<EditText android:minWidth="250dp"
android:id="@+id/Phone" android:text="" />
android:layout_width="250dp" </TableRow>
android:minWidth="250dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:hint="0123456789"
android:inputType="phone" >
</EditText>
</TableRow>
<TableRow> <TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/website" />
<EditText <Button
android:id="@+id/Website" android:id="@+id/OpenHoursButton"
android:layout_width="250dp" android:layout_width="wrap_content"
android:minWidth="250dp" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:text="@string/poi_dialog_opening_hours" />
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:hint="http://osmand.net" >
</EditText>
</TableRow>
<TableRow> <EditText
<TextView android:id="@+id/OpeningHours"
android:id="@+id/TextView" android:layout_width="250dp"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginLeft="5dp"
android:layout_marginLeft="5dp" android:layout_marginRight="5dp"
android:text="@string/poi_dialog_comment" /> android:hint="Mo-Su 08:00-20:00"
android:minWidth="250dp"
android:text="" >
</EditText>
</TableRow>
<EditText <TableRow>
android:id="@+id/Comment"
android:layout_width="250dp"
android:minWidth="250dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:text="@string/poi_dialog_comment_default" >
</EditText>
</TableRow>
<TableRow> <TextView
<CheckBox android:layout_width="wrap_content"
android:id="@+id/CloseChangeset" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_marginLeft="5dp"
android:layout_marginLeft="5dp" android:text="@string/street_name" />
android:layout_marginRight="5dp"
android:layout_span="2"
android:text="@string/close_changeset" />
</TableRow>
</TableLayout>
<EditText
android:id="@+id/StreetName"
android:layout_width="250dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:minWidth="250dp" >
</EditText>
</TableRow>
<TableRow>
<TableLayout <TextView
android:id="@+id/advancedModeTable" android:layout_width="wrap_content"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginLeft="5dp"
android:stretchColumns="1" android:text="@string/hno" />
android:visibility="gone">
</TableLayout>
<LinearLayout android:layout_width="fill_parent" <EditText
android:layout_height="wrap_content"> android:id="@+id/HouseNumber"
android:layout_width="250dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:minWidth="250dp" >
</EditText>
</TableRow>
<Button <TableRow>
android:id="@+id/addTag"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="150dp"
android:text="@string/btn_add_tag"
android:visibility="gone" />
<Button <TextView
android:id="@+id/advancedMode" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:minWidth="150dp" android:layout_marginLeft="5dp"
android:layout_height="wrap_content" android:text="@string/phone" />
android:text="@string/btn_advanced_mode" />
</LinearLayout>
<TextView android:text="@string/poi_dialog_other_tags_message" android:id="@+id/TextView" android:layout_marginLeft="5dp" android:layout_width="fill_parent" android:layout_height="wrap_content"/> <EditText
<LinearLayout android:id="@+id/LinearLayout" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="horizontal" android:id="@+id/Phone"
android:gravity="bottom|center"> android:layout_width="250dp"
<Button android:layout_width="125dp" android:layout_height="wrap_content" android:text="@string/default_buttons_cancel" android:id="@+id/Cancel"></Button> android:layout_height="wrap_content"
<Button android:layout_width="125dp" android:layout_height="wrap_content" android:text="@string/default_buttons_commit" android:id="@+id/Commit"></Button> android:layout_marginLeft="5dp"
</LinearLayout> android:layout_marginRight="5dp"
</LinearLayout> android:hint="0123456789"
</ScrollView> android:inputType="phone"
android:minWidth="250dp" >
</EditText>
</TableRow>
<TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/website" />
<EditText
android:id="@+id/Website"
android:layout_width="250dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:hint="http://osmand.net"
android:minWidth="250dp" >
</EditText>
</TableRow>
<TableRow>
<TextView
android:id="@+id/TextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/poi_dialog_comment" />
<EditText
android:id="@+id/Comment"
android:layout_width="250dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:minWidth="250dp"
android:text="@string/poi_dialog_comment_default" >
</EditText>
</TableRow>
<TableRow>
<CheckBox
android:id="@+id/CloseChangeset"
android:layout_width="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_span="2"
android:text="@string/close_changeset" />
</TableRow>
</TableLayout>
<TableLayout
android:id="@+id/advancedModeTable"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:stretchColumns="1"
android:visibility="gone" >
</TableLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content" >
<Button
android:id="@+id/addTag"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="150dp"
android:text="@string/btn_add_tag"
android:visibility="gone" />
<Button
android:id="@+id/advancedMode"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="150dp"
android:text="@string/btn_advanced_mode" />
</LinearLayout>
<TextView
android:id="@+id/TextView"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/poi_dialog_other_tags_message" />
<LinearLayout
android:id="@+id/LinearLayout"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="bottom|center"
android:orientation="horizontal" >
<Button
android:id="@+id/Cancel"
android:layout_width="125dp"
android:layout_height="wrap_content"
android:text="@string/default_buttons_cancel" >
</Button>
<Button
android:id="@+id/Commit"
android:layout_width="125dp"
android:layout_height="wrap_content"
android:text="@string/default_buttons_commit" >
</Button>
</LinearLayout>
</LinearLayout>
</ScrollView>

14
OsmAnd/res/layout/editing_poi_filter.xml
View file

@ -1,7 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?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"
android:orientation="vertical" android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent"> android:layout_height="fill_parent"
<ListView android:id="@android:id/list" android:layout_width="fill_parent" android:choiceMode="multipleChoice" android:orientation="vertical">
android:layout_height="fill_parent" style="@style/OsmandListView"></ListView>
<ListView
android:id="@android:id/list"
style="@style/OsmandListView"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:choiceMode="multipleChoice" />
</LinearLayout> </LinearLayout>

25
OsmAnd/res/layout/editing_poi_filter_list.xml
View file

@ -1,14 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?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"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="fill_parent"
android:orientation="horizontal"> android:layout_height="wrap_content"
android:orientation="horizontal">
<CheckBox android:id="@+id/filter_poi_check" <CheckBox
android:layout_width="wrap_content" android:layout_height="wrap_content"></CheckBox> android:id="@+id/filter_poi_check"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView android:id="@+id/filter_poi_label"
android:layout_width="fill_parent" android:layout_height="wrap_content"
style="@style/ListText"></TextView> <TextView
android:id="@+id/filter_poi_label"
style="@style/ListText"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>

64
OsmAnd/res/layout/editing_tile_source.xml
View file

@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" > android:layout_height="fill_parent">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:orientation="vertical" > android:orientation="vertical">
<TableLayout <TableLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:stretchColumns="1" > android:stretchColumns="1">
<TableRow> <TableRow>
@ -28,31 +28,32 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:text="" > android:text="">
<requestFocus /> <requestFocus />
</EditText> </EditText>
</TableRow> </TableRow>
<TableRow android:layout_width="fill_parent" <TableRow
android:layout_height="wrap_content"> android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/edit_tilesource_choose_existing" > android:text="@string/edit_tilesource_choose_existing"></TextView>
</TextView>
<Spinner <Spinner
android:id="@+id/TileSourceSpinner" android:id="@+id/TileSourceSpinner"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" > android:layout_marginRight="5dp"></Spinner>
</Spinner>
</TableRow> </TableRow>
<TableRow android:layout_width="fill_parent" <TableRow
android:layout_height="wrap_content"> android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -64,13 +65,13 @@
android:layout_width="180dp" android:layout_width="180dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:lines="5" android:lines="5"
android:minLines="2" android:minLines="2"
android:text="" > android:text=""></EditText>
</EditText>
</TableRow> </TableRow>
<TableRow android:layout_width="fill_parent" <TableRow
android:layout_height="wrap_content"> android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -81,12 +82,12 @@
android:id="@+id/MinZoom" android:id="@+id/MinZoom"
android:layout_width="180dp" android:layout_width="180dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="" > android:text=""></EditText>
</EditText>
</TableRow> </TableRow>
<TableRow android:layout_width="fill_parent" <TableRow
android:layout_height="wrap_content"> android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -97,29 +98,28 @@
android:id="@+id/MaxZoom" android:id="@+id/MaxZoom"
android:layout_width="180dp" android:layout_width="180dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="" > android:text=""></EditText>
</EditText>
</TableRow> </TableRow>
<TableRow android:layout_width="fill_parent" <TableRow
android:layout_height="wrap_content"> android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="@string/edit_tilesource_expiration_time" android:text="@string/edit_tilesource_expiration_time" />
/>
<EditText <EditText
android:id="@+id/ExpirationTime" android:id="@+id/ExpirationTime"
android:layout_width="180dp" android:layout_width="180dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="" > android:text=""></EditText>
</EditText>
</TableRow> </TableRow>
<TableRow android:layout_width="fill_parent" <TableRow
android:layout_height="wrap_content"> android:layout_width="fill_parent"
android:layout_height="wrap_content">
<CheckBox <CheckBox
android:id="@+id/EllipticMercator" android:id="@+id/EllipticMercator"

5
OsmAnd/res/layout/expandable_list.xml
View file

@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical" > android:orientation="vertical">
<TextView <TextView
android:id="@+id/DescriptionText" android:id="@+id/DescriptionText"
@ -24,7 +24,6 @@
android:layout_marginRight="0dp" android:layout_marginRight="0dp"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
android:layout_weight="1" android:layout_weight="1"
android:groupIndicator="@android:color/transparent" > android:groupIndicator="@android:color/transparent"></ExpandableListView>
</ExpandableListView>
</LinearLayout> </LinearLayout>

16
OsmAnd/res/layout/expandable_list_item_category.xml
View file

@ -6,7 +6,7 @@
android:paddingBottom="5dp" android:paddingBottom="5dp"
android:paddingLeft="4dp" android:paddingLeft="4dp"
android:paddingRight="4dp" android:paddingRight="4dp"
android:paddingTop="5dp" > android:paddingTop="5dp">
<ImageView <ImageView
android:id="@+id/explist_indicator" android:id="@+id/explist_indicator"
@ -24,14 +24,14 @@
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
android:autoLink="web" android:autoLink="web"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textSize="18sp"> android:textSize="18sp"></TextView>
</TextView>
<LinearLayout
<LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" > android:layout_gravity="right">
<CheckBox
<CheckBox
android:id="@+id/check_item" android:id="@+id/check_item"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -39,6 +39,6 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

18
OsmAnd/res/layout/expandable_list_item_category_btn.xml
View file

@ -6,7 +6,7 @@
android:paddingBottom="5dp" android:paddingBottom="5dp"
android:paddingLeft="4dp" android:paddingLeft="4dp"
android:paddingRight="4dp" android:paddingRight="4dp"
android:paddingTop="5dp" > android:paddingTop="5dp">
<ImageView <ImageView
android:id="@+id/explist_indicator" android:id="@+id/explist_indicator"
@ -24,13 +24,12 @@
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textSize="18sp"> android:textSize="18sp"></TextView>
</TextView>
<LinearLayout
<LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" > android:layout_gravity="right">
<ImageView <ImageView
android:id="@+id/check_item" android:id="@+id/check_item"
@ -38,10 +37,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/ic_action_settings_dark" android:src="@drawable/ic_action_settings_dark"
android:focusable="false" android:focusable="false"
android:gravity="center_vertical" android:gravity="center_vertical" />
/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

13
OsmAnd/res/layout/fav_group_edit.xml
View file

@ -4,7 +4,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="7dp" android:paddingLeft="7dp"
android:paddingRight="7dp" android:paddingRight="7dp"
android:stretchColumns="1" > android:stretchColumns="1">
<TableRow> <TableRow>
@ -18,27 +18,24 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp" />
/>
</TableRow> </TableRow>
<TableRow <TableRow
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" > android:layout_height="wrap_content">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/osmo_edit_color" > android:text="@string/osmo_edit_color"></TextView>
</TextView>
<Spinner <Spinner
android:id="@+id/ColorSpinner" android:id="@+id/ColorSpinner"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" > android:layout_marginRight="5dp"></Spinner>
</Spinner>
</TableRow> </TableRow>
</TableLayout> </TableLayout>

52
OsmAnd/res/layout/favourite_edit_dialog.xml
View file

@ -1,17 +1,41 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android" <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingLeft="3dp" android:layout_width="fill_parent"
android:paddingRight="3dp" android:stretchColumns="1"> android:layout_height="wrap_content"
<TableRow > android:paddingLeft="3dp"
<TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingRight="3dp"
android:text="@string/favourites_edit_dialog_name"/> android:stretchColumns="1">
<EditText android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingLeft="3dp"
android:id="@+id/Name" android:inputType="textCapWords" android:selectAllOnFocus="true"/> <TableRow>
</TableRow>
<TableRow> <TextView
<TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_width="wrap_content"
android:text="@string/favourites_edit_dialog_category"/> android:layout_height="wrap_content"
<AutoCompleteTextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingLeft="3dp" android:text="@string/favourites_edit_dialog_name" />
android:id="@+id/Category" android:completionThreshold="1" android:inputType="textCapWords" android:selectAllOnFocus="true"/>
</TableRow> <EditText
android:id="@+id/Name"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:inputType="textCapWords"
android:paddingLeft="3dp"
android:selectAllOnFocus="true" />
</TableRow>
<TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/favourites_edit_dialog_category" />
<AutoCompleteTextView
android:id="@+id/Category"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:completionThreshold="1"
android:inputType="textCapWords"
android:paddingLeft="3dp"
android:selectAllOnFocus="true" />
</TableRow>
</TableLayout> </TableLayout>

43
OsmAnd/res/layout/favourites_list_item.xml
View file

@ -1,21 +1,38 @@
<?xml version="1.0" encoding="utf-8"?> <?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"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="fill_parent"
android:orientation="horizontal" android:layout_height="wrap_content"
android:paddingBottom="5dp" android:orientation="horizontal"
android:paddingBottom="5dp"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:paddingRight="4dp" android:paddingRight="4dp"
android:paddingTop="5dp"> android:paddingTop="5dp">
<LinearLayout 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:gravity="center_vertical" android:focusable="false" android:visibility="gone"/>
</LinearLayout>
<ImageView android:id="@+id/favourite_icon" android:layout_width="25dp" <LinearLayout
android:paddingRight="2dp" android:paddingTop="2dp" android:layout_height="fill_parent" /> android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView android:id="@+id/favourite_label" android:layout_width="wrap_content" android:layout_marginLeft="10dp"
android:layout_height="wrap_content" style="@style/ListText"/> <CheckBox
android:id="@+id/check_item"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:focusable="false"
android:visibility="gone" />
</LinearLayout>
<ImageView
android:id="@+id/favourite_icon"
android:layout_width="25dp"
android:paddingRight="2dp"
android:paddingTop="2dp"
android:layout_height="fill_parent" />
<TextView
android:id="@+id/favourite_label"
android:layout_width="wrap_content"
android:layout_marginLeft="10dp"
android:layout_height="wrap_content"
style="@style/ListText" />
</LinearLayout> </LinearLayout>

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

@ -2,6 +2,6 @@
<android.opengl.GLSurfaceView xmlns:android="http://schemas.android.com/apk/res/android" <android.opengl.GLSurfaceView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/glSurfaceView" android:id="@+id/glSurfaceView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" > android:layout_height="match_parent">
</android.opengl.GLSurfaceView> </android.opengl.GLSurfaceView>

18
OsmAnd/res/layout/gpx_item_list_item.xml
View file

@ -6,17 +6,16 @@
android:paddingBottom="4dp" android:paddingBottom="4dp"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:paddingRight="8dp" android:paddingRight="8dp"
android:paddingTop="4dp" > android:paddingTop="4dp">
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" > android:layout_height="wrap_content">
<FrameLayout <FrameLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="3dp" android:layout_marginLeft="3dp">
>
<ImageView <ImageView
android:id="@+id/icon" android:id="@+id/icon"
@ -32,8 +31,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginRight="3dp" android:layout_marginRight="3dp"
android:layout_marginLeft="2dp" > android:layout_marginLeft="2dp"></TextView>
</TextView>
</FrameLayout> </FrameLayout>
<TextView <TextView
@ -44,8 +42,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_weight="1" android:layout_weight="1"
android:layout_gravity="center_vertical" > android:layout_gravity="center_vertical"></TextView>
</TextView>
</LinearLayout> </LinearLayout>
<TextView <TextView
@ -54,7 +51,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:maxLines="25" > android:maxLines="25"></TextView>
</TextView>
</LinearLayout> </LinearLayout>

19
OsmAnd/res/layout/layers_list_activity_item.xml
View file

@ -12,22 +12,23 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dip" android:layout_marginTop="4dip"
android:layout_marginBottom="4dip" android:layout_marginBottom="4dip"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/layer_poi" android:text="@string/layer_poi"
android:textSize="18sp" android:textSize="18sp"
android:layout_weight="1"/> android:layout_weight="1" />
<LinearLayout android:layout_width="wrap_content" <LinearLayout
android:layout_width="wrap_content"
android:layout_height="fill_parent"> android:layout_height="fill_parent">
<CheckBox <CheckBox
android:id="@+id/check_item" android:id="@+id/check_item"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:focusable="false" android:focusable="false"
android:gravity="center_vertical" /> android:gravity="center_vertical" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

5
OsmAnd/res/layout/list_bigtextview.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?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"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" > android:layout_height="wrap_content">
<TextView <TextView
android:id="@+id/Text" android:id="@+id/Text"
@ -11,7 +11,6 @@
android:layout_marginLeft="20dip" android:layout_marginLeft="20dip"
android:layout_marginTop="12dip" android:layout_marginTop="12dip"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textSize="20sp" > android:textSize="20sp"></TextView>
</TextView>
</LinearLayout> </LinearLayout>

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

@ -3,7 +3,7 @@
android:id="@+id/bidforfixitemlayout" android:id="@+id/bidforfixitemlayout"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:background="@android:color/white" > android:background="@android:color/white">
<TextView <TextView
android:id="@+id/bffiText" android:id="@+id/bffiText"

43
OsmAnd/res/layout/list_menu_item.xml
View file

@ -7,16 +7,15 @@
android:layout_marginLeft="5dip" android:layout_marginLeft="5dip"
android:layout_marginRight="5dip" android:layout_marginRight="5dip"
android:background="@color/color_white"> android:background="@color/color_white">
<ImageView <ImageView
android:layout_marginLeft="7dip" android:layout_marginLeft="7dip"
android:id="@+id/icon" android:id="@+id/icon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone" android:visibility="gone"
android:gravity="center" android:gravity="center"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical" />
/>
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
@ -24,31 +23,33 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="12dip" android:layout_marginLeft="12dip"
android:layout_marginTop="12dip" android:layout_marginTop="12dip"
android:layout_marginBottom="12dip" android:layout_marginBottom="12dip"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/layer_poi" android:text="@string/layer_poi"
android:textSize="18sp" android:textSize="18sp"
android:textColor="@color/color_black" android:layout_weight="1"/> android:textColor="@color/color_black"
android:layout_weight="1" />
<LinearLayout android:layout_width="wrap_content" <LinearLayout
android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:gravity="center_vertical"> android:gravity="center_vertical">
<ImageView android:id="@+id/icon_settings" <ImageView
android:layout_width="wrap_content" android:id="@+id/icon_settings"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:gravity="center_vertical" android:layout_height="wrap_content"
android:visibility="gone" android:gravity="center_vertical"
android:focusable="false"/> android:visibility="gone"
android:focusable="false" />
<CheckBox <CheckBox
android:id="@+id/check_item" android:id="@+id/check_item"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="2dip" android:layout_marginRight="2dip"
android:button="@drawable/ic_btn_wocheckbox" android:button="@drawable/ic_btn_wocheckbox"
android:focusable="false" android:focusable="false" />
/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

43
OsmAnd/res/layout/list_menu_item_native.xml
View file

@ -6,47 +6,48 @@
android:orientation="horizontal" android:orientation="horizontal"
android:layout_marginLeft="5dip" android:layout_marginLeft="5dip"
android:layout_marginRight="5dip"> android:layout_marginRight="5dip">
<ImageView <ImageView
android:layout_marginLeft="7dip" android:layout_marginLeft="7dip"
android:id="@+id/icon" android:id="@+id/icon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone" android:visibility="gone"
android:gravity="center" android:gravity="center"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical" />
/>
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="12dip" android:layout_marginLeft="12dip"
android:layout_marginTop="12dip" android:layout_marginTop="12dip"
android:layout_marginBottom="12dip" android:layout_marginBottom="12dip"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/layer_poi" android:text="@string/layer_poi"
style="@style/ListText" style="@style/ListText"
android:layout_weight="1"/> android:layout_weight="1" />
<LinearLayout android:layout_width="wrap_content" <LinearLayout
android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:gravity="center_vertical"> android:gravity="center_vertical">
<ImageView android:id="@+id/icon_settings" <ImageView
android:layout_width="wrap_content" android:id="@+id/icon_settings"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:gravity="center_vertical" android:layout_height="wrap_content"
android:visibility="gone" android:gravity="center_vertical"
android:focusable="false"/> android:visibility="gone"
android:focusable="false" />
<!-- android:button="@drawable/ic_btn_wocheckbox" --> <!-- android:button="@drawable/ic_btn_wocheckbox" -->
<CheckBox <CheckBox
android:id="@+id/check_item" android:id="@+id/check_item"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="2dip" android:layout_marginRight="2dip"
android:focusable="false"/> android:focusable="false" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

10
OsmAnd/res/layout/list_textview.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TextView <TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:textSize="20sp" android:textStyle="bold"> android:textSize="20sp"
</TextView> android:textStyle="bold"></TextView>

43
OsmAnd/res/layout/local_index.xml
View file

@ -1,23 +1,28 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent" android:orientation="vertical">
<TextView android:id="@+id/DescriptionText" android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginTop="3dp" android:layout_marginBottom="5dp"
android:layout_marginRight="10dp" android:text="@string/download_link_and_local_description"/>
<ExpandableListView
android:id="@android:id/list"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0dp" android:layout_height="fill_parent"
android:layout_marginLeft="0dp" android:orientation="vertical">
android:layout_marginRight="0dp"
android:layout_marginTop="0dp" <TextView
android:layout_weight="1" android:id="@+id/DescriptionText"
android:groupIndicator="@android:color/transparent" android:layout_width="fill_parent"
style="@style/OsmandListView" > android:layout_height="wrap_content"
</ExpandableListView> android:layout_marginLeft="10dp"
android:layout_marginTop="3dp"
android:layout_marginBottom="5dp"
android:layout_marginRight="10dp"
android:text="@string/download_link_and_local_description" />
<ExpandableListView
android:id="@android:id/list"
android:layout_width="fill_parent"
android:layout_height="0dp"
android:layout_marginLeft="0dp"
android:layout_marginRight="0dp"
android:layout_marginTop="0dp"
android:layout_weight="1"
android:groupIndicator="@android:color/transparent"
style="@style/OsmandListView"></ExpandableListView>
</LinearLayout> </LinearLayout>

61
OsmAnd/res/layout/local_index_list_item.xml
View file

@ -1,19 +1,52 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:orientation="vertical" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content" android:paddingTop="4dp" android:paddingBottom="4dp" android:paddingRight="8dp" android:paddingLeft="8dp"> android:layout_width="fill_parent"
android:orientation="vertical"
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingRight="8dp"
android:paddingLeft="8dp">
<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content"> <LinearLayout
<LinearLayout android:layout_width="wrap_content" android:layout_height="fill_parent"> android:layout_width="fill_parent"
<CheckBox android:id="@+id/check_local_index" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_height="wrap_content">
android:gravity="center_vertical" android:focusable="false" />
</LinearLayout>
<TextView android:id="@+id/local_index_name" android:gravity="center_vertical" android:layout_width="0dp" android:layout_height="wrap_content"
android:layout_weight="1" style="@style/ListText.Small"></TextView>
<TextView android:id="@+id/local_index_size" android:layout_marginLeft="3dp" android:gravity="right" android:layout_width="wrap_content"
android:layout_height="wrap_content" style="@style/ListText.Small"></TextView>
</LinearLayout>
<TextView android:id="@+id/local_index_descr" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" <LinearLayout
android:maxLines="25" style="@style/ListText.Small"></TextView> android:layout_width="wrap_content"
android:layout_height="fill_parent">
<CheckBox
android:id="@+id/check_local_index"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:focusable="false" />
</LinearLayout>
<TextView
android:id="@+id/local_index_name"
android:gravity="center_vertical"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
style="@style/ListText.Small"></TextView>
<TextView
android:id="@+id/local_index_size"
android:layout_marginLeft="3dp"
android:gravity="right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/ListText.Small"></TextView>
</LinearLayout>
<TextView
android:id="@+id/local_index_descr"
android:gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="25"
style="@style/ListText.Small"></TextView>
</LinearLayout> </LinearLayout>

17
OsmAnd/res/layout/local_openstreetmap.xml
View file

@ -1,11 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:layout_height="fill_parent" android:orientation="vertical"> android:orientation="vertical">
<ListView android:id="@android:id/list" android:layout_width="fill_parent" android:layout_height="fill_parent" <ListView
android:layout_marginLeft="3dp" android:layout_marginTop="3dp" android:layout_marginRight="3dp" ></ListView> android:id="@android:id/list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_marginLeft="3dp"
android:layout_marginTop="3dp"
android:layout_marginRight="3dp"></ListView>
</LinearLayout> </LinearLayout>

16
OsmAnd/res/layout/local_openstreetmap_list_item.xml
View file

@ -1,7 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"> android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView android:id="@+id/local_openstreetmap_name" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="0dp" <TextView
android:layout_weight="1" style="@style/ListText.Small" android:layout_marginLeft="8dp"></TextView> android:id="@+id/local_openstreetmap_name"
android:gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
style="@style/ListText.Small"
android:layout_marginLeft="8dp"></TextView>
</LinearLayout> </LinearLayout>

18
OsmAnd/res/layout/main.xml
View file

@ -2,21 +2,21 @@
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/drawer_layout" android:id="@+id/drawer_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" > android:layout_height="match_parent">
<FrameLayout <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:clipChildren="false" android:clipChildren="false"
android:keepScreenOn="true" android:keepScreenOn="true"
android:orientation="vertical" > android:orientation="vertical">
<ViewStub android:id="@+id/glSurfaceStub" <ViewStub
android:inflatedId="@+id/glSurfaceView" android:id="@+id/glSurfaceStub"
android:layout="@layout/gl_surface" android:inflatedId="@+id/glSurfaceView"
android:layout_width="match_parent" android:layout="@layout/gl_surface"
android:layout_height="match_parent" /> android:layout_width="match_parent"
android:layout_height="match_parent" />
<net.osmand.plus.views.OsmAndMapSurfaceView <net.osmand.plus.views.OsmAndMapSurfaceView
android:id="@+id/MapView" android:id="@+id/MapView"

90
OsmAnd/res/layout/map_settings_item.xml
View file

@ -1,47 +1,57 @@
<?xml version="1.0" encoding="utf-8"?> <?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"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:paddingRight="8dp"> android:paddingRight="8dp">
<ImageButton android:id="@+id/back"
android:focusable="false"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@null"
android:layout_marginRight="10dp"/>
<ImageView android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_gravity="center_vertical"/>
<LinearLayout android:orientation="vertical" <ImageButton
android:layout_width="wrap_content" android:id="@+id/back"
android:layout_height="wrap_content" android:focusable="false"
android:layout_gravity="center_vertical" android:layout_width="wrap_content"
android:layout_weight="1" android:layout_height="wrap_content"
android:layout_marginBottom="10dp" android:layout_gravity="center_vertical"
android:layout_marginTop="10dp"> android:background="@null"
<TextView android:id="@+id/name" android:layout_marginRight="10dp" />
android:textSize="16sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView android:id="@+id/descr"
android:textSize="12sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"/>
</LinearLayout>
<CheckBox android:id="@+id/check" <ImageView
android:focusable="false" android:id="@+id/icon"
android:layout_gravity="center_vertical" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:visibility="gone"
android:visibility="gone"/> android:layout_gravity="center_vertical" />
<LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp">
<TextView
android:id="@+id/name"
android:textSize="16sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/descr"
android:textSize="12sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone" />
</LinearLayout>
<CheckBox
android:id="@+id/check"
android:focusable="false"
android:layout_gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone" />
</LinearLayout> </LinearLayout>

317
OsmAnd/res/layout/menu.xml
View file

@ -1,81 +1,244 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<net.osmand.access.AccessibleLayout xmlns:android="http://schemas.android.com/apk/res/android" <net.osmand.access.AccessibleLayout xmlns:android="http://schemas.android.com/apk/res/android"
class="net.osmand.access.AccessibleLayout" class="net.osmand.access.AccessibleLayout"
android:layout_width="fill_parent" android:layout_height="fill_parent" android:background="@drawable/background"> android:layout_width="match_parent"
<LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical"> android:layout_height="match_parent"
<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center_horizontal"> android:background="@drawable/background">
<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:background="@drawable/status_bar"
android:orientation="horizontal" android:id="@+id/Headliner" android:layout_marginLeft="8dp" android:layout_marginRight="8dp"> <LinearLayout
<ImageView android:src="@drawable/icon_small" android:layout_marginLeft="4dp" android:layout_marginTop="4dp" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_width="wrap_content"/> android:layout_height="fill_parent"
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/AppName" android:orientation="vertical">
android:layout_marginLeft="2dp" android:layout_marginTop="3dp"
android:text="@string/app_name" android:textColor="#000000" android:typeface="serif" android:textSize="20sp"/> <LinearLayout
<TextView android:layout_height="wrap_content" android:layout_width="0dp" android:layout_weight="1" android:layout_width="fill_parent"
android:layout_marginLeft="12dp" android:layout_marginTop="3dp" android:layout_marginBottom="3dp" android:text="@string/app_version" android:gravity="right" android:layout_height="wrap_content"
android:textColor="#000000" android:typeface="serif" android:id="@+id/TextVersion" android:textSize="13sp"/> android:gravity="center_horizontal">
<ImageView android:id="@+id/HelpButton" android:clickable="true" android:layout_marginTop="7dp" android:layout_marginLeft="4dp"
android:contentDescription="@string/help" <LinearLayout
android:layout_height="wrap_content" android:layout_width="wrap_content" android:src="@drawable/help_icon" android:id="@+id/Headliner"
android:focusable="true"/> android:layout_width="fill_parent"
<ImageView android:layout_marginRight="2dp" android:clickable="true" android:id="@+id/CloseButton" android:layout_height="wrap_content"
android:contentDescription="@string/close" android:layout_marginLeft="8dp"
android:layout_marginTop="7dp" android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginRight="8dp"
android:layout_marginLeft="0dp" android:src="@drawable/headliner_close" android:focusable="true"/> android:background="@drawable/status_bar"
</LinearLayout> android:orientation="horizontal">
</LinearLayout>
<TableLayout android:layout_width="fill_parent" android:layout_height="wrap_content"> <ImageView
<TableRow android:layout_height = "wrap_content" android:layout_marginTop="15dp"> android:layout_width="wrap_content"
<LinearLayout android:id="@+id/MapButton" android:background="@drawable/bg_leftr" android:orientation="vertical" android:clickable="true" android:layout_height="wrap_content"
android:layout_weight="3" android:layout_height="175dp" android:focusable="true"> android:layout_marginLeft="4dp"
<ImageView android:layout_marginTop="4dp"
android:src="@drawable/button_icon_map" android:scaleType="center" android:layout_gravity="center" android:src="@drawable/icon_small" />
android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/>
<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center"> <TextView
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/AppName"
android:layout_gravity="center_horizontal|top" android:textSize="18sp" android:layout_width="wrap_content"
android:text="@string/map_Button" android:typeface="serif" android:textColor="#000000"/> android:layout_height="wrap_content"
</LinearLayout> android:layout_marginLeft="2dp"
</LinearLayout> android:layout_marginTop="3dp"
<LinearLayout android:layout_weight="2" android:layout_height="fill_parent"/> android:text="@string/app_name"
<LinearLayout android:id="@+id/SearchButton" android:background="@drawable/bg_rightr" android:orientation="vertical" android:clickable="true" android:textColor="#000000"
android:layout_weight="3" android:layout_height="175dp" android:focusable="true"> android:textSize="20sp"
<ImageView android:typeface="serif" />
android:src="@drawable/button_icon_search" android:scaleType="center" android:layout_gravity="center"
android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/> <TextView
<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center"> android:id="@+id/TextVersion"
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_gravity="center_horizontal|top" android:textSize="18sp" android:layout_height="wrap_content"
android:text="@string/search_button" android:typeface="serif" android:textColor="#000000"/> android:layout_marginBottom="3dp"
</LinearLayout> android:layout_marginLeft="12dp"
</LinearLayout> android:layout_marginTop="3dp"
</TableRow> android:layout_weight="1"
<TableRow android:layout_height = "wrap_content" android:layout_marginTop="15dp"> android:gravity="right"
<LinearLayout android:id="@+id/FavoritesButton" android:background="@drawable/bg_leftr" android:orientation="vertical" android:clickable="true" android:text="@string/app_version"
android:layout_weight="3" android:layout_height="175dp" android:focusable="true"> android:textColor="#000000"
<ImageView android:id="@+id/FavoritesButtonImage" android:textSize="13sp"
android:src="@drawable/button_icon_favorites" android:scaleType="center" android:layout_gravity="center" android:typeface="serif" />
android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/>
<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center"> <ImageView
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/FavoritesButtonText" android:id="@+id/HelpButton"
android:layout_gravity="center_horizontal|top" android:textSize="18sp" android:layout_width="wrap_content"
android:text="@string/my_data_Button" android:typeface="serif" android:textColor="#000000"/> android:layout_height="wrap_content"
</LinearLayout> android:layout_marginLeft="4dp"
</LinearLayout> android:layout_marginTop="7dp"
<LinearLayout android:layout_weight="2" android:layout_height="fill_parent"/> android:clickable="true"
<LinearLayout android:id="@+id/SettingsButton" android:background="@drawable/bg_rightr" android:orientation="vertical" android:clickable="true" android:contentDescription="@string/help"
android:layout_weight="3" android:layout_height="175dp" android:focusable="true"> android:focusable="true"
<ImageView android:id="@+id/SettingsButtonImage" android:src="@drawable/help_icon" />
android:src="@drawable/button_icon_settings" android:scaleType="center" android:layout_gravity="center"
android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/> <ImageView
<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center"> android:id="@+id/CloseButton"
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center_horizontal|top" android:textSize="18sp" android:id="@+id/SettingsButtonText" android:layout_height="wrap_content"
android:text="@string/settings_Button" android:typeface="serif" android:textColor="#000000"/> android:layout_marginLeft="0dp"
</LinearLayout> android:layout_marginRight="2dp"
</LinearLayout> android:layout_marginTop="7dp"
</TableRow> android:clickable="true"
</TableLayout> android:contentDescription="@string/close"
</LinearLayout> android:focusable="true"
android:src="@drawable/headliner_close" />
</LinearLayout>
</LinearLayout>
<TableLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TableRow
android:layout_height="wrap_content"
android:layout_marginTop="15dp">
<LinearLayout
android:id="@+id/MapButton"
android:layout_height="175dp"
android:layout_weight="3"
android:background="@drawable/bg_leftr"
android:clickable="true"
android:focusable="true"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_gravity="center"
android:layout_weight="1"
android:scaleType="center"
android:src="@drawable/button_icon_map" />
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|top"
android:text="@string/map_Button"
android:textColor="#000000"
android:textSize="18sp"
android:typeface="serif" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_height="fill_parent"
android:layout_weight="2" />
<LinearLayout
android:id="@+id/SearchButton"
android:layout_height="175dp"
android:layout_weight="3"
android:background="@drawable/bg_rightr"
android:clickable="true"
android:focusable="true"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_gravity="center"
android:layout_weight="1"
android:scaleType="center"
android:src="@drawable/button_icon_search" />
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|top"
android:text="@string/search_button"
android:textColor="#000000"
android:textSize="18sp"
android:typeface="serif" />
</LinearLayout>
</LinearLayout>
</TableRow>
<TableRow
android:layout_height="wrap_content"
android:layout_marginTop="15dp">
<LinearLayout
android:id="@+id/FavoritesButton"
android:layout_height="175dp"
android:layout_weight="3"
android:background="@drawable/bg_leftr"
android:clickable="true"
android:focusable="true"
android:orientation="vertical">
<ImageView
android:id="@+id/FavoritesButtonImage"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_gravity="center"
android:layout_weight="1"
android:scaleType="center"
android:src="@drawable/button_icon_favorites" />
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center">
<TextView
android:id="@+id/FavoritesButtonText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|top"
android:text="@string/my_data_Button"
android:textColor="#000000"
android:textSize="18sp"
android:typeface="serif" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_height="fill_parent"
android:layout_weight="2" />
<LinearLayout
android:id="@+id/SettingsButton"
android:layout_height="175dp"
android:layout_weight="3"
android:background="@drawable/bg_rightr"
android:clickable="true"
android:focusable="true"
android:orientation="vertical">
<ImageView
android:id="@+id/SettingsButtonImage"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_gravity="center"
android:layout_weight="1"
android:scaleType="center"
android:src="@drawable/button_icon_settings" />
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center">
<TextView
android:id="@+id/SettingsButtonText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|top"
android:text="@string/settings_Button"
android:textColor="#000000"
android:textSize="18sp"
android:typeface="serif" />
</LinearLayout>
</LinearLayout>
</TableRow>
</TableLayout>
</LinearLayout>
</net.osmand.access.AccessibleLayout> </net.osmand.access.AccessibleLayout>

6
OsmAnd/res/layout/mode_toggles.xml
View file

@ -2,8 +2,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:layout_gravity="center_horizontal" android:gravity="center_horizontal" android:orientation="horizontal"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:paddingTop="7dp" android:paddingTop="7dp"
android:paddingBottom="7dp"> android:paddingBottom="7dp">
</LinearLayout> </LinearLayout>

119
OsmAnd/res/layout/navigate_point.xml
View file

@ -1,29 +1,100 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:custom="http://schemas.android.com/apk/res/net.osmand.plus" xmlns:custom="http://schemas.android.com/apk/res/net.osmand.plus"
android:layout_width="fill_parent" android:layout_height="fill_parent" > android:layout_width="fill_parent"
<LinearLayout android:layout_height="fill_parent">
android:layout_width="fill_parent"
android:layout_height="wrap_content" android:orientation="vertical" android:gravity="center_horizontal">
<net.osmand.view.ExpandableLinearLayout custom:maxVisibleWidth="800dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" >
<TextView android:id="@+id/TextView" android:textSize="16sp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:text="@string/navigate_point_top_text"></TextView>
<TableLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:stretchColumns="1"> <LinearLayout
<TableRow android:layout_width="fill_parent" > android:layout_width="fill_parent"
<TextView android:textSize="20sp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:text="@string/navigate_point_latitude"></TextView> android:layout_height="wrap_content"
<EditText android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/LatitudeEdit" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:inputType="phone"></EditText> android:orientation="vertical"
</TableRow> android:gravity="center_horizontal">
<TableRow android:layout_width="fill_parent" >
<TextView android:textSize="20sp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:text="@string/navigate_point_longitude"></TextView>
<EditText android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/LongitudeEdit" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:inputType="phone"></EditText>
</TableRow>
<TableRow android:layout_width="fill_parent" >
<TextView android:textSize="20sp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:text="@string/navigate_point_format"></TextView>
<Spinner android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/Format" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" ></Spinner>
</TableRow>
<TextView android:id="@+id/ValidateTextView" android:textSize="16sp" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="" android:gravity="center" android:textColor="@color/color_invalid"></TextView>
</TableLayout>
</net.osmand.view.ExpandableLinearLayout> <net.osmand.view.ExpandableLinearLayout
</LinearLayout> custom:maxVisibleWidth="800dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/TextView"
android:textSize="16sp"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:text="@string/navigate_point_top_text"></TextView>
<TableLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:stretchColumns="1">
<TableRow android:layout_width="fill_parent">
<TextView
android:textSize="20sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/navigate_point_latitude"></TextView>
<EditText
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/LatitudeEdit"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:inputType="phone"></EditText>
</TableRow>
<TableRow android:layout_width="fill_parent">
<TextView
android:textSize="20sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/navigate_point_longitude"></TextView>
<EditText
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/LongitudeEdit"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:inputType="phone"></EditText>
</TableRow>
<TableRow android:layout_width="fill_parent">
<TextView
android:textSize="20sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/navigate_point_format"></TextView>
<Spinner
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/Format"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"></Spinner>
</TableRow>
<TextView
android:id="@+id/ValidateTextView"
android:textSize="16sp"
android:visibility="gone"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text=""
android:gravity="center"
android:textColor="@color/color_invalid"></TextView>
</TableLayout>
</net.osmand.view.ExpandableLinearLayout>
</LinearLayout>
</ScrollView> </ScrollView>

20
OsmAnd/res/layout/notification.xml
View file

@ -1,12 +1,18 @@
<?xml version="1.0" encoding="utf-8"?> <?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"
android:id="@+id/layout" android:id="@+id/layout"
android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_width="fill_parent"
android:orientation="vertical" android:background="@color/color_black"> android:layout_height="fill_parent"
android:orientation="vertical"
android:background="@color/color_black">
<net.osmand.access.NotificationTextView android:id="@+id/message" <net.osmand.access.NotificationTextView
android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:id="@+id/message"
android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginLeft="4dp"
android:textSize="18sp" android:gravity="fill_horizontal"/> android:layout_marginRight="4dp"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:textSize="18sp"
android:gravity="fill_horizontal" />
</LinearLayout> </LinearLayout>

79
OsmAnd/res/layout/open_bug.xml
View file

@ -1,44 +1,53 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<TextView
android:layout_marginLeft="5dp"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/osb_comment_dialog_message" />
<EditText
android:id="@+id/BugMessage"
android:minLines="1"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:inputType="textMultiLine" />
android:orientation="vertical">
<TextView android:layout_marginLeft="5dp"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/osb_comment_dialog_message"/>
<EditText android:id="@+id/BugMessage"
android:minLines="1"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:inputType="textMultiLine"/>
<TextView android:layout_marginLeft="5dp" <TextView
android:layout_height="wrap_content" android:layout_marginLeft="5dp"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:text="@string/osb_comment_dialog_author"/> android:layout_width="wrap_content"
<EditText android:id="@+id/AuthorName" android:text="@string/osb_comment_dialog_author" />
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" <EditText
android:layout_height="wrap_content" android:id="@+id/AuthorName"
android:layout_width="fill_parent" android:layout_marginLeft="5dp"
android:text="NoName"/> android:layout_marginRight="5dp"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="NoName" />
<TextView android:layout_marginLeft="5dp" <TextView
android:layout_height="wrap_content" android:layout_marginLeft="5dp"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:text="@string/osb_author_dialog_password"/> android:layout_width="wrap_content"
<EditText android:id="@+id/Password" android:text="@string/osb_author_dialog_password" />
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" <EditText
android:layout_height="wrap_content" android:id="@+id/Password"
android:layout_width="fill_parent" android:layout_marginLeft="5dp"
android:inputType="textPassword"/> android:layout_marginRight="5dp"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:inputType="textPassword" />
</LinearLayout> </LinearLayout>

36
OsmAnd/res/layout/open_hours_edit.xml
View file

@ -1,11 +1,31 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?><!-- <ScrollView android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android"> -->
<!-- <ScrollView android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android"> --> <LinearLayout
<LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical" xmlns:android="http://schemas.android.com/apk/res/android"> android:layout_width="fill_parent"
<ListView android:layout_width="fill_parent" android:layout_height="fill_parent" android:id="@+id/ListView" /> android:layout_height="fill_parent"
<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp"> android:orientation="vertical"
<TimePicker android:id="@+id/TimePickerStart" android:layout_width="wrap_content" android:layout_height="wrap_content"></TimePicker> xmlns:android="http://schemas.android.com/apk/res/android">
<TimePicker android:layout_marginLeft="5dp" android:id="@+id/TimePickerEnd" android:layout_width="wrap_content" android:layout_height="wrap_content"></TimePicker>
</LinearLayout> <ListView
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:id="@+id/ListView" />
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp">
<TimePicker
android:id="@+id/TimePickerStart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"></TimePicker>
<TimePicker
android:layout_marginLeft="5dp"
android:id="@+id/TimePickerEnd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"></TimePicker>
</LinearLayout>
</LinearLayout> </LinearLayout>

28
OsmAnd/res/layout/open_hours_list_item.xml
View file

@ -1,14 +1,24 @@
<?xml version="1.0" encoding="utf-8"?> <?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"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="fill_parent"
android:orientation="horizontal"> android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView android:id="@+id/label" android:layout_weight="1" android:layout_width="0dp" <TextView
android:layout_height="wrap_content" android:textSize="20sp" /> android:id="@+id/label"
android:layout_width="0dp"
<ImageButton android:id="@+id/remove" android:layout_width="wrap_content" android:background="?attr/reset_image" android:layout_height="wrap_content"
android:contentDescription="@string/default_buttons_delete" android:layout_weight="1"
android:paddingLeft="2dp" android:paddingRight="2dp" android:textSize="20sp" />
android:paddingTop="2dp" android:layout_height="wrap_content" />
<ImageButton
android:id="@+id/remove"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/reset_image"
android:contentDescription="@string/default_buttons_delete"
android:paddingLeft="2dp"
android:paddingRight="2dp"
android:paddingTop="2dp" />
</LinearLayout> </LinearLayout>

10
OsmAnd/res/layout/osmo_connect_to_device.xml
View file

@ -4,14 +4,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="7dp" android:paddingLeft="7dp"
android:paddingRight="7dp" android:paddingRight="7dp"
android:stretchColumns="1" > android:stretchColumns="1">
<TableRow> <TableRow>
<RadioGroup <RadioGroup
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_span="2" > android:layout_span="2">
<RadioButton <RadioButton
android:id="@+id/ConnectToDevice" android:id="@+id/ConnectToDevice"
@ -59,8 +59,10 @@
android:inputType="textCapWords" android:inputType="textCapWords"
android:paddingLeft="3dp" /> android:paddingLeft="3dp" />
</TableRow> </TableRow>
<TableRow android:id="@+id/MyGroupName" android:visibility="gone"> <TableRow
android:id="@+id/MyGroupName"
android:visibility="gone">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"

9
OsmAnd/res/layout/osmo_create_group.xml
View file

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" > android:layout_height="fill_parent">
<TableLayout <TableLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="7dp" android:paddingLeft="7dp"
android:paddingRight="7dp" android:paddingRight="7dp"
android:stretchColumns="1" > android:stretchColumns="1">
<TableRow> <TableRow>
@ -67,9 +67,9 @@
android:paddingLeft="3dp" /> android:paddingLeft="3dp" />
</TableRow> </TableRow>
<TableRow> <TableRow>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -81,6 +81,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="3dp" /> android:paddingLeft="3dp" />
</TableRow> </TableRow>
<TableRow> <TableRow>
<TextView <TextView

13
OsmAnd/res/layout/osmo_edit_device.xml
View file

@ -4,7 +4,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="7dp" android:paddingLeft="7dp"
android:paddingRight="7dp" android:paddingRight="7dp"
android:stretchColumns="1" > android:stretchColumns="1">
<TableRow> <TableRow>
@ -18,8 +18,7 @@
android:layout_width="180dp" android:layout_width="180dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp">
android:text="" >
<requestFocus /> <requestFocus />
</EditText> </EditText>
@ -27,21 +26,19 @@
<TableRow <TableRow
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" > android:layout_height="wrap_content">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/osmo_edit_color" > android:text="@string/osmo_edit_color" />
</TextView>
<Spinner <Spinner
android:id="@+id/ColorSpinner" android:id="@+id/ColorSpinner"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" > android:layout_marginRight="5dp" />
</Spinner>
</TableRow> </TableRow>
</TableLayout> </TableLayout>

10
OsmAnd/res/layout/osmo_group_item.xml
View file

@ -6,7 +6,7 @@
android:paddingBottom="5dp" android:paddingBottom="5dp"
android:paddingLeft="3dp" android:paddingLeft="3dp"
android:paddingRight="4dp" android:paddingRight="4dp"
android:paddingTop="5dp" > android:paddingTop="5dp">
<ImageView <ImageView
android:id="@+id/explist_indicator" android:id="@+id/explist_indicator"
@ -25,16 +25,14 @@
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
android:layout_weight="1" android:layout_weight="1"
android:textSize="18sp" > android:textSize="18sp" />
</TextView>
<include layout="@layout/check_item_rel" /> <include layout="@layout/check_item_rel" />
<RelativeLayout <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_gravity="center_vertical" > android:layout_gravity="center_vertical">
<ImageView <ImageView
android:id="@+id/settings" android:id="@+id/settings"

11
OsmAnd/res/layout/osmo_group_list_item.xml
View file

@ -6,7 +6,7 @@
android:paddingBottom="5dp" android:paddingBottom="5dp"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:paddingRight="4dp" android:paddingRight="4dp"
android:paddingTop="5dp" > android:paddingTop="5dp">
<ImageView <ImageView
android:id="@+id/osmo_user_icon" android:id="@+id/osmo_user_icon"
@ -18,19 +18,18 @@
<TextView <TextView
android:id="@+id/osmo_label" android:id="@+id/osmo_label"
style="@style/ListText" style="@style/ListText"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:maxLines="7" android:maxLines="7"
android:layout_weight="1" /> android:layout_weight="1" />
<TextView <TextView
android:id="@+id/osmo_label_time" android:id="@+id/osmo_label_time"
style="@style/ListText.Small" style="@style/ListText.Small"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="3dp" android:layout_marginLeft="3dp" />
/>
<!-- <include layout="@layout/check_item" /> --> <!-- <include layout="@layout/check_item" /> -->

9
OsmAnd/res/layout/osmo_groups_list.xml
View file

@ -2,10 +2,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical" android:orientation="vertical">
>
<include layout="@layout/osmo_groups_list_header" />
<include layout="@layout/osmo_groups_list_header"/>
<ExpandableListView <ExpandableListView
android:id="@android:id/list" android:id="@android:id/list"
android:layout_width="fill_parent" android:layout_width="fill_parent"
@ -15,7 +15,6 @@
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
android:layout_weight="1" android:layout_weight="1"
android:groupIndicator="@android:color/transparent" android:groupIndicator="@android:color/transparent"
style="@style/OsmandListView"> style="@style/OsmandListView" />
</ExpandableListView>
</LinearLayout> </LinearLayout>

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" > android:layout_height="match_parent">
<TextView <TextView
android:id="@+id/osmo_no_connection_msg" android:id="@+id/osmo_no_connection_msg"

8
OsmAnd/res/layout/osmo_groups_list_header.xml
View file

@ -6,12 +6,12 @@
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:orientation="vertical" > android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" > android:orientation="horizontal">
<ImageView <ImageView
android:id="@+id/osmo_status" android:id="@+id/osmo_status"
@ -36,7 +36,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="3dp" android:layout_marginLeft="3dp"
android:layout_marginTop="3dp" > android:layout_marginTop="3dp">
<TextView <TextView
android:id="@+id/osmo_user_name_text_view" android:id="@+id/osmo_user_name_text_view"
@ -66,7 +66,7 @@
android:minWidth="0dp" android:minWidth="0dp"
android:text="\?" android:text="\?"
android:textAppearance="?android:attr/textAppearance" /> android:textAppearance="?android:attr/textAppearance" />
</RelativeLayout> </RelativeLayout>
<CheckBox <CheckBox

83
OsmAnd/res/layout/package_delivered.xml
View file

@ -1,45 +1,54 @@
<?xml version="1.0" encoding="utf-8"?> <?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"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/color_black"> android:background="@color/color_black">
<TextView android:id="@+id/point_name" <TextView
android:layout_width="wrap_content" android:id="@+id/point_name"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center_horizontal" android:layout_height="wrap_content"
android:textSize="16sp" android:layout_gravity="center_horizontal"
android:layout_marginTop="2dp" android:textSize="16sp"
android:layout_marginBottom="2dp" android:layout_marginTop="2dp"
android:textStyle="bold"/> android:layout_marginBottom="2dp"
android:textStyle="bold" />
<TextView android:id="@+id/point_id" <TextView
android:layout_width="wrap_content" android:id="@+id/point_id"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:visibility="gone"/> android:layout_height="wrap_content"
android:visibility="gone" />
<LinearLayout android:layout_width="wrap_content" <LinearLayout
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:orientation="horizontal"> android:layout_height="wrap_content"
<TextView android:layout_width="wrap_content" android:orientation="horizontal">
android:layout_height="wrap_content"
android:layout_marginLeft="10dp" <TextView
android:layout_marginRight="10dp" android:layout_width="wrap_content"
android:text="@string/package_delivered"/> android:layout_height="wrap_content"
<Button android:id="@+id/delivered_yes" android:layout_marginLeft="10dp"
android:layout_width="wrap_content" android:layout_marginRight="10dp"
android:layout_height="wrap_content" android:text="@string/package_delivered" />
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" <Button
android:text="@string/default_buttons_yes"/> android:id="@+id/delivered_yes"
<Button android:id="@+id/delivered_no" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginLeft="5dp"
android:layout_marginLeft="5dp" android:layout_marginRight="5dp"
android:layout_marginRight="5dp" android:text="@string/default_buttons_yes" />
android:text="@string/default_buttons_no"/>
</LinearLayout> <Button
android:id="@+id/delivered_no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:text="@string/default_buttons_no" />
</LinearLayout>
</LinearLayout> </LinearLayout>

16
OsmAnd/res/layout/parking_set_time_limit.xml
View file

@ -2,20 +2,20 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" > android:orientation="vertical">
<TextView <TextView
android:id="@+id/parkTime" android:id="@+id/parkTime"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/osmand_parking_position_description_add" /> android:text="@string/osmand_parking_position_description_add" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_gravity="center_horizontal" > android:layout_gravity="center_horizontal">
<TextView <TextView
android:id="@+id/textView1" android:id="@+id/textView1"

6
OsmAnd/res/layout/parking_set_type.xml
View file

@ -2,12 +2,12 @@
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android" <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" > android:gravity="center_horizontal">
<TableRow <TableRow
android:id="@+id/tableRow1" android:id="@+id/tableRow1"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" > android:layout_height="wrap_content">
<ImageButton <ImageButton
android:id="@+id/parking_no_lim_button" android:id="@+id/parking_no_lim_button"
@ -31,7 +31,7 @@
<TableRow <TableRow
android:id="@+id/tableRow2" android:id="@+id/tableRow2"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" > android:layout_height="wrap_content">
<TextView <TextView
android:id="@+id/parking_lim_text" android:id="@+id/parking_lim_text"

131
OsmAnd/res/layout/plan_route_info.xml
View file

@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" > android:orientation="vertical">
<ScrollView <ScrollView
@ -10,49 +10,56 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginRight="5dp"> android:layout_marginRight="5dp">
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:id="@+id/RouteTargets" > android:id="@+id/RouteTargets">
<TextView android:id="@+id/ValidateTextView" android:textSize="16sp" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content"
android:text="" android:gravity="center" android:textColor="@color/color_invalid"></TextView> <TextView
android:id="@+id/ValidateTextView"
<TextView android:textSize="16sp"
android:layout_width="wrap_content" android:visibility="gone"
android:layout_height="wrap_content" android:layout_width="fill_parent"
android:drawableLeft="@drawable/map_config_white" android:layout_height="wrap_content"
android:drawablePadding="3dp" android:text=""
android:text="@string/target_points" android:gravity="center"
android:id="@+id/Targets" android:textColor="@color/color_invalid"></TextView>
android:textSize="24sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/map_config_white"
android:drawablePadding="3dp"
android:text="@string/target_points"
android:id="@+id/Targets"
android:textSize="24sp" />
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" > android:layout_height="wrap_content">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="3dp" android:layout_marginLeft="3dp"
android:text="@string/route_from" android:text="@string/route_from"
android:textSize="18sp" > android:textSize="18sp"></TextView>
</TextView>
<Spinner <Spinner
android:id="@+id/FromSpinner" android:id="@+id/FromSpinner"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:textSize="18sp" > android:textSize="18sp"></Spinner>
</Spinner>
</LinearLayout> </LinearLayout>
<LinearLayout android:layout_width="fill_parent" <LinearLayout
android:layout_height="wrap_content" > android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView <TextView
android:id="@+id/ViaView" android:id="@+id/ViaView"
@ -62,19 +69,19 @@
android:gravity="left" android:gravity="left"
android:textSize="18sp" /> android:textSize="18sp" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" > android:layout_height="wrap_content">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="3dp" android:layout_marginLeft="3dp"
android:text="@string/route_to" android:text="@string/route_to"
android:textSize="18sp" > android:textSize="18sp">
</TextView> </TextView>
<Spinner <Spinner
@ -82,57 +89,61 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:textSize="18sp" > android:textSize="18sp"></Spinner>
</Spinner>
</LinearLayout> </LinearLayout>
<View android:layout_width="fill_parent"
android:layout_height="2dip" <View
android:background="#FFC8C8C8" /> android:layout_width="fill_parent"
android:layout_height="2dip"
android:background="#FFC8C8C8" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
<LinearLayout android:layout_width="fill_parent"
android:layout_height="wrap_content" <LinearLayout
android:orientation="horizontal" android:layout_width="fill_parent"
android:gravity="center" android:layout_height="wrap_content"
android:id="@+id/RouteInfoControls" > android:orientation="horizontal"
<ImageButton android:gravity="center"
android:id="@+id/RouteInfoControls">
<ImageButton
android:id="@+id/Prev" android:id="@+id/Prev"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:scaleType="centerInside" android:scaleType="centerInside"
android:background="@drawable/map_btn_plain" android:background="@drawable/map_btn_plain"
android:contentDescription="@string/previous_button" android:contentDescription="@string/previous_button"
android:src="@drawable/ax_1_navigation_previous_item_light" android:src="@drawable/ax_1_navigation_previous_item_light" />
/>
<ImageButton <ImageButton
android:id="@+id/Info" android:id="@+id/Info"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:scaleType="centerInside" android:scaleType="centerInside"
android:background="@drawable/map_btn_plain" android:background="@drawable/map_btn_plain"
android:contentDescription="@string/info_button" android:contentDescription="@string/info_button"
android:src="@drawable/ax_2_action_about_light" android:src="@drawable/ax_2_action_about_light" />
/>
<ImageButton <ImageButton
android:id="@+id/Next" android:id="@+id/Next"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:scaleType="centerInside" android:scaleType="centerInside"
android:background="@drawable/map_btn_plain" android:background="@drawable/map_btn_plain"
android:contentDescription="@string/next_button" android:contentDescription="@string/next_button"
android:src="@drawable/ax_1_navigation_next_item_light" android:src="@drawable/ax_1_navigation_next_item_light" />
/>
</LinearLayout> </LinearLayout>
<Button android:id="@+id/SimulateRoute"
android:layout_width="wrap_content" <Button
android:layout_height="wrap_content" android:id="@+id/SimulateRoute"
android:gravity="center" android:layout_width="wrap_content"
android:layout_gravity="center_horizontal" android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_action_play_dark" android:gravity="center"
android:text="@string/animate_route" android:layout_gravity="center_horizontal"
/> android:drawableLeft="@drawable/ic_action_play_dark"
android:text="@string/animate_route" />
</LinearLayout> </LinearLayout>

13
OsmAnd/res/layout/plan_route_settings.xml
View file

@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" > android:orientation="vertical">
<LinearLayout <LinearLayout
android:id="@+id/TopBar" android:id="@+id/TopBar"
@ -13,7 +13,7 @@
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginLeft="10dp"> android:layout_marginLeft="10dp">
<TextView <TextView
@ -21,8 +21,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="3dp" android:layout_marginLeft="3dp"
android:text="@string/gpx_navigation" android:text="@string/gpx_navigation"
android:textSize="18sp" > android:textSize="18sp"></TextView>
</TextView>
<Spinner <Spinner
android:id="@+id/GPXRouteSpinner" android:id="@+id/GPXRouteSpinner"
@ -30,8 +29,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:textSize="18sp" > android:textSize="18sp"></Spinner>
</Spinner>
</LinearLayout> </LinearLayout>
<ListView <ListView
@ -39,7 +37,6 @@
style="@style/OsmandListView" style="@style/OsmandListView"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" > android:layout_height="fill_parent"></ListView>
</ListView>
</LinearLayout> </LinearLayout>

25
OsmAnd/res/layout/plugins.xml
View file

@ -1,11 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:layout_height="fill_parent" android:orientation="vertical"> android:orientation="vertical">
<TextView android:id="@+id/Label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:text="@string/select_plugin_to_activate"></TextView>
<ListView android:id="@android:id/list" android:layout_width="fill_parent" android:layout_weight="1" android:layout_height="0dp" <TextView
android:layout_marginTop="10dp"></ListView> android:id="@+id/Label"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/select_plugin_to_activate"></TextView>
<ListView
android:id="@android:id/list"
android:layout_width="fill_parent"
android:layout_weight="1"
android:layout_height="0dp"
android:layout_marginTop="10dp"></ListView>
</LinearLayout> </LinearLayout>

61
OsmAnd/res/layout/plugins_list_item.xml
View file

@ -2,44 +2,53 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" > android:orientation="vertical">
<LinearLayout <LinearLayout
android:background="?attr/expandable_category_color"
android:paddingTop="6dp"
android:paddingBottom="3dp"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="5dp"
>
<CheckBox android:id="@+id/check_item" android:focusable="false" android:gravity="top"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
<TextView
android:id="@+id/plugin_name"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="top" android:background="?attr/expandable_category_color"
android:textStyle="bold" android:paddingBottom="3dp"
android:textColor="?android:textColorPrimary" android:paddingTop="6dp">
style="@style/ListText" android:text="@string/extra_settings"
android:paddingRight="10dp"> <LinearLayout
</TextView> android:layout_width="wrap_content"
</LinearLayout> android:layout_height="wrap_content"
android:paddingLeft="5dp">
<CheckBox
android:id="@+id/check_item"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="false"
android:gravity="top" />
</LinearLayout>
<TextView
android:id="@+id/plugin_name"
style="@style/ListText"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="top"
android:paddingRight="10dp"
android:text="@string/extra_settings"
android:textColor="?android:textColorPrimary"
android:textStyle="bold" />
</LinearLayout>
<TextView <TextView
android:id="@+id/plugin_descr" android:id="@+id/plugin_descr"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone"
android:maxLines="7" android:maxLines="7"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="5dp"
android:text="@string/osmand_extra_settings_description" android:text="@string/osmand_extra_settings_description"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="14sp" android:textSize="14sp"
android:paddingRight="10dp" android:visibility="gone">
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:paddingBottom="5dp">
</TextView> </TextView>

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" > android:layout_height="match_parent">
<WebView <WebView
android:id="@+id/printDialogWebview" android:id="@+id/printDialogWebview"

26
OsmAnd/res/layout/quickaction.xml
View file

@ -2,20 +2,20 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<FrameLayout <FrameLayout
android:layout_marginTop="10dip" android:layout_marginTop="10dip"
android:id="@+id/header2" android:id="@+id/header2"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/quickaction_top_frame"/> android:background="@drawable/quickaction_top_frame" />
<ImageView <ImageView
android:id="@+id/arrow_up" android:id="@+id/arrow_up"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/quickaction_arrow_up" /> android:src="@drawable/quickaction_arrow_up" />
<HorizontalScrollView <HorizontalScrollView
android:id="@+id/scroll" android:id="@+id/scroll"
android:layout_width="fill_parent" android:layout_width="fill_parent"
@ -31,9 +31,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="4dip" android:paddingTop="4dip"
android:paddingBottom="4dip" android:paddingBottom="4dip"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -43,9 +43,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/quickaction_slider_grip_right" /> android:src="@drawable/quickaction_slider_grip_right" />
</LinearLayout> </LinearLayout>
</HorizontalScrollView> </HorizontalScrollView>
<FrameLayout <FrameLayout
@ -59,7 +59,7 @@
android:id="@+id/arrow_down" android:id="@+id/arrow_down"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="-1dip" android:layout_marginTop="-1dip"
android:layout_below="@id/footer" android:layout_below="@id/footer"
android:src="@drawable/quickaction_arrow_down" /> android:src="@drawable/quickaction_arrow_down" />

9
OsmAnd/res/layout/route_info_list_item.xml
View file

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?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"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" > android:layout_height="wrap_content">
<LinearLayout <LinearLayout
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:orientation="vertical" > android:orientation="vertical">
<TextView <TextView
android:id="@+id/cumulative_distance" android:id="@+id/cumulative_distance"
@ -29,7 +29,7 @@
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:orientation="vertical" > android:orientation="vertical">
<TextView <TextView
android:id="@+id/distance" android:id="@+id/distance"
@ -47,7 +47,6 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:text="" > android:text=""></TextView>
</TextView>
</LinearLayout> </LinearLayout>

44
OsmAnd/res/layout/route_point_info.xml
View file

@ -1,30 +1,32 @@
<?xml version="1.0" encoding="utf-8"?> <?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"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView android:id="@+id/point_icon"
android:layout_width="32dp" <ImageView
android:padding="3dp" android:id="@+id/point_icon"
android:layout_marginLeft="5dp" android:layout_width="32dp"
android:layout_height="wrap_content" android:padding="3dp"
android:layout_gravity="center_vertical"/> android:layout_marginLeft="5dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" />
<TextView <TextView
android:id="@+id/name" android:id="@+id/name"
android:layout_marginLeft="6dp" android:layout_marginLeft="6dp"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:layout_weight="1"/> android:layout_weight="1" />
<TextView <TextView
android:id="@+id/date_or_distance" android:id="@+id/date_or_distance"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:layout_gravity="center_vertical"/> android:layout_gravity="center_vertical" />
</LinearLayout> </LinearLayout>

48
OsmAnd/res/layout/route_steps_main.xml
View file

@ -1,33 +1,39 @@
<?xml version="1.0" encoding="utf-8"?> <?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"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content"> <LinearLayout
<TextView android:id="@+id/gpx_name" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:ellipsize="end"
android:textSize="20sp"/>
<TextView android:id="@+id/points_count" <TextView
android:layout_width="wrap_content" android:id="@+id/gpx_name"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginLeft="5dp" android:layout_height="wrap_content"
android:minWidth="16dp" android:layout_marginLeft="10dp"
android:textSize="20sp"/> android:ellipsize="end"
android:textSize="20sp" />
<TextView
android:id="@+id/points_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:minWidth="16dp"
android:textSize="20sp" />
</LinearLayout> </LinearLayout>
<ListView android:id="@android:id/list" <ListView
android:layout_width="fill_parent" android:id="@android:id/list"
android:layout_height="fill_parent" android:layout_width="fill_parent"
android:choiceMode="singleChoice" android:layout_height="fill_parent"
style="@style/OsmandListView"/> android:choiceMode="singleChoice"
style="@style/OsmandListView" />
</LinearLayout> </LinearLayout>

66
OsmAnd/res/layout/save_directions_dialog.xml
View file

@ -1,16 +1,54 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:layout_width="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
android:layout_height="fill_parent" android:orientation="vertical"> android:layout_width="fill_parent"
xmlns:android="http://schemas.android.com/apk/res/android"
<TextView android:text="@string/file_with_name_already_exist" android:id="@+id/DuplicateFileName" android:layout_marginLeft="5dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_height="fill_parent"
android:visibility="gone"/> android:orientation="vertical">
<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:layout_marginTop="3dp">
<TextView android:text="@string/filename_input" android:layout_marginLeft="5dp" android:layout_width="wrap_content" android:layout_height="wrap_content"/> <TextView
<EditText android:id="@+id/FileNameEdit" android:layout_marginLeft="5dp" android:layout_width="fill_parent" android:layout_height="wrap_content"/> android:text="@string/file_with_name_already_exist"
</LinearLayout> android:id="@+id/DuplicateFileName"
<LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="horizontal" android:layout_marginLeft="5dp"
android:gravity="bottom|center" android:layout_marginTop="5dp"> android:layout_width="fill_parent"
<Button android:layout_width="125dp" android:layout_height="wrap_content" android:text="@string/default_buttons_cancel" android:id="@+id/Cancel"></Button> android:layout_height="wrap_content"
<Button android:layout_width="125dp" android:layout_height="wrap_content" android:text="@string/default_buttons_save" android:id="@+id/Save"></Button> android:visibility="gone" />
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="3dp">
<TextView
android:text="@string/filename_input"
android:layout_marginLeft="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<EditText
android:id="@+id/FileNameEdit"
android:layout_marginLeft="5dp"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:gravity="bottom|center"
android:layout_marginTop="5dp">
<Button
android:layout_width="125dp"
android:layout_height="wrap_content"
android:text="@string/default_buttons_cancel"
android:id="@+id/Cancel"></Button>
<Button
android:layout_width="125dp"
android:layout_height="wrap_content"
android:text="@string/default_buttons_save"
android:id="@+id/Save"></Button>
</LinearLayout>
</LinearLayout> </LinearLayout>

92
OsmAnd/res/layout/search_address.xml
View file

@ -2,132 +2,120 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:custom="http://schemas.android.com/apk/res/net.osmand.plus" xmlns:custom="http://schemas.android.com/apk/res/net.osmand.plus"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" > android:layout_height="fill_parent">
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical" > android:orientation="vertical">
<net.osmand.view.ExpandableLinearLayout <net.osmand.view.ExpandableLinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
custom:maxVisibleWidth="800dp" > custom:maxVisibleWidth="800dp">
<TableLayout <TableLayout
android:id="@+id/TableLayout" android:id="@+id/TableLayout"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:stretchColumns="1" > android:stretchColumns="1">
<TableRow <TableRow
android:id="@+id/TableRow" android:id="@+id/TableRow"
android:layout_marginLeft="5dp" > android:layout_marginLeft="5dp">
<TextView <TextView
android:id="@+id/TextView" android:id="@+id/TextView"
android:text="@string/search_address_region" > android:text="@string/search_address_region" />
</TextView>
<Button <Button
android:id="@+id/CountryButton" android:id="@+id/CountryButton"
android:text="@string/ChooseCountry" android:layout_width="150dp"
android:scrollHorizontally="true" android:ellipsize="end"
android:lines="1" android:lines="1"
android:ellipsize="end" android:scrollHorizontally="true"
android:layout_width="150dp" android:text="@string/ChooseCountry" />
/>
<ImageButton <ImageButton
android:id="@+id/ResetCountry" android:id="@+id/ResetCountry"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:background="?attr/reset_image" android:background="?attr/reset_image"
android:contentDescription="@string/default_buttons_reset" > android:contentDescription="@string/default_buttons_reset" />
</ImageButton>
</TableRow> </TableRow>
<TableRow <TableRow
android:id="@+id/TableRow" android:id="@+id/TableRow"
android:layout_marginLeft="5dp" > android:layout_marginLeft="5dp">
<TextView <TextView
android:id="@+id/TextView" android:id="@+id/TextView"
android:text="@string/search_address_city" > android:text="@string/search_address_city" />
</TextView>
<Button <Button
android:id="@+id/CityButton" android:id="@+id/CityButton"
android:text="@string/choose_city" android:layout_width="150dp"
android:scrollHorizontally="true" android:ellipsize="end"
android:lines="1" android:lines="1"
android:ellipsize="end" android:scrollHorizontally="true"
android:layout_width="150dp" android:text="@string/choose_city" />
/>
<ImageButton <ImageButton
android:id="@+id/ResetCity" android:id="@+id/ResetCity"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:background="?attr/reset_image" android:background="?attr/reset_image"
android:contentDescription="@string/default_buttons_reset" > android:contentDescription="@string/default_buttons_reset" />
</ImageButton>
</TableRow> </TableRow>
<TableRow <TableRow
android:id="@+id/TableRow" android:id="@+id/TableRow"
android:layout_marginLeft="5dp" > android:layout_marginLeft="5dp">
<TextView <TextView
android:id="@+id/TextView" android:id="@+id/TextView"
android:text="@string/search_address_street" > android:text="@string/search_address_street" />
</TextView>
<Button <Button
android:id="@+id/StreetButton" android:id="@+id/StreetButton"
android:text="@string/choose_street" android:layout_width="150dp"
android:scrollHorizontally="true" android:ellipsize="end"
android:lines="1" android:lines="1"
android:ellipsize="end" android:scrollHorizontally="true"
android:layout_width="150dp" android:text="@string/choose_street" />
/>
<ImageButton <ImageButton
android:id="@+id/ResetStreet" android:id="@+id/ResetStreet"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:background="?attr/reset_image" android:background="?attr/reset_image"
android:contentDescription="@string/default_buttons_reset" > android:contentDescription="@string/default_buttons_reset" />
</ImageButton>
</TableRow> </TableRow>
<TableRow <TableRow
android:id="@+id/TableRow" android:id="@+id/TableRow"
android:layout_marginLeft="5dp" > android:layout_marginLeft="5dp">
<TextView <TextView
android:id="@+id/BuildingText" android:id="@+id/BuildingText"
android:text="@string/search_address_building" > android:text="@string/search_address_building" />
</TextView>
<Button <Button
android:id="@+id/BuildingButton" android:id="@+id/BuildingButton"
android:text="@string/choose_building" android:layout_width="150dp"
android:scrollHorizontally="true" android:ellipsize="end"
android:lines="1" android:lines="1"
android:ellipsize="end" android:scrollHorizontally="true"
android:layout_width="150dp" android:text="@string/choose_building" />
/>
<ImageButton <ImageButton
android:id="@+id/ResetBuilding" android:id="@+id/ResetBuilding"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:background="?attr/reset_image" android:background="?attr/reset_image"
android:contentDescription="@string/default_buttons_reset" > android:contentDescription="@string/default_buttons_reset" />
</ImageButton>
</TableRow> </TableRow>
</TableLayout> </TableLayout>
@ -137,22 +125,20 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_span="3" android:layout_span="3"
android:orientation="horizontal" > android:orientation="horizontal">
<RadioButton <RadioButton
android:id="@+id/RadioBuilding" android:id="@+id/RadioBuilding"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/search_address_building_option" > android:text="@string/search_address_building_option" />
</RadioButton>
<RadioButton <RadioButton
android:id="@+id/RadioIntersStreet" android:id="@+id/RadioIntersStreet"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:text="@string/search_address_street_option" > android:text="@string/search_address_street_option" />
</RadioButton>
</RadioGroup> </RadioGroup>
</net.osmand.view.ExpandableLinearLayout> </net.osmand.view.ExpandableLinearLayout>
</LinearLayout> </LinearLayout>

5
OsmAnd/res/layout/search_address_offline.xml
View file

@ -2,14 +2,13 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical" > android:orientation="vertical">
<ListView <ListView
android:id="@android:id/list" android:id="@android:id/list"
style="@style/OsmandListView" style="@style/OsmandListView"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" > android:layout_weight="1"></ListView>
</ListView>
</LinearLayout> </LinearLayout>

27
OsmAnd/res/layout/search_address_offline_list_item.xml
View file

@ -1,11 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:layout_height="fill_parent" android:orientation="horizontal"> android:orientation="horizontal">
<TextView android:id="@+id/distance_label" android:layout_marginLeft="5dp"
android:layout_width="80dp" android:layout_height="wrap_content" android:gravity="left" <TextView
android:textSize="20sp"/> android:id="@+id/distance_label"
<TextView android:id="@+id/label" android:layout_width="fill_parent" android:layout_marginLeft="5dp"
android:layout_height="wrap_content" android:textSize="20sp" /> android:layout_width="80dp"
android:layout_height="wrap_content"
android:gravity="left"
android:textSize="20sp" />
<TextView
android:id="@+id/label"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textSize="20sp" />
</LinearLayout> </LinearLayout>

20
OsmAnd/res/layout/search_address_online.xml
View file

@ -2,21 +2,20 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical" > android:orientation="vertical">
<LinearLayout <LinearLayout
android:id="@+id/LinearLayout" android:id="@+id/LinearLayout"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:layout_marginTop="5dp" > android:layout_marginTop="5dp">
<ProgressBar <ProgressBar
android:id="@+id/ProgressBar" android:id="@+id/ProgressBar"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="invisible"> android:visibility="invisible"></ProgressBar>
</ProgressBar>
<EditText <EditText
android:id="@+id/SearchText" android:id="@+id/SearchText"
@ -24,16 +23,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:hint="@string/hint_search_online" android:hint="@string/hint_search_online"
android:text="" > android:text=""></EditText>
</EditText>
<Button <Button
android:id="@+id/SearchButton" android:id="@+id/SearchButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minWidth="80dp" android:minWidth="80dp"
android:text="@string/search_button" > android:text="@string/search_button"></Button>
</Button>
</LinearLayout> </LinearLayout>
<ListView <ListView
@ -41,7 +38,6 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" android:layout_weight="1"
style="@style/OsmandListView"> style="@style/OsmandListView"></ListView>
</ListView>
</LinearLayout> </LinearLayout>

4
OsmAnd/res/layout/search_address_online_list_item.xml
View file

@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="horizontal" > android:orientation="horizontal">
<TextView <TextView
android:id="@+id/distance_label" android:id="@+id/distance_label"
@ -16,6 +16,6 @@
android:id="@+id/label" android:id="@+id/label"
style="@style/ListText.Small" style="@style/ListText.Small"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>

63
OsmAnd/res/layout/search_by_name.xml
View file

@ -1,25 +1,50 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:layout_height="fill_parent" android:orientation="vertical"> android:orientation="vertical">
<!-- <!--
<LinearLayout android:id="@+id/LinearLayout" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="3dp" android:layout_marginRight="5dp" <LinearLayout android:id="@+id/LinearLayout" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="3dp" android:layout_marginRight="5dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView android:text="" android:id="@+id/Label" android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center"></TextView> <TextView android:text="" android:id="@+id/Label" android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center"></TextView>
</LinearLayout>
-->
</LinearLayout> <LinearLayout
--> android:id="@+id/LinearLayout"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="3dp"
android:layout_marginRight="3dp"
android:layout_marginTop="1dp">
<LinearLayout android:id="@+id/LinearLayout" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="1dp" android:layout_marginRight="3dp"> <ProgressBar
<ProgressBar android:id="@+id/ProgressBar" android:layout_width="wrap_content" android:layout_height="wrap_content"></ProgressBar> android:id="@+id/ProgressBar"
<EditText android:text="" android:id="@+id/SearchText" android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="wrap_content" android:inputType="textFilter"></EditText> android:layout_width="wrap_content"
<Button android:id="@+id/ResetButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_height="wrap_content" />
android:layout_weight="0" android:text="@string/default_buttons_reset"></Button>
</LinearLayout> <EditText
android:id="@+id/SearchText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"/>
<ListView android:id="@android:id/list" android:layout_width="fill_parent" android:layout_height="fill_parent" <Button
android:layout_marginLeft="3dp" android:layout_marginTop="3dp" android:layout_marginRight="3dp" style="@style/OsmandListView"></ListView> android:id="@+id/ResetButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:text="@string/default_buttons_reset" />
</LinearLayout> </LinearLayout>
<ListView
android:id="@android:id/list"
style="@style/OsmandListView"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_marginLeft="3dp"
android:layout_marginRight="3dp"
android:layout_marginTop="3dp" />
</LinearLayout>

4
OsmAnd/res/layout/search_history_list_item.xml
View file

@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" > android:orientation="horizontal">
<TextView <TextView
android:id="@+id/label" android:id="@+id/label"
@ -11,7 +11,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="3dp" android:layout_marginLeft="3dp"
android:layout_marginRight="3dp" android:layout_marginRight="3dp"
android:layout_weight="1"/> android:layout_weight="1" />
<ImageButton <ImageButton
android:id="@+id/remove" android:id="@+id/remove"

42
OsmAnd/res/layout/search_main.xml
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TabHost <TabHost xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/tabhost" android:id="@android:id/tabhost"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -14,35 +14,35 @@
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0"/> android:layout_weight="0" />
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:background="@drawable/ic_background_topofsearchactivities"> android:background="@drawable/ic_background_topofsearchactivities">
<TextView
android:id="@+id/textViewADesc" <TextView
android:layout_width="wrap_content" android:id="@+id/textViewADesc"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center" android:layout_height="wrap_content"
android:background="@drawable/ic_background_tabinfotext" android:layout_gravity="center"
android:textColor="@color/color_white" android:background="@drawable/ic_background_tabinfotext"
android:text="@string/poi_search_desc" android:textColor="@color/color_white"
android:textAppearance="?android:attr/textAppearanceSmall"/> android:text="@string/poi_search_desc"
</LinearLayout> android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
<FrameLayout <FrameLayout
android:id="@android:id/tabcontent" android:id="@android:id/tabcontent"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp" />
/>
<android.support.v4.view.ViewPager <android.support.v4.view.ViewPager
android:id="@+id/pager" android:id="@+id/pager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1"/> android:layout_weight="1" />
</LinearLayout> </LinearLayout>
</TabHost> </TabHost>

3
OsmAnd/res/layout/search_main_tab_header.xml
View file

@ -2,5 +2,4 @@
<ImageView xmlns:android="http://schemas.android.com/apk/res/android" <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/TabImage" android:id="@+id/TabImage" />
/>

23
OsmAnd/res/layout/search_transport.xml
View file

@ -1,28 +1,25 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?><!-- This file is at /res/layout/list.xml -->
<!-- This file is at /res/layout/list.xml -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/RootLayout" android:id="@+id/RootLayout"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical" > android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" > android:orientation="horizontal">
<ProgressBar <ProgressBar
android:id="@+id/ProgressBar" android:id="@+id/ProgressBar"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" > android:layout_height="wrap_content" />
</ProgressBar>
<Button <Button
android:id="@+id/SearchTransportLevelButton" android:id="@+id/SearchTransportLevelButton"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" > android:layout_weight="1" />
</Button>
<TextView <TextView
android:id="@+id/SearchAreaText" android:id="@+id/SearchAreaText"
@ -35,7 +32,7 @@
android:id="@+id/RelativeLayout" android:id="@+id/RelativeLayout"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_gravity="center" > android:layout_gravity="center">
<ListView <ListView
android:id="@android:id/list" android:id="@android:id/list"
@ -43,16 +40,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_below="@+id/listView" android:layout_below="@+id/listView"
style="@style/OsmandListView"> style="@style/OsmandListView" />
</ListView>
<ListView <ListView
android:id="@+id/listView" android:id="@+id/listView"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
style="@style/OsmandListView" > style="@style/OsmandListView" />
</ListView>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>

24
OsmAnd/res/layout/search_transport_list_item.xml
View file

@ -1,13 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?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"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="fill_parent"
android:orientation="horizontal"> android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView android:id="@+id/search_icon" android:layout_width="25dp" <ImageView
android:paddingLeft="2dp" android:paddingRight="2dp" android:id="@+id/search_icon"
android:paddingTop="2dp" android:layout_height="fill_parent" /> android:layout_width="25dp"
android:layout_height="fill_parent"
<TextView android:id="@+id/label" android:layout_width="wrap_content" android:paddingLeft="2dp"
android:layout_height="wrap_content" style="@style/ListText.Small"/> android:paddingRight="2dp"
android:paddingTop="2dp" />
<TextView
android:id="@+id/label"
style="@style/ListText.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>

34
OsmAnd/res/layout/search_transport_route_item.xml
View file

@ -1,17 +1,27 @@
<?xml version="1.0" encoding="utf-8"?> <?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"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="fill_parent"
android:orientation="horizontal"> android:layout_height="wrap_content"
android:orientation="horizontal">
<!-- <TextView android:id="@+id/distance_label" android:layout_marginLeft="5dp" <!-- <TextView android:id="@+id/distance_label" android:layout_marginLeft="5dp"
android:layout_width="80dp" android:layout_height="fill_parent" android:gravity="left" android:layout_width="80dp" android:layout_height="fill_parent" android:gravity="left"
android:textSize="20sp"/> --> android:textSize="20sp"/> -->
<TextView android:id="@+id/label" android:layout_weight="1" android:layout_width="0dp" <TextView
android:layout_height="wrap_content" style="@style/ListText" /> android:id="@+id/label"
style="@style/ListText"
<ImageButton android:id="@+id/remove" android:layout_width="wrap_content" android:background="?attr/reset_image" android:layout_width="0dp"
android:contentDescription="@string/default_buttons_delete" android:layout_height="wrap_content"
android:paddingLeft="2dp" android:paddingRight="2dp" android:layout_weight="1" />
android:paddingTop="2dp" android:layout_height="wrap_content" />
<ImageButton
android:id="@+id/remove"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/reset_image"
android:contentDescription="@string/default_buttons_delete"
android:paddingLeft="2dp"
android:paddingRight="2dp"
android:paddingTop="2dp" />
</LinearLayout> </LinearLayout>

17
OsmAnd/res/layout/searchbyname_list.xml
View file

@ -1,9 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?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"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="fill_parent"
android:paddingTop="3dp" android:layout_height="wrap_content"
android:paddingBottom="3dp" android:orientation="horizontal"
android:orientation="horizontal"> android:paddingBottom="3dp"
<TextView android:id="@+id/NameLabel" android:layout_width="fill_parent" android:paddingTop="3dp">
android:layout_height="fill_parent" style="@style/ListText"/>
<TextView
android:id="@+id/NameLabel"
style="@style/ListText"
android:layout_width="fill_parent"
android:layout_height="fill_parent" />
</LinearLayout> </LinearLayout>

46
OsmAnd/res/layout/searchpoi.xml
View file

@ -1,14 +1,36 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?> <!-- This file is at /res/layout/list.xml -->
<!-- This file is at /res/layout/list.xml -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent"> android:layout_height="fill_parent"
<LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/SearchFilterLayout" android:visibility="gone" android:orientation="vertical">
android:layout_marginLeft = "5dp" >
<TextView android:layout_width="wrap_content" android:text="@string/search_poi_filter" android:id="@+id/TextView" android:layout_height="wrap_content"/> <LinearLayout
<EditText android:layout_marginLeft = "5dp" android:layout_marginRight = "5dp" android:layout_width="fill_parent" android:text="" android:id="@+id/SearchFilter" android:layout_height="wrap_content"/> android:id="@+id/SearchFilterLayout"
</LinearLayout> android:layout_width="fill_parent"
<ListView android:id="@android:id/list" android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_height="fill_parent" style="@style/OsmandListView"></ListView> android:layout_marginLeft="5dp"
android:orientation="horizontal"
android:visibility="gone">
<TextView
android:id="@+id/TextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/search_poi_filter" />
<EditText
android:id="@+id/SearchFilter"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:text="" />
</LinearLayout>
<ListView
android:id="@android:id/list"
style="@style/OsmandListView"
android:layout_width="fill_parent"
android:layout_height="fill_parent" />
</LinearLayout> </LinearLayout>

49
OsmAnd/res/layout/searchpoi_list.xml
View file

@ -1,31 +1,42 @@
<?xml version="1.0" encoding="utf-8"?> <?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"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="fill_parent"
android:paddingTop="5dp" android:layout_height="wrap_content"
android:paddingBottom="5dp" android:paddingBottom="5dp"
> android:paddingTop="5dp">
<LinearLayout android:layout_width="wrap_content" <LinearLayout
android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="6dp" android:paddingLeft="6dp"
android:paddingRight="3dp"> android:paddingRight="3dp">
<ImageView android:id="@+id/poi_direction" android:layout_width="26dp" android:layout_height="26dp" <ImageView
/> android:id="@+id/poi_direction"
android:layout_width="26dp"
<ImageView android:id="@+id/poi_icon" android:layout_width="26dp" android:layout_height="26dp" android:layout_height="26dp" />
android:layout_marginLeft="3dp" />
<ImageView
android:id="@+id/poi_icon"
android:layout_width="26dp"
android:layout_height="26dp"
android:layout_marginLeft="3dp" />
</LinearLayout> </LinearLayout>
<LinearLayout android:layout_width="wrap_content" <LinearLayout
android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:paddingRight="3dp"> android:paddingRight="3dp">
<TextView android:id="@+id/poi_label" android:layout_width="fill_parent" <TextView
android:layout_height="fill_parent" android:gravity="center_vertical" style="@style/ListText.Small"/> android:id="@+id/poi_label"
style="@style/ListText.Small"
</LinearLayout> android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center_vertical" />
</LinearLayout>
</LinearLayout> </LinearLayout>

42
OsmAnd/res/layout/searchpoifolder_list.xml
View file

@ -1,18 +1,32 @@
<?xml version="1.0" encoding="utf-8"?> <?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"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="fill_parent"
android:paddingTop="5dp" android:layout_height="wrap_content"
android:paddingBottom="5dp" android:orientation="horizontal"
android:orientation="horizontal"> android:paddingBottom="5dp"
android:paddingTop="5dp">
<ImageView android:id="@+id/folder_icon" android:layout_width="37dip" <ImageView
android:paddingLeft="8dp" android:paddingRight="8dp" android:id="@+id/folder_icon"
android:paddingTop="2dp" android:layout_height="fill_parent" /> android:layout_width="37dip"
<TextView android:id="@+id/folder_label" android:layout_width="0dp" android:layout_weight="1" android:layout_height="fill_parent"
android:layout_height="wrap_content" style="@style/ListText"/> android:paddingLeft="8dp"
android:paddingRight="8dp"
<ImageView android:id="@+id/folder_edit_icon" android:paddingTop="2dp" />
android:paddingLeft="4dp" android:paddingRight="8dp" android:src="@android:drawable/ic_input_get"
android:layout_width="37dip" <TextView
android:paddingTop="2dp" android:layout_height="fill_parent" /> android:id="@+id/folder_label"
style="@style/ListText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
<ImageView
android:id="@+id/folder_edit_icon"
android:layout_width="37dip"
android:layout_height="fill_parent"
android:paddingLeft="4dp"
android:paddingRight="8dp"
android:paddingTop="2dp"
android:src="@android:drawable/ic_input_get" />
</LinearLayout> </LinearLayout>

13
OsmAnd/res/layout/selected_track_edit.xml
View file

@ -4,7 +4,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="7dp" android:paddingLeft="7dp"
android:paddingRight="7dp" android:paddingRight="7dp"
android:stretchColumns="1" > android:stretchColumns="1">
<TableRow> <TableRow>
@ -18,27 +18,24 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp" />
/>
</TableRow> </TableRow>
<TableRow <TableRow
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" > android:layout_height="wrap_content">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/gpx_split_interval" > android:text="@string/gpx_split_interval"></TextView>
</TextView>
<Spinner <Spinner
android:id="@+id/Spinner" android:id="@+id/Spinner"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" > android:layout_marginRight="5dp"></Spinner>
</Spinner>
</TableRow> </TableRow>
</TableLayout> </TableLayout>

89
OsmAnd/res/layout/send_gpx_osm.xml
View file

@ -1,29 +1,68 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TableLayout <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:layout_height="fill_parent" android:stretchColumns="1"> android:stretchColumns="1">
<TextView android:id="@+id/DescriptionTextTop" android:layout_marginLeft="5dp" android:layout_marginBottom="5dp"
style="@style/ListText" android:gravity="center_horizontal" <TextView
android:layout_height="wrap_content" android:text="@string/send_files_to_osm"></TextView> android:id="@+id/DescriptionTextTop"
<TableRow android:layout_width="fill_parent"> style="@style/ListText"
<TextView android:id="@+id/TextView" android:layout_marginLeft="5dp" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:text="@string/gpx_description_txt"></TextView> android:layout_marginBottom="5dp"
<EditText android:text="" android:id="@+id/DescriptionText" android:minLines="3" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:layout_marginLeft="5dp"
android:layout_height="wrap_content" android:layout_width="fill_parent"></EditText> android:gravity="center_horizontal"
</TableRow> android:text="@string/send_files_to_osm" />
<TableRow android:layout_width="fill_parent">
<TextView android:id="@+id/TextView" android:layout_marginLeft="5dp" <TableRow android:layout_width="fill_parent">
android:layout_height="wrap_content" android:text="@string/gpx_tags_txt"></TextView>
<EditText android:id="@+id/TagsText" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" <TextView
android:layout_height="wrap_content" android:text="osmand" android:layout_width="fill_parent"></EditText> android:id="@+id/TextView"
</TableRow> android:layout_height="wrap_content"
<TableRow android:layout_width="fill_parent"> android:layout_marginLeft="5dp"
<TextView android:id="@+id/TextView" android:layout_marginLeft="5dp" android:text="@string/gpx_description_txt" />
android:layout_height="wrap_content" android:text="@string/gpx_visibility_txt"></TextView>
<Spinner android:id="@+id/Visibility" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" <EditText
android:layout_height="wrap_content" android:layout_width="fill_parent"></Spinner> android:id="@+id/DescriptionText"
</TableRow> android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:minLines="3"
android:text="" />
</TableRow>
<TableRow android:layout_width="fill_parent">
<TextView
android:id="@+id/TextView"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/gpx_tags_txt" />
<EditText
android:id="@+id/TagsText"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:text="osmand" />
</TableRow>
<TableRow android:layout_width="fill_parent">
<TextView
android:id="@+id/TextView"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/gpx_visibility_txt" />
<Spinner
android:id="@+id/Visibility"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" />
</TableRow>
</TableLayout> </TableLayout>

8
OsmAnd/res/layout/sherpafy_browse_tour.xml
View file

@ -1,5 +1,4 @@
<android.support.v4.widget.DrawerLayout <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/drawer_layout" android:id="@+id/drawer_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
@ -9,12 +8,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
<!-- The navigation drawer --> <!-- The navigation drawer -->
<ListView android:id="@+id/left_drawer" <ListView
android:id="@+id/left_drawer"
android:layout_width="240dp" android:layout_width="240dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="start" android:layout_gravity="start"
android:choiceMode="singleChoice" android:choiceMode="singleChoice"
android:divider="@drawable/divider" android:divider="@drawable/divider"
android:dividerHeight="1px" android:dividerHeight="1px"
android:background="@color/color_white"/> android:background="@color/color_white" />
</android.support.v4.widget.DrawerLayout> </android.support.v4.widget.DrawerLayout>

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

@ -4,7 +4,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:paddingTop="8dp" > android:paddingTop="8dp">
<ImageView <ImageView
android:id="@+id/Icon" android:id="@+id/Icon"

132
OsmAnd/res/layout/sherpafy_list_tour_item.xml
View file

@ -1,79 +1,77 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/sherpafy_tour_row"> android:background="@drawable/sherpafy_tour_row">
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="15dp" android:layout_marginBottom="15dp"
android:layout_marginLeft="14dp" android:layout_marginLeft="14dp"
android:layout_marginRight="14dp" android:layout_marginRight="14dp"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:id="@+id/AreaPreview" android:id="@+id/AreaPreview"
android:background="@drawable/tour_bg" android:background="@drawable/tour_bg"
android:orientation="vertical"> android:orientation="vertical">
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<ImageView
android:layout_marginLeft="1dp"
android:layout_marginRight="1dp"
android:layout_marginTop="1dp"
android:id="@+id/TourImage"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop">
</ImageView>
<TextView <ImageView
android:id="@+id/TourName" android:layout_marginLeft="1dp"
android:layout_width="match_parent" android:layout_marginRight="1dp"
android:layout_height="wrap_content" android:layout_marginTop="1dp"
android:layout_gravity="bottom" android:id="@+id/TourImage"
android:layout_marginLeft="10dp" android:layout_width="match_parent"
android:layout_marginRight="6dp" android:layout_height="match_parent"
android:background="@color/shadow_color" android:scaleType="centerCrop"></ImageView>
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/color_white"
android:textSize="23sp"/>
</FrameLayout>
<TextView <TextView
android:id="@+id/TourDescription" android:id="@+id/TourName"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_gravity="bottom"
android:layout_marginRight="5dp" android:layout_marginLeft="10dp"
android:layout_marginTop="5dp" android:layout_marginRight="6dp"
android:layout_weight="1" android:background="@color/shadow_color"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="3" android:maxLines="1"
android:textSize="16sp"/> android:textColor="@color/color_white"
android:textSize="23sp" />
</FrameLayout>
<LinearLayout <TextView
android:layout_width="fill_parent" android:id="@+id/TourDescription"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_marginLeft="14dp" android:layout_height="wrap_content"
android:layout_marginRight="14dp" android:layout_marginLeft="10dp"
android:layout_marginTop="5dp" android:layout_marginRight="5dp"
android:layout_marginBottom="3dp" android:layout_marginTop="5dp"
android:orientation="vertical"> android:layout_weight="1"
android:ellipsize="end"
android:maxLines="3"
android:textSize="16sp" />
<TextView <LinearLayout
android:id="@+id/MoreInformation" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginLeft="14dp"
android:textSize="14sp" android:layout_marginRight="14dp"
android:focusable="false" android:layout_marginTop="5dp"
/> android:layout_marginBottom="3dp"
</LinearLayout> android:orientation="vertical">
<TextView
android:id="@+id/MoreInformation"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textSize="14sp"
android:focusable="false" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</FrameLayout> </FrameLayout>

7
OsmAnd/res/layout/sherpafy_loading.xml
View file

@ -1,14 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" > android:layout_height="fill_parent">
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:gravity="center_vertical|center_horizontal" android:gravity="center_vertical|center_horizontal"
android:orientation="horizontal" > android:orientation="horizontal">
<ProgressBar <ProgressBar
android:id="@+id/ProgressBar" android:id="@+id/ProgressBar"

11
OsmAnd/res/layout/sherpafy_stage_info.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent"> android:layout_height="fill_parent">
@ -12,15 +11,15 @@
android:visibility="gone" /> android:visibility="gone" />
<ScrollView <ScrollView
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" > android:layout_height="fill_parent">
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/color_white" android:background="@color/color_white"
android:orientation="vertical" > android:orientation="vertical">
<ImageView <ImageView
android:id="@+id/Icon" android:id="@+id/Icon"
@ -34,7 +33,7 @@
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:orientation="horizontal" > android:orientation="horizontal">
<TextView <TextView
android:id="@+id/HeaderText" android:id="@+id/HeaderText"

20
OsmAnd/res/layout/sherpafy_stage_list_item.xml
View file

@ -4,22 +4,24 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:paddingTop="8dp" android:paddingTop="8dp"
android:orientation="horizontal" > android:orientation="horizontal">
<FrameLayout <FrameLayout
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_marginRight="8dp" > android:layout_marginRight="8dp">
<ImageView
android:id="@+id/Icon" <ImageView
android:layout_width="48dp" android:id="@+id/Icon"
android:layout_height="48dp"/> android:layout_width="48dp"
</FrameLayout> android:layout_height="48dp" />
</FrameLayout>
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView

5
OsmAnd/res/layout/stdlist.xml
View file

@ -2,13 +2,12 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical" > android:orientation="vertical">
<ListView <ListView
android:id="@android:id/list" android:id="@android:id/list"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
style="@style/OsmandListView"> style="@style/OsmandListView"></ListView>
</ListView>
</LinearLayout> </LinearLayout>

166
OsmAnd/res/layout/tab_content.xml
View file

@ -1,118 +1,116 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TabHost <TabHost xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/tabhost" android:id="@android:id/tabhost"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:id="@+id/ProgressView" android:id="@+id/ProgressView"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone" > android:visibility="gone">
<RelativeLayout <RelativeLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="3dp" android:layout_marginLeft="3dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:gravity="center_vertical|left" android:gravity="center_vertical|left"
android:orientation="horizontal" > android:orientation="horizontal">
<ProgressBar <ProgressBar
android:id="@+id/IndeterminateProgressBar" android:id="@+id/IndeterminateProgressBar"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:indeterminate="true" android:indeterminate="true"
android:indeterminateOnly="true" android:indeterminateOnly="true"
android:visibility="gone" /> android:visibility="gone" />
<TextView <TextView
android:id="@+id/ProgressPercent" android:id="@+id/ProgressPercent"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:gravity="right|center_vertical" android:gravity="right|center_vertical"
android:text="" android:text=""
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
android:id="@+id/ProgressMessage" android:id="@+id/ProgressMessage"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="3dp" android:layout_marginLeft="3dp"
android:layout_toLeftOf="@id/ProgressPercent" android:layout_toLeftOf="@id/ProgressPercent"
android:layout_toRightOf="@id/IndeterminateProgressBar" android:layout_toRightOf="@id/IndeterminateProgressBar"
android:ellipsize="end" android:ellipsize="end"
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:singleLine="true" android:singleLine="true"
android:text="" android:text=""
android:textSize="14sp" /> android:textSize="14sp" />
</RelativeLayout> </RelativeLayout>
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" > android:orientation="horizontal">
<ProgressBar <ProgressBar
android:id="@+id/DeterminateProgressBar" android:id="@+id/DeterminateProgressBar"
style="?android:attr/progressBarStyleHorizontal" style="?android:attr/progressBarStyleHorizontal"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" /> android:layout_weight="1" />
<ImageView <ImageView
android:id="@+id/Cancel" android:id="@+id/Cancel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/a_1_navigation_cancel_small_dark" /> android:src="@drawable/a_1_navigation_cancel_small_dark" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<TabWidget <TabWidget
android:id="@android:id/tabs" android:id="@android:id/tabs"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0"/> android:layout_weight="0" />
<FrameLayout
<FrameLayout
android:id="@android:id/tabcontent" android:id="@android:id/tabcontent"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp" />
/>
<net.osmand.plus.CustomPager <net.osmand.plus.CustomPager
android:id="@+id/pager" android:id="@+id/pager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1"/> android:layout_weight="1" />
<Button <Button
android:id="@+id/DownloadButton" android:id="@+id/DownloadButton"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginLeft="3dp" android:layout_marginLeft="3dp"
android:layout_marginRight="3dp" android:layout_marginRight="3dp"
android:layout_marginTop="3dp" android:layout_marginTop="3dp"
android:gravity="center" android:gravity="center"
android:text="@string/download_files" android:text="@string/download_files"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>

Some files were not shown because too many files have changed in this diff Show more