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

Merge branch 'master' into design

Browse source
This commit is contained in:
Victor Shcherb 2014-11-17 21:55:40 +01:00
commit 6bf5363e15
118 changed files with 2987 additions and 2022 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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,8 +111,9 @@ 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>());
@ -115,6 +121,25 @@ public class MapTileDownloader {
} }
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);
} }

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

Binary file not shown.

3
OsmAnd/res/layout/action_item.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: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"

16
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:layout_height="fill_parent"
android:orientation="vertical"> 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>

71
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:orientation="vertical"> android:layout_height="fill_parent"
<RadioGroup android:layout_width="fill_parent" android:layout_height="wrap_content"> android:orientation="vertical">
<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,6 +16,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" />
<RadioButton <RadioButton
android:id="@+id/radio_gpx" android:id="@+id/radio_gpx"
android:text="@string/animate_routing_gpx" android:text="@string/animate_routing_gpx"
@ -21,21 +26,53 @@
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">
<TextView android:text="@string/select_animate_speedup" android:gravity="left"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:layout_marginTop="5dp"/>
<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 <LinearLayout
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="fill_parent"
android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:layout_marginTop="5dp"> android:id="@+id/layout_animate_gpx"
<TextView android:text="10" android:gravity="left" android:layout_weight="0.5" android:id="@+id/MinSpeedup" android:layout_height="fill_parent"
android:layout_width="wrap_content" android:layout_height="wrap_content"/> android:orientation="vertical"
<TextView android:text="15" android:gravity="right" android:layout_weight="0.5" android:id="@+id/MaxSpeedup" android:visibility="gone">
android:layout_width="wrap_content" android:layout_height="wrap_content"/>
<TextView
android:text="@string/select_animate_speedup"
android:gravity="left"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="5dp" />
<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>
</LinearLayout> </LinearLayout>

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

@ -3,8 +3,17 @@
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"
@ -36,8 +45,7 @@
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
@ -77,8 +84,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>
</LinearLayout> </LinearLayout>

17
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" <ImageButton
android:src="@drawable/av_download"
android:id="@+id/down"
android:layout_width="wrap_content"
android:layout_height="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,8 +24,12 @@
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" />

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

@ -3,15 +3,18 @@
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>

21
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_width="fill_parent"
android:layout_height="wrap_content"> 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>

41
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">
<CheckBox
android:id="@+id/check_download_item"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:focusable="false" />
</LinearLayout> </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" <TextView
android:layout_height="wrap_content" style="@style/ListText.Small"/> 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>

74
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:orientation="vertical"> android:layout_height="fill_parent"
<TextView android:text="@string/select_max_zoom_preload_area" android:gravity="center" android:orientation="vertical">
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:layout_marginTop="5dp"/> <TextView
<SeekBar android:id="@+id/ZoomToDownload" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/select_max_zoom_preload_area"
android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:layout_marginTop="5dp"/> android:gravity="center"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="5dp" />
<SeekBar
android:id="@+id/ZoomToDownload"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="5dp" />
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="fill_parent"
android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:layout_marginTop="5dp"> android:layout_height="wrap_content"
<TextView android:text="10" android:gravity="left" android:layout_weight="0.5" android:id="@+id/MinZoom" android:layout_marginLeft="10dp"
android:layout_width="wrap_content" android:layout_height="wrap_content"/> android:layout_marginRight="10dp"
<TextView android:text="15" android:gravity="right" android:layout_weight="0.5" android:id="@+id/MaxZoom" android:layout_marginTop="5dp">
android:layout_width="wrap_content" android:layout_height="wrap_content"/>
<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> </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"/> <TextView
<ImageView android:layout_width="fill_parent" android:layout_height="fill_parent" android:text="@string/tiles_to_download_estimated_size"
android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:layout_marginTop="5dp" 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:layout_marginBottom="5dp"
android:id="@+id/AreaPreview" /> android:id="@+id/AreaPreview" />
</LinearLayout> </LinearLayout>

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

@ -7,11 +7,14 @@
android:paddingLeft="24dp" android:paddingLeft="24dp"
android:paddingRight="16dp"> android:paddingRight="16dp">
<LinearLayout android:layout_width="0dp" <LinearLayout
android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_height="48dp"> android:layout_height="48dp">
<TextView android:id="@+id/title"
<TextView
android:id="@+id/title"
android:textSize="18sp" android:textSize="18sp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_weight="1" android:layout_weight="1"
@ -19,7 +22,9 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:maxLines="2" android:maxLines="2"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView android:id="@+id/descr"
<TextView
android:id="@+id/descr"
android:textSize="14sp" android:textSize="14sp"
android:layout_weight="1" android:layout_weight="1"
android:textColor="#bebebe" android:textColor="#bebebe"
@ -31,6 +36,7 @@
android:layout_gravity="center_vertical|right" android:layout_gravity="center_vertical|right"
android:layout_height="wrap_content" /> 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"

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

@ -8,14 +8,16 @@
android:minHeight="40dp" android:minHeight="40dp"
android:layout_marginBottom="5dp"> android:layout_marginBottom="5dp">
<ImageView android:id="@+id/waypoint_icon" <ImageView
android:id="@+id/waypoint_icon"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center_vertical" /> android:layout_gravity="center_vertical" />
<TextView android:id="@+id/title" <TextView
android:id="@+id/title"
android:text="@string/search_radius_proximity" android:text="@string/search_radius_proximity"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
@ -24,7 +26,8 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:textSize="20sp" /> android:textSize="20sp" />
<TextView android:id="@+id/descr" <TextView
android:id="@+id/descr"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="20sp" android:textSize="20sp"

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

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

@ -1,6 +1,5 @@
<?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_width="fill_parent"
android:layout_height="fill_parent" > android:layout_height="fill_parent" >
@ -16,9 +15,13 @@
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:text="@string/create_poi_link_to_osm_doc" /> android:text="@string/create_poi_link_to_osm_doc" />
<TableLayout android:layout_width="fill_parent" android:layout_height="wrap_content" <TableLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:stretchColumns="1" > android:stretchColumns="1" >
<TableRow> <TableRow>
<TextView <TextView
android:id="@+id/TextView" android:id="@+id/TextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -30,16 +33,18 @@
<EditText <EditText
android:id="@+id/Name" 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:text="" > android:text="" >
<requestFocus /> <requestFocus />
</EditText> </EditText>
</TableRow> </TableRow>
<TableRow> <TableRow>
<Button <Button
android:id="@+id/TypeButton" android:id="@+id/TypeButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -49,14 +54,15 @@
<AutoCompleteTextView <AutoCompleteTextView
android:id="@+id/Type" android:id="@+id/Type"
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:text="" /> android:text="" />
</TableRow> </TableRow>
<TableRow> <TableRow>
<Button <Button
android:id="@+id/OpenHoursButton" android:id="@+id/OpenHoursButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -66,16 +72,17 @@
<EditText <EditText
android:id="@+id/OpeningHours" android:id="@+id/OpeningHours"
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:hint="Mo-Su 08:00-20:00" android:hint="Mo-Su 08:00-20:00"
android:minWidth="250dp"
android:text="" > android:text="" >
</EditText> </EditText>
</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"
@ -85,13 +92,15 @@
<EditText <EditText
android:id="@+id/StreetName" android:id="@+id/StreetName"
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" >
</EditText> </EditText>
</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"
@ -101,32 +110,35 @@
<EditText <EditText
android:id="@+id/HouseNumber" android:id="@+id/HouseNumber"
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" >
</EditText> </EditText>
</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"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:text="@string/phone" /> android:text="@string/phone" />
<EditText <EditText
android:id="@+id/Phone" android:id="@+id/Phone"
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:hint="0123456789" android:hint="0123456789"
android:inputType="phone" > android:inputType="phone"
android:minWidth="250dp" >
</EditText> </EditText>
</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"
@ -136,15 +148,16 @@
<EditText <EditText
android:id="@+id/Website" android:id="@+id/Website"
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:hint="http://osmand.net" > android:hint="http://osmand.net"
android:minWidth="250dp" >
</EditText> </EditText>
</TableRow> </TableRow>
<TableRow> <TableRow>
<TextView <TextView
android:id="@+id/TextView" android:id="@+id/TextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -155,15 +168,16 @@
<EditText <EditText
android:id="@+id/Comment" android:id="@+id/Comment"
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:text="@string/poi_dialog_comment_default" > android:text="@string/poi_dialog_comment_default" >
</EditText> </EditText>
</TableRow> </TableRow>
<TableRow> <TableRow>
<CheckBox <CheckBox
android:id="@+id/CloseChangeset" android:id="@+id/CloseChangeset"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -174,8 +188,6 @@
</TableRow> </TableRow>
</TableLayout> </TableLayout>
<TableLayout <TableLayout
android:id="@+id/advancedModeTable" android:id="@+id/advancedModeTable"
android:layout_width="fill_parent" android:layout_width="fill_parent"
@ -184,7 +196,8 @@
android:visibility="gone" > android:visibility="gone" >
</TableLayout> </TableLayout>
<LinearLayout android:layout_width="fill_parent" <LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content" > android:layout_height="wrap_content" >
<Button <Button
@ -198,16 +211,39 @@
<Button <Button
android:id="@+id/advancedMode" android:id="@+id/advancedMode"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:minWidth="150dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minWidth="150dp"
android:text="@string/btn_advanced_mode" /> android:text="@string/btn_advanced_mode" />
</LinearLayout> </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"/> <TextView
<LinearLayout android:id="@+id/LinearLayout" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="horizontal" android:id="@+id/TextView"
android:gravity="bottom|center"> 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_commit" android:id="@+id/Commit"></Button> 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>
</LinearLayout> </LinearLayout>
</ScrollView> </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>

17
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:layout_height="wrap_content"
android:orientation="horizontal"> 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" <TextView
android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/filter_poi_label"
style="@style/ListText"></TextView> style="@style/ListText"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>

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

@ -34,24 +34,25 @@
</EditText> </EditText>
</TableRow> </TableRow>
<TableRow android:layout_width="fill_parent" <TableRow
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/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_width="fill_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
@ -65,11 +66,11 @@
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_width="fill_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
@ -81,11 +82,11 @@
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_width="fill_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
@ -97,28 +98,27 @@
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_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="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_width="fill_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<CheckBox <CheckBox

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

@ -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>

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

@ -24,13 +24,13 @@
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"

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

@ -24,8 +24,7 @@
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"
@ -38,8 +37,7 @@
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>

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

@ -18,8 +18,7 @@
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
@ -29,16 +28,14 @@
<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>

40
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"
android:paddingLeft="3dp"
android:paddingRight="3dp"
android:stretchColumns="1">
<TableRow> <TableRow>
<TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/favourites_edit_dialog_name" /> android:text="@string/favourites_edit_dialog_name" />
<EditText android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingLeft="3dp"
android:id="@+id/Name" android:inputType="textCapWords" android:selectAllOnFocus="true"/> <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>
<TableRow> <TableRow>
<TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/favourites_edit_dialog_category" /> android:text="@string/favourites_edit_dialog_category" />
<AutoCompleteTextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingLeft="3dp"
android:id="@+id/Category" android:completionThreshold="1" android:inputType="textCapWords" android:selectAllOnFocus="true"/> <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> </TableRow>
</TableLayout> </TableLayout>

33
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:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingBottom="5dp" 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"> <LinearLayout
<CheckBox android:id="@+id/check_item" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_width="wrap_content"
android:gravity="center_vertical" android:focusable="false" android:visibility="gone"/> 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> </LinearLayout>
<ImageView android:id="@+id/favourite_icon" android:layout_width="25dp" <ImageView
android:paddingRight="2dp" android:paddingTop="2dp" android:layout_height="fill_parent" /> 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" <TextView
android:layout_height="wrap_content" style="@style/ListText"/> android:id="@+id/favourite_label"
android:layout_width="wrap_content"
android:layout_marginLeft="10dp"
android:layout_height="wrap_content"
style="@style/ListText" />
</LinearLayout> </LinearLayout>

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

@ -15,8 +15,7 @@
<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>

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

@ -18,7 +18,8 @@
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">

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

@ -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>

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

@ -15,8 +15,7 @@
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"
@ -28,13 +27,16 @@
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:id="@+id/icon_settings"
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"
@ -47,8 +49,7 @@
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>

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

@ -14,8 +14,7 @@
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"
@ -29,11 +28,13 @@
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:id="@+id/icon_settings"
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"

8
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:textSize="20sp" android:textStyle="bold"> android:layout_height="wrap_content"
</TextView> android:textSize="20sp"
android:textStyle="bold"></TextView>

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

@ -1,12 +1,18 @@
<?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:orientation="vertical"> android:layout_height="fill_parent"
android:orientation="vertical">
<TextView android:id="@+id/DescriptionText" android:layout_width="fill_parent" android:layout_height="wrap_content" <TextView
android:layout_marginLeft="10dp" android:layout_marginTop="3dp" android:layout_marginBottom="5dp" android:id="@+id/DescriptionText"
android:layout_marginRight="10dp" android:text="@string/download_link_and_local_description"/> 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 <ExpandableListView
android:id="@android:id/list" android:id="@android:id/list"
@ -17,7 +23,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>
</ExpandableListView>
</LinearLayout> </LinearLayout>

59
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> <LinearLayout
<TextView android:id="@+id/local_index_name" android:gravity="center_vertical" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_weight="1" style="@style/ListText.Small"></TextView> android:layout_height="fill_parent">
<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> <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> </LinearLayout>
<TextView android:id="@+id/local_index_descr" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" <TextView
android:maxLines="25" style="@style/ListText.Small"></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>

15
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:orientation="vertical"> android:layout_height="fill_parent"
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>

14
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:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"> 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>

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

@ -4,15 +4,15 @@
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:id="@+id/glSurfaceStub"
android:inflatedId="@+id/glSurfaceView" android:inflatedId="@+id/glSurfaceView"
android:layout="@layout/gl_surface" android:layout="@layout/gl_surface"
android:layout_width="match_parent" android:layout_width="match_parent"

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

@ -6,38 +6,48 @@
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"
<ImageButton
android:id="@+id/back"
android:focusable="false" android:focusable="false"
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"
android:background="@null" android:background="@null"
android:layout_marginRight="10dp" /> android:layout_marginRight="10dp" />
<ImageView android:id="@+id/icon"
<ImageView
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:layout_gravity="center_vertical" /> android:layout_gravity="center_vertical" />
<LinearLayout android:orientation="vertical" <LinearLayout
android:orientation="vertical"
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"
android:layout_weight="1" android:layout_weight="1"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"> android:layout_marginTop="10dp">
<TextView android:id="@+id/name"
<TextView
android:id="@+id/name"
android:textSize="16sp" android:textSize="16sp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView android:id="@+id/descr"
<TextView
android:id="@+id/descr"
android:textSize="12sp" android:textSize="12sp"
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" />
</LinearLayout> </LinearLayout>
<CheckBox android:id="@+id/check" <CheckBox
android:id="@+id/check"
android:focusable="false" android:focusable="false"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_width="wrap_content" android:layout_width="wrap_content"

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

@ -2,77 +2,240 @@
<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"
<LinearLayout
android:id="@+id/Headliner"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:background="@drawable/status_bar"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_marginTop="4dp"
android:src="@drawable/icon_small" />
<TextView
android:id="@+id/AppName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginTop="3dp"
android:text="@string/app_name"
android:textColor="#000000"
android:textSize="20sp"
android:typeface="serif" />
<TextView
android:id="@+id/TextVersion"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="3dp"
android:layout_marginLeft="12dp"
android:layout_marginTop="3dp"
android:layout_weight="1"
android:gravity="right"
android:text="@string/app_version"
android:textColor="#000000"
android:textSize="13sp"
android:typeface="serif" />
<ImageView
android:id="@+id/HelpButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_marginTop="7dp"
android:clickable="true"
android:contentDescription="@string/help" android:contentDescription="@string/help"
android:layout_height="wrap_content" android:layout_width="wrap_content" android:src="@drawable/help_icon" android:focusable="true"
android:focusable="true"/> android:src="@drawable/help_icon" />
<ImageView android:layout_marginRight="2dp" android:clickable="true" android:id="@+id/CloseButton"
<ImageView
android:id="@+id/CloseButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="0dp"
android:layout_marginRight="2dp"
android:layout_marginTop="7dp"
android:clickable="true"
android:contentDescription="@string/close" android:contentDescription="@string/close"
android:layout_marginTop="7dp" android:layout_height="wrap_content" android:layout_width="wrap_content" android:focusable="true"
android:layout_marginLeft="0dp" android:src="@drawable/headliner_close" android:focusable="true"/> android:src="@drawable/headliner_close" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<TableLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
<TableRow android:layout_height = "wrap_content" android:layout_marginTop="15dp"> <TableLayout
<LinearLayout android:id="@+id/MapButton" android:background="@drawable/bg_leftr" android:orientation="vertical" android:clickable="true" android:layout_width="fill_parent"
android:layout_weight="3" android:layout_height="175dp" android:focusable="true"> 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 <ImageView
android:src="@drawable/button_icon_map" android:scaleType="center" android:layout_gravity="center" android:layout_width="wrap_content"
android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/> android:layout_height="0dp"
<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center"> android:layout_gravity="center"
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="1"
android:layout_gravity="center_horizontal|top" android:textSize="18sp" android:scaleType="center"
android:text="@string/map_Button" android:typeface="serif" android:textColor="#000000"/> 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> </LinearLayout>
<LinearLayout android:layout_weight="2" android:layout_height="fill_parent"/>
<LinearLayout android:id="@+id/SearchButton" android:background="@drawable/bg_rightr" android:orientation="vertical" android:clickable="true" <LinearLayout
android:layout_weight="3" android:layout_height="175dp" android:focusable="true"> 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 <ImageView
android:src="@drawable/button_icon_search" android:scaleType="center" android:layout_gravity="center" android:layout_width="wrap_content"
android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/> android:layout_height="0dp"
<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center"> android:layout_gravity="center"
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="1"
android:layout_gravity="center_horizontal|top" android:textSize="18sp" android:scaleType="center"
android:text="@string/search_button" android:typeface="serif" android:textColor="#000000"/> 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>
</LinearLayout> </LinearLayout>
</TableRow> </TableRow>
<TableRow android:layout_height = "wrap_content" android:layout_marginTop="15dp">
<LinearLayout android:id="@+id/FavoritesButton" android:background="@drawable/bg_leftr" android:orientation="vertical" android:clickable="true" <TableRow
android:layout_weight="3" android:layout_height="175dp" android:focusable="true"> android:layout_height="wrap_content"
<ImageView android:id="@+id/FavoritesButtonImage" android:layout_marginTop="15dp">
android:src="@drawable/button_icon_favorites" android:scaleType="center" android:layout_gravity="center"
android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/> <LinearLayout
<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center"> android:id="@+id/FavoritesButton"
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/FavoritesButtonText" android:layout_height="175dp"
android:layout_gravity="center_horizontal|top" android:textSize="18sp" android:layout_weight="3"
android:text="@string/my_data_Button" android:typeface="serif" android:textColor="#000000"/> 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> </LinearLayout>
<LinearLayout android:layout_weight="2" android:layout_height="fill_parent"/>
<LinearLayout android:id="@+id/SettingsButton" android:background="@drawable/bg_rightr" android:orientation="vertical" android:clickable="true" <LinearLayout
android:layout_weight="3" android:layout_height="175dp" android:focusable="true"> android:layout_height="fill_parent"
<ImageView android:id="@+id/SettingsButtonImage" android:layout_weight="2" />
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"/> <LinearLayout
<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center"> android:id="@+id/SettingsButton"
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_height="175dp"
android:layout_gravity="center_horizontal|top" android:textSize="18sp" android:id="@+id/SettingsButtonText" android:layout_weight="3"
android:text="@string/settings_Button" android:typeface="serif" android:textColor="#000000"/> 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>
</LinearLayout> </LinearLayout>
</TableRow> </TableRow>

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

@ -2,7 +2,9 @@
<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">

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

@ -1,27 +1,98 @@
<?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"
android:layout_height="fill_parent">
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:orientation="vertical" android:gravity="center_horizontal"> android:layout_height="wrap_content"
<net.osmand.view.ExpandableLinearLayout custom:maxVisibleWidth="800dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" > 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> 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">
<TableLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:stretchColumns="1">
<TableRow android:layout_width="fill_parent"> <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> <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>
<TableRow android:layout_width="fill_parent"> <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> <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>
<TableRow android:layout_width="fill_parent"> <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> <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> </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>
<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> </TableLayout>
</net.osmand.view.ExpandableLinearLayout> </net.osmand.view.ExpandableLinearLayout>

18
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>

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

@ -1,14 +1,17 @@
<?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:layout_marginLeft="5dp"
<TextView
android:layout_marginLeft="5dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:text="@string/osb_comment_dialog_message" /> android:text="@string/osb_comment_dialog_message" />
<EditText android:id="@+id/BugMessage"
<EditText
android:id="@+id/BugMessage"
android:minLines="1" android:minLines="1"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
@ -17,11 +20,14 @@
android:inputType="textMultiLine" /> android:inputType="textMultiLine" />
<TextView android:layout_marginLeft="5dp" <TextView
android:layout_marginLeft="5dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:text="@string/osb_comment_dialog_author" /> android:text="@string/osb_comment_dialog_author" />
<EditText android:id="@+id/AuthorName"
<EditText
android:id="@+id/AuthorName"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -29,11 +35,14 @@
android:text="NoName" /> android:text="NoName" />
<TextView android:layout_marginLeft="5dp" <TextView
android:layout_marginLeft="5dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:text="@string/osb_author_dialog_password" /> android:text="@string/osb_author_dialog_password" />
<EditText android:id="@+id/Password"
<EditText
android:id="@+id/Password"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"

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

@ -1,10 +1,30 @@
<?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>
<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> </LinearLayout>

22
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:layout_height="wrap_content"
android:orientation="horizontal"> 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"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textSize="20sp" />
<ImageButton android:id="@+id/remove" android:layout_width="wrap_content" android:background="?attr/reset_image" <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:contentDescription="@string/default_buttons_delete"
android:paddingLeft="2dp" android:paddingRight="2dp" android:paddingLeft="2dp"
android:paddingTop="2dp" android:layout_height="wrap_content" /> android:paddingRight="2dp"
android:paddingTop="2dp" />
</LinearLayout> </LinearLayout>

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

@ -60,7 +60,9 @@
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"

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

@ -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

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

@ -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>
@ -32,16 +31,14 @@
<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>

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

@ -25,13 +25,11 @@
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">

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

@ -29,8 +29,7 @@
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" /> -->

7
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>

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

@ -6,7 +6,8 @@
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:id="@+id/point_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
@ -15,26 +16,34 @@
android:layout_marginBottom="2dp" android:layout_marginBottom="2dp"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView android:id="@+id/point_id" <TextView
android:id="@+id/point_id"
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" />
<LinearLayout android:layout_width="wrap_content" <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView android:layout_width="wrap_content"
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:text="@string/package_delivered" /> android:text="@string/package_delivered" />
<Button android:id="@+id/delivered_yes"
<Button
android:id="@+id/delivered_yes"
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_yes" />
<Button android:id="@+id/delivered_no"
<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"

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

@ -18,8 +18,16 @@
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"
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 <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -39,19 +47,18 @@
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_width="fill_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
@ -82,20 +89,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:textSize="18sp" > android:textSize="18sp"></Spinner>
</Spinner>
</LinearLayout> </LinearLayout>
<View android:layout_width="fill_parent"
<View
android:layout_width="fill_parent"
android:layout_height="2dip" android:layout_height="2dip"
android:background="#FFC8C8C8" /> android:background="#FFC8C8C8" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
<LinearLayout android:layout_width="fill_parent"
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:gravity="center" android:gravity="center"
android:id="@+id/RouteInfoControls"> android:id="@+id/RouteInfoControls">
<ImageButton <ImageButton
android:id="@+id/Prev" android:id="@+id/Prev"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -103,8 +114,8 @@
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"
@ -113,8 +124,8 @@
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"
@ -123,16 +134,16 @@
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"
<Button
android:id="@+id/SimulateRoute"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:drawableLeft="@drawable/ic_action_play_dark" android:drawableLeft="@drawable/ic_action_play_dark"
android:text="@string/animate_route" android:text="@string/animate_route" />
/>
</LinearLayout> </LinearLayout>

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

@ -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>

19
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:orientation="vertical"> android:layout_height="fill_parent"
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> <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" <ListView
android:id="@android:id/list"
android:layout_width="fill_parent"
android:layout_weight="1"
android:layout_height="0dp"
android:layout_marginTop="10dp"></ListView> android:layout_marginTop="10dp"></ListView>
</LinearLayout> </LinearLayout>

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

@ -5,41 +5,50 @@
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_width="fill_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
<LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="5dp" android:background="?attr/expandable_category_color"
> android:paddingBottom="3dp"
<CheckBox android:id="@+id/check_item" android:focusable="false" android:gravity="top" android:paddingTop="6dp">
<LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> 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> </LinearLayout>
<TextView <TextView
android:id="@+id/plugin_name" android:id="@+id/plugin_name"
style="@style/ListText"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="top" android:gravity="top"
android:textStyle="bold" android:paddingRight="10dp"
android:text="@string/extra_settings"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
style="@style/ListText" android:text="@string/extra_settings" android:textStyle="bold" />
android:paddingRight="10dp">
</TextView>
</LinearLayout> </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>

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

@ -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>

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

@ -4,7 +4,9 @@
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"
<ImageView
android:id="@+id/point_icon"
android:layout_width="32dp" android:layout_width="32dp"
android:padding="3dp" android:padding="3dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"

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

@ -5,15 +5,20 @@
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_height="wrap_content">
<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:layout_marginLeft="10dp"
android:ellipsize="end" android:ellipsize="end"
android:textSize="20sp" /> android:textSize="20sp" />
<TextView android:id="@+id/points_count" <TextView
android:id="@+id/points_count"
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"
@ -23,7 +28,8 @@
</LinearLayout> </LinearLayout>
<ListView android:id="@android:id/list" <ListView
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"
android:choiceMode="singleChoice" android:choiceMode="singleChoice"

58
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"
android:layout_height="fill_parent"
android:orientation="vertical">
<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" <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:visibility="gone" /> android:visibility="gone" />
<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"/> <LinearLayout
<EditText android:id="@+id/FileNameEdit" android:layout_marginLeft="5dp" android:layout_width="fill_parent" android:layout_height="wrap_content"/> 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>
<LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="horizontal"
android:gravity="bottom|center" android:layout_marginTop="5dp"> <LinearLayout
<Button android:layout_width="125dp" android:layout_height="wrap_content" android:text="@string/default_buttons_cancel" android:id="@+id/Cancel"></Button> android:layout_width="fill_parent"
<Button android:layout_width="125dp" android:layout_height="wrap_content" android:text="@string/default_buttons_save" android:id="@+id/Save"></Button> 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> </LinearLayout>

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

@ -28,25 +28,22 @@
<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:scrollHorizontally="true"
android:lines="1"
android:ellipsize="end"
android:layout_width="150dp" android:layout_width="150dp"
/> android:ellipsize="end"
android:lines="1"
android:scrollHorizontally="true"
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
@ -55,25 +52,22 @@
<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:scrollHorizontally="true"
android:lines="1"
android:ellipsize="end"
android:layout_width="150dp" android:layout_width="150dp"
/> android:ellipsize="end"
android:lines="1"
android:scrollHorizontally="true"
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
@ -82,25 +76,22 @@
<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:scrollHorizontally="true"
android:lines="1"
android:ellipsize="end"
android:layout_width="150dp" android:layout_width="150dp"
/> android:ellipsize="end"
android:lines="1"
android:scrollHorizontally="true"
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
@ -109,25 +100,22 @@
<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:scrollHorizontally="true"
android:lines="1"
android:ellipsize="end"
android:layout_width="150dp" android:layout_width="150dp"
/> android:ellipsize="end"
android:lines="1"
android:scrollHorizontally="true"
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>
@ -143,16 +131,14 @@
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>

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

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

23
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:orientation="horizontal"> android:layout_height="fill_parent"
<TextView android:id="@+id/distance_label" android:layout_marginLeft="5dp" android:orientation="horizontal">
android:layout_width="80dp" android:layout_height="wrap_content" android:gravity="left"
<TextView
android:id="@+id/distance_label"
android:layout_marginLeft="5dp"
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" /> android:textSize="20sp" />
<TextView android:id="@+id/label" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:textSize="20sp" />
</LinearLayout> </LinearLayout>

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

@ -15,8 +15,7 @@
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>

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

@ -1,25 +1,51 @@
<?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:orientation="vertical"> android:layout_height="fill_parent"
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="5dp" android:layout_marginTop="1dp" android:layout_marginRight="3dp"> <LinearLayout
<ProgressBar android:id="@+id/ProgressBar" android:layout_width="wrap_content" android:layout_height="wrap_content"></ProgressBar> android:id="@+id/LinearLayout"
<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="fill_parent"
<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> android:layout_marginLeft="3dp"
android:layout_marginRight="3dp"
android:layout_marginTop="1dp">
<ProgressBar
android:id="@+id/ProgressBar"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<EditText
android:id="@+id/SearchText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:inputType="number" />
<Button
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" android:layout_width="fill_parent" android:layout_height="fill_parent" <ListView
android:layout_marginLeft="3dp" android:layout_marginTop="3dp" android:layout_marginRight="3dp" style="@style/OsmandListView"></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> </LinearLayout>

8
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"
@ -21,6 +21,7 @@
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 <TextView
android:id="@+id/textViewADesc" android:id="@+id/textViewADesc"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -35,8 +36,7 @@
<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"

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" />
/>

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

@ -1,5 +1,4 @@
<?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"
@ -14,15 +13,13 @@
<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"
@ -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>

20
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:layout_height="wrap_content"
android:orientation="horizontal"> 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"
android:paddingLeft="2dp"
android:paddingRight="2dp"
android:paddingTop="2dp" />
<TextView android:id="@+id/label" android:layout_width="wrap_content" <TextView
android:layout_height="wrap_content" style="@style/ListText.Small"/> android:id="@+id/label"
style="@style/ListText.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>

22
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:layout_height="wrap_content"
android:orientation="horizontal"> 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"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
<ImageButton android:id="@+id/remove" android:layout_width="wrap_content" android:background="?attr/reset_image" <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:contentDescription="@string/default_buttons_delete"
android:paddingLeft="2dp" android:paddingRight="2dp" android:paddingLeft="2dp"
android:paddingTop="2dp" android:layout_height="wrap_content" /> android:paddingRight="2dp"
android:paddingTop="2dp" />
</LinearLayout> </LinearLayout>

15
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:orientation="horizontal"
android:paddingBottom="3dp" android:paddingBottom="3dp"
android:orientation="horizontal"> android:paddingTop="3dp">
<TextView android:id="@+id/NameLabel" android:layout_width="fill_parent"
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>

42
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"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
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> </LinearLayout>
<ListView android:id="@android:id/list" android:layout_width="fill_parent"
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" />
</LinearLayout> </LinearLayout>

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

@ -1,30 +1,41 @@
<?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"
android:layout_height="26dp" />
<ImageView android:id="@+id/poi_icon" android:layout_width="26dp" android:layout_height="26dp" <ImageView
android:id="@+id/poi_icon"
android:layout_width="26dp"
android:layout_height="26dp"
android:layout_marginLeft="3dp" /> 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"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center_vertical" />
</LinearLayout> </LinearLayout>

38
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:orientation="horizontal"
android:paddingBottom="5dp" android:paddingBottom="5dp"
android:orientation="horizontal"> 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" />
<TextView android:id="@+id/folder_label" android:layout_width="0dp" android:layout_weight="1"
android:layout_height="wrap_content" style="@style/ListText"/>
<ImageView android:id="@+id/folder_edit_icon"
android:paddingLeft="4dp" android:paddingRight="8dp" android:src="@android:drawable/ic_input_get"
android:layout_width="37dip" android:layout_width="37dip"
android:paddingTop="2dp" android:layout_height="fill_parent" /> android:layout_height="fill_parent"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="2dp" />
<TextView
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>

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

@ -18,8 +18,7 @@
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
@ -29,16 +28,14 @@
<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>

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

@ -1,28 +1,67 @@
<?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:stretchColumns="1"> android:layout_height="fill_parent"
<TextView android:id="@+id/DescriptionTextTop" android:layout_marginLeft="5dp" android:layout_marginBottom="5dp" android:stretchColumns="1">
style="@style/ListText" android:gravity="center_horizontal"
android:layout_height="wrap_content" android:text="@string/send_files_to_osm"></TextView> <TextView
android:id="@+id/DescriptionTextTop"
style="@style/ListText"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:layout_marginLeft="5dp"
android:gravity="center_horizontal"
android:text="@string/send_files_to_osm" />
<TableRow android:layout_width="fill_parent"> <TableRow android:layout_width="fill_parent">
<TextView android:id="@+id/TextView" android:layout_marginLeft="5dp"
android:layout_height="wrap_content" android:text="@string/gpx_description_txt"></TextView> <TextView
<EditText android:text="" android:id="@+id/DescriptionText" android:minLines="3" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:id="@+id/TextView"
android:layout_height="wrap_content" android:layout_width="fill_parent"></EditText> android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/gpx_description_txt" />
<EditText
android:id="@+id/DescriptionText"
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>
<TableRow android:layout_width="fill_parent"> <TableRow android:layout_width="fill_parent">
<TextView android:id="@+id/TextView" android:layout_marginLeft="5dp"
android:layout_height="wrap_content" android:text="@string/gpx_tags_txt"></TextView> <TextView
<EditText android:id="@+id/TagsText" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:id="@+id/TextView"
android:layout_height="wrap_content" android:text="osmand" android:layout_width="fill_parent"></EditText> 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>
<TableRow android:layout_width="fill_parent"> <TableRow android:layout_width="fill_parent">
<TextView android:id="@+id/TextView" android:layout_marginLeft="5dp"
android:layout_height="wrap_content" android:text="@string/gpx_visibility_txt"></TextView> <TextView
<Spinner android:id="@+id/Visibility" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:id="@+id/TextView"
android:layout_height="wrap_content" android:layout_width="fill_parent"></Spinner> 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> </TableRow>

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

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

@ -26,8 +26,7 @@
android:id="@+id/TourImage" android:id="@+id/TourImage"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop"> android:scaleType="centerCrop"></ImageView>
</ImageView>
<TextView <TextView
android:id="@+id/TourName" android:id="@+id/TourName"
@ -69,8 +68,7 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="14sp" android:textSize="14sp"
android:focusable="false" android:focusable="false" />
/>
</LinearLayout> </LinearLayout>

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

@ -3,8 +3,7 @@
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"

3
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">

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

@ -11,11 +11,13 @@
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 <ImageView
android:id="@+id/Icon" android:id="@+id/Icon"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" /> android:layout_height="48dp" />
</FrameLayout> </FrameLayout>
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"

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

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

8
OsmAnd/res/layout/tab_content.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"
@ -89,12 +89,10 @@
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"

54
OsmAnd/res/layout/tips_and_tricks.xml
View file

@ -1,19 +1,51 @@
<?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 xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent" android:orientation="vertical" > android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<net.osmand.access.ExplorableTextView android:text="" android:id="@+id/TipDescription" android:layout_marginLeft="4dp" android:scrollbars="vertical" <net.osmand.access.ExplorableTextView
android:layout_width="fill_parent" android:layout_height="0dp" android:layout_marginRight="4dp" android:layout_weight="1" android:id="@+id/TipDescription"
style="@style/ListText" android:gravity="fill_horizontal" style="@style/ListText"
/> android:layout_width="fill_parent"
android:layout_height="0dp"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
android:layout_weight="1"
android:gravity="fill_horizontal"
android:scrollbars="vertical"
android:text="" />
<!-- <TextView android:text="@string/poi_dialog_other_tags_message" android:id="@+id/TextView" android:layout_marginLeft="5dp" <!-- <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" /> --> android:layout_width="fill_parent" android:layout_height="wrap_content" /> -->
<LinearLayout android:id="@+id/LinearLayout" android:layout_width="fill_parent" android:layout_height="wrap_content" <LinearLayout
android:layout_marginTop = "15dp" android:orientation="horizontal" android:gravity="bottom|center"> android:id="@+id/LinearLayout"
<Button android:minWidth="70dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/previous_button" android:id="@+id/PreviousButton"></Button> android:layout_width="fill_parent"
<Button android:minWidth="70dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/next_button" android:id="@+id/NextButton"></Button> android:layout_height="wrap_content"
<Button android:minWidth="70dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/close" android:id="@+id/CloseButton"></Button> android:layout_marginTop="15dp"
android:gravity="bottom|center"
android:orientation="horizontal">
<Button
android:id="@+id/PreviousButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="70dp"
android:text="@string/previous_button" />
<Button
android:id="@+id/NextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="70dp"
android:text="@string/next_button" />
<Button
android:id="@+id/CloseButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="70dp"
android:text="@string/close" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

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

@ -7,13 +7,15 @@
android:paddingBottom="1dp" android:paddingBottom="1dp"
android:paddingRight="8dp"> android:paddingRight="8dp">
<CheckBox android:id="@+id/check_download_item" <CheckBox
android:id="@+id/check_download_item"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical" android:gravity="center_vertical"
android:focusable="false" /> android:focusable="false" />
<TextView android:layout_width="0dp" <TextView
android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/download_item" android:id="@+id/download_item"
android:gravity="center_vertical" android:gravity="center_vertical"
@ -21,7 +23,8 @@
android:layout_weight="1" android:layout_weight="1"
style="@style/ListText.Small" /> style="@style/ListText.Small" />
<TextView android:layout_width="wrap_content" <TextView
android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/download_descr" android:id="@+id/download_descr"
android:layout_marginLeft="3dp" android:layout_marginLeft="3dp"

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

@ -8,6 +8,7 @@
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:minHeight="40dp" android:minHeight="40dp"
android:layout_marginRight="3dp"> android:layout_marginRight="3dp">
<ProgressBar <ProgressBar
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -15,7 +16,8 @@
android:id="@+id/ProgressBar" android:id="@+id/ProgressBar"
android:layout_marginLeft="4dp" /> android:layout_marginLeft="4dp" />
<TextView android:id="@+id/header_text" <TextView
android:id="@+id/header_text"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
@ -26,6 +28,7 @@
android:textSize="20sp" /> android:textSize="20sp" />
<include layout="@layout/check_item_rel" /> <include layout="@layout/check_item_rel" />
<ImageView <ImageView
android:id="@+id/sort" android:id="@+id/sort"
android:layout_width="wrap_content" android:layout_width="wrap_content"

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

@ -9,14 +9,16 @@
android:minHeight="48dp" android:minHeight="48dp"
android:descendantFocusability="blocksDescendants"> android:descendantFocusability="blocksDescendants">
<ImageView android:id="@+id/waypoint_icon" <ImageView
android:id="@+id/waypoint_icon"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:src="@drawable/list_favorite" android:src="@drawable/list_favorite"
android:layout_height="25dp" android:layout_height="25dp"
android:layout_width="25dp" android:layout_width="25dp"
android:layout_gravity="center_vertical" /> android:layout_gravity="center_vertical" />
<TextView android:id="@+id/waypoint_dist" <TextView
android:id="@+id/waypoint_dist"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="4dp" android:layout_marginLeft="4dp"
@ -26,7 +28,8 @@
android:textStyle="bold" android:textStyle="bold"
android:textSize="15sp"></TextView> android:textSize="15sp"></TextView>
<TextView android:id="@+id/waypoint_text" <TextView
android:id="@+id/waypoint_text"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="4dp" android:layout_marginLeft="4dp"
@ -36,7 +39,8 @@
android:layout_weight="1" android:layout_weight="1"
android:textSize="18sp" /> android:textSize="18sp" />
<ImageButton android:id="@+id/all_points" <ImageButton
android:id="@+id/all_points"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/more" android:contentDescription="@string/more"
@ -46,7 +50,8 @@
style="@style/Widget.Sherlock.ActionButton" style="@style/Widget.Sherlock.ActionButton"
android:src="@drawable/ic_action_core_overflow_dark" /> android:src="@drawable/ic_action_core_overflow_dark" />
<ImageButton android:id="@+id/info_close" <ImageButton
android:id="@+id/info_close"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/close" android:contentDescription="@string/close"

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

@ -8,6 +8,7 @@
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:layout_marginRight="3dp" android:layout_marginRight="3dp"
android:descendantFocusability="blocksDescendants"> android:descendantFocusability="blocksDescendants">
<ImageView <ImageView
android:id="@+id/back" android:id="@+id/back"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -17,7 +18,8 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:visibility="gone" /> android:visibility="gone" />
<TextView android:id="@+id/title" <TextView
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="8dp" android:layout_marginLeft="8dp"
@ -28,6 +30,7 @@
android:layout_weight="1" android:layout_weight="1"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:textSize="20sp" /> android:textSize="20sp" />
<ImageButton <ImageButton
android:id="@+id/sort" android:id="@+id/sort"
android:layout_width="wrap_content" android:layout_width="wrap_content"

18
OsmAnd/res/values-bg/strings.xml
View file

@ -845,9 +845,8 @@ OsmAnd е с отворен код и активно да се развива.
\n\t* \'По посоката на движение\' - Картата ще се завърта в зависимост от вашата посока на движение. \n\t* \'По посоката на движение\' - Картата ще се завърта в зависимост от вашата посока на движение.
\n\t* \'По компаса\' - Картата ще бъде ориентирана по вградения компас. \n\t* \'По компаса\' - Картата ще бъде ориентирана по вградения компас.
</string> </string>
<string name="binary_map_download_success">Успешно сваляне <string name="binary_map_download_success">"Успешно сваляне
\n\t\n\tЗа използване \'Меню\' -&gt; \'Настройки на екрана\' -&gt; \'Карти…\' -&gt; \'Offline vector maps\'. \n\t\n\tЗа да използвате активирайте \'Меню\' → \'Настройки карта\' → \'Карта източник…\' → \'Offline векторни карти\'. "</string>
</string>
<string name="tip_day_night_mode">Дневен/нощен режим</string> <string name="tip_day_night_mode">Дневен/нощен режим</string>
<string name="tip_day_night_mode_t_v2">Можете да променяте изгледа на картата от дневен (ярък) към нощен (тъмен). Тъмният изглед е подходящ за безопасно шофиране нощем. <string name="tip_day_night_mode_t_v2">Можете да променяте изгледа на картата от дневен (ярък) към нощен (тъмен). Тъмният изглед е подходящ за безопасно шофиране нощем.
\n\nПревключването между дневен и нощен изглед можете да направите в \'Меню\' -&gt; \'Настройки на екрана…\' -&gt;\'Дневен/нощен изглед\'. \n\nПревключването между дневен и нощен изглед можете да направите в \'Меню\' -&gt; \'Настройки на екрана…\' -&gt;\'Дневен/нощен изглед\'.
@ -1018,7 +1017,7 @@ OsmAnd е с отворен код и активно да се развива.
<string name="gpx_option_reverse_route">Обръщане посоката на GPX</string> <string name="gpx_option_reverse_route">Обръщане посоката на GPX</string>
<string name="gpx_option_destination_point">Ползвай текущата крайна цел</string> <string name="gpx_option_destination_point">Ползвай текущата крайна цел</string>
<string name="gpx_option_from_start_point">Преминахте по целия маршрут</string> <string name="gpx_option_from_start_point">Преминахте по целия маршрут</string>
<string name="switch_to_vector_map_to_see">За този район има карта в офлайн режим.\n\t\n\tАктивирайте я от \'Меню\' -&gt; \'Настройки изглед\' -&gt; \'Карти…\' -&gt; \'Офлайн векторни карти\'.</string> <string name="switch_to_vector_map_to_see">За този район има карта в офлайн режим.\n\t\n\tАктивирайте я от \'Меню\' → \'Настройки карта\' → \'Карта източник…\' → \'Офлайн векторни карти\'.</string>
<string name="choose_audio_stream">Канал за гласовите напътствия</string> <string name="choose_audio_stream">Канал за гласовите напътствия</string>
<string name="choose_audio_stream_descr">Избор на звуков канал за гласовите напътствия (зависи от настройките на Вашето устройство)</string> <string name="choose_audio_stream_descr">Избор на звуков канал за гласовите напътствия (зависи от настройките на Вашето устройство)</string>
<string name="voice_stream_voice_call">Канал за гласови данни (за предпочитане)</string> <string name="voice_stream_voice_call">Канал за гласови данни (за предпочитане)</string>
@ -1652,7 +1651,7 @@ OsmAnd е с отворен код и активно да се развива.
<string name="routing_attr_weight_description">Изберете максималната разрешена маса (тегло) на МПС</string> <string name="routing_attr_weight_description">Изберете максималната разрешена маса (тегло) на МПС</string>
<string name="copying_osmand_files">Копиране файловете на OsmAnd</string> <string name="copying_osmand_files">Копиране файловете на OsmAnd</string>
<string name="app_mode_truck">Камион</string> <string name="app_mode_truck">Камион</string>
<string name="rendering_attr_publicTransportMode_name">Автобусни и тролейбусни линии</string> <string name="rendering_attr_publicTransportMode_name">Автобусни, тролейбусни, маршрутни линии</string>
<string name="record_plugin_name">Запис на Вашето пътуване</string> <string name="record_plugin_name">Запис на Вашето пътуване</string>
<string name="int_hour">ч.</string> <string name="int_hour">ч.</string>
<string name="duration">Продължителност</string> <string name="duration">Продължителност</string>
@ -1759,10 +1758,10 @@ OsmAnd е с отворен код и активно да се развива.
<string name="map_widget_left">Ляв панел</string> <string name="map_widget_left">Ляв панел</string>
<string name="layers_category_show">Покажи</string> <string name="layers_category_show">Покажи</string>
<string name="configure_map">Настройка на картата</string> <string name="configure_map">Настройка на картата</string>
<string name="rendering_attr_tramTrainRoutes_name">Трамваи и влакове</string> <string name="rendering_attr_tramTrainRoutes_name">Трамвайни и влакови маршрути</string>
<string name="lock_screen_request_explanation">%1$s изисква това разрешение за да изключи екрана с цел пестене на енергия.</string> <string name="lock_screen_request_explanation">%1$s изисква това разрешение за да изключи екрана с цел пестене на енергия.</string>
<string name="wake_on_voice">Включи екрана</string> <string name="wake_on_voice">Включи екрана</string>
<string name="wake_on_voice_descr">Включи екрана, когато приближава завой</string> <string name="wake_on_voice_descr">Включване на екрана на телефона, когато наближава завой</string>
<string name="wake_on_voice_never">Никога</string> <string name="wake_on_voice_never">Никога</string>
<string name="select_impassable_road">Избери на картата</string> <string name="select_impassable_road">Избери на картата</string>
<string name="impassable_road">Избягване на пътища…</string> <string name="impassable_road">Избягване на пътища…</string>
@ -1771,4 +1770,9 @@ OsmAnd е с отворен код и активно да се развива.
<string name="rendering_attr_busRoutes_name">Автобусни линии</string> <string name="rendering_attr_busRoutes_name">Автобусни линии</string>
<string name="rendering_attr_trainLightrailRoutes_name">Маршрути на влакове</string> <string name="rendering_attr_trainLightrailRoutes_name">Маршрути на влакове</string>
<string name="rendering_attr_trolleybusRoutes_name">Тролейбусни линии</string> <string name="rendering_attr_trolleybusRoutes_name">Тролейбусни линии</string>
<string name="tip_recent_changes_1_9_t">"Промени в версия 1.9: * Актуализирани карти със показване на пътната настилка, транспортни слоеве и туристически символи * Търсене POI по маршрута * Маркиране на пътя като непроходим за сесията * По лесно изтегляне и актуализиране на карти * Получаване на визуално и аудио уведомление при приближаване до точката * Показване на маршрута и информация към него * Поддръжка на пътни платна * Поддръжка на Android Wear * Много промени в потребителския интерфейс * Отделна настройка за големината на текста на картата * Специални аудио уведомления в случай че сте напуснали пътя * OsMo вход * Фикс в несъвместимоста на OsMo версията "</string>
<string name="rendering_attr_shareTaxiRoutes_name">Сподели пътя с такси</string>
<string name="search_radius_proximity">В близост до</string>
<string name="osmo_device_not_found">Устройството не е намерено</string>
<string name="osmo_no_connection_msg">OsMo услугата е недостъпна:\n- проверете връзката;\n- проверете настройките;\n- намерете ни в Twitter: https://twitter.com/OsMomobi</string>
</resources> </resources>

2
OsmAnd/res/values-de/strings.xml
View file

@ -1268,7 +1268,7 @@
<string name="bg_service_screen_lock_toast">Bildschirm gesperrt</string> <string name="bg_service_screen_lock_toast">Bildschirm gesperrt</string>
<string name="bg_service_interval">Aufwachintervall setzen:</string> <string name="bg_service_interval">Aufwachintervall setzen:</string>
<string name="map_widget_day_night">Tag/Nacht-Modus</string> <string name="map_widget_day_night">Tag/Nacht-Modus</string>
<string name="map_widget_vector_attributes">Karten-Zusatzoptionen:</string> <string name="map_widget_vector_attributes">Karten-Zusatzoptionen</string>
<string name="map_widget_renderer">Kartendarstellung</string> <string name="map_widget_renderer">Kartendarstellung</string>
<string name="layer_map_appearance">Anzeige konfigurieren</string> <string name="layer_map_appearance">Anzeige konfigurieren</string>

8
OsmAnd/res/values-el/strings.xml
View file

@ -1683,4 +1683,12 @@
<string name="map_widget_left">Αριστερός πίνακας</string> <string name="map_widget_left">Αριστερός πίνακας</string>
<string name="layers_category_show">Εμφάνιση</string> <string name="layers_category_show">Εμφάνιση</string>
<string name="configure_map">Διαμόρφωση χάρτη</string> <string name="configure_map">Διαμόρφωση χάρτη</string>
<string name="rendering_attr_tramTrainRoutes_name">Δρομολόγια τραμ και τρένων</string>
<string name="rendering_attr_trainLightrailRoutes_name">Δρομολόγια τρένου</string>
<string name="rendering_attr_tramRoutes_name">Δρομολόγια τραμ</string>
<string name="rendering_attr_trolleybusRoutes_name">Δρομολόγια τρόλεϋ</string>
<string name="rendering_attr_busRoutes_name">Δρομολόγια λεωφορείων</string>
<string name="rendering_category_transport">Μεταφορές</string>
<string name="map_widget_top">Γραμμή κατάστασης</string>
<string name="speed_limit_exceed">Ανοχή ορίου ταχύτητας</string>
</resources> </resources>

15
OsmAnd/res/values-it/strings.xml
View file

@ -66,7 +66,7 @@
<string name="switch_to_raster_map_to_see">Nessuna mappa vettoriale è presente per questa posizione. Ne puoi scaricare una in Impostazioni (Gestisci i file mappe), o passa alle mappe online (abilita il plugin delle mappe online).</string> <string name="switch_to_raster_map_to_see">Nessuna mappa vettoriale è presente per questa posizione. Ne puoi scaricare una in Impostazioni (Gestisci i file mappe), o passa alle mappe online (abilita il plugin delle mappe online).</string>
<string name="binary_map_download_success">"Download completato. <string name="binary_map_download_success">"Download completato.
\n\t\n\tPer usarle attivare \'Impostazioni\' → \'Configurazione delle mappe\' → \'Sorgenti mappe...\'\t\'Mappe vettoriali offline\'. "</string> \n\t\n\tPer usarle attivare \'Impostazioni\' → \'Gestisci i file delle mappe\' → \'Sorgenti mappe...\' → \'Mappe vettoriali offline\'. "</string>
<string name="tip_day_night_mode">Modo giorno/notte</string> <string name="tip_day_night_mode">Modo giorno/notte</string>
<string name="tip_osm_improve">Migliora i dati OSM</string> <string name="tip_osm_improve">Migliora i dati OSM</string>
@ -231,7 +231,7 @@
<string name="gpx_option_reverse_route">Inverti direzione GPX</string> <string name="gpx_option_reverse_route">Inverti direzione GPX</string>
<string name="gpx_option_destination_point">Usa il punto di destinazione attuale</string> <string name="gpx_option_destination_point">Usa il punto di destinazione attuale</string>
<string name="gpx_option_from_start_point">Percorri tutta la traccia</string> <string name="gpx_option_from_start_point">Percorri tutta la traccia</string>
<string name="switch_to_vector_map_to_see">Mappa vettoriale offline presente per quest\'area.\n\t\n\tPer usarla attivare \'Menu\'→\'Strati mappa\'→\'Fonte Mappa…\'→\'Mappe vettoriali offline\'.</string> <string name="switch_to_vector_map_to_see">Mappa vettoriale offline presente per quest\'area.\n\t\n\tPer usarla attivare \'Menu\' → \'Configura la mappa\' → \'Sorgente mappa…\' → \'Mappe vettoriali offline\'.</string>
<string name="choose_audio_stream">Canale d\'uscita della voce guida</string> <string name="choose_audio_stream">Canale d\'uscita della voce guida</string>
<string name="choose_audio_stream_descr">Scegli il canale per la guida vocale (dipendente dal sistema)</string> <string name="choose_audio_stream_descr">Scegli il canale per la guida vocale (dipendente dal sistema)</string>
<string name="voice_stream_voice_call">Audio chiamate vocali</string> <string name="voice_stream_voice_call">Audio chiamate vocali</string>
@ -269,7 +269,7 @@
\n\nScegli poi un modo per condividere la tua posizione. Le opzioni sono: E-Mail, SMS o semplicemente copia le coordinate sugli appunti. \n\nScegli poi un modo per condividere la tua posizione. Le opzioni sono: E-Mail, SMS o semplicemente copia le coordinate sugli appunti.
</string> </string>
<string name="tip_favorites">Punti Preferiti</string> <string name="tip_favorites">Punti Preferiti</string>
<string name="tip_favorites_t">"I punti usati di frequente possono essere salvati come Preferiti in questo modo:\n\nNel menu contestuale per ogni punto \'Utilizza posizione\' scegliere \'Aggiungi ai favoriti\' e quindi immettere un nome per esso.\n\nDopo il salvataggio, il punto preferito sarà accessibile nel \'Menu\'→\'I miei luoghi\'. Premendo su una qualsiasi voce della lista dei \'Preferiti\', appariranno le opzioni per impostarlo come destinazione, modificarlo o eliminarlo.\n\nPer visualizzare tutti i punti preferiti direttamente sulla mappa, attiva nella schermata della mappa il livello \'Preferiti\' dal menù \'Strati mappa\'. "</string> <string name="tip_favorites_t">"I punti usati di frequente possono essere salvati come Preferiti in questo modo:\n\nPer qualsiasi punto, nel menu contestuale \'Utilizza la posizione…\' scegliere \'Aggiungi ai Preferiti\' e quindi immettere un nome.\n\nDopo il salvataggio, il punto sarà accessibile attraverso \'Menu\' → \'I miei luoghi\'. Premendo su una voce della lista dei \'Preferiti\', appariranno le opzioni per impostarlo come destinazione, modificarlo o eliminarlo.\n\nPer visualizzare tutti i punti preferiti direttamente sulla mappa, nella schermata della mappa attiva il livello \'Preferiti\' da \'Menu\' → \'Configura la mappa\'. "</string>
<string name="create_poi_link_to_osm_doc"> <u>OSM Online</u> con immagini</string> <string name="create_poi_link_to_osm_doc"> <u>OSM Online</u> con immagini</string>
<string name="error_doing_search">Errore nella ricerca offline</string> <string name="error_doing_search">Errore nella ricerca offline</string>
<string name="search_offline_geo_error">Impossibile leggere geo intent \'%s\'</string> <string name="search_offline_geo_error">Impossibile leggere geo intent \'%s\'</string>
@ -1586,11 +1586,10 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="about_settings_descr">Informazioni versione, licenze, membri del progetto</string> <string name="about_settings_descr">Informazioni versione, licenze, membri del progetto</string>
<string name="tips_and_tricks">Aiuto</string> <string name="tips_and_tricks">Aiuto</string>
<string name="tip_map_styles">Stili mappa</string> <string name="tip_map_styles">Stili mappa</string>
<string name="tip_map_styles_t">"OsmAnd supporta la visualizzazione delle mappe vettoriali in differenti stili mappa per adattarsi alle tue esigenze: <string name="tip_map_styles_t">"OsmAnd supporta le mappe vettoriali offline con stili di visualizzazione differenti per adattarsi alle tue esigenze:
\n\nDiversi stili mappa da quello bilanciato preimpostato, li trovi sotto \'Menu\' -&gt; \'Configura mappa\' -&gt; \'Stile Mappa\' scegli per esempio \n\nOltre allo stile bilanciato preimpostato, sotto \'Menu\' → \'Configura la mappa\' → \'Stile della mappa\' puoi scegliere ad esempio
\n\t* Lo stile \'Touring view\': contiene le più dettagliate informazioni possibile per viaggiare e per visitare, incluse le ottimizzazioni per i guidatori professionali (strade contrasto maggiormente distinguibile), opzione per l\'escursionismo Alpino (scala SAC), itinerari ciclistici, simboli per escursionismo, etc. \n\t* Lo stile \'Touring view\', che contiene le informazioni più dettagliate possibili per viaggiatori e turisti, incluse le ottimizzazioni per gli autisti professionisti (maggiore contrasto, strade distinguibili), opzioni per l\'escursionismo Alpino (scala SAC), itinerari ciclistici, simboli per escursionismo, ecc.\n\t* \'High contrast roads\' mostra le strade con colori molto accentuati per le situazioni con intensa luminosità ambientale
\n\t* \'Alto contrasto strade \' mostra le strade con una luminosità dei colori molto accentuata per le situazioni di cattiva illuminazione \n\t* \'Winter and ski\' crea una vista da paesaggio invernale (coperto da neve) e mostra pendenze sciistiche e impianti di risalita (abbinata alle mappe scaricabili \'World ski\') "</string>
\n\t* \'Inverno e sci\' crea una vista del paesaggio invernale (coperto da neve), e visione globale delle piste da sci e degli impianti di risalita (in abbinata con \'World ski\' download mappa) "</string>
<string name="base_world_map">Mappa mondiale di base</string> <string name="base_world_map">Mappa mondiale di base</string>

5
OsmAnd/res/values-ku/strings.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources> <?xml version='1.0' encoding='utf-8'?>
<string name="dist_control_start">دەستپێکه</string> <resources>
<string name="dist_control_start">donya hich wafay bom niya, zhyan hich khoshi bom niya, mrdn jegay shanaziya</string>
<string name="local_indexes_cat_av">زانیاری دەنگ/ڤیدیۆ</string> <string name="local_indexes_cat_av">زانیاری دەنگ/ڤیدیۆ</string>
<string name="stop_routing_confirm">دڵنیای له وەی که ئه ته وێت ناڤیگێشن راگریت</string> <string name="stop_routing_confirm">دڵنیای له وەی که ئه ته وێت ناڤیگێشن راگریت</string>
<string name="recording_context_menu_show">پشاندە</string> <string name="recording_context_menu_show">پشاندە</string>

188
OsmAnd/res/values-nb/strings.xml
View file

@ -42,8 +42,8 @@
<string name="auto_zoom_map">Auto-zoom kart</string> <string name="auto_zoom_map">Auto-zoom kart</string>
<string name="snap_to_road_descr">Hold posisjon på veien under navigering</string> <string name="snap_to_road_descr">Hold posisjon på veien under navigering</string>
<string name="snap_to_road">Hold på vei</string> <string name="snap_to_road">Hold på vei</string>
<string name="osmand_short_description_80_chars">OsmAnd er et navigeringsprogram for offline og online kart og som er åpen kildekode</string> <string name="osmand_short_description_80_chars">Global mobilkartvisning &amp; navigering for offline og nettbaserte OSM-kart</string>
<string name="osmand_plus_short_description_80_chars">Global mobilkartvisning &amp; navigering for offline og nettbasert OSM-kart</string> <string name="osmand_plus_short_description_80_chars">Global mobilkartvisning &amp; navigering for offline og nettbaserte OSM-kart</string>
<string name="recalculate_route_to_your_location">Transportmodus:</string> <string name="recalculate_route_to_your_location">Transportmodus:</string>
<string name="select_navigation_mode">Velg transportmåte</string> <string name="select_navigation_mode">Velg transportmåte</string>
<string name="day_night_info_description">Soloppgang: %1$s \nSolnedgang: %2$s</string> <string name="day_night_info_description">Soloppgang: %1$s \nSolnedgang: %2$s</string>
@ -88,7 +88,7 @@
<string name="show_traffic_warnings">Vis trafikkvarsler</string> <string name="show_traffic_warnings">Vis trafikkvarsler</string>
<string name="avoid_toll_roads">Unngå bomveier</string> <string name="avoid_toll_roads">Unngå bomveier</string>
<string name="continue_follow_previous_route_auto">Forrige navigering var ikke ferdig. Fortsette å følge den? (%1$s sekunder)</string> <string name="continue_follow_previous_route_auto">Forrige navigering var ikke ferdig. Fortsette å følge den? (%1$s sekunder)</string>
<string name="route_updated_loc_found">Ruten blir beregnet på nytt når sted blir funnet</string> <string name="route_updated_loc_found">Rute blir beregnet når posisjon blir funnet</string>
<string name="osmand_parking_hours">Timer</string> <string name="osmand_parking_hours">Timer</string>
<string name="osmand_parking_minutes">Minutter</string> <string name="osmand_parking_minutes">Minutter</string>
<string name="osmand_parking_position_description_add_time">Bilen ble parkert her:</string> <string name="osmand_parking_position_description_add_time">Bilen ble parkert her:</string>
@ -110,22 +110,22 @@
<string name="download_link_and_local_description">Klikk her for å laste ned eller oppdatere offline-data. \nKlikk eksisterende element for å se flere detaljer, trykk og hold for å deaktivere eller slette. Gjeldende data på enheten (%1$s ledig):</string> <string name="download_link_and_local_description">Klikk her for å laste ned eller oppdatere offline-data. \nKlikk eksisterende element for å se flere detaljer, trykk og hold for å deaktivere eller slette. Gjeldende data på enheten (%1$s ledig):</string>
<string name="unknown_from_location">Startpunkt er ennå ikke bestemt</string> <string name="unknown_from_location">Startpunkt er ennå ikke bestemt</string>
<string name="unknown_location">Posisjon ennå ikke kjent</string> <string name="unknown_location">Posisjon ennå ikke kjent</string>
<string name="local_indexes_cat_tile">Nettbaserte kart og kartfliser</string> <string name="local_indexes_cat_tile">Nettbaserte- og flis-kart</string>
<string name="local_indexes_cat_map">Offline-kart (vektor)</string> <string name="local_indexes_cat_map">Offline-kart (vektor)</string>
<string name="index_settings_descr">Last ned og håndter offline-kart lagret på enheten</string> <string name="index_settings_descr">Last ned og håndter offline-kart lagret på enheten</string>
<string name="map_online_plugin_is_not_installed">Aktiver programtillegg for nettbaserte kart for å velge ulike kartkilder</string> <string name="map_online_plugin_is_not_installed">Aktiver programtillegg for nettbaserte kart for å velge ulike kartkilder</string>
<string name="map_online_data">Nettbaserte kart (fliser)</string> <string name="map_online_data">Nettbaserte- og flis-kart</string>
<string name="map_online_data_descr">Bruk nettbaserte kart (laste ned og mellomlagre fliser på SD-kort)</string> <string name="map_online_data_descr">Bruk nettbaserte kart (last ned og bufre fliser på SD-kort)</string>
<string name="online_map_settings">Nettbaserte kart</string> <string name="online_map_settings">Nettbaserte kart</string>
<string name="online_map_settings_descr">Still inn nettbaserte eller hurtigbufrede flis-kartkilder</string> <string name="online_map_settings_descr">Still inn nettbaserte eller hurtigbufrede flis-kartkilder</string>
<string name="map_settings">Kartinnstillinger</string> <string name="map_settings">Kartinnstillinger</string>
<string name="map_settings_descr">Still inn kartvisningen</string> <string name="map_settings_descr">Still inn kartvisningen</string>
<string name="vector_maps_may_display_faster_on_some_devices">Vektorkart vises trolig raskere. Fungerer kanskje ikke bra på enkelte enheter.</string> <string name="vector_maps_may_display_faster_on_some_devices">Vektorkart vises trolig raskere. Fungerer kanskje ikke bra på enkelte enheter.</string>
<string name="native_rendering">Rask opptegning</string> <string name="native_rendering">Intern opptegning</string>
<string name="show_ruler_level">Vis målestokk</string> <string name="show_ruler_level">Vis målestokk</string>
<string name="info_button">Info</string> <string name="info_button">Info</string>
<string name="back_to_location">Tilbake til sted</string> <string name="back_to_location">Tilbake til posisjon</string>
<string name="help">Hjelp</string> <string name="help">Hjelp</string>
<string name="show_details">Vis detaljer</string> <string name="show_details">Vis detaljer</string>
<string name="accessibility_extensions_descr">Tilgjengelighetsmoduler for gamle Android-versjoner</string> <string name="accessibility_extensions_descr">Tilgjengelighetsmoduler for gamle Android-versjoner</string>
@ -204,7 +204,7 @@
<string name="index_name_asia">Asia</string> <string name="index_name_asia">Asia</string>
<string name="index_name_oceania">Oseania</string> <string name="index_name_oceania">Oseania</string>
<string name="index_name_other">Verdens- og emnekart</string> <string name="index_name_other">Verdens- og emnekart</string>
<string name="index_name_wiki">Verdensomspennende Wikipedia</string> <string name="index_name_wiki">Verdensomspennende Wikipedia-interessepunkter</string>
<string name="index_name_voice">Talepakker (opptak, begrenset funksjonalitet)</string> <string name="index_name_voice">Talepakker (opptak, begrenset funksjonalitet)</string>
<string name="index_name_tts_voice">Talepakker (TTS kunstig tale, foretrekk)</string> <string name="index_name_tts_voice">Talepakker (TTS kunstig tale, foretrekk)</string>
<string name="amenity_type_osmwiki">Wikipedia (offline)</string> <string name="amenity_type_osmwiki">Wikipedia (offline)</string>
@ -221,12 +221,11 @@
<string name="general_settings_descr">Still inn visning og generelle programinnstillinger</string> <string name="general_settings_descr">Still inn visning og generelle programinnstillinger</string>
<string name="global_app_settings">Globale programinnstillinger</string> <string name="global_app_settings">Globale programinnstillinger</string>
<string name="tip_rotation_switching">Kartorientering</string> <string name="tip_rotation_switching">Kartorientering</string>
<string name="tip_rotation_switching_t_v2">\tDu kan velge hvordan kartvisningen roteres ved å gjentatte ganger klikke på kompassikonet. <string name="tip_rotation_switching_t_v2">"Du kan slå av/på om og hvordan kartvisningen roteres ved å gjentatte ganger klikke på kartskjermens kompassikon.
\n\tValgene er: \n\nValgene er:
\n\t\'Ingen rotasjon (nord er opp)\' - Kart vil ikke roteres. Nord vil alltid være opp \n\t* \'Ingen rotasjon (nord er opp)\': Kart vil ikke roteres. Nord vil alltid være opp
\n\t\'I bevegelsesretning\' - Kartorienteringen justeres kontinuerlig til bevegelsesretningen \n\t* \'I bevegelsesretning\': Kartorienteringen justeres kontinuerlig til bevegelsesretningen
\n\t\'Ifølge kompass\' - Kartrotasjon tilpasses kontinuerlig til kompassavlesningen for enheten \n\t* \'Ifølge kompass\': Kartrotasjon tilpasses kontinuerlig til kompassavlesningen for enheten "</string>
</string>
<string name="binary_map_download_success">"Nedlasting vellykket. <string name="binary_map_download_success">"Nedlasting vellykket.
\n\t\n\tFor å bruke aktiver \'Meny\' → \'Still inn kart\' → \'Kartkilde…\' → \'Offline vektorkart\'. "</string> \n\t\n\tFor å bruke aktiver \'Meny\' → \'Still inn kart\' → \'Kartkilde…\' → \'Offline vektorkart\'. "</string>
<string name="tip_day_night_mode">Dag/natt-modus</string> <string name="tip_day_night_mode">Dag/natt-modus</string>
@ -253,12 +252,12 @@
<string name="file_with_name_already_exists">Fil med dette navnet finnes allerede.</string> <string name="file_with_name_already_exists">Fil med dette navnet finnes allerede.</string>
<string name="gpx_navigation">GPX-rute</string> <string name="gpx_navigation">GPX-rute</string>
<string name="poi_query_by_name_matches_categories">Flere interessepunktkategorier funnet som samsvarer med søket:</string> <string name="poi_query_by_name_matches_categories">Flere interessepunktkategorier funnet som samsvarer med søket:</string>
<string name="data_to_search_poi_not_available">Lokale data til å søke interessepunkter er ikke til stede.</string> <string name="data_to_search_poi_not_available">Lokale data til å søke interessepunkter foreligger ikke.</string>
<string name="poi_filter_by_name">Søk på navn</string> <string name="poi_filter_by_name">Søk på navn</string>
<string name="old_poi_file_should_be_deleted">Interessepunktfilen \'%1$s\' er overflødig og kan slettes.</string> <string name="old_poi_file_should_be_deleted">Interessepunktfilen \'%1$s\' er overflødig og kan slettes.</string>
<string name="update_poi_file_not_found">Lokal fil for å opprettholde interessepunktendringer ikke funnet og kunne ikke opprettes.</string> <string name="update_poi_file_not_found">Lokal fil for å opprettholde interessepunktendringer ikke funnet og kunne ikke opprettes.</string>
<string name="button_upgrade_osmandplus">Oppgrader OsmAnd+</string> <string name="button_upgrade_osmandplus">Oppgrader OsmAnd+</string>
<string name="map_version_changed_info">Server inneholder kartfiler som ikke er kompatible med din nåværende versjon av programmet. For å laste ned og bruke dem, oppgrader programmet til nyere versjon.</string> <string name="map_version_changed_info">Server inneholder kartfiler som ikke er kompatible med din gjeldende versjon av programmet. For å laste ned og bruke dem, oppgrader programmet til nyere versjon.</string>
<string name="local_index_mi_rename">Endre navn</string> <string name="local_index_mi_rename">Endre navn</string>
<string name="show_gpx_route">Vis på kart</string> <string name="show_gpx_route">Vis på kart</string>
<string name="search_position_current_location_search">Søker posisjon…</string> <string name="search_position_current_location_search">Søker posisjon…</string>
@ -276,7 +275,7 @@
<string name="filename_input">Filnavn: </string> <string name="filename_input">Filnavn: </string>
<string name="file_with_name_already_exist">Fil med samme navn finnes allerede.</string> <string name="file_with_name_already_exist">Fil med samme navn finnes allerede.</string>
<string name="default_buttons_save">Lagre</string> <string name="default_buttons_save">Lagre</string>
<string name="menu_save_directions">Lagre rute</string> <string name="menu_save_directions">Lagre anvisninger</string>
<string name="show_more_map_detail">Vis flere kartdetaljer</string> <string name="show_more_map_detail">Vis flere kartdetaljer</string>
<string name="favourites_delete_multiple_succesful">Favorittpunkt(er) vellykket slettet.</string> <string name="favourites_delete_multiple_succesful">Favorittpunkt(er) vellykket slettet.</string>
<string name="favorite_delete_multiple">Du kommer til å slette %1$d favoritt(er) og %2$d favorittgruppe(r). Er du sikker?</string> <string name="favorite_delete_multiple">Du kommer til å slette %1$d favoritt(er) og %2$d favorittgruppe(r). Er du sikker?</string>
@ -323,10 +322,10 @@
\n\nI lokalmenyen \'Bruk posisjon\' for et punkt, velg alternativet \'Legg til i favoritter\' og skriv deretter inn et navn for den. \n\nI lokalmenyen \'Bruk posisjon\' for et punkt, velg alternativet \'Legg til i favoritter\' og skriv deretter inn et navn for den.
\n\nEtter å ha lagret en favoritt er den tilgjengelig via \'Meny\' → \'Mine steder\'. Trykking på en oppføring i \'Favoritter\'-listen gir muligheter som å navigere til den, redigere eller slette den. \n\nEtter å ha lagret en favoritt er den tilgjengelig via \'Meny\' → \'Mine steder\'. Trykking på en oppføring i \'Favoritter\'-listen gir muligheter som å navigere til den, redigere eller slette den.
\n\nFor å vise alle favorittpunkter direkte på kartet, aktiver på kartskjermen laget \'Favoritter\' i \'Meny\' → \'Still inn kart\'. "</string> \n\nFor å vise alle favorittpunkter direkte på kartet, aktiver på kartskjermen laget \'Favoritter\' i \'Meny\' → \'Still inn kart\'. "</string>
<string name="search_osm_offline">Søk adresse ved bruk av offline-kart</string> <string name="search_osm_offline">Søk geografisk plassering</string>
<string name="system_locale">System</string> <string name="system_locale">System</string>
<string name="preferred_locale_descr">Velg visningsspråk</string> <string name="preferred_locale_descr">Velg visningsspråk</string>
<string name="preferred_locale">Språk</string> <string name="preferred_locale">Visningsspråk</string>
<string name="tip_map_switch">Velg en kartkilde</string> <string name="tip_map_switch">Velg en kartkilde</string>
<string name="tip_map_switch_t_v2">"Kartkilden og kartlag som vises endres via \'Meny\' → \'Still inn kart\'. <string name="tip_map_switch_t_v2">"Kartkilden og kartlag som vises endres via \'Meny\' → \'Still inn kart\'.
\n\nUnder \'Kartkilde…\' kan du velge å bruke de forhåndslastede offline vektorkartene (standard, trengs også for offline navigering), eller forhåndsdefinerte (nettbaserte eller bufret offline) fliskilder (aktiver programtillegget for \'Nettbaserte kart\' under \'Innstillinger\' → \'Programtillegg\' for dette), eller kart manuelt opprettet ved bruk av f.eks. OsmAndMapCreator på en PC. \n\nUnder \'Kartkilde…\' kan du velge å bruke de forhåndslastede offline vektorkartene (standard, trengs også for offline navigering), eller forhåndsdefinerte (nettbaserte eller bufret offline) fliskilder (aktiver programtillegget for \'Nettbaserte kart\' under \'Innstillinger\' → \'Programtillegg\' for dette), eller kart manuelt opprettet ved bruk av f.eks. OsmAndMapCreator på en PC.
@ -355,7 +354,7 @@
\n\nEn markør-boks kan skjules igjen ved å trykke lenge på den. "</string> \n\nEn markør-boks kan skjules igjen ved å trykke lenge på den. "</string>
<string name="tip_initial">Hjelp</string> <string name="tip_initial">Hjelp</string>
<string name="tip_initial_t">"OsmAnd er et navigeringsprogram med mange funksjoner. <string name="tip_initial_t">"OsmAnd er et navigeringsprogram med mange funksjoner.
\n\tSom en grunnleggende innføring er noen brukertips og triks lenket til via \'Meny\' → \'Hjelp\' fra kartskjermen. "</string> \n\nSom en grunnleggende innføring er noen brukertips og triks lenket til via \'Meny\' → \'Hjelp\' fra kartskjermen. "</string>
<string name="next_button">Neste</string> <string name="next_button">Neste</string>
<string name="previous_button">Forrige</string> <string name="previous_button">Forrige</string>
<string name="unit_of_length_descr">Endre lengde- og hastighetsenhet</string> <string name="unit_of_length_descr">Endre lengde- og hastighetsenhet</string>
@ -404,7 +403,7 @@
<string name="daynight">Dag/natt-modus</string> <string name="daynight">Dag/natt-modus</string>
<string name="download_files_question">Laste ned {0} fil(er) ({1} MB)?</string> <string name="download_files_question">Laste ned {0} fil(er) ({1} MB)?</string>
<string name="items_were_selected">{0} element(er) valgt</string> <string name="items_were_selected">{0} element(er) valgt</string>
<string name="filter_existing_indexes">Filtrer nedlastede</string> <string name="filter_existing_indexes">Nedlastet</string>
<string name="deselect_all">Fravelg alle</string> <string name="deselect_all">Fravelg alle</string>
<string name="select_all">Velg alle</string> <string name="select_all">Velg alle</string>
<string name="reload">Gjenoppfrisk</string> <string name="reload">Gjenoppfrisk</string>
@ -414,7 +413,7 @@
<string name="context_menu_item_download_map">Last ned kart</string> <string name="context_menu_item_download_map">Last ned kart</string>
<string name="renderers">Vektor-opptegning</string> <string name="renderers">Vektor-opptegning</string>
<string name="renderers_descr">Velg utseende på opptegningen</string> <string name="renderers_descr">Velg utseende på opptegningen</string>
<string name="website">nettsted</string> <string name="website">Nettsted</string>
<string name="phone">Telefon</string> <string name="phone">Telefon</string>
<string name="context_menu_item_search_transport">Søk transport</string> <string name="context_menu_item_search_transport">Søk transport</string>
<string name="transport_searching_transport">Transportresultater (ingen mål):</string> <string name="transport_searching_transport">Transportresultater (ingen mål):</string>
@ -494,8 +493,8 @@
<string name="searching">Søker…</string> <string name="searching">Søker…</string>
<string name="searching_address">Søker adresse…</string> <string name="searching_address">Søker adresse…</string>
<string name="hint_search_online">Husnummer, gate, by</string> <string name="hint_search_online">Husnummer, gate, by</string>
<string name="search_offline_address">Offline</string> <string name="search_offline_address">Offline-søk</string>
<string name="search_online_address">Internett</string> <string name="search_online_address">Nettbasert søk</string>
<string name="max_level_download_tile">Maks. nettbasert zoom</string> <string name="max_level_download_tile">Maks. nettbasert zoom</string>
<string name="max_level_download_tile_descr">Velg maksimalt zoomnivå å laste ned for nettbaserte kartseksjoner</string> <string name="max_level_download_tile_descr">Velg maksimalt zoomnivå å laste ned for nettbaserte kartseksjoner</string>
<string name="route_general_information">Total distanse %1$s, reisetid %2$d t %3$d m.</string> <string name="route_general_information">Total distanse %1$s, reisetid %2$d t %3$d m.</string>
@ -503,7 +502,7 @@
<string name="router_service">Navigeringstjeneste</string> <string name="router_service">Navigeringstjeneste</string>
<string name="sd_dir_not_accessible">Lagringsmappe på SD-kortet ikke tilgjengelig</string> <string name="sd_dir_not_accessible">Lagringsmappe på SD-kortet ikke tilgjengelig</string>
<string name="download_question">Laste ned {0} - {1} ?</string> <string name="download_question">Laste ned {0} - {1} ?</string>
<string name="download_question_exist">Offline-data for {0} finnes allerede ({1}). Vil du oppdatere det ({2}) ?</string> <string name="download_question_exist">Offline-data for {0} finnes allerede ({1}). Vil du oppdatere ({2}) ?</string>
<string name="address">Adresse</string> <string name="address">Adresse</string>
<string name="download_index_success">Nedlasting vellykket</string> <string name="download_index_success">Nedlasting vellykket</string>
<string name="error_io_error">I/O feil oppstod</string> <string name="error_io_error">I/O feil oppstod</string>
@ -537,7 +536,7 @@
<string name="show_osm_bugs">Vis OpenStreet-feil</string> <string name="show_osm_bugs">Vis OpenStreet-feil</string>
<string name="favourites_activity">Favoritter</string> <string name="favourites_activity">Favoritter</string>
<string name="add_to_favourite">Legg til i favoritter</string> <string name="add_to_favourite">Legg til i favoritter</string>
<string name="use_english_names_descr">Bruk lokale eller engelske navn</string> <string name="use_english_names_descr">Velg mellom lokale og engelske navn</string>
<string name="use_english_names">Bruk engelske navn i kartene</string> <string name="use_english_names">Bruk engelske navn i kartene</string>
<string name="app_settings">Programinnstillinger</string> <string name="app_settings">Programinnstillinger</string>
<string name="search_address">Søk adresse</string> <string name="search_address">Søk adresse</string>
@ -545,13 +544,13 @@
<string name="choose_street">Velg gate</string> <string name="choose_street">Velg gate</string>
<string name="choose_city">Velg by</string> <string name="choose_city">Velg by</string>
<string name="ChooseCountry">Velg land</string> <string name="ChooseCountry">Velg land</string>
<string name="show_view_angle">Vis synsretningen</string> <string name="show_view_angle">Vis synsretning</string>
<string name="map_view_3d_descr">Aktiver 3D-visning av kartet</string> <string name="map_view_3d_descr">Aktiver 3D-visning av kartet</string>
<string name="map_view_3d">3D-kartvisning</string> <string name="map_view_3d">3D-kartvisning</string>
<string name="show_poi_over_map_description">Vis interessepunkt over kart (bruk sist valgte filter)</string> <string name="show_poi_over_map_description">Vis interessepunkt over kart (bruk sist valgte filter)</string>
<string name="show_poi_over_map">Vis interessepunkt</string> <string name="show_poi_over_map">Vis interessepunkt</string>
<string name="map_tile_source_descr">Velg kilden til nettbaserte eller hurtigbufrede kartdeler</string> <string name="map_tile_source_descr">Velg kilden til nettbaserte eller hurtigbufrede kartdeler</string>
<string name="map_tile_source">Flislegg kartkilde</string> <string name="map_tile_source">Fliskartkilde</string>
<string name="map_source">Kartkilde</string> <string name="map_source">Kartkilde</string>
<string name="use_internet">Bruk internett</string> <string name="use_internet">Bruk internett</string>
<string name="show_location">Vis sted</string> <string name="show_location">Vis sted</string>
@ -654,13 +653,13 @@
<string name="osmodroid_mode_on">Stopp OsMoDroid</string> <string name="osmodroid_mode_on">Stopp OsMoDroid</string>
<string name="osmodroid_mode_off">Start OsMoDroid</string> <string name="osmodroid_mode_off">Start OsMoDroid</string>
<string name="announce_gpx_waypoints">Meld om GPX-rutepunkter</string> <string name="announce_gpx_waypoints">Meld om GPX-rutepunkter</string>
<string name="speak_title">Meddel…</string> <string name="speak_title">Meld om…</string>
<string name="speak_descr">Still inn for å meddele gatenavn, trafikkvarsler (tvungne stopp, fartsdumper), fotoboksvarsler, fartsgrenser</string> <string name="speak_descr">Still inn for å meddele gatenavn, trafikkvarsler (tvungne stopp, fartsdumper), fotoboksvarsler, fartsgrenser</string>
<string name="speak_street_names">Meddel gatenavn (TTS)</string> <string name="speak_street_names">Meddel gatenavn (TTS)</string>
<string name="speak_speed_limit">Meddel fartsgrense</string> <string name="speak_speed_limit">Meld om fartsgrense</string>
<string name="speak_cameras">Meld om fotobokser</string> <string name="speak_cameras">Meld om fotobokser</string>
<string name="speak_traffic_warnings">Meld trafikkvarsler</string> <string name="speak_traffic_warnings">Meld trafikkvarsler</string>
<string name="tip_recent_changes_1_5_t">"Endringer i 1.5:↵ →\n\t* Stemmevarslinger om fartsgrenser og fotobokser ↵ →\n\t* Flere muligheter for opplesning (gatenavn blir meddelt) ↵ →\n\t* Kartikoner i høy oppløsning ↵ →\n\t* Flere endringer i brukergrensesnittet ↵ →\n\t* Feilrettinger i avstandsvisningen, GPX-analyse, håndtering av rutepunkter, planleggingsmodulen, opplasting til OSM, https-håndtering "</string> <string name="tip_recent_changes_1_5_t">"Endringer i 1.5:↵ →\n\t* Talevarslinger om fartsgrenser og fotobokser ↵ →\n\t* Flere muligheter for talemeldinger (gatenavn blir meddelt) ↵ →\n\t* Kartikoner i høy oppløsning ↵ →\n\t* Flere endringer i brukergrensesnittet ↵ →\n\t* Feilrettinger i avstandsvisningen, GPX-analyse, håndtering av rutepunkter, planleggingsmodulen, opplasting til OSM, https-håndtering "</string>
<string name="osb_author_or_password_not_specified">Oppgi OSM brukernavn og passord i Innstillinger</string> <string name="osb_author_or_password_not_specified">Oppgi OSM brukernavn og passord i Innstillinger</string>
<string name="clear_intermediate_points">Slett mellomliggende rutepunkter</string> <string name="clear_intermediate_points">Slett mellomliggende rutepunkter</string>
<string name="keep_intermediate_points">Behold mellomliggende rutepunkter</string> <string name="keep_intermediate_points">Behold mellomliggende rutepunkter</string>
@ -669,18 +668,18 @@
<string name="context_menu_item_directions_from">Anvisninger fra</string> <string name="context_menu_item_directions_from">Anvisninger fra</string>
<string name="route_descr_map_location">Kart: </string> <string name="route_descr_map_location">Kart: </string>
<string name="route_descr_lat_lon">Br %1$.3f, Le %2$.3f</string> <string name="route_descr_lat_lon">Br %1$.3f, Le %2$.3f</string>
<string name="route_descr_current_location">Aktuell posisjon</string> <string name="route_descr_current_location">Gjeldende posisjon</string>
<string name="route_to">Til:</string> <string name="route_to">Til:</string>
<string name="route_via">Via:</string> <string name="route_via">Via:</string>
<string name="route_from">Fra:</string> <string name="route_from">Fra:</string>
<string name="destination_point">Mål %1$s</string> <string name="destination_point">Reisemål %1$s</string>
<string name="context_menu_item_destination_point">Velg som mål</string> <string name="context_menu_item_destination_point">Sett som reisemål</string>
<string name="please_select_address">Velg by eller gate først</string> <string name="please_select_address">Velg by eller gate først</string>
<string name="search_street_in_neighborhood_cities">Søk etter gaten i nabobyer</string> <string name="search_street_in_neighborhood_cities">Søk etter gaten i nabobyer</string>
<string name="tip_map_styles">Kartstiler</string> <string name="tip_map_styles">Kartstiler</string>
<string name="about_version">Utgave:</string> <string name="about_version">Versjon:</string>
<string name="about_settings">Om</string> <string name="about_settings">Om</string>
<string name="about_settings_descr">Versjonsinformasjon, lisenser, prosjektmedlemmer</string> <string name="about_settings_descr">Versjonsinformasjon, lisenser, prosjektmedlemmer</string>
<string name="tips_and_tricks">Hjelp</string> <string name="tips_and_tricks">Hjelp</string>
@ -763,14 +762,14 @@
<string name="lang_pt_br">Portugisisk (Brasil)</string> <string name="lang_pt_br">Portugisisk (Brasil)</string>
<string name="index_name_canada">Nord-Amerika - Canada</string> <string name="index_name_canada">Nord-Amerika - Canada</string>
<string name="index_item_nation_addresses">adresser (hele landet)</string> <string name="index_item_nation_addresses">adresser (hele landet)</string>
<string name="index_item_world_altitude_correction">Korreksjon av høyde (verden)</string> <string name="index_item_world_altitude_correction">Høydekorrigering (verden)</string>
<string name="index_item_world_seamarks">Sjømerkene(verden)</string> <string name="index_item_world_seamarks">Sjømerker (verden)</string>
<string name="index_item_world_bitcoin_payments">Bitcoinbetalinger (verden)</string> <string name="index_item_world_bitcoin_payments">Bitcoin-betalinger (verden)</string>
<string name="index_item_world_basemap">Oversiktskart (verden)</string> <string name="index_item_world_basemap">Oversiktskart (verden)</string>
<string name="index_item_world_ski">Skikart (verden)</string> <string name="index_item_world_ski">Skikart (verden)</string>
<string name="lang_hr">Kroatisk</string> <string name="lang_hr">Kroatisk</string>
<string name="calculate_osmand_route_without_internet">Beregn OsmAnd rutesegment uten internett</string> <string name="calculate_osmand_route_without_internet">Beregn OsmAnd rutesegment uten internett</string>
<string name="gpx_option_calculate_first_last_segment">Beregn OsmAnd rute for første og siste rute segment</string> <string name="gpx_option_calculate_first_last_segment">Beregn OsmAnd-rute for første og siste rutesegment</string>
<string name="osmo_settings_uuid">Unik enhets-id</string> <string name="osmo_settings_uuid">Unik enhets-id</string>
<string name="osmo_settings_descr">Still inn overvåking og personlig overvåkingskanal</string> <string name="osmo_settings_descr">Still inn overvåking og personlig overvåkingskanal</string>
<string name="osmo_plugin_description"/> <string name="osmo_plugin_description"/>
@ -946,4 +945,113 @@
<string name="navigation_intent_invalid">Ugyldig format: %s</string> <string name="navigation_intent_invalid">Ugyldig format: %s</string>
<string name="hide_all_waypoints">Fjern alle</string> <string name="hide_all_waypoints">Fjern alle</string>
<string name="rendering_attr_shareTaxiRoutes_name">Samletaxi-ruter</string> <string name="rendering_attr_shareTaxiRoutes_name">Samletaxi-ruter</string>
<string name="continue_navigation">Fortsett navigering</string>
<string name="pause_navigation">Midlertidig stopp navigering</string>
<string name="rendering_attr_hideWoodScrubs_name">Skjul skog og kratt</string>
<string name="rendering_attr_lessDetailed_name">Færre detaljer</string>
<string name="sort_by_distance">Sorter etter avstand</string>
<string name="sort_by_name">Sorter etter navn</string>
<string name="selected_gpx_info_show">\n\nTrykk og hold for å se på kartet</string>
<string name="gpx_info_waypoints">"Rutepunkter: %1$s "</string>
<string name="loading_streets">Laster gater…</string>
<string name="loading_cities">Laster byer…</string>
<string name="invalid_locations">Koordinater er ugyldige!</string>
<string name="go_back_to_osmand">Tilbake til OsmAnd-kart</string>
<string name="osb_comment_dialog_add_button">Legg til kommentar</string>
<string name="osb_comment_dialog_success">Kommentar ble vellykket lagt til</string>
<string name="no_buildings_found">Ingen bygninger funnet.</string>
<string name="loading_streets_buildings">Laster gater/bygninger…</string>
<string name="osmo_activity">OpenStreetMap-overvåking</string>
<string name="fav_point_dublicate_message">Favorittpunktnavn er endret til %1$s for å unngå dupliserte navn.</string>
<string name="gpx_selection_point">Punkt %1$s</string>
<string name="my_favorites">Mine favoritter</string>
<string name="osmo_center_location">Sentrer på skjermen</string>
<string name="color_red">rød</string>
<string name="color_pink">rosa</string>
<string name="color_orange">orange</string>
<string name="color_brown">brun</string>
<string name="color_yellow">gul</string>
<string name="color_lightblue">lyseblå</string>
<string name="color_blue">blå</string>
<string name="color_green">grønn</string>
<string name="osmo_group_info">Info</string>
<string name="osmo_track_interval">Loggeintervall</string>
<string name="osmo_group_description">Beskrivelse</string>
<string name="use_points_as_intermediates">Beregn rute mellom punkter</string>
<string name="lang_sr">Serbisk</string>
<string name="lang_zh_CN">Forenklet kinesisk</string>
<string name="lang_zh_TW">Tradisjonell kinesisk</string>
<string name="keep_and_add_destination_point">Legg til som målpunkt</string>
<string name="select_gpx">Velg GPX …</string>
<string name="route_descr_select_on_map">Velg på kart…</string>
<string name="route_descr_favorite">Favoritt…</string>
<string name="route_preferences">Ruteinnstillinger</string>
<string name="route_info">Ruteinformasjon</string>
<string name="calculate_osmand_route_gpx">Beregn OsmAnd offline-rute</string>
<string name="app_mode_truck">Lastebil</string>
<string name="local_index_tile_data_name">Flisdata: %1$s</string>
<string name="edit_tilesource_elliptic_tile">Elliptisk mercator</string>
<string name="delete_point">Slett punkt</string>
<string name="plugin_distance_point_time">tid</string>
<string name="plugin_distance_point_hdop">presisjon</string>
<string name="plugin_distance_point_speed">fart</string>
<string name="plugin_distance_point_ele">høyde</string>
<string name="plugin_distance_point">Punkt</string>
<string name="default_buttons_do_not_show_again">Ikke vis igjen</string>
<string name="use_magnetic_sensor">Bruk magnetisk sensor</string>
<string name="files_limit">%1$d filer igjen</string>
<string name="cancel_navigation">Stopp navigering</string>
<string name="hno">Husnummer</string>
<string name="select_address_activity">Velg adresse</string>
<string name="favourites_list_activity">Velg favoritt</string>
<string name="local_indexes_cat_srtm">Kotedata</string>
<string name="recording_context_menu_show">Vis</string>
<string name="srtm_paid_version_title">Programtillegg for koter</string>
<string name="av_settings_descr">Still inn lyd og video</string>
<string name="av_settings">"Lyd/video-innstillinger "</string>
<string name="av_control_stop">Stopp</string>
<string name="osmand_srtm_short_description_80_chars">OsmAnd-programtillegg for offline koter</string>
<string name="map_widget_distancemeasurement">Avstandsmåling</string>
<string name="monitoring_control_stop">Stopp</string>
<string name="index_srtm_ele">Koter</string>
<string name="srtm_plugin_name">Programtillegg for koter</string>
<string name="download_select_map_types">Andre kart</string>
<string name="download_roads_only_item">Bare veier</string>
<string name="download_srtm_maps">Koter</string>
<string name="download_regular_maps">Vanlige kart</string>
<string name="download_roads_only_maps">Rene veikart</string>
<string name="osmodroid_plugin_name">OsMoDroid-programtillegg</string>
<string name="tip_altitude_offset">Høydekorrigering</string>
<string name="search_villages_and_postcodes">Søk landsbyer/postnummer</string>
<string name="rendering_attr_showRoadMaps_description">Velg når det skal vises rene veikart:</string>
<string name="rendering_attr_showRoadMaps_name">Rene veikart</string>
<string name="osmand_play_title_30_chars">OsmAnd kart &amp; navigering</string>
<string name="osmand_plus_play_title_30_chars">OsmAnd+ kart &amp; navigering</string>
<string name="map_widget_view_direction">Synsretning</string>
<string name="gpxup_private">Privat</string>
<string name="share_route_as_gpx">Del rute som GPX-fil</string>
<string name="modify_transparency">Endre gjennomsiktighet (0 - gjennomsiktig, 255 - ugjennomsiktig)</string>
<string name="extra_settings">Avanserte innstillinger</string>
<string name="select_plugin_to_activate">Trykk på et programtillegg for å aktivere eller deaktivere det. (Omstart av OsmAnd kan være nødvendig.)</string>
<string name="gpx_visibility_txt">Synlighet</string>
<string name="gpx_description_txt">Beskrivelse</string>
<string name="use_transparent_map_theme">Gjennomsiktig tema</string>
<string name="keep_informing_never">Aldri</string>
<string name="local_index_installed">Utgave</string>
<string name="local_index_mi_export">Eksporter</string>
<string name="gpx_option_destination_point">Bruk gjeldende mål</string>
<string name="tip_location_sharing">Del en posisjon</string>
<string name="error_doing_search">Feil oppstod i offline-søk</string>
<string name="send_location">Send posisjon</string>
<string name="amenity_type_administrative">Administrative</string>
<string name="import_save">Lagre</string>
<string name="layer_transport_route">Transportrute</string>
<string name="unzipping_file">Pakker ut fil…</string>
<string name="transport_Stop">Stoppested</string>
<string name="transport_stops">Stoppesteder</string>
<string name="downloading_file_new">Laster ned…</string>
<string name="loading_postcodes">Laster postnummer…</string>
<string name="close">Lukk</string>
<string name="loading_data">Laster data…</string>
</resources> </resources>

278
OsmAnd/res/values-ru/phrases.xml
View file

@ -28,6 +28,7 @@
<string name="poi_bed_shop">Спальные принадлежности</string> <string name="poi_bed_shop">Спальные принадлежности</string>
<string name="poi_boutique">Бутик</string> <string name="poi_boutique">Бутик</string>
<string name="poi_carpet_shop">Магазин ковров</string> <string name="poi_carpet_shop">Магазин ковров</string>
<string name="poi_charity_shop">Благотворительный магазин</string>
<string name="poi_chemist_shop">Бытовая химия, косметика</string> <string name="poi_chemist_shop">Бытовая химия, косметика</string>
<string name="poi_clothes_shop">Одежда</string> <string name="poi_clothes_shop">Одежда</string>
<string name="poi_children_clothes_shop">Детская одежда</string> <string name="poi_children_clothes_shop">Детская одежда</string>
@ -318,6 +319,7 @@
<string name="poi_rowing">Академическая гребля</string> <string name="poi_rowing">Академическая гребля</string>
<string name="poi_rugby_union">Рэгби-юнион</string> <string name="poi_rugby_union">Рэгби-юнион</string>
<string name="poi_rugby_league">Рэгби-лиг</string> <string name="poi_rugby_league">Рэгби-лиг</string>
<string name="poi_sailing">Парусный спорт</string>
<string name="poi_shooting">Стрельба</string> <string name="poi_shooting">Стрельба</string>
<string name="poi_skating">Катание на роликах (коньках)</string> <string name="poi_skating">Катание на роликах (коньках)</string>
<string name="poi_skateboard">Скейтборд</string> <string name="poi_skateboard">Скейтборд</string>
@ -329,84 +331,84 @@
<string name="poi_toboggan"></string> <string name="poi_toboggan"></string>
<string name="poi_volleyball">Воллейбол</string> <string name="poi_volleyball">Воллейбол</string>
<string name="poi_museum"></string> <string name="poi_museum">Музей</string>
<string name="poi_attraction"></string> <string name="poi_attraction">Достопримечательность</string>
<string name="poi_memorial"></string> <string name="poi_memorial">Памятник, мемориал</string>
<string name="poi_artwork"></string> <string name="poi_artwork">Произведение искусства</string>
<string name="poi_archaeological_site"></string> <string name="poi_archaeological_site">Раскопки</string>
<string name="poi_battlefield"></string> <string name="poi_battlefield">Поле битвы</string>
<string name="poi_boundary_stone"></string> <string name="poi_boundary_stone">Межевой камень</string>
<string name="poi_castle"></string> <string name="poi_castle">Замок</string>
<string name="poi_city_gate"></string> <string name="poi_city_gate">Городские ворота</string>
<string name="poi_fort"></string> <string name="poi_fort">Фортификационные сооружения</string>
<string name="poi_fountain"></string> <string name="poi_fountain">Фонтан</string>
<string name="poi_ruins_historic"></string> <string name="poi_ruins_historic">Исторические руины</string>
<string name="poi_rune_stone"></string> <string name="poi_rune_stone">Рунический камень</string>
<string name="poi_wreck"></string> <string name="poi_wreck">Место кораблекрушения</string>
<string name="poi_ship_historic"></string> <string name="poi_ship_historic">Судно (музей)</string>
<string name="poi_mine_historic"></string> <string name="poi_mine_historic">Историческая шахта</string>
<string name="poi_monument"></string> <string name="poi_monument">Монумент (памятник)</string>
<string name="poi_zoo"></string> <string name="poi_zoo">Зоопарк</string>
<string name="poi_theme_park"></string> <string name="poi_theme_park">Парк развлечений</string>
<string name="poi_hotel"></string> <string name="poi_hotel">Гостиница</string>
<string name="poi_guest_house"></string> <string name="poi_guest_house">Гостевой дом</string>
<string name="poi_hostel"></string> <string name="poi_hostel">Хостел</string>
<string name="poi_motel"></string> <string name="poi_motel">Мотель</string>
<string name="poi_alpine_hut"></string> <string name="poi_alpine_hut">Горный приют</string>
<string name="poi_chalet"></string> <string name="poi_chalet">Шале</string>
<string name="poi_place_of_worship"></string> <string name="poi_place_of_worship">Место поклонения</string>
<string name="poi_place_of_worship_christian"></string> <string name="poi_place_of_worship_christian">Храм, церковь (часовня)</string>
<string name="poi_place_of_worship_jewish"></string> <string name="poi_place_of_worship_jewish">Синагога</string>
<string name="poi_place_of_worship_muslim"></string> <string name="poi_place_of_worship_muslim">Мечеть</string>
<string name="poi_place_of_worship_sikh"></string> <string name="poi_place_of_worship_sikh">Место поклонения: сикхизм</string>
<string name="poi_place_of_worship_buddhist"></string> <string name="poi_place_of_worship_buddhist">Место поклонения: буддизм</string>
<string name="poi_place_of_worship_hindu"></string> <string name="poi_place_of_worship_hindu">Место поклонения: индуизм</string>
<string name="poi_place_of_worship_shinto"></string> <string name="poi_place_of_worship_shinto">Место поклонения: синтоизм</string>
<string name="poi_place_of_worship_taoist"></string> <string name="poi_place_of_worship_taoist">Место поклонения: даосизм</string>
<string name="poi_monastery"></string> <string name="poi_monastery">Монастырь</string>
<string name="poi_historic_monastery"></string> <string name="poi_historic_monastery">Исторический монастырь</string>
<string name="poi_wayside_cross"></string> <string name="poi_wayside_cross">Придорожный крест</string>
<string name="poi_wayside_shrine"></string> <string name="poi_wayside_shrine">Придорожная святыня</string>
<string name="poi_tourism_information"></string> <string name="poi_tourism_information">Информационный стенд</string>
<string name="poi_clock"></string> <string name="poi_clock">Часы</string>
<string name="poi_travel_agent"></string> <string name="poi_travel_agent">Турагенство</string>
<string name="poi_viewpoint"></string> <string name="poi_viewpoint">Место с хорошим видом</string>
<string name="poi_camp_site"></string> <string name="poi_camp_site">Место для лагеря</string>
<string name="poi_caravan_site"></string> <string name="poi_caravan_site"></string>
<string name="poi_picnic_site"></string> <string name="poi_picnic_site">Место для пикника</string>
<string name="poi_spring"></string> <string name="poi_spring">Родник</string>
<string name="poi_cemetery"></string> <string name="poi_cemetery">Кладбище</string>
<string name="poi_grave_yard"></string> <string name="poi_grave_yard">Кладбище (небольшое)</string>
<string name="poi_shelter"></string> <string name="poi_shelter">Укрытие от непогоды</string>
<string name="poi_funicular"></string> <string name="poi_funicular">Фуникулёр</string>
<string name="poi_resort"></string> <string name="poi_resort">Курорт</string>
<string name="poi_club_art"></string> <string name="poi_club_art">Клуб любителей искусства</string>
<string name="poi_club_astronomy"></string> <string name="poi_club_astronomy">Астрономический клуб</string>
<string name="poi_club_computer"></string> <string name="poi_club_computer">Компьютерный клуб</string>
<string name="poi_club_board_games"></string> <string name="poi_club_board_games">Настольные игры</string>
<string name="poi_club_motorcycle"></string> <string name="poi_club_motorcycle">Мотоклуб</string>
<string name="poi_club_sport"></string> <string name="poi_club_sport">Спортивный клуб</string>
<string name="poi_club_game"></string> <string name="poi_club_game">Игровой клуб</string>
<string name="poi_club_automobile"></string> <string name="poi_club_automobile">Автоклуб</string>
<string name="poi_club_chess"></string> <string name="poi_club_chess">Шахматный клуб</string>
<string name="poi_club_cinema"></string> <string name="poi_club_cinema">Киноклуб</string>
<string name="poi_club_fan"></string> <string name="poi_club_fan">Фанклуб</string>
<string name="poi_club_fishing"></string> <string name="poi_club_fishing">Клуб рыболовов</string>
<string name="poi_club_veterans"></string> <string name="poi_club_veterans">Клуб ветеранов</string>
<string name="poi_club_linux"></string> <string name="poi_club_linux">Клуб любителей Linux</string>
<string name="poi_club_theatre"></string> <string name="poi_club_theatre">Театральный клуб</string>
<string name="poi_club_history"></string> <string name="poi_club_history">Исторический клуб</string>
<string name="poi_club_music"></string> <string name="poi_club_music">Музыкальный клуб</string>
<string name="poi_club_ethnic"></string> <string name="poi_club_ethnic">Клуб этнической культуры</string>
<string name="poi_club_nature"></string> <string name="poi_club_nature">Клуб натуралистов</string>
<string name="poi_club_photography"></string> <string name="poi_club_photography">Фотоклуб</string>
<string name="poi_club_hunting"></string> <string name="poi_club_hunting">Клуб охотников</string>
<string name="poi_club_shooting"></string> <string name="poi_club_shooting">Оружейный клуб</string>
<string name="poi_club_tourism"></string> <string name="poi_club_tourism">Туристический клуб</string>
<string name="poi_club_charity"></string> <string name="poi_club_charity">Благотворительский клуб</string>
<string name="poi_library">Библиотека</string> <string name="poi_library">Библиотека</string>
<string name="poi_arts_centre">Художественный центр</string> <string name="poi_arts_centre">Художественный центр</string>
@ -430,64 +432,64 @@
<string name="poi_water_park">Аквапарк</string> <string name="poi_water_park">Аквапарк</string>
<string name="poi_park">Парк</string> <string name="poi_park">Парк</string>
<string name="poi_cafe"></string> <string name="poi_cafe">Кафе</string>
<string name="poi_biergarten"></string> <string name="poi_biergarten">Летнее кафе</string>
<string name="poi_restaurant"></string> <string name="poi_restaurant">Ресторан</string>
<string name="poi_fast_food"></string> <string name="poi_fast_food">Фастфуд (быстрое питание)</string>
<string name="poi_bar"></string> <string name="poi_bar">Бар</string>
<string name="poi_pub"></string> <string name="poi_pub">Паб</string>
<string name="poi_food_court"></string> <string name="poi_food_court">Ресторанный дворик</string>
<string name="poi_drinking_water"></string> <string name="poi_drinking_water">Питьевая вода</string>
<string name="poi_barbecue"></string> <string name="poi_barbecue">Установка для барбекю</string>
<string name="poi_agricultural_engines_craft"></string> <string name="poi_agricultural_engines_craft">Ремонт с/х техники</string>
<string name="poi_basket_maker"></string> <string name="poi_basket_maker">Плетение из лозы</string>
<string name="poi_beekeeper"></string> <string name="poi_beekeeper">Пасека</string>
<string name="poi_blacksmith"></string> <string name="poi_blacksmith">Кузница</string>
<string name="poi_brewery"></string> <string name="poi_brewery">Пивоварня</string>
<string name="poi_boatbuilder"></string> <string name="poi_boatbuilder">Верфь</string>
<string name="poi_bookbinder"></string> <string name="poi_bookbinder">Переплётная мастерская</string>
<string name="poi_carpenter"></string> <string name="poi_carpenter">Столярная мастерская</string>
<string name="poi_carpet_layer"></string> <string name="poi_carpet_layer">Укладка ковров, ковролина</string>
<string name="poi_caterer"></string> <string name="poi_caterer">Кейтеринг</string>
<string name="poi_clockmaker"></string> <string name="poi_clockmaker">Часовая мастерская</string>
<string name="poi_dressmaker"></string> <string name="poi_dressmaker">Пошив, ремонт одежды</string>
<string name="poi_electrician"></string> <string name="poi_electrician">Электрик</string>
<string name="poi_gardener"></string> <string name="poi_gardener">Садовник, ландшафтный дизайнер</string>
<string name="poi_glaziery_craft"></string> <string name="poi_glaziery_craft">Стеклорезная мастерская</string>
<string name="poi_handicraft"></string> <string name="poi_handicraft">Рукодельные штуки, украшения</string>
<string name="poi_hvac"></string> <string name="poi_hvac">Монтаж кондиционеров, систем вентиляции</string>
<string name="poi_insulation_craft"></string> <string name="poi_insulation_craft">Услуги по утеплению помещений</string>
<string name="poi_jeweller"></string> <string name="poi_jeweller">Ювелирная мастерская</string>
<string name="poi_locksmith"></string> <string name="poi_locksmith">Слесарные работы</string>
<string name="poi_key_cutter"></string> <string name="poi_key_cutter">Изготовление ключей</string>
<string name="poi_metal_construction_craft"></string> <string name="poi_metal_construction_craft">Металлоконструкции</string>
<string name="poi_optician"></string> <string name="poi_optician">Изготовление, подгонка очков, линз</string>
<string name="poi_painter"></string> <string name="poi_painter">Маляр</string>
<string name="poi_parquet_layer"></string> <string name="poi_parquet_layer">Паркетные работы</string>
<string name="poi_photographer"></string> <string name="poi_photographer">Фотограф</string>
<string name="poi_photographic_laboratory"></string> <string name="poi_photographic_laboratory">Фотолаборатория</string>
<string name="poi_plasterer"></string> <string name="poi_plasterer">Штукатурные работы</string>
<string name="poi_plumber"></string> <string name="poi_plumber">Сантехник</string>
<string name="poi_pottery_craft"></string> <string name="poi_pottery_craft">Гончарная мастерская</string>
<string name="poi_rigger"></string> <string name="poi_rigger">Оснастка для яхт, катеров</string>
<string name="poi_roofer"></string> <string name="poi_roofer">Кровельщик</string>
<string name="poi_saddler"></string> <string name="poi_saddler">Пошив и ремонт автокресел</string>
<string name="poi_sailmaker"></string> <string name="poi_sailmaker">Пошив и ремонт парусов</string>
<string name="poi_sawmill"></string> <string name="poi_sawmill">Пилорама</string>
<string name="poi_scaffolder"></string> <string name="poi_scaffolder">Возведение строительных лесов</string>
<string name="poi_sculptor"></string> <string name="poi_sculptor">Скульптор</string>
<string name="poi_shoemaker"></string> <string name="poi_shoemaker">Обувная мастерская</string>
<string name="poi_stand_builder"></string> <string name="poi_stand_builder">Изготовление выставочных стендов</string>
<string name="poi_stonemason"></string> <string name="poi_stonemason">Камнерезная мастерская</string>
<string name="poi_sun_protection_craft"></string> <string name="poi_sun_protection_craft">Изготовление навесов, жалюзи</string>
<string name="poi_sweep"></string> <string name="poi_sweep">Трубочист</string>
<string name="poi_tailor"></string> <string name="poi_tailor">Ателье</string>
<string name="poi_tiler"></string> <string name="poi_tiler">Плиточные работы</string>
<string name="poi_tinsmith"></string> <string name="poi_tinsmith">Жестянщик, лудильщик</string>
<string name="poi_upholsterer"></string> <string name="poi_upholsterer">Драпировщик, обивка мебели</string>
<string name="poi_watchmaker"></string> <string name="poi_watchmaker">Часовщик</string>
<string name="poi_window_construction"></string> <string name="poi_window_construction">Изготовление окон</string>
<string name="poi_funeral_directors">Ритуальные услуги</string> <string name="poi_funeral_directors">Ритуальные услуги</string>
<string name="poi_computer_craft">Сборка компьютеров</string> <string name="poi_computer_craft">Сборка компьютеров</string>
@ -578,11 +580,11 @@
<string name="poi_seamark_rock"></string> <string name="poi_seamark_rock"></string>
<string name="poi_seamark_wreck"></string> <string name="poi_seamark_wreck"></string>
<string name="poi_military_airfield"></string> <string name="poi_military_airfield">Военный аэродром</string>
<string name="poi_military_bunker"></string> <string name="poi_military_bunker">Военный бункер</string>
<string name="poi_military_barracks"></string> <string name="poi_military_barracks">Бараки</string>
<string name="poi_military_danger_area"></string> <string name="poi_military_danger_area">Опасная зона</string>
<string name="poi_military_range"></string> <string name="poi_military_range">Военное стрельбище</string>
<string name="poi_military_naval_base"></string> <string name="poi_military_naval_base">Военно-морская база</string>
<string name="poi_military_nuclear_explosion_site"></string> <string name="poi_military_nuclear_explosion_site">Место ядерного взрыва</string>
</resources> </resources>

2
OsmAnd/res/values-ru/strings.xml
View file

@ -1771,7 +1771,7 @@
<string name="traffic_warning_calming">Снизьте скорость</string> <string name="traffic_warning_calming">Снизьте скорость</string>
<string name="traffic_warning_speed_camera">Скоростной радар</string> <string name="traffic_warning_speed_camera">Скоростной радар</string>
<string name="traffic_warning">Ограничение скорости</string> <string name="traffic_warning">Ограничение скорости</string>
<string name="speed_limit_exceed_message">Выберите допустимое значение превышения скорости выше которого вы получите голосовое предупреждение</string> <string name="speed_limit_exceed_message">Выберите допустимое значение превышения скорости выше которого вы получите голосовое предупреждение.</string>
<string name="speed_limit_exceed">Допустимое значение превышения скорости</string> <string name="speed_limit_exceed">Допустимое значение превышения скорости</string>
<string name="test_native_render">Тест нативной визуализации</string> <string name="test_native_render">Тест нативной визуализации</string>
<string name="fav_point_emoticons_message">Название избранной точки было изменено на %1$s для возможности сохранения строки со смайликом в файл.</string> <string name="fav_point_emoticons_message">Название избранной точки было изменено на %1$s для возможности сохранения строки со смайликом в файл.</string>

4
OsmAnd/res/values-sc/strings.xml
View file

@ -495,8 +495,8 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
<string name="auto_zoom_map">Zoom automàticu mapa</string> <string name="auto_zoom_map">Zoom automàticu mapa</string>
<string name="snap_to_road_descr">Arrea sa positzione in subra de sas istradas durante su nàvigu</string> <string name="snap_to_road_descr">Arrea sa positzione in subra de sas istradas durante su nàvigu</string>
<string name="snap_to_road">Arrea in subra de sas istradas</string> <string name="snap_to_road">Arrea in subra de sas istradas</string>
<string name="interrupt_music_descr">Interrumpe sa mùsica pro faghere sos annuntzios</string> <string name="interrupt_music_descr">Firma sa mùsica pro fàghere sos annùntzios</string>
<string name="interrupt_music">Interrumpe sa mùsica</string> <string name="interrupt_music">Firma sa mùsica</string>
<string name="tip_recent_changes_0_8_2_t">"Mudas in sa 0.8.2: <string name="tip_recent_changes_0_8_2_t">"Mudas in sa 0.8.2:
\n\t* Megiorau su calculu de sas àndalas \n\t* Megiorau su calculu de sas àndalas
\n\t* Widgets dinàmicos pro sas mapas \n\t* Widgets dinàmicos pro sas mapas

138
OsmAnd/res/values/phrases.xml
View file

@ -1,95 +1,95 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<resources> <resources>
<string name="poi_bakery">Bakery shop</string> <string name="poi_bakery">Bakery</string>
<string name="poi_alcohol">Alcohol shop</string> <string name="poi_alcohol">liquor store</string>
<string name="poi_convenience">Convenience store</string> <string name="poi_convenience">Convenience store</string>
<string name="poi_mall">Mall</string> <string name="poi_mall">Mall</string>
<string name="poi_beverages">Beverages shop</string> <string name="poi_beverages">Beverage store</string>
<string name="poi_butcher">Butcher shop</string> <string name="poi_butcher">Meat market</string>
<string name="poi_deli">Fine foods shop</string> <string name="poi_deli">Deli</string>
<string name="poi_shop_farm">Farm produce shop</string> <string name="poi_shop_farm">Farm shop</string>
<string name="poi_greengrocer">Greengrocer</string> <string name="poi_greengrocer">Greengrocery</string>
<string name="poi_seafood">Seafood shop</string> <string name="poi_seafood">Seafood store</string>
<string name="poi_confectionery">Confectionery Shop</string> <string name="poi_confectionery">Confectionery</string>
<string name="poi_ice_cream">Ice cream</string> <string name="poi_ice_cream">Ice cream parlor</string>
<string name="poi_supermarket">Supermarket</string> <string name="poi_supermarket">Supermarket</string>
<string name="poi_shop_tea">Tea shop</string> <string name="poi_shop_tea">Tea shop</string>
<string name="poi_dairy">Dairy shop</string> <string name="poi_dairy">Dairy shop</string>
<string name="poi_vending_machine">Vending machine</string> <string name="poi_vending_machine">Vending machine</string>
<string name="poi_bookshop">Book shop</string> <string name="poi_bookshop">Bookstore</string>
<string name="poi_bicycle_shop">Bicycle shop</string> <string name="poi_bicycle_shop">Bicycle shop</string>
<string name="poi_anime_shop">Anime shop</string> <string name="poi_anime_shop">Anime shop</string>
<string name="poi_antiques_shop">Antiques shop</string> <string name="poi_antiques_shop">Antiques store</string>
<string name="poi_art_shop">Art shop</string> <string name="poi_art_shop">Art shop</string>
<string name="poi_baby_goods">Baby goods</string> <string name="poi_baby_goods">Baby goods</string>
<string name="poi_bag_shop">Bag shop</string> <string name="poi_bag_shop">Bag shop</string>
<string name="poi_bathroom_furnishing_shop">Bathroom furnishing shop</string> <string name="poi_bathroom_furnishing_shop">Bathroom furnishings</string>
<string name="poi_bed_shop">Bed shop</string> <string name="poi_bed_shop">Bed room furnishings</string>
<string name="poi_boutique">Boutique shop</string> <string name="poi_boutique">Fashion boutique</string>
<string name="poi_carpet_shop">Carpet shop</string> <string name="poi_carpet_shop">Carpet shop</string>
<string name="poi_chemist_shop">Chemist shop</string> <string name="poi_chemist_shop">Drug store</string>
<string name="poi_clothes_shop">Clothes shop</string> <string name="poi_clothes_shop">Apparel store</string>
<string name="poi_children_clothes_shop">Children clothes shop</string> <string name="poi_children_clothes_shop">Childrens apparel</string>
<string name="poi_shoes">Shoes shop</string> <string name="poi_shoes">Shoe store</string>
<string name="poi_computer_shop">Computer shop</string> <string name="poi_computer_shop">Computer store</string>
<string name="poi_copyshop">Copy shop</string> <string name="poi_copyshop">Copy shop</string>
<string name="poi_curtain_shop">Curtain shop</string> <string name="poi_curtain_shop">Curtain shop</string>
<string name="poi_fabric_shop">Fabric shop</string> <string name="poi_fabric_shop">Drapery shop</string>
<string name="poi_bedding_shop">Bedding shop</string> <string name="poi_bedding_shop">Bedding store</string>
<string name="poi_dive_shop">Dive shop</string> <string name="poi_dive_shop">Diving equipment</string>
<string name="poi_doityourself_shop">Do-It-Yourself shop</string> <string name="poi_doityourself_shop">Home improvement store</string>
<string name="poi_erotic_shop">Sex shop</string> <string name="poi_erotic_shop">Erotic shop</string>
<string name="poi_fishing_shop">Fishing shop</string> <string name="poi_fishing_shop">Fishing tackle</string>
<string name="poi_florist">Florist shop</string> <string name="poi_florist">Flower shop</string>
<string name="poi_frame_shop">Frame shop</string> <string name="poi_frame_shop">Picture frame shop</string>
<string name="poi_furniture_shop">Furniture shop</string> <string name="poi_furniture_shop">Furniture store</string>
<string name="poi_garden_centre">Garden centre</string> <string name="poi_garden_centre">Garden center</string>
<string name="poi_gas_shop">Bottled gas shop</string> <string name="poi_gas_shop">Liquid gas store</string>
<string name="poi_general_shop">General shop</string> <string name="poi_general_shop">General store</string>
<string name="poi_gift_shop">Gift shop</string> <string name="poi_gift_shop">Gift shop</string>
<string name="poi_glaziery_shop">Glaziery shop</string> <string name="poi_glaziery_shop">Glaziery</string>
<string name="poi_hardware_shop">Hardware shop</string> <string name="poi_hardware_shop">Hardware store</string>
<string name="poi_hearing_aids_shop">Hearing aids shop</string> <string name="poi_hearing_aids_shop">Hearing aids</string>
<string name="poi_herbalist">Herbalist shop</string> <string name="poi_herbalist">Herb store</string>
<string name="poi_hifi_shop">HiFi shop</string> <string name="poi_hifi_shop">HiFi store</string>
<string name="poi_houseware_shop">Houseware shop</string> <string name="poi_houseware_shop">Household supply store</string>
<string name="poi_hunting_shop">Hunting shop</string> <string name="poi_hunting_shop">Hunting equipment</string>
<string name="poi_interior_decoration_shop">Interior decoration shop</string> <string name="poi_interior_decoration_shop">Interior decoration store</string>
<string name="poi_jewelry_shop">Jewelry shop</string> <string name="poi_jewelry_shop">Jewelry store</string>
<string name="poi_kiosk">Kiosk</string> <string name="poi_kiosk">Kiosk</string>
<string name="poi_kitchen_shop">Kitchen shop</string> <string name="poi_kitchen_shop">Kitchenware</string>
<string name="poi_mobile_phone_shop">Mobile phone shop</string> <string name="poi_mobile_phone_shop">Cell phone store</string>
<string name="poi_motorcycle_shop">Motorcycle shop</string> <string name="poi_motorcycle_shop">Motorcycle shop</string>
<string name="poi_musical_instrument_shop">Musical instrument shop</string> <string name="poi_musical_instrument_shop">Musical instruments</string>
<string name="poi_newsagent_shop">Newsagent shop</string> <string name="poi_newsagent_shop">Newsagency</string>
<string name="poi_optician_shop">Optician shop</string> <string name="poi_optician_shop">Optometrist</string>
<string name="poi_organic_shop">Organic store</string> <string name="poi_organic_shop">Organic food</string>
<string name="poi_outdoor_shop">Outdoor shop</string> <string name="poi_outdoor_shop">Outdoor store</string>
<string name="poi_paint_shop">Paint shop</string> <string name="poi_paint_shop">Paint shop</string>
<string name="poi_pet_shop">Pet shop</string> <string name="poi_pet_shop">Pet shop</string>
<string name="poi_radiotechnics_shop">Radiotechnics shop</string> <string name="poi_radiotechnics_shop">Radiotechnics store</string>
<string name="poi_second_hand">Second hand shop</string> <string name="poi_second_hand">Second hand store</string>
<string name="poi_ship_chandler">Ship chandler</string> <string name="poi_ship_chandler">Ship chandler</string>
<string name="poi_sports_shop">Sports shop</string> <string name="poi_sports_shop">Sporting goods</string>
<string name="poi_stationery_shop">Stationery shop</string> <string name="poi_stationery_shop">Stationery shop</string>
<string name="poi_tableware_shop">Tableware shop</string> <string name="poi_tableware_shop">Tableware shop</string>
<string name="poi_ticket_shop">Ticket shop</string> <string name="poi_ticket_shop">Ticket shop</string>
<string name="poi_tobacco_shop">Tobacco shop</string> <string name="poi_tobacco_shop">Tobacco store</string>
<string name="poi_toys_shop">Toys shop</string> <string name="poi_toys_shop">Toys store</string>
<string name="poi_trade_shop">Trade shop</string> <string name="poi_trade_shop">Trading post</string>
<string name="poi_vacuum_cleaner_shop">Vacuum cleaner shop</string> <string name="poi_vacuum_cleaner_shop">Vacuum cleaner store</string>
<string name="poi_variety_store">Variety store</string> <string name="poi_variety_store">Variety store</string>
<string name="poi_video_shop">Video shop</string> <string name="poi_video_shop">Video store</string>
<string name="poi_window_blind_shop">Window blind shop</string> <string name="poi_window_blind_shop">Window blind store</string>
<string name="poi_department_store">Department store</string> <string name="poi_department_store">Department store</string>
<string name="poi_electronics_shop">Electronics shop</string> <string name="poi_electronics_shop">Electronics store</string>
<string name="poi_car_shop">Car shop</string> <string name="poi_car_shop">Car shop</string>
<string name="poi_car_parts_shop">Car parts shop</string> <string name="poi_car_parts_shop">Car parts</string>
<string name="poi_atv_shop">Quad shop</string> <string name="poi_atv_shop">Quad store</string>
<string name="poi_cosmetics_shop">Cosmetics shop</string> <string name="poi_cosmetics_shop">Cosmetics</string>
<string name="poi_marketplace">Marketplace</string> <string name="poi_marketplace">Marketplace</string>
<string name="poi_sewing_shop">Sewing shop</string> <string name="poi_sewing_shop">Dry goods store</string>
<string name="poi_police">Police</string> <string name="poi_police">Police</string>
<string name="poi_fire_station">Fire station</string> <string name="poi_fire_station">Fire station</string>
@ -118,13 +118,13 @@
<string name="poi_traffic_calming_rumble_strip">Rumble strip</string> <string name="poi_traffic_calming_rumble_strip">Rumble strip</string>
<string name="poi_traffic_calming_table">Table</string> <string name="poi_traffic_calming_table">Table</string>
<string name="poi_traffic_calming_choker">Choker</string> <string name="poi_traffic_calming_choker">Choker</string>
<string name="poi_traffic_signals">Traffic signals</string> <string name="poi_traffic_signals">Stop light</string>
<string name="poi_car_repair">Car repair</string> <string name="poi_car_repair">Car repair</string>
<string name="poi_service_tyres">Tire</string> <string name="poi_service_tyres">Tires</string>
<string name="poi_vehicle_inspection">Vehicle inspection</string> <string name="poi_vehicle_inspection">Vehicle inspection</string>
<string name="poi_car_wash">Car wash</string> <string name="poi_car_wash">Car wash</string>
<string name="poi_fuel">Petrol station</string> <string name="poi_fuel">Gas station</string>
<string name="poi_charging_station">Charging station</string> <string name="poi_charging_station">Charging station</string>
<string name="poi_vehicle_ramp">Vehicle ramp</string> <string name="poi_vehicle_ramp">Vehicle ramp</string>
<string name="poi_compressed_air">Compressed air</string> <string name="poi_compressed_air">Compressed air</string>
@ -231,7 +231,7 @@
<string name="poi_social_facility">Social facility</string> <string name="poi_social_facility">Social facility</string>
<string name="poi_courthouse">Courthouse</string> <string name="poi_courthouse">Courthouse</string>
<string name="poi_prison">Prison</string> <string name="poi_prison">Prison</string>
<string name="poi_register_office">Register office</string> <string name="poi_register_office">Civil registry office</string>
<string name="poi_embassy">Embassy</string> <string name="poi_embassy">Embassy</string>
<string name="poi_government">Government</string> <string name="poi_government">Government</string>
<string name="poi_bailiff">Bailiff</string> <string name="poi_bailiff">Bailiff</string>
@ -388,7 +388,7 @@
<string name="poi_club_computer">Computer club</string> <string name="poi_club_computer">Computer club</string>
<string name="poi_club_board_games">Board games club</string> <string name="poi_club_board_games">Board games club</string>
<string name="poi_club_motorcycle">Motorcycle club</string> <string name="poi_club_motorcycle">Motorcycle club</string>
<string name="poi_club_sport">Sport club</string> <string name="poi_club_sport">Sports club</string>
<string name="poi_club_game">Game club</string> <string name="poi_club_game">Game club</string>
<string name="poi_club_automobile">Automobile club</string> <string name="poi_club_automobile">Automobile club</string>
<string name="poi_club_chess">Chess club</string> <string name="poi_club_chess">Chess club</string>
@ -397,7 +397,7 @@
<string name="poi_club_fishing">Fishing club</string> <string name="poi_club_fishing">Fishing club</string>
<string name="poi_club_veterans">Veterans club</string> <string name="poi_club_veterans">Veterans club</string>
<string name="poi_club_linux">Linux club</string> <string name="poi_club_linux">Linux club</string>
<string name="poi_club_theatre">Theatre club</string> <string name="poi_club_theatre">Theater club</string>
<string name="poi_club_history">History club</string> <string name="poi_club_history">History club</string>
<string name="poi_club_music">Music club</string> <string name="poi_club_music">Music club</string>
<string name="poi_club_ethnic">Ethnic club</string> <string name="poi_club_ethnic">Ethnic club</string>
@ -501,7 +501,7 @@
<string name="poi_car_rental">Car rental</string> <string name="poi_car_rental">Car rental</string>
<string name="poi_car_sharing">Car sharing</string> <string name="poi_car_sharing">Car sharing</string>
<string name="poi_boat_sharing">Boat sharing</string> <string name="poi_boat_sharing">Boat sharing</string>
<string name="poi_toilets">Toilets</string> <string name="poi_toilets">Restroom</string>
<string name="poi_sauna">Sauna</string> <string name="poi_sauna">Sauna</string>
<string name="poi_brothel">Brothel</string> <string name="poi_brothel">Brothel</string>
<string name="poi_mortuary">Mortuary</string> <string name="poi_mortuary">Mortuary</string>

62
OsmAnd/src/net/osmand/core/android/GLActivity.java
View file

@ -54,11 +54,11 @@ public class GLActivity extends Activity {
private ResolvedMapStyle _mapStyle; private ResolvedMapStyle _mapStyle;
private ObfsCollection _obfsCollection; private ObfsCollection _obfsCollection;
private MapPresentationEnvironment _mapPresentationEnvironment; private MapPresentationEnvironment _mapPresentationEnvironment;
private Primitiviser _primitiviser; private MapPrimitiviser _mapPrimitiviser;
private BinaryMapDataProvider _binaryMapDataProvider; private ObfMapObjectsProvider _obfMapObjectsProvider;
private BinaryMapPrimitivesProvider _binaryMapPrimitivesProvider; private MapPrimitivesProvider _mapPrimitivesProvider;
private BinaryMapStaticSymbolsProvider _binaryMapStaticSymbolsProvider; private MapObjectsSymbolsProvider _mapObjectsSymbolsProvider;
private BinaryMapRasterLayerProvider _binaryMapRasterLayerProvider; private MapRasterLayerProvider _mapRasterLayerProvider;
private OnlineRasterMapLayerProvider _onlineMapRasterLayerProvider; private OnlineRasterMapLayerProvider _onlineMapRasterLayerProvider;
private IMapRenderer _mapRenderer; private IMapRenderer _mapRenderer;
private GpuWorkerThreadPrologue _gpuWorkerThreadPrologue; private GpuWorkerThreadPrologue _gpuWorkerThreadPrologue;
@ -194,19 +194,19 @@ public class GLActivity extends Activity {
_displayDensityFactor, _displayDensityFactor,
"en"); //TODO: here should be current locale "en"); //TODO: here should be current locale
//mapPresentationEnvironment->setSettings(configuration.styleSettings); //mapPresentationEnvironment->setSettings(configuration.styleSettings);
_primitiviser = new Primitiviser( _mapPrimitiviser = new MapPrimitiviser(
_mapPresentationEnvironment); _mapPresentationEnvironment);
_binaryMapDataProvider = new BinaryMapDataProvider( _obfMapObjectsProvider = new ObfMapObjectsProvider(
_obfsCollection); _obfsCollection);
_binaryMapPrimitivesProvider = new BinaryMapPrimitivesProvider( _mapPrimitivesProvider = new MapPrimitivesProvider(
_binaryMapDataProvider, _obfMapObjectsProvider,
_primitiviser, _mapPrimitiviser,
_rasterTileSize); _rasterTileSize);
_binaryMapStaticSymbolsProvider = new BinaryMapStaticSymbolsProvider( _mapObjectsSymbolsProvider = new MapObjectsSymbolsProvider(
_binaryMapPrimitivesProvider, _mapPrimitivesProvider,
_rasterTileSize); _rasterTileSize);
_binaryMapRasterLayerProvider = new BinaryMapRasterLayerProvider_Software( _mapRasterLayerProvider = new MapRasterLayerProvider_Software(
_binaryMapPrimitivesProvider); _mapPrimitivesProvider);
_onlineMapRasterLayerProvider = OnlineTileSources.getBuiltIn().createProviderFor("Mapnik (OsmAnd)"); _onlineMapRasterLayerProvider = OnlineTileSources.getBuiltIn().createProviderFor("Mapnik (OsmAnd)");
@ -222,14 +222,14 @@ public class GLActivity extends Activity {
atlasRendererConfiguration.setReferenceTileSizeOnScreenInPixels(_referenceTileSize); atlasRendererConfiguration.setReferenceTileSizeOnScreenInPixels(_referenceTileSize);
_mapRenderer.setConfiguration(AtlasMapRendererConfiguration.Casts.downcastTo_MapRendererConfiguration(atlasRendererConfiguration)); _mapRenderer.setConfiguration(AtlasMapRendererConfiguration.Casts.downcastTo_MapRendererConfiguration(atlasRendererConfiguration));
_mapRenderer.addSymbolsProvider(_binaryMapStaticSymbolsProvider); _mapRenderer.addSymbolsProvider(_mapObjectsSymbolsProvider);
updateView(); updateView();
/* /*
IMapRasterLayerProvider mapnik = OnlineTileSources.getBuiltIn().createProviderFor("Mapnik (OsmAnd)"); IMapRasterLayerProvider mapnik = OnlineTileSources.getBuiltIn().createProviderFor("Mapnik (OsmAnd)");
if (mapnik == null) if (mapnik == null)
Log.e(TAG, "Failed to create mapnik"); Log.e(TAG, "Failed to create mapnik");
*/ */
_mapRenderer.setMapLayerProvider(0, _binaryMapRasterLayerProvider); _mapRenderer.setMapLayerProvider(0, _mapRasterLayerProvider);
_glSurfaceView = (GLSurfaceView) findViewById(R.id.glSurfaceView); _glSurfaceView = (GLSurfaceView) findViewById(R.id.glSurfaceView);
//TODO:_glSurfaceView.setPreserveEGLContextOnPause(true); //TODO:_glSurfaceView.setPreserveEGLContextOnPause(true);
@ -289,29 +289,29 @@ public class GLActivity extends Activity {
_mapPresentationEnvironment = null; _mapPresentationEnvironment = null;
} }
if (_primitiviser != null) { if (_mapPrimitiviser != null) {
_primitiviser.delete(); _mapPrimitiviser.delete();
_primitiviser = null; _mapPrimitiviser = null;
} }
if (_binaryMapDataProvider != null) { if (_obfMapObjectsProvider != null) {
_binaryMapDataProvider.delete(); _obfMapObjectsProvider.delete();
_binaryMapDataProvider = null; _obfMapObjectsProvider = null;
} }
if (_binaryMapPrimitivesProvider != null) { if (_mapPrimitivesProvider != null) {
_binaryMapPrimitivesProvider.delete(); _mapPrimitivesProvider.delete();
_binaryMapPrimitivesProvider = null; _mapPrimitivesProvider = null;
} }
if (_binaryMapStaticSymbolsProvider != null) { if (_mapObjectsSymbolsProvider != null) {
_binaryMapStaticSymbolsProvider.delete(); _mapObjectsSymbolsProvider.delete();
_binaryMapStaticSymbolsProvider = null; _mapObjectsSymbolsProvider = null;
} }
if (_binaryMapRasterLayerProvider != null) { if (_mapRasterLayerProvider != null) {
_binaryMapRasterLayerProvider.delete(); _mapRasterLayerProvider.delete();
_binaryMapRasterLayerProvider = null; _mapRasterLayerProvider = null;
} }
if (_mapRenderer != null) { if (_mapRenderer != null) {

2
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -856,7 +856,7 @@ public class MapActivity extends AccessibleActivity implements
if (mDevicePolicyManager != null && mDeviceAdmin != null) { if (mDevicePolicyManager != null && mDeviceAdmin != null) {
final Integer screenPowerSave = settings.WAKE_ON_VOICE_INT.get(); final Integer screenPowerSave = settings.WAKE_ON_VOICE_INT.get();
if (screenPowerSave > 0) { if (screenPowerSave > 0 && settings.MAP_ACTIVITY_ENABLED.get()) {
if (mDevicePolicyManager.isAdminActive(mDeviceAdmin)) { if (mDevicePolicyManager.isAdminActive(mDeviceAdmin)) {
try { try {
mDevicePolicyManager.lockNow(); mDevicePolicyManager.lockNow();

2
OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
View file

@ -148,7 +148,7 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
public void updateSettings(){ public void updateSettings(){
if (mapView != null) { if (mapView != null) {
if (settings.ROTATE_MAP.get() != OsmandSettings.ROTATE_MAP_COMPASS || routePlanningMode) { if (settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_NONE || routePlanningMode) {
mapView.setRotate(0); mapView.setRotate(0);
} }
mapView.setMapPosition(settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_BEARING mapView.setMapPosition(settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_BEARING

7
OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
View file

@ -100,7 +100,6 @@ public class DownloadActivity extends SherlockFragmentActivity {
tabHost.setCurrentTab(0); tabHost.setCurrentTab(0);
settings = ((OsmandApplication)getApplication()).getSettings(); settings = ((OsmandApplication)getApplication()).getSettings();
indeterminateProgressBar = (ProgressBar) findViewById(R.id.IndeterminateProgressBar); indeterminateProgressBar = (ProgressBar) findViewById(R.id.IndeterminateProgressBar);
@ -448,7 +447,11 @@ public class DownloadActivity extends SherlockFragmentActivity {
public void downloadedIndexes(){ public void downloadedIndexes(){
for(WeakReference<Fragment> ref : fragList) { for(WeakReference<Fragment> ref : fragList) {
Fragment f = ref.get(); Fragment f = ref.get();
if(f instanceof DownloadIndexFragment) { if(f instanceof LocalIndexesFragment){
if(!f.isDetached()){
((LocalIndexesFragment) f).reloadData();
}
} else if(f instanceof DownloadIndexFragment) {
if(!f.isDetached()) { if(!f.isDetached()) {
DownloadIndexAdapter adapter = ((DownloadIndexAdapter)((DownloadIndexFragment) f).getExpandableListAdapter()); DownloadIndexAdapter adapter = ((DownloadIndexAdapter)((DownloadIndexFragment) f).getExpandableListAdapter());
if (adapter != null) { if (adapter != null) {

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