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

Merge branch 'r3.6' into avoid_roads_export_import

Browse source
This commit is contained in:
Dmitriy Ruban 2020-02-25 11:20:07 +02:00 committed by GitHub
commit 03fd123419
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
390 changed files with 4176 additions and 2021 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd-java/src/main/java/net/osmand/data/Amenity.java
View file

@ -37,6 +37,7 @@ public class Amenity extends MapObject {
public static final String CONTENT = "content"; public static final String CONTENT = "content";
public static final String CUISINE = "cuisine"; public static final String CUISINE = "cuisine";
public static final String DISH = "dish"; public static final String DISH = "dish";
public static final String REF = "ref";
public static final String OSM_DELETE_VALUE = "delete"; public static final String OSM_DELETE_VALUE = "delete";
public static final String OSM_DELETE_TAG = "osmand_change"; public static final String OSM_DELETE_TAG = "osmand_change";

6
OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java
View file

@ -864,8 +864,10 @@ public class SearchUICore {
if ((!topVisible1 && !topVisible2) || (topVisible1 && topVisible2)) { if ((!topVisible1 && !topVisible2) || (topVisible1 && topVisible2)) {
if (o1.getUnknownPhraseMatchWeight() != o2.getUnknownPhraseMatchWeight()) { if (o1.getUnknownPhraseMatchWeight() != o2.getUnknownPhraseMatchWeight()) {
return -Double.compare(o1.getUnknownPhraseMatchWeight(), o2.getUnknownPhraseMatchWeight()); return -Double.compare(o1.getUnknownPhraseMatchWeight(), o2.getUnknownPhraseMatchWeight());
} else if (o1.getFoundWordCount() != o2.getFoundWordCount()) { } else {
return -Algorithms.compare(o1.getFoundWordCount(), o2.getFoundWordCount()); if (o1.getFoundWordCount() != o2.getFoundWordCount()) {
return -Algorithms.compare(o1.getFoundWordCount(), o2.getFoundWordCount());
}
} }
} }
if (!sortByName) { if (!sortByName) {

39
OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java
View file

@ -1,7 +1,5 @@
package net.osmand.search.core; package net.osmand.search.core;
import com.jwetherell.openmap.common.LatLonPoint;
import com.jwetherell.openmap.common.UTMPoint;
import net.osmand.CollatorStringMatcher.StringMatcherMode; import net.osmand.CollatorStringMatcher.StringMatcherMode;
import net.osmand.ResultMatcher; import net.osmand.ResultMatcher;
@ -146,7 +144,7 @@ public class SearchCoreFactory {
SearchResultMatcher resultMatcher, SearchResult res, SearchBaseAPI api) SearchResultMatcher resultMatcher, SearchResult res, SearchBaseAPI api)
throws IOException { throws IOException {
phrase.countUnknownWordsMatch(res); phrase.countUnknownWordsMatch(res);
int cnt = resultMatcher.getCount(); // int cnt = resultMatcher.getCount();
List<String> ws = phrase.getUnknownSearchWords(res.otherWordsMatch); List<String> ws = phrase.getUnknownSearchWords(res.otherWordsMatch);
if(!res.firstUnknownWordMatches) { if(!res.firstUnknownWordMatches) {
ws.add(phrase.getUnknownSearchWord()); ws.add(phrase.getUnknownSearchWord());
@ -938,7 +936,12 @@ public class SearchCoreFactory {
} }
if (phrase.isUnknownSearchWordPresent() if (phrase.isUnknownSearchWordPresent()
&& !(ns.matches(res.localeName) || ns.matches(res.otherNames))) { && !(ns.matches(res.localeName) || ns.matches(res.otherNames))) {
return false; String ref = object.getTagContent(Amenity.REF, null);
if(ref == null || !ns.matches(ref)) {
return false;
} else {
res.localeName += " " + ref;
}
} }
res.object = object; res.object = object;
@ -1266,20 +1269,6 @@ public class SearchCoreFactory {
return false; return false;
} }
// newFormat = PointDescription.FORMAT_DEGREES;
// newFormat = PointDescription.FORMAT_MINUTES;
// newFormat = PointDescription.FORMAT_SECONDS;
public void testUTM() {
double northing = 0;
double easting = 0;
String zone = "";
char c = zone.charAt(zone.length() -1);
int z = Integer.parseInt(zone.substring(0, zone.length() - 1));
UTMPoint upoint = new UTMPoint(northing, easting, z, c);
LatLonPoint ll = upoint.toLatLonPoint();
LatLon loc = new LatLon(ll.getLatitude(), ll.getLongitude());
}
@Override @Override
public boolean search(SearchPhrase phrase, SearchResultMatcher resultMatcher) throws IOException { public boolean search(SearchPhrase phrase, SearchResultMatcher resultMatcher) throws IOException {
if (!phrase.isUnknownSearchWordPresent()) { if (!phrase.isUnknownSearchWordPresent()) {
@ -1292,17 +1281,6 @@ public class SearchCoreFactory {
return super.search(phrase, resultMatcher); return super.search(phrase, resultMatcher);
} }
private boolean isKindOfNumber(String s) {
for (int i = 0; i < s.length(); i ++) {
char c = s.charAt(i);
if (c >= '0' && c <= '9') {
} else if (c == ':' || c == '.' || c == '#' || c == ',' || c == '-' || c == '\'' || c == '"') {
} else {
return false;
}
}
return true;
}
LatLon parsePartialLocation(String s) { LatLon parsePartialLocation(String s) {
s = s.trim(); s = s.trim();
@ -1342,8 +1320,7 @@ public class SearchCoreFactory {
searchLocation = sr.location; searchLocation = sr.location;
} }
break; break;
case CITY: default:
case VILLAGE:
searchLocation = sr.location; searchLocation = sr.location;
break; break;
} }

6
OsmAnd-java/src/main/java/net/osmand/util/OpeningHoursParser.java
View file

@ -1996,15 +1996,15 @@ public class OpeningHoursParser {
private static void fillRuleArray(boolean[] array, Token[] pair) { private static void fillRuleArray(boolean[] array, Token[] pair) {
if (pair[0].mainNumber <= pair[1].mainNumber) { if (pair[0].mainNumber <= pair[1].mainNumber) {
for (int j = pair[0].mainNumber; j <= pair[1].mainNumber && j < array.length; j++) { for (int j = pair[0].mainNumber; j <= pair[1].mainNumber && j >= 0 && j < array.length; j++) {
array[j] = true; array[j] = true;
} }
} else { } else {
// overflow // overflow
for (int j = pair[0].mainNumber; j < array.length; j++) { for (int j = pair[0].mainNumber; j >= 0 && j < array.length; j++) {
array[j] = true; array[j] = true;
} }
for (int j = 0; j <= pair[1].mainNumber; j++) { for (int j = 0; j <= pair[1].mainNumber && j < array.length; j++) {
array[j] = true; array[j] = true;
} }
} }

94
OsmAnd-telegram/res/values-ar-rSA/strings.xml
View file

@ -1,4 +1,98 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="time_zone">المنطقة الزمنية</string> <string name="time_zone">المنطقة الزمنية</string>
<string name="shared_string_ok">موافق</string>
<string name="timeline_available_for_free_now">الجدول الزمني هو ميزة متاحة الآن مجانا.</string>
<string name="disable_monitoring">تعطيل المراقبة</string>
<string name="location_recording_enabled">تمكين تسجيل الموقع</string>
<string name="timeline_description">تمكن الرصد لحفظ جميع المواقع في التاريخ.</string>
<string name="app_name_short">متعقب أوسماند</string>
<string name="shared_string_telegram">تيليجرام</string>
<string name="privacy_policy_use_telegram">يستخدم تيليجرام (تطبيق المراسلة) للاتصال والتواصل مع الأشخاص.</string>
<string name="privacy_policy_telegram_client">تعقب أوسماند هوأحد العملاء الذين يستخدمون منصة تيليجرام المفتوحة. يمكن لجهات الاتصال الخاصة بك استخدام أي عميل تيليجرام آخر.</string>
<string name="privacy_policy_agree">من خلال النقر على \"متابعة\" فإنك توافق على شروط سياسة الخصوصية تيليجرام وأوسماند.</string>
<string name="shared_string_accept">قبول</string>
<string name="telegram_privacy_policy">سياسة خصوصية تيليجرام</string>
<string name="osmand_privacy_policy">سياسة الخصوصية Osmand</string>
<string name="how_it_works">كيف يعمل</string>
<string name="received_gps_points">نقاط GPX المستلمة: %1$s</string>
<string name="shared_string_appearance">المظهر</string>
<string name="show_gps_points">إظهار نقاط GPS</string>
<string name="show_gps_points_descr">إظهار كمية نقاط GPS التي تم جمعها وإرسالها.</string>
<string name="please_update_osmand">يرجى تحديث OsmAnd لعرض البيانات على الخريطة</string>
<string name="shared_string_update">تحديث</string>
<string name="gps_points_in_buffer">أرسلت (%1$d في المخزن المؤقت)</string>
<string name="points_size">%1$d من النقاط</string>
<string name="shared_string_date">تاريخ</string>
<string name="shared_string_collected">جمع</string>
<string name="gps_points">نقاط GPS</string>
<string name="shared_string_sent">إرسال</string>
<string name="monitoring_is_enabled">تمكين المراقبة</string>
<string name="monitoring_is_disabled">تعطيل المراقبة</string>
<string name="time_on_the_move">نقل الوقت</string>
<string name="average_altitude">متوسط الارتفاع</string>
<string name="average_speed">متوسط السرعة</string>
<string name="open_in_osmand">عرض في OsmAnd</string>
<string name="end_date">تاريخ الانتهاء</string>
<string name="start_date">تاريخ البدء</string>
<string name="send_location_as">إرسال موقع</string>
<string name="send_location_as_descr">اختر كيف ستبدو الرسائل مع موقعك.</string>
<string name="shared_string_map">خريطه</string>
<string name="shared_string_text">النص</string>
<string name="map_and_text">خريطة ونص</string>
<string name="last_update_from_telegram">آخر تحديث من تيليجرام</string>
<string name="enter_another_device_name">اختيار اسم لم تستخدمه بالفعل</string>
<string name="search_contacts">البحث عن جهات الاتصال</string>
<string name="search_contacts_descr">ابحث في جميع المجموعات وجهات الاتصال.</string>
<string name="type_contact_or_group_name">نوع الاتصال أو اسم المجموعة</string>
<string name="shared_string_search">البحث</string>
<string name="direction">الاتجاه</string>
<string name="precision">الدقة</string>
<string name="altitude">ارتفاع</string>
<string name="proxy_key">مفتاح</string>
<string name="proxy_password">كلمه المرور</string>
<string name="proxy_username">اسم المستخدم</string>
<string name="proxy_credentials">وثائق التفويض</string>
<string name="proxy_port">منفذ</string>
<string name="proxy_server">الخادم</string>
<string name="shared_string_connection">اتصال</string>
<string name="shared_string_enable">تمكين</string>
<string name="proxy_type">نوع الخادم</string>
<string name="proxy_connected">متصل</string>
<string name="proxy_disconnected">قطع اتصال</string>
<string name="proxy_settings">إعدادات الوكيل</string>
<string name="proxy">الوكيل</string>
<string name="privacy">الخصوصيه</string>
<string name="shared_string_select">حدد</string>
<string name="min_logging_distance">الحد الأدنى لمسافة التسجيل</string>
<string name="min_logging_distance_descr">عامل التصفية: الحد الأدنى للمسافة لتسجيل نقطة جديدة</string>
<string name="min_logging_accuracy">الحد الأدنى من دقة التسجيل</string>
<string name="min_logging_accuracy_descr">عامل التصفية: لا تسجيل ما لم يتم الوصول إلى الدقة</string>
<string name="min_logging_speed">الحد الأدنى لسرعة التسجيل</string>
<string name="min_logging_speed_descr">عامل التصفية: لا تسجيل أقل من السرعة المحددة</string>
<string name="gpx_settings">إعدادات GPX</string>
<string name="timeline_no_data_descr">ليس لدينا بيانات تم جمعها لليوم المحدد</string>
<string name="timeline_no_data">لا توجد بيانات</string>
<string name="shared_string_end">نهاية</string>
<string name="shared_string_start">بدء</string>
<string name="shared_string_apply">تطبيق</string>
<string name="set_time_timeline_descr">تحديد وقت للعرض</string>
<string name="start_end_date">تاريخ البدء — تاريخ الانتهاء</string>
<string name="saved_messages">الرسائل المحفوظة</string>
<string name="time_zone_descr">حدد المنطقة الزمنية للعرض في موقع الرسائل.</string>
<string name="units_and_formats">الوحدات &amp; صيغ</string>
<string name="unit_of_length_descr">اختيار الوحدات: كم، ميل، ميل بحري.. إلخ.</string>
<string name="unit_of_length">وحدات الطول</string>
<string name="unit_of_speed_system_descr">تحديد وحدة من السرعة.</string>
<string name="unit_of_speed_system">وحدة السرعة</string>
<string name="buffer_time_descr">الحد الأقصى للوقت لتخزين النقاط في التخزين المؤقت</string>
<string name="buffer_time">وقت انتهاء صلاحية التخزين المؤقت</string>
<string name="shared_string_suggested">اقترح</string>
<string name="status_widget_title">OsmAnd تعقب حالة</string>
<string name="back_to_osmand">العودة إلى OsmAnd</string>
<string name="last_update_from_telegram_date">آخر تحديث من تيليجرام: %1$s</string>
<string name="last_response_date">آخر رد: %1$s</string>
<string name="last_update_from_telegram_duration">آخر تحديث من تيليجرام: %1$s قبل</string>
<string name="last_response_duration">الرد الأخير: قبل٪ 1 $ s</string>
<string name="shared_string_error_short">خطأ</string>
</resources> </resources>

1
OsmAnd-telegram/res/values-ar/strings.xml
View file

@ -73,4 +73,5 @@
<string name="last_response_date">الرد الأخير:٪ 1 $ s</string> <string name="last_response_date">الرد الأخير:٪ 1 $ s</string>
<string name="last_update_from_telegram_duration">آخر تحديث من تيليجرام: %1$s قبل</string> <string name="last_update_from_telegram_duration">آخر تحديث من تيليجرام: %1$s قبل</string>
<string name="last_response_duration">الرد الأخير: قبل٪ 1 $ s</string> <string name="last_response_duration">الرد الأخير: قبل٪ 1 $ s</string>
<string name="shared_string_error_short">خطا</string>
</resources> </resources>

29
OsmAnd/res/layout-land/add_gpx_point_bottom_sheet.xml
View file

@ -15,7 +15,7 @@
android:id="@+id/icon" android:id="@+id/icon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="16dp" android:padding="@dimen/content_padding"
android:src="@drawable/ic_action_photo_dark"/> android:src="@drawable/ic_action_photo_dark"/>
<LinearLayout <LinearLayout
@ -29,21 +29,25 @@
style="@style/TextAppearance.ContextMenuTitle" style="@style/TextAppearance.ContextMenuTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginLeft="@dimen/content_padding"
android:layout_marginRight="16dp" android:layout_marginRight="@dimen/content_padding"
android:layout_marginTop="16dp" android:layout_marginTop="@dimen/content_padding"
android:text="@string/waypoint_one"/> android:text="@string/waypoint_one"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding" />
<TextView <TextView
android:id="@+id/description" android:id="@+id/description"
style="@style/TextAppearance.ContextMenuSubtitle" style="@style/TextAppearance.ContextMenuSubtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp" android:layout_marginBottom="@dimen/content_padding_half"
android:layout_marginLeft="16dp" android:layout_marginLeft="@dimen/content_padding"
android:layout_marginRight="16dp" android:layout_marginRight="@dimen/content_padding"
android:layout_marginTop="8dp" android:layout_marginTop="@dimen/content_padding_half"
tools:text="Lat: 50.45375 Lon: 30.48693"/> tools:text="Lat: 50.45375 Lon: 30.48693"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding" />
</LinearLayout> </LinearLayout>
@ -60,7 +64,8 @@
style="@style/Widget.AppCompat.Button.Borderless.Colored" style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="16dp" android:layout_marginRight="@dimen/content_padding"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:text="@string/shared_string_cancel"/> android:text="@string/shared_string_cancel"
android:layout_marginEnd="@dimen/content_padding" />
</LinearLayout> </LinearLayout>

8
OsmAnd/res/layout-land/dashboard_over_map.xml
View file

@ -66,10 +66,12 @@
android:background="?attr/bg_color" android:background="?attr/bg_color"
android:clickable="true" android:clickable="true"
android:gravity="center" android:gravity="center"
android:paddingLeft="16dp" android:paddingLeft="@dimen/content_padding"
android:paddingRight="16dp" android:paddingRight="@dimen/content_padding"
android:textSize="@dimen/default_list_text_size_large" android:textSize="@dimen/default_list_text_size_large"
android:visibility="gone"/> android:visibility="gone"
android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding" />
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>

27
OsmAnd/res/layout-land/dest_reached_menu_fragment.xml
View file

@ -44,7 +44,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:orientation="vertical"> android:orientation="vertical"
android:layout_marginStart="8dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -60,7 +61,8 @@
android:paddingRight="8dp" android:paddingRight="8dp"
android:text="@string/arrived_at_destination" android:text="@string/arrived_at_destination"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textSize="@dimen/dialog_header_text_size"/> android:textSize="@dimen/dialog_header_text_size"
android:paddingEnd="8dp" />
<ImageButton <ImageButton
android:id="@+id/closeImageButton" android:id="@+id/closeImageButton"
@ -84,10 +86,13 @@
android:paddingRight="8dp" android:paddingRight="8dp"
android:drawableLeft="@drawable/ic_action_parking_dark" android:drawableLeft="@drawable/ic_action_parking_dark"
android:drawablePadding="12dp" android:drawablePadding="12dp"
android:gravity="left|center_vertical" android:gravity="start|center_vertical"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
style="@style/Widget.AppCompat.Button.Borderless" style="@style/Widget.AppCompat.Button.Borderless"
android:text="@string/find_parking"/> android:text="@string/find_parking"
android:drawableStart="@drawable/ic_action_parking_dark"
android:paddingStart="8dp"
android:paddingEnd="8dp" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
@ -105,10 +110,13 @@
android:paddingRight="8dp" android:paddingRight="8dp"
android:drawableLeft="@drawable/ic_action_gdirections_dark" android:drawableLeft="@drawable/ic_action_gdirections_dark"
android:drawablePadding="12dp" android:drawablePadding="12dp"
android:gravity="left|center_vertical" android:gravity="start|center_vertical"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
style="@style/Widget.AppCompat.Button.Borderless" style="@style/Widget.AppCompat.Button.Borderless"
android:text="@string/recalculate_route"/> android:text="@string/recalculate_route"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:drawableStart="@drawable/ic_action_gdirections_dark" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
@ -126,10 +134,13 @@
android:paddingRight="8dp" android:paddingRight="8dp"
android:drawableLeft="@drawable/ic_action_done" android:drawableLeft="@drawable/ic_action_done"
android:drawablePadding="12dp" android:drawablePadding="12dp"
android:gravity="left|center_vertical" android:gravity="start|center_vertical"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
style="@style/Widget.AppCompat.Button.Borderless" style="@style/Widget.AppCompat.Button.Borderless"
android:text="@string/finish_navigation"/> android:text="@string/finish_navigation"
android:paddingEnd="8dp"
android:paddingStart="8dp"
android:drawableStart="@drawable/ic_action_done" />
</LinearLayout> </LinearLayout>

4
OsmAnd/res/layout-land/fragment_coordinate_input_dialog.xml
View file

@ -64,7 +64,9 @@
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/color_white" android:textColor="@color/color_white"
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_medium"/> osmand:typeface="@string/font_roboto_medium"
android:paddingStart="16dp"
android:paddingEnd="16dp" />
</LinearLayout> </LinearLayout>

54
OsmAnd/res/layout-land/fragment_direction_indication_dialog.xml
View file

@ -53,7 +53,8 @@
android:textColor="@color/color_white" android:textColor="@color/color_white"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
tools:drawableRight="@drawable/ic_action_car_dark" tools:drawableRight="@drawable/ic_action_car_dark"
tools:text="car"/> tools:text="car"
tools:drawableEnd="@drawable/ic_action_car_dark" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.Toolbar> </android.support.v7.widget.Toolbar>
@ -78,7 +79,9 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginLeft="@dimen/bottom_sheet_content_margin_small" android:layout_marginLeft="@dimen/bottom_sheet_content_margin_small"
android:layout_marginRight="@dimen/bottom_sheet_content_margin_small" android:layout_marginRight="@dimen/bottom_sheet_content_margin_small"
tools:src="@drawable/img_help_markers_direction_device_night"/> tools:src="@drawable/img_help_markers_direction_device_night"
android:layout_marginStart="@dimen/bottom_sheet_content_margin_small"
android:layout_marginEnd="@dimen/bottom_sheet_content_margin_small" />
</FrameLayout> </FrameLayout>
<com.github.ksoichiro.android.observablescrollview.ObservableScrollView <com.github.ksoichiro.android.observablescrollview.ObservableScrollView
@ -91,7 +94,9 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="@dimen/content_padding" android:layout_marginLeft="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding" android:layout_marginRight="@dimen/content_padding"
android:orientation="vertical"> android:orientation="vertical"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -128,7 +133,8 @@
android:textColor="?attr/contextMenuButtonColor" android:textColor="?attr/contextMenuButtonColor"
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"
tools:drawableRight="@drawable/ic_action_arrow_drop_down" tools:drawableRight="@drawable/ic_action_arrow_drop_down"
tools:text="Two"/> tools:text="Two"
tools:drawableEnd="@drawable/ic_action_arrow_drop_down" />
</LinearLayout> </LinearLayout>
<View <View
@ -163,7 +169,9 @@
android:layout_height="@dimen/bottom_sheet_title_height" android:layout_height="@dimen/bottom_sheet_title_height"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"> android:paddingRight="@dimen/content_padding"
android:paddingStart="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding">
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@ -204,7 +212,9 @@
android:paddingTop="@dimen/content_padding_small" android:paddingTop="@dimen/content_padding_small"
android:text="@string/distance_indication_descr" android:text="@string/distance_indication_descr"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_desc_text_size"/> android:textSize="@dimen/default_desc_text_size"
android:layout_marginStart="@dimen/content_padding"
android:layout_marginEnd="@dimen/content_padding" />
<LinearLayout <LinearLayout
android:id="@+id/top_bar_row" android:id="@+id/top_bar_row"
@ -301,7 +311,9 @@
android:layout_height="@dimen/bottom_sheet_title_height" android:layout_height="@dimen/bottom_sheet_title_height"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"> android:paddingRight="@dimen/content_padding"
android:paddingStart="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding">
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@ -342,7 +354,9 @@
android:paddingTop="@dimen/content_padding_small" android:paddingTop="@dimen/content_padding_small"
android:text="@string/show_arrows_descr" android:text="@string/show_arrows_descr"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_desc_text_size"/> android:textSize="@dimen/default_desc_text_size"
android:layout_marginStart="@dimen/content_padding"
android:layout_marginEnd="@dimen/content_padding" />
</LinearLayout> </LinearLayout>
@ -359,7 +373,9 @@
android:layout_height="@dimen/bottom_sheet_title_height" android:layout_height="@dimen/bottom_sheet_title_height"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"> android:paddingRight="@dimen/content_padding"
android:paddingStart="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding">
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@ -400,7 +416,9 @@
android:paddingTop="@dimen/content_padding_small" android:paddingTop="@dimen/content_padding_small"
android:text="@string/show_guide_line_descr" android:text="@string/show_guide_line_descr"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_desc_text_size"/> android:textSize="@dimen/default_desc_text_size"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding" />
</LinearLayout> </LinearLayout>
@ -417,7 +435,9 @@
android:layout_height="@dimen/bottom_sheet_title_height" android:layout_height="@dimen/bottom_sheet_title_height"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"> android:paddingRight="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding">
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@ -458,7 +478,9 @@
android:paddingTop="@dimen/content_padding_small" android:paddingTop="@dimen/content_padding_small"
android:text="@string/one_tap_active_descr" android:text="@string/one_tap_active_descr"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_desc_text_size"/> android:textSize="@dimen/default_desc_text_size"
android:layout_marginStart="@dimen/content_padding"
android:layout_marginEnd="@dimen/content_padding" />
</LinearLayout> </LinearLayout>
@ -476,7 +498,9 @@
android:layout_height="@dimen/bottom_sheet_title_height" android:layout_height="@dimen/bottom_sheet_title_height"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"> android:paddingRight="@dimen/content_padding"
android:paddingStart="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding">
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@ -517,7 +541,9 @@
android:paddingTop="@dimen/content_padding_small" android:paddingTop="@dimen/content_padding_small"
android:text="@string/keep_passed_markers_descr" android:text="@string/keep_passed_markers_descr"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_desc_text_size"/> android:textSize="@dimen/default_desc_text_size"
android:layout_marginStart="@dimen/content_padding"
android:layout_marginEnd="@dimen/content_padding" />
</LinearLayout> </LinearLayout>

18
OsmAnd/res/layout-land/fragment_measurement_tool.xml
View file

@ -210,7 +210,10 @@
android:paddingLeft="@dimen/measurement_tool_button_padding" android:paddingLeft="@dimen/measurement_tool_button_padding"
android:paddingRight="@dimen/measurement_tool_button_padding" android:paddingRight="@dimen/measurement_tool_button_padding"
android:text="@string/shared_string_add" android:text="@string/shared_string_add"
android:textColor="@color/color_white"/> android:textColor="@color/color_white"
android:paddingEnd="@dimen/measurement_tool_button_padding"
android:paddingStart="@dimen/measurement_tool_button_padding"
android:drawableStart="@drawable/ic_action_plus" />
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>
@ -238,7 +241,9 @@
android:paddingLeft="@dimen/measurement_tool_button_padding" android:paddingLeft="@dimen/measurement_tool_button_padding"
android:paddingRight="@dimen/measurement_tool_button_padding" android:paddingRight="@dimen/measurement_tool_button_padding"
android:text="@string/shared_string_apply" android:text="@string/shared_string_apply"
android:textColor="@color/color_white"/> android:textColor="@color/color_white"
android:paddingEnd="@dimen/measurement_tool_button_padding"
android:paddingStart="@dimen/measurement_tool_button_padding" />
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/cancel_move_point_button" android:id="@+id/cancel_move_point_button"
@ -298,7 +303,9 @@
android:paddingLeft="@dimen/measurement_tool_button_padding" android:paddingLeft="@dimen/measurement_tool_button_padding"
android:paddingRight="@dimen/measurement_tool_button_padding" android:paddingRight="@dimen/measurement_tool_button_padding"
android:text="@string/shared_string_apply" android:text="@string/shared_string_apply"
android:textColor="?attr/color_dialog_buttons"/> android:textColor="?attr/color_dialog_buttons"
android:paddingEnd="@dimen/measurement_tool_button_padding"
android:paddingStart="@dimen/measurement_tool_button_padding" />
<Button <Button
android:id="@+id/add_point_before_after_button" android:id="@+id/add_point_before_after_button"
@ -314,7 +321,10 @@
android:paddingLeft="@dimen/measurement_tool_button_padding" android:paddingLeft="@dimen/measurement_tool_button_padding"
android:paddingRight="@dimen/measurement_tool_button_padding" android:paddingRight="@dimen/measurement_tool_button_padding"
android:text="@string/shared_string_add" android:text="@string/shared_string_add"
android:textColor="@color/color_white"/> android:textColor="@color/color_white"
android:paddingStart="@dimen/measurement_tool_button_padding"
android:paddingEnd="@dimen/measurement_tool_button_padding"
android:drawableStart="@drawable/ic_action_plus" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

4
OsmAnd/res/layout-land/fragment_plan_route_half_screen.xml
View file

@ -92,7 +92,9 @@
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="?attr/color_dialog_buttons" android:textColor="?attr/color_dialog_buttons"
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_medium"/> osmand:typeface="@string/font_roboto_medium"
android:paddingStart="@dimen/list_content_padding"
android:paddingEnd="@dimen/list_content_padding" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.Toolbar> </android.support.v7.widget.Toolbar>

24
OsmAnd/res/layout-land/map_hud_bottom.xml
View file

@ -16,7 +16,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_gravity="bottom|left"> android:layout_gravity="bottom|start">
<!-- ALARM --> <!-- ALARM -->
@ -24,9 +24,10 @@
android:id="@+id/map_alarm_warning" android:id="@+id/map_alarm_warning"
android:layout_width="@dimen/map_alarm_size" android:layout_width="@dimen/map_alarm_size"
android:layout_height="@dimen/map_alarm_size" android:layout_height="@dimen/map_alarm_size"
android:layout_gravity="bottom|left" android:layout_gravity="bottom|start"
android:layout_marginBottom="@dimen/map_alarm_bottom_margin_land" android:layout_marginBottom="@dimen/map_alarm_bottom_margin_land"
android:layout_marginLeft="@dimen/map_button_shadow_margin"> android:layout_marginLeft="@dimen/map_button_shadow_margin"
android:layout_marginStart="@dimen/map_button_shadow_margin">
<ImageView <ImageView
android:id="@+id/map_alarm_warning_icon" android:id="@+id/map_alarm_warning_icon"
@ -64,6 +65,7 @@
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginBottom="130dp" android:layout_marginBottom="130dp"
android:layout_marginLeft="@dimen/map_button_margin" android:layout_marginLeft="@dimen/map_button_margin"
android:layout_marginStart="@dimen/map_button_margin"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:textSize="@dimen/map_button_text_size" android:textSize="@dimen/map_button_text_size"
tools:text="13.88"/> tools:text="13.88"/>
@ -71,7 +73,7 @@
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|left"> android:layout_gravity="bottom|start">
<!-- PREPARATION SCREEN --> <!-- PREPARATION SCREEN -->
@ -79,15 +81,17 @@
layout="@layout/recording_note_fragment" layout="@layout/recording_note_fragment"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|left"/> android:layout_gravity="bottom|start"/>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|left" android:layout_gravity="bottom|start"
android:layout_marginBottom="@dimen/map_button_margin" android:layout_marginBottom="@dimen/map_button_margin"
android:layout_marginLeft="@dimen/map_button_margin" android:layout_marginLeft="@dimen/map_button_margin"
android:layout_marginStart="@dimen/map_button_margin"
android:layout_marginRight="@dimen/map_button_spacing_land" android:layout_marginRight="@dimen/map_button_spacing_land"
android:layout_marginEnd="@dimen/map_button_spacing_land"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageButton <ImageButton
@ -103,6 +107,7 @@
android:layout_width="@dimen/map_button_size" android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size" android:layout_height="@dimen/map_button_size"
android:layout_marginLeft="@dimen/map_button_spacing_land" android:layout_marginLeft="@dimen/map_button_spacing_land"
android:layout_marginStart="@dimen/map_button_spacing_land"
android:background="@drawable/btn_round" android:background="@drawable/btn_round"
android:contentDescription="@string/layer_route" android:contentDescription="@string/layer_route"
tools:src="@drawable/ic_action_test_light"/> tools:src="@drawable/ic_action_test_light"/>
@ -210,6 +215,8 @@
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginBottom="@dimen/map_button_margin" android:layout_marginBottom="@dimen/map_button_margin"
android:layout_marginLeft="@dimen/map_button_spacing_land" android:layout_marginLeft="@dimen/map_button_spacing_land"
android:layout_marginStart="@dimen/map_button_spacing_land"
android:layout_marginEnd="@dimen/map_button_margin"
android:layout_marginRight="@dimen/map_button_margin"> android:layout_marginRight="@dimen/map_button_margin">
<ImageButton <ImageButton
@ -226,6 +233,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginLeft="@dimen/map_button_spacing_land" android:layout_marginLeft="@dimen/map_button_spacing_land"
android:layout_marginStart="@dimen/map_button_spacing_land"
android:orientation="vertical"> android:orientation="vertical">
<ImageButton <ImageButton
@ -254,14 +262,14 @@
layout="@layout/move_marker_bottom_sheet" layout="@layout/move_marker_bottom_sheet"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|left" android:layout_gravity="bottom|start"
tools:visibility="visible"/> tools:visibility="visible"/>
<include <include
layout="@layout/add_gpx_point_bottom_sheet" layout="@layout/add_gpx_point_bottom_sheet"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|left" android:layout_gravity="bottom|start"
tools:visibility="visible"/> tools:visibility="visible"/>
<FrameLayout <FrameLayout

47
OsmAnd/res/layout-land/map_hud_top.xml
View file

@ -32,7 +32,9 @@
android:layout_marginLeft="@dimen/content_padding_half" android:layout_marginLeft="@dimen/content_padding_half"
android:layout_marginRight="@dimen/content_padding_half" android:layout_marginRight="@dimen/content_padding_half"
android:layout_weight="1" android:layout_weight="1"
android:orientation="horizontal"> android:orientation="horizontal"
android:layout_marginStart="@dimen/content_padding_half"
android:layout_marginEnd="@dimen/content_padding_half">
<ImageView <ImageView
android:id="@+id/lat_icon" android:id="@+id/lat_icon"
@ -73,7 +75,9 @@
android:layout_marginLeft="@dimen/content_padding_half" android:layout_marginLeft="@dimen/content_padding_half"
android:layout_marginRight="@dimen/content_padding_half" android:layout_marginRight="@dimen/content_padding_half"
android:layout_weight="1" android:layout_weight="1"
android:orientation="horizontal"> android:orientation="horizontal"
android:layout_marginStart="@dimen/content_padding_half"
android:layout_marginEnd="@dimen/content_padding_half">
<ImageView <ImageView
android:id="@+id/lon_icon" android:id="@+id/lon_icon"
@ -295,20 +299,20 @@
android:id="@+id/map_route_land_left_margin" android:id="@+id/map_route_land_left_margin"
android:layout_width="@dimen/map_route_planning_land_width_minus_shadow" android:layout_width="@dimen/map_route_planning_land_width_minus_shadow"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_gravity="top|left" android:layout_gravity="top|start"
android:visibility="gone"/> android:visibility="gone"/>
<!-- LEFT widgets colon --> <!-- LEFT widgets colon -->
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="top|left" android:layout_gravity="top|start"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:id="@+id/map_left_widgets_panel" android:id="@+id/map_left_widgets_panel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="top|left" android:layout_gravity="top|start"
android:orientation="vertical"> android:orientation="vertical">
<include <include
@ -342,7 +346,9 @@
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="horizontal"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp">
<TextView <TextView
android:id="@+id/map_exit_ref" android:id="@+id/map_exit_ref"
@ -417,7 +423,9 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/map_button_margin" android:layout_marginLeft="@dimen/map_button_margin"
android:layout_marginRight="@dimen/map_button_margin" android:layout_marginRight="@dimen/map_button_margin"
android:src="@drawable/ic_action_test_light"/> android:src="@drawable/ic_action_test_light"
android:layout_marginStart="@dimen/map_button_margin"
android:layout_marginEnd="@dimen/map_button_margin" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -431,6 +439,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="2dp" android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:maxLines="2" android:maxLines="2"
android:textColor="@color/osmand_orange" android:textColor="@color/osmand_orange"
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"
@ -442,6 +451,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginLeft="2dp" android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:drawablePadding="2dp" android:drawablePadding="2dp"
android:maxLines="1" android:maxLines="1"
android:textColor="@color/osmand_orange" android:textColor="@color/osmand_orange"
@ -456,6 +466,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp" android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:layout_weight="1"> android:layout_weight="1">
@ -655,8 +666,9 @@
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="top|left" android:layout_gravity="top|start"
android:layout_marginLeft="@dimen/map_button_margin" android:layout_marginLeft="@dimen/map_button_margin"
android:layout_marginStart="@dimen/map_button_margin"
android:layout_marginTop="@dimen/map_button_margin" android:layout_marginTop="@dimen/map_button_margin"
android:orientation="horizontal"> android:orientation="horizontal">
@ -690,6 +702,7 @@
android:layout_width="@dimen/map_small_button_size" android:layout_width="@dimen/map_small_button_size"
android:layout_height="@dimen/map_small_button_size" android:layout_height="@dimen/map_small_button_size"
android:layout_marginLeft="@dimen/map_small_button_margin" android:layout_marginLeft="@dimen/map_small_button_margin"
android:layout_marginStart="@dimen/map_small_button_margin"
android:background="@drawable/btn_inset_circle_trans" android:background="@drawable/btn_inset_circle_trans"
android:contentDescription="@string/map_widget_search" android:contentDescription="@string/map_widget_search"
tools:src="@drawable/ic_action_test_light"/> tools:src="@drawable/ic_action_test_light"/>
@ -713,7 +726,9 @@
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginLeft="@dimen/widget_turn_lane_border" android:layout_marginLeft="@dimen/widget_turn_lane_border"
android:layout_marginRight="@dimen/widget_turn_lane_border" android:layout_marginRight="@dimen/widget_turn_lane_border"
android:layout_marginTop="@dimen/widget_turn_lane_border"/> android:layout_marginTop="@dimen/widget_turn_lane_border"
android:layout_marginStart="@dimen/widget_turn_lane_border"
android:layout_marginEnd="@dimen/widget_turn_lane_border" />
<FrameLayout <FrameLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -732,7 +747,9 @@
android:maxLines="1" android:maxLines="1"
android:textColor="@color/color_black" android:textColor="@color/color_black"
android:textSize="@dimen/map_button_text_size" android:textSize="@dimen/map_button_text_size"
tools:text="1048 km"/> tools:text="1048 km"
android:layout_marginEnd="@dimen/widget_turn_lane_border"
android:layout_marginStart="@dimen/widget_turn_lane_border" />
<TextView <TextView
android:id="@+id/map_lanes_dist_text" android:id="@+id/map_lanes_dist_text"
@ -744,7 +761,9 @@
android:maxLines="1" android:maxLines="1"
android:textColor="@color/color_black" android:textColor="@color/color_black"
android:textSize="@dimen/map_button_text_size" android:textSize="@dimen/map_button_text_size"
tools:text="1048 km"/> tools:text="1048 km"
android:layout_marginEnd="@dimen/widget_turn_lane_border"
android:layout_marginStart="@dimen/widget_turn_lane_border" />
</FrameLayout> </FrameLayout>
@ -758,19 +777,19 @@
<FrameLayout <FrameLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="top|right"> android:layout_gravity="top|end">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="top|right" android:layout_gravity="top|end"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:id="@+id/map_right_widgets_panel" android:id="@+id/map_right_widgets_panel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="top|right" android:layout_gravity="top|end"
android:orientation="vertical"> android:orientation="vertical">
<include layout="@layout/map_hud_widget"/> <include layout="@layout/map_hud_widget"/>

29
OsmAnd/res/layout-land/move_marker_bottom_sheet.xml
View file

@ -15,7 +15,7 @@
android:id="@+id/icon" android:id="@+id/icon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="16dp" android:padding="@dimen/content_padding"
android:src="@drawable/ic_action_photo_dark"/> android:src="@drawable/ic_action_photo_dark"/>
<LinearLayout <LinearLayout
@ -28,21 +28,25 @@
style="@style/TextAppearance.ContextMenuTitle" style="@style/TextAppearance.ContextMenuTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginLeft="@dimen/content_padding"
android:layout_marginRight="16dp" android:layout_marginRight="@dimen/content_padding"
android:layout_marginTop="16dp" android:layout_marginTop="@dimen/content_padding"
android:text="@string/move_marker_bottom_sheet_title"/> android:text="@string/move_marker_bottom_sheet_title"
android:layout_marginStart="@dimen/content_padding"
android:layout_marginEnd="@dimen/content_padding" />
<TextView <TextView
android:id="@+id/description" android:id="@+id/description"
style="@style/TextAppearance.ContextMenuSubtitle" style="@style/TextAppearance.ContextMenuSubtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp" android:layout_marginBottom="@dimen/content_padding_half"
android:layout_marginLeft="16dp" android:layout_marginLeft="@dimen/content_padding"
android:layout_marginRight="16dp" android:layout_marginRight="@dimen/content_padding"
android:layout_marginTop="8dp" android:layout_marginTop="@dimen/content_padding_half"
tools:text="Lat: 50.45375 Lon: 30.48693"/> tools:text="Lat: 50.45375 Lon: 30.48693"
android:layout_marginStart="@dimen/content_padding"
android:layout_marginEnd="@dimen/content_padding" />
</LinearLayout> </LinearLayout>
@ -59,7 +63,8 @@
style="@style/Widget.AppCompat.Button.Borderless.Colored" style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="16dp" android:layout_marginRight="@dimen/content_padding"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:text="@string/shared_string_cancel"/> android:text="@string/shared_string_cancel"
android:layout_marginEnd="@dimen/content_padding" />
</LinearLayout> </LinearLayout>

4
OsmAnd/res/layout-land/parking_set_time_limit.xml
View file

@ -12,7 +12,9 @@
android:paddingBottom="@dimen/dialog_content_bottom_margin" android:paddingBottom="@dimen/dialog_content_bottom_margin"
android:paddingLeft="@dimen/dialog_content_margin" android:paddingLeft="@dimen/dialog_content_margin"
android:paddingRight="@dimen/dialog_content_margin" android:paddingRight="@dimen/dialog_content_margin"
android:paddingTop="@dimen/dialog_content_bottom_margin"> android:paddingTop="@dimen/dialog_content_bottom_margin"
android:paddingStart="@dimen/dialog_content_margin"
android:paddingEnd="@dimen/dialog_content_margin">
<TextView <TextView
android:id="@+id/parkTime" android:id="@+id/parkTime"

66
OsmAnd/res/layout-land/point_editor_fragment.xml
View file

@ -85,19 +85,23 @@
android:layout_marginRight="12dp" android:layout_marginRight="12dp"
android:text="@string/shared_string_name" android:text="@string/shared_string_name"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_list_text_size"/> android:textSize="@dimen/default_list_text_size"
android:layout_marginEnd="@dimen/content_padding_small"
android:layout_marginStart="@dimen/content_padding_small" />
<EditText <EditText
android:id="@+id/name_edit" android:id="@+id/name_edit"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="@dimen/content_padding_half"
android:layout_marginRight="16dp" android:layout_marginRight="@dimen/content_padding"
android:layout_marginLeft="8dp" android:layout_marginLeft="@dimen/content_padding_half"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textColorHint="?android:textColorSecondary" android:textColorHint="?android:textColorSecondary"
android:imeOptions="actionDone" android:imeOptions="actionDone"
android:inputType="text"/> android:inputType="text"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding_half" />
</LinearLayout> </LinearLayout>
@ -121,8 +125,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:layout_marginLeft="12dp" android:layout_marginLeft="@dimen/content_padding_small"
android:layout_marginStart="12dp" android:layout_marginStart="@dimen/content_padding_small"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/ic_action_building_number"/> android:src="@drawable/ic_action_building_number"/>
@ -131,7 +135,7 @@
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="16dp" android:layout_marginBottom="@dimen/content_padding"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
@ -139,19 +143,23 @@
android:id="@+id/category_caption" android:id="@+id/category_caption"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="12dp" android:layout_marginLeft="@dimen/content_padding_small"
android:layout_marginRight="12dp" android:layout_marginRight="@dimen/content_padding_small"
android:text="@string/shared_string_name" android:text="@string/shared_string_name"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_list_text_size"/> android:textSize="@dimen/default_list_text_size"
android:layout_marginStart="@dimen/content_padding_small"
android:layout_marginEnd="@dimen/content_padding_small" />
<net.osmand.plus.widgets.AutoCompleteTextViewEx <net.osmand.plus.widgets.AutoCompleteTextViewEx
android:id="@+id/category_edit" android:id="@+id/category_edit"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="@dimen/content_padding_half"
android:layout_marginRight="16dp" android:layout_marginRight="@dimen/content_padding"
android:layout_marginLeft="8dp"/> android:layout_marginLeft="@dimen/content_padding_half"
android:layout_marginStart="@dimen/content_padding_half"
android:layout_marginEnd="@dimen/content_padding" />
</LinearLayout> </LinearLayout>
@ -182,8 +190,8 @@
android:id="@+id/description_image" android:id="@+id/description_image"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="12dp" android:layout_marginLeft="@dimen/content_padding_small"
android:layout_marginStart="12dp" android:layout_marginStart="@dimen/content_padding_small"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_action_note_dark"/> android:src="@drawable/ic_action_note_dark"/>
@ -193,7 +201,7 @@
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp" android:layout_marginBottom="@dimen/content_padding_half"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
@ -201,13 +209,15 @@
android:id="@+id/description_edit" android:id="@+id/description_edit"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="16dp" android:layout_marginRight="@dimen/content_padding"
android:layout_marginLeft="8dp" android:layout_marginLeft="@dimen/content_padding_half"
android:maxLines="1000" android:maxLines="1000"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textColorHint="?android:textColorSecondary" android:textColorHint="?android:textColorSecondary"
android:inputType="textMultiLine"/> android:inputType="textMultiLine"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding_half" />
</LinearLayout> </LinearLayout>
@ -248,7 +258,9 @@
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
android:text="@string/shared_string_delete" android:text="@string/shared_string_delete"
android:textColor="?attr/contextMenuButtonColor"/> android:textColor="?attr/contextMenuButtonColor"
android:paddingEnd="10dp"
android:paddingStart="10dp" />
<Button <Button
android:id="@+id/replace_button" android:id="@+id/replace_button"
@ -259,7 +271,9 @@
android:paddingRight="10dp" android:paddingRight="10dp"
android:text="@string/update_existing" android:text="@string/update_existing"
android:textColor="?attr/contextMenuButtonColor" android:textColor="?attr/contextMenuButtonColor"
android:visibility="gone"/> android:visibility="gone"
android:paddingEnd="10dp"
android:paddingStart="10dp" />
<View <View
android:layout_width="0dp" android:layout_width="0dp"
@ -274,7 +288,9 @@
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
android:text="@string/shared_string_cancel" android:text="@string/shared_string_cancel"
android:textColor="?attr/contextMenuButtonColor"/> android:textColor="?attr/contextMenuButtonColor"
android:paddingStart="10dp"
android:paddingEnd="10dp" />
<Button <Button
android:id="@+id/save_button" android:id="@+id/save_button"
@ -284,7 +300,9 @@
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
android:text="@string/shared_string_save" android:text="@string/shared_string_save"
android:textColor="?attr/contextMenuButtonColor"/> android:textColor="?attr/contextMenuButtonColor"
android:paddingEnd="10dp"
android:paddingStart="10dp" />
</LinearLayout> </LinearLayout>

14
OsmAnd/res/layout-land/quick_action_widget.xml
View file

@ -9,7 +9,7 @@
android:id="@+id/container" android:id="@+id/container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="@dimen/content_padding_half"
android:background="@drawable/bg_card_light" android:background="@drawable/bg_card_light"
android:clickable="true" android:clickable="true"
android:orientation="vertical"> android:orientation="vertical">
@ -33,8 +33,10 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:paddingLeft="16dp" android:paddingLeft="@dimen/content_padding"
android:paddingRight="16dp" /> android:paddingRight="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding" />
<LinearLayout <LinearLayout
android:id="@+id/dots" android:id="@+id/dots"
@ -51,8 +53,10 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:paddingLeft="16dp" android:paddingLeft="@dimen/content_padding"
android:paddingRight="16dp" /> android:paddingRight="@dimen/content_padding"
android:paddingStart="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding" />
</LinearLayout> </LinearLayout>

21
OsmAnd/res/layout-land/recording_note_fragment.xml
View file

@ -44,7 +44,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="12dp" android:layout_marginLeft="12dp"
android:gravity="left|center_vertical"> android:gravity="start|center_vertical"
android:layout_marginStart="12dp">
<ImageView <ImageView
android:id="@+id/leftButtonIcon" android:id="@+id/leftButtonIcon"
@ -63,7 +64,9 @@
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:text="@string/shared_string_hide" android:text="@string/shared_string_hide"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_list_text_size"/> android:textSize="@dimen/default_list_text_size"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp" />
</LinearLayout> </LinearLayout>
@ -99,7 +102,9 @@
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:text="@string/shared_string_control_stop" android:text="@string/shared_string_control_stop"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_list_text_size"/> android:textSize="@dimen/default_list_text_size"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp" />
</LinearLayout> </LinearLayout>
@ -137,7 +142,9 @@
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:text="@string/shared_string_control_stop" android:text="@string/shared_string_control_stop"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_list_text_size"/> android:textSize="@dimen/default_list_text_size"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp" />
</LinearLayout> </LinearLayout>
@ -157,10 +164,12 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="12dp" android:layout_marginLeft="12dp"
android:layout_marginRight="12dp" android:layout_marginRight="12dp"
android:gravity="right" android:gravity="end"
android:text="00:00:00" android:text="00:00:00"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_list_text_size"/> android:textSize="@dimen/default_list_text_size"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp" />
</LinearLayout> </LinearLayout>

12
OsmAnd/res/layout-land/search_by_name.xml
View file

@ -19,7 +19,9 @@
android:layout_marginLeft="3dp" android:layout_marginLeft="3dp"
android:layout_marginRight="3dp" android:layout_marginRight="3dp"
android:layout_marginBottom="0dp" android:layout_marginBottom="0dp"
android:layout_marginTop="0dp" > android:layout_marginTop="0dp"
android:layout_marginEnd="3dp"
android:layout_marginStart="3dp">
<ProgressBar <ProgressBar
android:id="@+id/ProgressBar" android:id="@+id/ProgressBar"
@ -49,7 +51,9 @@
android:layout_marginBottom="-5dp" android:layout_marginBottom="-5dp"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
android:padding="0dp" android:padding="0dp"
android:text="@string/shared_string_clear" /> android:text="@string/shared_string_clear"
android:layout_marginStart="0dp"
android:layout_marginEnd="0dp" />
</LinearLayout> </LinearLayout>
@ -60,6 +64,8 @@
android:dividerHeight="1dp" android:dividerHeight="1dp"
android:layout_marginLeft="3dp" android:layout_marginLeft="3dp"
android:layout_marginRight="3dp" android:layout_marginRight="3dp"
android:layout_marginTop="0dp" /> android:layout_marginTop="0dp"
android:layout_marginEnd="3dp"
android:layout_marginStart="3dp" />
</LinearLayout> </LinearLayout>

4
OsmAnd/res/layout-land/searchbyname_list.xml
View file

@ -6,7 +6,9 @@
android:paddingTop="1dp" android:paddingTop="1dp"
android:paddingBottom="1dp" android:paddingBottom="1dp"
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingRight="16dp"> android:paddingRight="16dp"
android:paddingStart="16dp"
android:paddingEnd="16dp">
<!-- <!--
ppenguin 2016-03-07: more compact layout (less padding) for landscape, to allow the maximum ppenguin 2016-03-07: more compact layout (less padding) for landscape, to allow the maximum

20
OsmAnd/res/layout-land/track_details.xml
View file

@ -114,7 +114,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/list_content_padding" android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginRight="@dimen/list_content_padding" android:layout_marginRight="@dimen/list_content_padding"
android:src="@drawable/ic_action_altitude_average"/> android:src="@drawable/ic_action_altitude_average"
android:layout_marginStart="@dimen/list_content_padding"
android:layout_marginEnd="@dimen/list_content_padding" />
<TextView <TextView
android:id="@+id/y_axis_title" android:id="@+id/y_axis_title"
@ -124,14 +126,16 @@
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
tools:text="@string/altitude"/> tools:text="@string/altitude"
android:layout_marginEnd="8dp" />
<ImageView <ImageView
android:id="@+id/y_axis_arrow" android:id="@+id/y_axis_arrow"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:src="@drawable/ic_action_arrow_drop_down"/> android:src="@drawable/ic_action_arrow_drop_down"
android:layout_marginEnd="8dp" />
</LinearLayout> </LinearLayout>
@ -158,7 +162,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/list_content_padding" android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginRight="@dimen/list_content_padding" android:layout_marginRight="@dimen/list_content_padding"
android:src="@drawable/ic_action_speed"/> android:src="@drawable/ic_action_speed"
android:layout_marginStart="@dimen/list_content_padding"
android:layout_marginEnd="@dimen/list_content_padding" />
<TextView <TextView
android:id="@+id/x_axis_title" android:id="@+id/x_axis_title"
@ -168,14 +174,16 @@
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
tools:text="@string/map_widget_speed"/> tools:text="@string/map_widget_speed"
android:layout_marginEnd="8dp" />
<ImageView <ImageView
android:id="@+id/x_axis_arrow" android:id="@+id/x_axis_arrow"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:src="@drawable/ic_action_arrow_drop_down"/> android:src="@drawable/ic_action_arrow_drop_down"
android:layout_marginEnd="8dp" />
</LinearLayout> </LinearLayout>

8
OsmAnd/res/layout-xlarge/first_usage_welcome_fragment.xml
View file

@ -24,7 +24,9 @@
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="40dp" android:paddingLeft="40dp"
android:paddingRight="40dp" android:paddingRight="40dp"
android:paddingTop="@dimen/first_usage_title_margin"> android:paddingTop="@dimen/first_usage_title_margin"
android:paddingStart="40dp"
android:paddingEnd="40dp">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -46,7 +48,9 @@
android:layout_marginRight="180dp" android:layout_marginRight="180dp"
android:textSize="@dimen/first_usage_subtitle_text_size" android:textSize="@dimen/first_usage_subtitle_text_size"
android:textStyle="bold" android:textStyle="bold"
osmand:typeface="@string/font_roboto_regular"/> osmand:typeface="@string/font_roboto_regular"
android:layout_marginEnd="180dp"
android:layout_marginStart="180dp" />
<View <View

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

@ -5,8 +5,8 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right" android:gravity="end"
android:textColor="?attr/color_dialog_buttons" android:textColor="?attr/color_dialog_buttons"
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"
android:padding="8dp" android:padding="@dimen/content_padding_half"
tools:text="Test text"/> tools:text="Test text"/>

37
OsmAnd/res/layout/add_gpx_point_bottom_sheet.xml
View file

@ -15,7 +15,7 @@
android:id="@+id/icon" android:id="@+id/icon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="16dp" android:padding="@dimen/content_padding"
android:src="@drawable/ic_action_photo_dark"/> android:src="@drawable/ic_action_photo_dark"/>
<LinearLayout <LinearLayout
@ -28,34 +28,41 @@
style="@style/TextAppearance.ContextMenuTitle" style="@style/TextAppearance.ContextMenuTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginLeft="@dimen/content_padding"
android:layout_marginRight="16dp" android:layout_marginRight="@dimen/content_padding"
android:layout_marginTop="16dp" android:layout_marginTop="@dimen/content_padding"
tools:text="@string/waypoint_one"/> tools:text="@string/waypoint_one"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding" />
<TextView <TextView
android:id="@+id/description" android:id="@+id/description"
style="@style/TextAppearance.ContextMenuSubtitle" style="@style/TextAppearance.ContextMenuSubtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp" android:layout_marginBottom="@dimen/content_padding_half"
android:layout_marginLeft="16dp" android:layout_marginLeft="@dimen/content_padding"
android:layout_marginRight="16dp" android:layout_marginRight="@dimen/content_padding"
android:layout_marginTop="8dp" android:layout_marginTop="@dimen/content_padding_half"
tools:text="Lat: 50.45375\nLon: 30.48693"/> tools:text="Lat: 50.45375\nLon: 30.48693"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="16dp" android:layout_marginBottom="@dimen/content_padding"
android:layout_marginLeft="12dp" android:layout_marginLeft="@dimen/content_padding_small"
android:layout_marginRight="12dp"> android:layout_marginRight="@dimen/content_padding_small"
android:layout_marginStart="@dimen/content_padding_small"
android:layout_marginEnd="@dimen/content_padding_small">
<Button <Button
android:id="@+id/create_button" android:id="@+id/create_button"
style="@style/DialogActionButton" style="@style/DialogActionButton"
android:layout_marginRight="8dp" android:layout_marginRight="@dimen/content_padding_half"
android:text="@string/shared_string_add"/> android:text="@string/shared_string_add"
android:layout_marginEnd="@dimen/content_padding_half" />
<Button <Button
android:id="@+id/cancel_button" android:id="@+id/cancel_button"

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

@ -9,6 +9,8 @@
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:id="@android:id/edit" android:id="@android:id/edit"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_marginStart="10dp" />
</LinearLayout> </LinearLayout>

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

@ -30,10 +30,11 @@
android:gravity="end" android:gravity="end"
android:maxLength="4" android:maxLength="4"
android:maxLines="1" android:maxLines="1"
android:paddingRight="4dp" android:paddingRight="@dimen/text_margin_small"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"
tools:text="60" /> tools:text="60"
android:paddingEnd="@dimen/text_margin_small" />
<TextView <TextView
android:id="@+id/speed_units" android:id="@+id/speed_units"

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

@ -22,21 +22,25 @@
android:layout_marginLeft="@dimen/content_padding" android:layout_marginLeft="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding" android:layout_marginRight="@dimen/content_padding"
android:layout_marginTop="@dimen/content_padding" android:layout_marginTop="@dimen/content_padding"
tools:src="@drawable/ic_action_arrow_down" /> tools:src="@drawable/ic_action_arrow_down"
android:layout_marginStart="@dimen/content_padding"
android:layout_marginEnd="@dimen/content_padding" />
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/title" android:id="@+id/title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="64dp" android:layout_marginLeft="@dimen/bottom_sheet_divider_margin_start"
android:layout_marginRight="64dp" android:layout_marginRight="@dimen/bottom_sheet_divider_margin_start"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:textAppearance="@style/TextAppearance.ListItemTitle" android:textAppearance="@style/TextAppearance.ListItemTitle"
android:textColor="?attr/active_color_basic" android:textColor="?attr/active_color_basic"
osmand:typeface="@string/font_roboto_medium" osmand:typeface="@string/font_roboto_medium"
tools:text="Some Title" /> tools:text="Some Title"
android:layout_marginEnd="@dimen/bottom_sheet_divider_margin_start"
android:layout_marginStart="@dimen/bottom_sheet_divider_margin_start" />
<android.support.v7.widget.SwitchCompat <android.support.v7.widget.SwitchCompat
android:id="@+id/compound_button" android:id="@+id/compound_button"
@ -48,7 +52,9 @@
android:background="@null" android:background="@null"
android:clickable="false" android:clickable="false"
android:focusable="false" android:focusable="false"
android:focusableInTouchMode="false" /> android:focusableInTouchMode="false"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding" />
</FrameLayout> </FrameLayout>

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

@ -23,7 +23,9 @@
android:layout_marginLeft="@dimen/content_padding" android:layout_marginLeft="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding" android:layout_marginRight="@dimen/content_padding"
android:layout_marginTop="@dimen/content_padding" android:layout_marginTop="@dimen/content_padding"
android:src="@drawable/ic_action_fav_dark" /> android:src="@drawable/ic_action_fav_dark"
android:layout_marginStart="@dimen/content_padding"
android:layout_marginEnd="@dimen/content_padding" />
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
@ -48,7 +50,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="2dp"> android:layout_marginTop="@dimen/subHeaderPadding">
<TextView <TextView
android:id="@+id/waypoint_dist" android:id="@+id/waypoint_dist"
@ -65,9 +67,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginLeft="6dp" android:layout_marginLeft="@dimen/dashPadding"
android:layout_marginStart="6dp" android:layout_marginStart="@dimen/dashPadding"
android:drawablePadding="2dp" android:drawablePadding="@dimen/subHeaderPadding"
android:maxLines="1" android:maxLines="1"
android:textColor="@color/text_color_secondary_dark" android:textColor="@color/text_color_secondary_dark"
android:textSize="@dimen/default_sub_text_size" android:textSize="@dimen/default_sub_text_size"
@ -92,11 +94,11 @@
<ImageButton <ImageButton
android:id="@+id/info_close" android:id="@+id/info_close"
style="@style/Widget.AppCompat.ActionButton" style="@style/Widget.AppCompat.ActionButton"
android:layout_width="48dp" android:layout_width="@dimen/bottom_sheet_list_item_height"
android:layout_height="48dp" android:layout_height="@dimen/bottom_sheet_list_item_height"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginEnd="2dp" android:layout_marginEnd="@dimen/subHeaderPadding"
android:layout_marginRight="2dp" android:layout_marginRight="@dimen/subHeaderPadding"
android:contentDescription="@string/shared_string_delete" android:contentDescription="@string/shared_string_delete"
android:focusable="false" android:focusable="false"
android:scaleType="center" android:scaleType="center"
@ -108,7 +110,7 @@
android:id="@+id/bottom_divider" android:id="@+id/bottom_divider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginTop="8dp" android:layout_marginTop="@dimen/content_padding_half"
android:background="?attr/divider_color_basic" /> android:background="?attr/divider_color_basic" />
</LinearLayout> </LinearLayout>

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

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="56dp" android:minHeight="@dimen/wpt_list_item_height"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
@ -22,7 +22,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="56dp" android:layout_height="@dimen/wpt_list_item_height"
android:baselineAligned="false" android:baselineAligned="false"
android:orientation="horizontal"> android:orientation="horizontal">
@ -53,12 +53,13 @@
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_marginRight="16dp" android:layout_marginRight="@dimen/content_padding"
android:layout_marginTop="2dp" android:layout_marginTop="@dimen/subHeaderPadding"
android:textColor="@color/color_myloc_distance" android:textColor="@color/color_myloc_distance"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium" osmand:typeface="@string/font_roboto_medium"
tools:text="500 m" /> tools:text="500 m"
android:layout_marginEnd="@dimen/content_padding" />
</LinearLayout> </LinearLayout>
@ -68,9 +69,10 @@
android:id="@+id/secondCellContainer" android:id="@+id/secondCellContainer"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginRight="16dp" android:layout_marginRight="@dimen/content_padding"
android:layout_weight="1" android:layout_weight="1"
android:background="?attr/selectableItemBackground"> android:background="?attr/selectableItemBackground"
android:layout_marginEnd="@dimen/content_padding">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -92,7 +94,7 @@
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_marginTop="2dp" android:layout_marginTop="@dimen/subHeaderPadding"
android:textColor="@color/color_myloc_distance" android:textColor="@color/color_myloc_distance"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium" osmand:typeface="@string/font_roboto_medium"
@ -116,7 +118,7 @@
android:id="@+id/bottom_divider" android:id="@+id/bottom_divider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginTop="8dp" android:layout_marginTop="@dimen/content_padding_half"
android:background="?attr/divider_color_basic" /> android:background="?attr/divider_color_basic" />
</LinearLayout> </LinearLayout>

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

@ -4,14 +4,14 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="44dp" android:minHeight="@dimen/bottom_sheet_descr_height"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:minHeight="44dp" android:minHeight="@dimen/bottom_sheet_descr_height"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
@ -19,8 +19,8 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="64dp" android:layout_marginLeft="@dimen/bottom_sheet_divider_margin_start"
android:layout_marginStart="64dp" android:layout_marginStart="@dimen/bottom_sheet_divider_margin_start"
android:layout_weight="1" android:layout_weight="1"
android:text="@string/search_radius_proximity" android:text="@string/search_radius_proximity"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
@ -31,12 +31,14 @@
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_marginLeft="16dp" android:layout_marginLeft="@dimen/content_padding"
android:layout_marginRight="16dp" android:layout_marginRight="@dimen/content_padding"
android:textColor="@color/color_myloc_distance" android:textColor="@color/color_myloc_distance"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium" osmand:typeface="@string/font_roboto_medium"
tools:text="500 m" /> tools:text="500 m"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding" />
</LinearLayout> </LinearLayout>
@ -44,7 +46,7 @@
android:id="@+id/bottom_divider" android:id="@+id/bottom_divider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginTop="8dp" android:layout_marginTop="@dimen/content_padding_half"
android:background="?attr/divider_color_basic" /> android:background="?attr/divider_color_basic" />
</LinearLayout> </LinearLayout>

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

@ -7,12 +7,14 @@
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="24dp" android:layout_marginLeft="@dimen/dialog_content_margin"
android:layout_marginTop="16dp" android:layout_marginTop="@dimen/content_padding"
android:layout_marginRight="16dp" android:layout_marginRight="@dimen/content_padding"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:layout_marginBottom="8dp" android:layout_marginBottom="@dimen/content_padding_half"
android:text="@string/animate_routing_gpx" /> android:text="@string/animate_routing_gpx"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/dialog_content_margin" />
<LinearLayout <LinearLayout
android:id="@+id/layout_animate_gpx" android:id="@+id/layout_animate_gpx"
@ -23,27 +25,33 @@
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="24dp" android:layout_marginLeft="@dimen/dialog_content_margin"
android:layout_marginTop="5dp" android:layout_marginTop="@dimen/map_small_button_margin"
android:layout_marginRight="16dp" android:layout_marginRight="@dimen/content_padding"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:gravity="left" android:gravity="start"
android:text="@string/select_animate_speedup" /> android:text="@string/select_animate_speedup"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/dialog_content_margin" />
<SeekBar <SeekBar
android:id="@+id/Speedup" android:id="@+id/Speedup"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="24dp" android:layout_marginLeft="@dimen/dialog_content_margin"
android:layout_marginTop="5dp" android:layout_marginTop="@dimen/map_small_button_margin"
android:layout_marginRight="16dp" /> android:layout_marginRight="@dimen/content_padding"
android:layout_marginStart="@dimen/dialog_content_margin"
android:layout_marginEnd="@dimen/content_padding" />
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="24dp" android:layout_marginLeft="@dimen/dialog_content_margin"
android:layout_marginTop="5dp" android:layout_marginTop="@dimen/map_small_button_margin"
android:layout_marginRight="16dp"> android:layout_marginRight="@dimen/content_padding"
android:layout_marginStart="@dimen/dialog_content_margin"
android:layout_marginEnd="@dimen/content_padding">
<TextView <TextView
android:id="@+id/MinSpeedup" android:id="@+id/MinSpeedup"
@ -51,7 +59,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:layout_weight="0.5" android:layout_weight="0.5"
android:gravity="left" android:gravity="start"
android:text="10" /> android:text="10" />
<TextView <TextView
@ -60,7 +68,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:layout_weight="0.5" android:layout_weight="0.5"
android:gravity="right" android:gravity="end"
android:text="15" /> android:text="15" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

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

@ -5,13 +5,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="top|start" android:layout_gravity="top|start"
android:gravity="end" android:gravity="end"
android:paddingTop="5dp" android:paddingTop="@dimen/map_small_button_margin"
android:orientation="horizontal"> android:orientation="horizontal">
<ProgressBar <ProgressBar
android:id="@+id/ProgressBar" android:id="@+id/ProgressBar"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="30dp"/> android:layout_height="@dimen/card_button_progress_size"/>
<TextView <TextView
android:id="@+id/ProgressMessage" android:id="@+id/ProgressMessage"
@ -21,7 +21,8 @@
android:visibility="gone" android:visibility="gone"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:text="@string/loading_data" android:text="@string/loading_data"
android:layout_marginRight="5dp" android:layout_marginRight="@dimen/map_small_button_margin"
android:textSize="@dimen/default_desc_text_size"/> android:textSize="@dimen/default_desc_text_size"
android:layout_marginEnd="@dimen/map_small_button_margin" />
</LinearLayout> </LinearLayout>

53
OsmAnd/res/layout/ask_map_download_fragment.xml
View file

@ -19,13 +19,13 @@
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout
android:layout_width="56dp" android:layout_width="@dimen/context_menu_action_buttons_height"
android:layout_height="match_parent"> android:layout_height="match_parent">
<ImageView <ImageView
android:id="@+id/titleIconImageView" android:id="@+id/titleIconImageView"
android:layout_width="56dp" android:layout_width="@dimen/context_menu_action_buttons_height"
android:layout_height="56dp" android:layout_height="@dimen/context_menu_action_buttons_height"
android:scaleType="center" android:scaleType="center"
tools:background="@color/color_warning" tools:background="@color/color_warning"
tools:src="@drawable/ic_map"/> tools:src="@drawable/ic_map"/>
@ -48,18 +48,20 @@
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:layout_marginTop="16dp" android:layout_marginTop="@dimen/content_padding"
android:layout_marginLeft="8dp" android:layout_marginLeft="@dimen/content_padding_half"
android:paddingRight="8dp" android:paddingRight="@dimen/content_padding_half"
android:text="@string/index_item_world_basemap" android:text="@string/index_item_world_basemap"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textSize="@dimen/dialog_header_text_size"/> android:textSize="@dimen/dialog_header_text_size"
android:layout_marginStart="@dimen/content_padding_half"
android:paddingEnd="@dimen/content_padding_half" />
<ImageButton <ImageButton
android:id="@+id/closeImageButton" android:id="@+id/closeImageButton"
android:contentDescription="@string/shared_string_close" android:contentDescription="@string/shared_string_close"
android:layout_width="44dp" android:layout_width="@dimen/bottom_sheet_list_item_height"
android:layout_height="44dp" android:layout_height="@dimen/bottom_sheet_list_item_height"
android:layout_gravity="center" android:layout_gravity="center"
style="@style/Widget.AppCompat.Button.Borderless" style="@style/Widget.AppCompat.Button.Borderless"
tools:background="@color/color_warning" tools:background="@color/color_warning"
@ -72,41 +74,48 @@
android:id="@+id/descriptionTextView" android:id="@+id/descriptionTextView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="@dimen/content_padding"
android:layout_marginLeft="8dp" android:layout_marginLeft="@dimen/content_padding_half"
android:paddingRight="8dp" android:paddingRight="@dimen/content_padding_half"
android:text="@string/world_map_download_descr" android:text="@string/world_map_download_descr"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_list_text_size"/> android:textSize="@dimen/default_list_text_size"
android:paddingEnd="@dimen/content_padding_half"
android:layout_marginStart="@dimen/content_padding_half" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginTop="@dimen/context_menu_padding_margin_medium"
android:layout_marginBottom="10dp" android:layout_marginBottom="@dimen/context_menu_padding_margin_medium"
android:orientation="horizontal"> android:orientation="horizontal">
<Button <Button
android:id="@+id/actionButtonOk" android:id="@+id/actionButtonOk"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="8dp" android:paddingLeft="@dimen/content_padding_half"
android:paddingRight="8dp" android:paddingRight="@dimen/content_padding_half"
style="@style/Widget.AppCompat.Button.Borderless" style="@style/Widget.AppCompat.Button.Borderless"
android:textColor="?attr/contextMenuButtonColor" android:textColor="?attr/contextMenuButtonColor"
tools:background="@color/color_warning" tools:background="@color/color_warning"
android:text="@string/shared_string_download"/> android:text="@string/shared_string_download"
android:paddingStart="@dimen/content_padding_half"
android:paddingEnd="@dimen/content_padding_half" />
<Button <Button
android:id="@+id/actionButtonCancel" android:id="@+id/actionButtonCancel"
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="@dimen/context_menu_padding_margin_medium"
android:paddingLeft="8dp" android:paddingLeft="@dimen/content_padding_half"
android:paddingRight="8dp" android:paddingRight="@dimen/content_padding_half"
style="@style/Widget.AppCompat.Button.Borderless" style="@style/Widget.AppCompat.Button.Borderless"
tools:background="@color/color_warning" tools:background="@color/color_warning"
android:text="@string/later"/> android:text="@string/later"
android:paddingEnd="@dimen/content_padding_half"
android:layout_marginStart="@dimen/context_menu_padding_margin_medium"
android:paddingStart="@dimen/content_padding_half" />
</LinearLayout> </LinearLayout>

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

@ -16,7 +16,9 @@
android:divider="@null" android:divider="@null"
android:dividerHeight="0dp" android:dividerHeight="0dp"
android:drawSelectorOnTop="false" android:drawSelectorOnTop="false"
android:groupIndicator="@android:color/transparent"/> android:groupIndicator="@android:color/transparent"
android:layout_marginStart="0dp"
android:layout_marginEnd="0dp" />
<include layout="@layout/empty_state_my_tracks" <include layout="@layout/empty_state_my_tracks"
android:id="@android:id/empty"/> android:id="@android:id/empty"/>

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

@ -8,7 +8,9 @@
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"> android:paddingRight="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding">
<include <include
android:id="@+id/dismiss_button" android:id="@+id/dismiss_button"

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

@ -3,7 +3,9 @@
android:orientation="vertical" android:layout_width="match_parent" android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"> android:paddingRight="@dimen/content_padding"
android:paddingStart="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding">
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"

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

@ -24,7 +24,9 @@
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium" osmand:typeface="@string/font_roboto_medium"
android:duplicateParentState="true" android:duplicateParentState="true"
tools:text="Button" /> tools:text="Button"
android:paddingStart="@dimen/content_padding_small"
android:paddingEnd="@dimen/content_padding_small" />
</LinearLayout> </LinearLayout>

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

@ -23,7 +23,9 @@
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium" osmand:typeface="@string/font_roboto_medium"
android:duplicateParentState="true" android:duplicateParentState="true"
tools:text="Button" /> tools:text="Button"
android:paddingStart="@dimen/content_padding_small"
android:paddingEnd="@dimen/content_padding_small" />
</LinearLayout> </LinearLayout>

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

@ -16,7 +16,9 @@
android:layout_marginLeft="@dimen/route_info_buttons_padding_top_bottom" android:layout_marginLeft="@dimen/route_info_buttons_padding_top_bottom"
android:layout_marginRight="@dimen/route_info_buttons_padding_top_bottom" android:layout_marginRight="@dimen/route_info_buttons_padding_top_bottom"
android:layout_marginTop="7dp" android:layout_marginTop="7dp"
android:orientation="horizontal"> android:orientation="horizontal"
android:layout_marginEnd="@dimen/route_info_buttons_padding_top_bottom"
android:layout_marginStart="@dimen/route_info_buttons_padding_top_bottom">
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/button_descr" android:id="@+id/button_descr"

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

@ -17,7 +17,9 @@
android:layout_marginRight="@dimen/content_padding" android:layout_marginRight="@dimen/content_padding"
android:tint="?attr/active_color_basic" android:tint="?attr/active_color_basic"
tools:visibility="visible" tools:visibility="visible"
android:src="@drawable/ic_action_plus"/> android:src="@drawable/ic_action_plus"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding" />
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -25,7 +27,9 @@
android:layout_gravity="top" android:layout_gravity="top"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"> android:paddingRight="@dimen/content_padding"
android:paddingStart="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding">
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/button_text" android:id="@+id/button_text"

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

@ -12,4 +12,6 @@
android:paddingRight="@dimen/content_padding" android:paddingRight="@dimen/content_padding"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
tools:text="Some long description"/> tools:text="Some long description"
android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding" />

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

@ -13,4 +13,6 @@
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
android:linksClickable="true" android:linksClickable="true"
android:lineSpacingMultiplier="@dimen/bottom_sheet_text_spacing_multiplier" android:lineSpacingMultiplier="@dimen/bottom_sheet_text_spacing_multiplier"
tools:text="Some long description"/> tools:text="Some long description"
android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding" />

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

@ -14,4 +14,6 @@
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"
app:typeface="@string/font_roboto_regular" app:typeface="@string/font_roboto_regular"
tools:text="@string/reset_all_profile_settings_descr" /> tools:text="@string/reset_all_profile_settings_descr"
android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding" />

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

@ -11,7 +11,9 @@
android:paddingBottom="@dimen/content_padding_half" android:paddingBottom="@dimen/content_padding_half"
android:paddingTop="@dimen/content_padding_half" android:paddingTop="@dimen/content_padding_half"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"> android:paddingRight="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding">
<android.support.v7.widget.AppCompatImageView <android.support.v7.widget.AppCompatImageView
android:id="@+id/icon" android:id="@+id/icon"

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

@ -13,4 +13,6 @@
android:paddingBottom="@dimen/gpx_small_text_margin" android:paddingBottom="@dimen/gpx_small_text_margin"
android:textAppearance="@style/TextAppearance.ListItemTitle" android:textAppearance="@style/TextAppearance.ListItemTitle"
app:typeface="@string/font_roboto_regular" app:typeface="@string/font_roboto_regular"
tools:text="@string/auto_zoom_map_descr" /> tools:text="@string/auto_zoom_map_descr"
android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding" />

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

@ -15,7 +15,9 @@
android:minHeight="@dimen/bottom_sheet_list_item_height" android:minHeight="@dimen/bottom_sheet_list_item_height"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding" android:paddingRight="@dimen/content_padding"
tools:background="@drawable/rectangle_rounded_right"> tools:background="@drawable/rectangle_rounded_right"
android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding">
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/title" android:id="@+id/title"

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

@ -10,7 +10,9 @@
android:paddingBottom="@dimen/content_padding_half" android:paddingBottom="@dimen/content_padding_half"
android:paddingTop="@dimen/content_padding_half" android:paddingTop="@dimen/content_padding_half"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"> android:paddingRight="@dimen/content_padding"
android:paddingStart="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding">
<ImageView <ImageView
android:id="@+id/icon" android:id="@+id/icon"

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

@ -10,7 +10,9 @@
android:paddingBottom="@dimen/content_padding_half" android:paddingBottom="@dimen/content_padding_half"
android:paddingTop="@dimen/content_padding_half" android:paddingTop="@dimen/content_padding_half"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"> android:paddingRight="@dimen/content_padding"
android:paddingStart="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding">
<ImageView <ImageView
android:id="@+id/icon" android:id="@+id/icon"

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

@ -8,7 +8,9 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="@dimen/bottom_sheet_list_item_height" android:minHeight="@dimen/bottom_sheet_list_item_height"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"> android:paddingRight="@dimen/content_padding"
android:paddingStart="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding">
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/title" android:id="@+id/title"

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

@ -13,4 +13,6 @@
android:paddingTop="@dimen/content_padding_small" android:paddingTop="@dimen/content_padding_small"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
tools:text="Some subtitle"/> tools:text="Some subtitle"
android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding" />

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

@ -14,4 +14,6 @@
android:paddingRight="@dimen/content_padding" android:paddingRight="@dimen/content_padding"
android:textAppearance="@style/TextAppearance.ListItemTitle" android:textAppearance="@style/TextAppearance.ListItemTitle"
osmand:typeface="@string/font_roboto_medium" osmand:typeface="@string/font_roboto_medium"
tools:text="Some Title"/> tools:text="Some Title"
android:paddingStart="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding" />

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

@ -15,4 +15,6 @@
android:textAppearance="@style/TextAppearance.ListItemTitle" android:textAppearance="@style/TextAppearance.ListItemTitle"
android:textSize="@dimen/bottom_sheet_title_big" android:textSize="@dimen/bottom_sheet_title_big"
osmand:typeface="@string/font_roboto_medium" osmand:typeface="@string/font_roboto_medium"
tools:text="@string/new_plugin_added" /> tools:text="@string/new_plugin_added"
android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding" />

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

@ -10,4 +10,6 @@
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding" android:paddingRight="@dimen/content_padding"
android:textAppearance="@style/TextAppearance.ListItemTitle" android:textAppearance="@style/TextAppearance.ListItemTitle"
tools:text="Some long description" /> tools:text="Some long description"
android:paddingStart="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding" />

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

@ -10,7 +10,9 @@
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding" android:paddingRight="@dimen/content_padding"
android:paddingTop="@dimen/wikilink_bottom_sheet_padding" android:paddingTop="@dimen/wikilink_bottom_sheet_padding"
android:orientation="vertical"> android:orientation="vertical"
android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding">
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/title" android:id="@+id/title"

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

@ -7,7 +7,8 @@
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="@dimen/bottom_sheet_selected_item_title_height" android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
android:paddingLeft="@dimen/content_padding"> android:paddingLeft="@dimen/content_padding"
android:paddingStart="@dimen/content_padding">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
@ -56,6 +57,9 @@
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium" osmand:typeface="@string/font_roboto_medium"
tools:drawableRight="@drawable/ic_action_sort_by_name" tools:drawableRight="@drawable/ic_action_sort_by_name"
tools:text="Some button" /> tools:text="Some button"
tools:drawableEnd="@drawable/ic_action_sort_by_name"
android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding" />
</LinearLayout> </LinearLayout>

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

@ -7,7 +7,9 @@
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:minHeight="@dimen/bottom_sheet_selected_item_title_height" android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"> android:paddingRight="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding">
<ImageView <ImageView
android:id="@+id/icon" android:id="@+id/icon"

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

@ -8,7 +8,9 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="@dimen/bottom_sheet_selected_item_title_height" android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"> android:paddingRight="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding">
<ImageView <ImageView
android:id="@+id/icon" android:id="@+id/icon"

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

@ -8,7 +8,9 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="@dimen/bottom_sheet_selected_item_title_height" android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"> android:paddingRight="@dimen/content_padding"
android:paddingStart="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding">
<ImageView <ImageView
android:id="@+id/icon" android:id="@+id/icon"

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

@ -18,7 +18,9 @@
android:paddingRight="@dimen/content_padding" android:paddingRight="@dimen/content_padding"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
tools:text="@string/default_render_descr"/> tools:text="@string/default_render_descr"
android:paddingStart="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding" />
<FrameLayout <FrameLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -46,7 +48,9 @@
android:textSize="@dimen/text_button_text_size" android:textSize="@dimen/text_button_text_size"
osmand:typeface="@string/font_roboto_medium" osmand:typeface="@string/font_roboto_medium"
tools:ignore="UnusedAttribute" tools:ignore="UnusedAttribute"
tools:text="Show full description"/> tools:text="Show full description"
android:paddingStart="@dimen/bottom_sheet_content_padding_small"
android:paddingEnd="@dimen/bottom_sheet_content_padding_small" />
</FrameLayout> </FrameLayout>

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

@ -8,7 +8,9 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="@dimen/bottom_sheet_list_item_height" android:minHeight="@dimen/bottom_sheet_list_item_height"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"> android:paddingRight="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding">
<android.support.v7.widget.AppCompatRadioButton <android.support.v7.widget.AppCompatRadioButton
android:id="@+id/compound_button" android:id="@+id/compound_button"

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

@ -8,7 +8,9 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="@dimen/bottom_sheet_list_item_height" android:minHeight="@dimen/bottom_sheet_list_item_height"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"> android:paddingRight="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding">
<ImageView <ImageView
android:id="@+id/icon" android:id="@+id/icon"

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

@ -8,7 +8,9 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="@dimen/bottom_sheet_list_item_height" android:minHeight="@dimen/bottom_sheet_list_item_height"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"> android:paddingRight="@dimen/content_padding"
android:paddingStart="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding">
<ImageView <ImageView
android:id="@+id/icon" android:id="@+id/icon"

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

@ -7,7 +7,9 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="@dimen/bottom_sheet_selected_item_title_height" android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"> android:paddingRight="@dimen/content_padding"
android:paddingStart="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding">
<ImageView <ImageView
android:id="@+id/icon" android:id="@+id/icon"

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

@ -7,7 +7,9 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="@dimen/bottom_sheet_list_item_height" android:minHeight="@dimen/bottom_sheet_list_item_height"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"> android:paddingRight="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding">
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"

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

@ -16,7 +16,9 @@
android:paddingRight="@dimen/content_padding" android:paddingRight="@dimen/content_padding"
app:labelText="@string/enter_path_to_folder" app:labelText="@string/enter_path_to_folder"
app:primaryColor="?android:textColorPrimary" app:primaryColor="?android:textColorPrimary"
app:secondaryColor="?android:textColorSecondary"> app:secondaryColor="?android:textColorSecondary"
android:paddingStart="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding">
<studio.carbonylgroup.textfieldboxes.ExtendedEditText <studio.carbonylgroup.textfieldboxes.ExtendedEditText
android:id="@+id/text" android:id="@+id/text"
@ -34,7 +36,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/content_padding" android:layout_marginLeft="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding"> android:layout_marginRight="@dimen/content_padding"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding">
<TextView <TextView
android:id="@+id/description" android:id="@+id/description"
@ -48,7 +52,9 @@
android:paddingRight="@dimen/content_padding" android:paddingRight="@dimen/content_padding"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_sub_text_size" android:textSize="@dimen/default_sub_text_size"
tools:text="EditText description" /> tools:text="EditText description"
android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding" />
</FrameLayout> </FrameLayout>

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

@ -8,7 +8,9 @@
android:minHeight="@dimen/list_item_height" android:minHeight="@dimen/list_item_height"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="@dimen/list_content_padding" android:paddingLeft="@dimen/list_content_padding"
android:paddingRight="@dimen/list_content_padding"> android:paddingRight="@dimen/list_content_padding"
android:paddingStart="@dimen/list_content_padding"
android:paddingEnd="@dimen/list_content_padding">
<ImageView <ImageView
android:id="@+id/change_color_icon" android:id="@+id/change_color_icon"

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

@ -8,7 +8,9 @@
android:layout_marginLeft="5dip" android:layout_marginLeft="5dip"
android:layout_marginRight="5dip" android:layout_marginRight="5dip"
android:weightSum="1" android:weightSum="1"
android:background="@color/color_white"> android:background="@color/color_white"
android:layout_marginStart="5dip"
android:layout_marginEnd="5dip">
<ImageButton <ImageButton
android:src="@drawable/ic_action_down_dark" android:src="@drawable/ic_action_down_dark"

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

@ -18,7 +18,9 @@
android:paddingTop="2dp" android:paddingTop="2dp"
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:paddingLeft="6dp" android:paddingLeft="6dp"
android:paddingRight="6dp"> android:paddingRight="6dp"
android:paddingEnd="6dp"
android:paddingStart="6dp">
<TextView <TextView
android:id="@+id/text_alt_value" android:id="@+id/text_alt_value"
@ -59,7 +61,9 @@
android:paddingTop="2dp" android:paddingTop="2dp"
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:paddingLeft="6dp" android:paddingLeft="6dp"
android:paddingRight="6dp"> android:paddingRight="6dp"
android:paddingEnd="6dp"
android:paddingStart="6dp">
<TextView <TextView
android:id="@+id/text_spd_value" android:id="@+id/text_spd_value"
@ -92,7 +96,9 @@
android:paddingTop="2dp" android:paddingTop="2dp"
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:paddingLeft="6dp" android:paddingLeft="6dp"
android:paddingRight="6dp"> android:paddingRight="6dp"
android:paddingEnd="6dp"
android:paddingStart="6dp">
<TextView <TextView
android:id="@+id/text_slp_value" android:id="@+id/text_slp_value"

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

@ -11,6 +11,8 @@
android:layout_marginTop="3dp" android:layout_marginTop="3dp"
android:layout_marginBottom="3dp" android:layout_marginBottom="3dp"
android:focusable="false" android:focusable="false"
android:gravity="center_vertical" /> android:gravity="center_vertical"
android:layout_marginStart="3dp"
android:layout_marginEnd="3dp" />
</merge> </merge>

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

@ -6,7 +6,9 @@
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="@dimen/content_padding_half" android:paddingLeft="@dimen/content_padding_half"
android:paddingRight="@dimen/content_padding_half" android:paddingRight="@dimen/content_padding_half"
android:paddingBottom="@dimen/context_menu_padding_margin_small"> android:paddingBottom="@dimen/context_menu_padding_margin_small"
android:paddingStart="@dimen/content_padding_half"
android:paddingEnd="@dimen/content_padding_half">
<include <include
android:id="@+id/additional_button_left_view" android:id="@+id/additional_button_left_view"

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

@ -12,15 +12,17 @@
android:id="@+id/title" android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="104dp" android:layout_height="104dp"
android:paddingLeft="24dp" android:paddingLeft="@dimen/dialog_content_margin"
android:paddingRight="24dp" android:paddingRight="@dimen/dialog_content_margin"
android:paddingTop="2dp" android:paddingTop="@dimen/subHeaderPadding"
android:maxLines="4" android:maxLines="4"
android:gravity="center" android:gravity="center"
android:ellipsize="end" android:ellipsize="end"
tools:textColor="?android:textColorPrimary" tools:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"
android:text="@string/mapillary_action_descr"/> android:text="@string/mapillary_action_descr"
android:paddingEnd="@dimen/dialog_content_margin"
android:paddingStart="@dimen/dialog_content_margin" />
<android.support.v7.widget.AppCompatButton <android.support.v7.widget.AppCompatButton
android:id="@+id/button" android:id="@+id/button"
@ -31,12 +33,14 @@
android:layout_gravity="bottom|center_horizontal" android:layout_gravity="bottom|center_horizontal"
android:drawableLeft="@drawable/ic_action_mapillary" android:drawableLeft="@drawable/ic_action_mapillary"
android:drawableStart="@drawable/ic_action_mapillary" android:drawableStart="@drawable/ic_action_mapillary"
android:drawablePadding="8dp" android:drawablePadding="@dimen/content_padding_half"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="14dp" android:paddingRight="14dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="@dimen/content_padding"
android:textColor="@color/color_white" android:textColor="@color/color_white"
android:text="@string/shared_string_add_photos"/> android:text="@string/shared_string_add_photos"
android:paddingEnd="14dp"
android:paddingStart="10dp" />
<View <View
android:id="@+id/card_background" android:id="@+id/card_background"

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

@ -23,7 +23,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:padding="16dp" android:padding="@dimen/content_padding"
android:background="?attr/bg_color" android:background="?attr/bg_color"
android:textColor="?attr/color_dialog_buttons" android:textColor="?attr/color_dialog_buttons"
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"
@ -39,23 +39,26 @@
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:visibility="gone" android:visibility="gone"
tools:src="@drawable/ic_action_photo_dark" tools:src="@drawable/ic_action_photo_dark"
tools:visibility="visible"/> tools:visibility="visible"
android:layout_marginStart="10dp" />
<TextView <TextView
android:id="@+id/watermark" android:id="@+id/watermark"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|right" android:layout_gravity="bottom|end"
android:paddingLeft="4dp" android:paddingLeft="4dp"
android:paddingTop="4dp" android:paddingTop="4dp"
android:paddingRight="8dp" android:paddingRight="@dimen/content_padding_half"
android:paddingBottom="8dp" android:paddingBottom="@dimen/content_padding_half"
android:background="@color/map_widget_dark" android:background="@color/map_widget_dark"
android:textColor="@color/color_white" android:textColor="@color/color_white"
android:textSize="@dimen/default_sub_text_size" android:textSize="@dimen/default_sub_text_size"
android:visibility="gone" android:visibility="gone"
tools:text="\@user123" tools:text="\@user123"
tools:visibility="visible"/> tools:visibility="visible"
android:paddingStart="4dp"
android:paddingEnd="@dimen/content_padding_half" />
<android.support.v7.widget.AppCompatButton <android.support.v7.widget.AppCompatButton
android:id="@+id/button" android:id="@+id/button"
@ -63,14 +66,16 @@
android:layout_height="40dp" android:layout_height="40dp"
android:background="@drawable/blue_button_drawable" android:background="@drawable/blue_button_drawable"
android:layout_gravity="bottom|center_horizontal" android:layout_gravity="bottom|center_horizontal"
android:drawablePadding="8dp" android:drawablePadding="@dimen/content_padding_half"
android:paddingLeft="14dp" android:paddingLeft="14dp"
android:paddingRight="14dp" android:paddingRight="14dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="@dimen/content_padding"
android:textColor="@color/color_white" android:textColor="@color/color_white"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" tools:visibility="visible"
tools:text="Button"/> tools:text="Button"
android:paddingStart="14dp"
android:paddingEnd="14dp" />
<ProgressBar <ProgressBar
android:id="@+id/progress" android:id="@+id/progress"

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

@ -12,7 +12,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="30dp" android:layout_marginLeft="30dp"
android:orientation="horizontal"> android:orientation="horizontal"
android:layout_marginStart="30dp">
<android.support.v7.widget.AppCompatImageView <android.support.v7.widget.AppCompatImageView
android:id="@+id/icon_sadface" android:id="@+id/icon_sadface"
@ -34,7 +35,9 @@
android:ellipsize="end" android:ellipsize="end"
tools:textColor="?android:textColorPrimary" tools:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"
android:text="@string/no_photos_descr"/> android:text="@string/no_photos_descr"
android:paddingEnd="24dp"
android:paddingStart="20dp" />
</LinearLayout> </LinearLayout>
@ -77,7 +80,8 @@
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
tools:textColor="?attr/color_dialog_buttons" tools:textColor="?attr/color_dialog_buttons"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:text="@string/shared_string_add_photos"/> android:text="@string/shared_string_add_photos"
android:layout_marginStart="16dp" />
</LinearLayout> </LinearLayout>

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

@ -29,7 +29,9 @@
android:layout_marginRight="@dimen/content_padding" android:layout_marginRight="@dimen/content_padding"
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
android:orientation="vertical" android:orientation="vertical"
tools:background="@drawable/context_menu_controller_bg_dark"> tools:background="@drawable/context_menu_controller_bg_dark"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding">
<ImageView <ImageView
android:id="@+id/south_side_iv" android:id="@+id/south_side_iv"
@ -176,7 +178,9 @@
android:layout_marginLeft="@dimen/content_padding" android:layout_marginLeft="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding" android:layout_marginRight="@dimen/content_padding"
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
tools:background="@drawable/context_menu_controller_bg_dark"> tools:background="@drawable/context_menu_controller_bg_dark"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding">
<ImageView <ImageView
android:id="@+id/east_side_iv" android:id="@+id/east_side_iv"

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

@ -47,7 +47,9 @@
android:text="@string/shared_string_cancel" android:text="@string/shared_string_cancel"
android:textColor="?attr/wikivoyage_active_color" android:textColor="?attr/wikivoyage_active_color"
android:textSize="@dimen/text_button_text_size" android:textSize="@dimen/text_button_text_size"
osmand:typeface="@string/font_roboto_medium" /> osmand:typeface="@string/font_roboto_medium"
android:paddingEnd="@dimen/bottom_sheet_content_padding_small"
android:paddingStart="@dimen/bottom_sheet_content_margin" />
<View <View
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -77,7 +79,10 @@
tools:drawableRight="@drawable/ic_action_type_add" tools:drawableRight="@drawable/ic_action_type_add"
tools:drawableTint="?attr/wikivoyage_active_color" tools:drawableTint="?attr/wikivoyage_active_color"
tools:ignore="UnusedAttribute" tools:ignore="UnusedAttribute"
tools:text="@string/shared_string_add" /> tools:text="@string/shared_string_add"
android:paddingEnd="@dimen/bottom_sheet_content_margin"
android:paddingStart="@dimen/bottom_sheet_content_padding_small"
tools:drawableEnd="@drawable/ic_action_type_add" />
</LinearLayout> </LinearLayout>

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

@ -18,7 +18,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:paddingBottom="8dp" android:paddingBottom="@dimen/content_padding_half"
android:orientation="horizontal"> android:orientation="horizontal">
<CheckBox <CheckBox
@ -26,28 +26,32 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/list_content_padding" android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginTop="12dp" android:layout_marginTop="@dimen/content_padding_small"
android:focusable="false" android:focusable="false"
android:visibility="gone"/> android:visibility="gone"
android:layout_marginStart="@dimen/list_content_padding" />
<ImageView <ImageView
android:id="@+id/icon" android:id="@+id/icon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/list_content_padding" android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginTop="12dp" android:layout_marginTop="@dimen/content_padding_small"
android:src="@drawable/monitoring_rec_big" android:src="@drawable/monitoring_rec_big"
android:visibility="visible"/> android:visibility="visible"
android:layout_marginStart="@dimen/list_content_padding" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="12dp" android:paddingTop="@dimen/content_padding_small"
android:layout_marginLeft="@dimen/subHeaderMarginLeft" android:layout_marginLeft="@dimen/subHeaderMarginLeft"
android:layout_marginRight="@dimen/showAllButtonMarginRight" android:layout_marginRight="@dimen/showAllButtonMarginRight"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="vertical"> android:orientation="vertical"
android:layout_marginEnd="@dimen/showAllButtonMarginRight"
android:layout_marginStart="@dimen/subHeaderMarginLeft">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -94,7 +98,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="@dimen/gpx_small_icon_margin" android:layout_marginRight="@dimen/gpx_small_icon_margin"
android:src="@drawable/ic_small_distance"/> android:src="@drawable/ic_small_distance"
android:layout_marginEnd="@dimen/gpx_small_icon_margin" />
<TextView <TextView
android:id="@+id/distance" android:id="@+id/distance"
@ -102,14 +107,16 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="@dimen/gpx_small_text_margin" android:layout_marginRight="@dimen/gpx_small_text_margin"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_sub_text_size"/> android:textSize="@dimen/default_sub_text_size"
android:layout_marginEnd="@dimen/gpx_small_text_margin" />
<ImageView <ImageView
android:id="@+id/points_icon" android:id="@+id/points_icon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="@dimen/gpx_small_icon_margin" android:layout_marginRight="@dimen/gpx_small_icon_margin"
android:src="@drawable/ic_small_point"/> android:src="@drawable/ic_small_point"
android:layout_marginEnd="@dimen/gpx_small_icon_margin" />
<TextView <TextView
android:id="@+id/points_count" android:id="@+id/points_count"
@ -117,7 +124,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="@dimen/gpx_small_text_margin" android:layout_marginRight="@dimen/gpx_small_text_margin"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_sub_text_size"/> android:textSize="@dimen/default_sub_text_size"
android:layout_marginEnd="@dimen/gpx_small_text_margin" />
</LinearLayout> </LinearLayout>
@ -153,8 +161,9 @@
android:id="@+id/divider_list" android:id="@+id/divider_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="54dp" android:layout_marginLeft="@dimen/route_info_list_text_padding"
android:background="?attr/dashboard_divider"/> android:background="?attr/dashboard_divider"
android:layout_marginStart="@dimen/route_info_list_text_padding" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -170,7 +179,11 @@
android:textColor="?attr/color_dialog_buttons" android:textColor="?attr/color_dialog_buttons"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:drawableLeft="@drawable/ic_action_rec_stop" android:drawableLeft="@drawable/ic_action_rec_stop"
android:text="@string/shared_string_control_stop"/> android:text="@string/shared_string_control_stop"
android:paddingStart="10dp"
android:layout_marginStart="40dp"
android:paddingEnd="10dp"
android:drawableStart="@drawable/ic_action_rec_stop" />
<Button <Button
android:id="@+id/save_button" android:id="@+id/save_button"
@ -183,7 +196,10 @@
android:textColor="?attr/color_dialog_buttons" android:textColor="?attr/color_dialog_buttons"
android:text="@string/shared_string_save" android:text="@string/shared_string_save"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"/> tools:visibility="visible"
android:drawableStart="@drawable/ic_action_gsave_dark"
android:paddingEnd="10dp"
android:paddingStart="10dp" />
</LinearLayout> </LinearLayout>

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

@ -9,7 +9,9 @@
android:layout_marginBottom="@dimen/dash_margin" android:layout_marginBottom="@dimen/dash_margin"
android:layout_marginLeft="@dimen/dash_margin_h" android:layout_marginLeft="@dimen/dash_margin_h"
android:layout_marginRight="@dimen/dash_margin_h" android:layout_marginRight="@dimen/dash_margin_h"
android:orientation="vertical" > android:orientation="vertical"
android:layout_marginStart="@dimen/dash_margin_h"
android:layout_marginEnd="@dimen/dash_margin_h">
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"

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

@ -9,7 +9,9 @@
android:layout_marginRight="@dimen/dash_margin_h" android:layout_marginRight="@dimen/dash_margin_h"
android:layout_marginTop="@dimen/dash_margin" android:layout_marginTop="@dimen/dash_margin"
android:background="?attr/bg_card" android:background="?attr/bg_card"
android:orientation="vertical"> android:orientation="vertical"
android:layout_marginStart="@dimen/dash_margin_h"
android:layout_marginEnd="@dimen/dash_margin_h">
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/header" android:id="@+id/header"
@ -22,7 +24,9 @@
android:text="@string/dashboard_or_drawer_title" android:text="@string/dashboard_or_drawer_title"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textSize="20sp" android:textSize="20sp"
osmand:typeface="@string/font_roboto_medium"/> osmand:typeface="@string/font_roboto_medium"
android:paddingEnd="@dimen/list_content_padding"
android:paddingStart="@dimen/list_content_padding" />
<TextView <TextView
android:id="@+id/subheader" android:id="@+id/subheader"
@ -35,7 +39,7 @@
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="@dimen/list_header_height" android:layout_height="@dimen/list_header_height"
android:gravity="right" android:gravity="end"
android:orientation="horizontal"> android:orientation="horizontal">
<net.osmand.plus.widgets.ButtonEx <net.osmand.plus.widgets.ButtonEx

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

@ -9,7 +9,9 @@
android:layout_marginBottom="@dimen/dash_margin" android:layout_marginBottom="@dimen/dash_margin"
android:layout_marginLeft="@dimen/dash_margin_h" android:layout_marginLeft="@dimen/dash_margin_h"
android:layout_marginRight="@dimen/dash_margin_h" android:layout_marginRight="@dimen/dash_margin_h"
android:orientation="vertical"> android:orientation="vertical"
android:layout_marginStart="@dimen/dash_margin_h"
android:layout_marginEnd="@dimen/dash_margin_h">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -26,7 +28,9 @@
android:scaleType="center" android:scaleType="center"
android:layout_marginLeft="@dimen/dashFavIconMargin" android:layout_marginLeft="@dimen/dashFavIconMargin"
android:layout_marginRight="@dimen/dashFavIconMargin" android:layout_marginRight="@dimen/dashFavIconMargin"
android:src="@drawable/ic_action_remove_dark"/> android:src="@drawable/ic_action_remove_dark"
android:layout_marginEnd="@dimen/dashFavIconMargin"
android:layout_marginStart="@dimen/dashFavIconMargin" />
<TextView <TextView
android:id="@+id/error_header" android:id="@+id/error_header"

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

@ -10,9 +10,10 @@
android:id="@+id/divider_list" android:id="@+id/divider_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="54dp" android:layout_marginLeft="@dimen/route_info_list_text_padding"
android:background="?attr/dashboard_divider" android:background="?attr/dashboard_divider"
android:visibility="gone"/> android:visibility="gone"
android:layout_marginStart="@dimen/route_info_list_text_padding" />
<View <View
android:id="@+id/divider_dash" android:id="@+id/divider_dash"
@ -33,7 +34,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/list_content_padding" android:layout_marginLeft="@dimen/list_content_padding"
android:focusable="false" android:focusable="false"
android:visibility="gone"/> android:visibility="gone"
android:layout_marginStart="@dimen/list_content_padding" />
<ImageView <ImageView
android:id="@+id/icon" android:id="@+id/icon"
@ -41,7 +43,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/list_content_padding" android:layout_marginLeft="@dimen/list_content_padding"
android:src="@drawable/ic_action_polygom_dark" android:src="@drawable/ic_action_polygom_dark"
android:visibility="visible"/> android:visibility="visible"
android:layout_marginStart="@dimen/list_content_padding" />
<LinearLayout <LinearLayout
@ -52,7 +55,9 @@
android:paddingLeft="@dimen/subHeaderMarginLeft" android:paddingLeft="@dimen/subHeaderMarginLeft"
android:paddingRight="@dimen/showAllButtonMarginRight" android:paddingRight="@dimen/showAllButtonMarginRight"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical"
android:paddingEnd="@dimen/showAllButtonMarginRight"
android:paddingStart="@dimen/subHeaderMarginLeft">
<TextView <TextView
android:id="@+id/name" android:id="@+id/name"
@ -75,7 +80,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="@dimen/gpx_small_icon_margin" android:layout_marginRight="@dimen/gpx_small_icon_margin"
android:src="@drawable/ic_small_distance"/> android:src="@drawable/ic_small_distance"
android:layout_marginEnd="@dimen/gpx_small_icon_margin" />
<TextView <TextView
android:id="@+id/distance" android:id="@+id/distance"
@ -84,14 +90,16 @@
android:layout_marginRight="@dimen/gpx_small_text_margin" android:layout_marginRight="@dimen/gpx_small_text_margin"
android:includeFontPadding="false" android:includeFontPadding="false"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_sub_text_size"/> android:textSize="@dimen/default_sub_text_size"
android:layout_marginEnd="@dimen/gpx_small_text_margin" />
<ImageView <ImageView
android:id="@+id/points_icon" android:id="@+id/points_icon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="@dimen/gpx_small_icon_margin" android:layout_marginRight="@dimen/gpx_small_icon_margin"
android:src="@drawable/ic_small_point"/> android:src="@drawable/ic_small_point"
android:layout_marginEnd="@dimen/gpx_small_icon_margin" />
<TextView <TextView
android:id="@+id/points_count" android:id="@+id/points_count"
@ -100,14 +108,16 @@
android:layout_marginRight="@dimen/gpx_small_text_margin" android:layout_marginRight="@dimen/gpx_small_text_margin"
android:includeFontPadding="false" android:includeFontPadding="false"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_sub_text_size"/> android:textSize="@dimen/default_sub_text_size"
android:layout_marginEnd="@dimen/gpx_small_text_margin" />
<ImageView <ImageView
android:id="@+id/time_icon" android:id="@+id/time_icon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="@dimen/gpx_small_icon_margin" android:layout_marginRight="@dimen/gpx_small_icon_margin"
android:src="@drawable/ic_small_time"/> android:src="@drawable/ic_small_time"
android:layout_marginEnd="@dimen/gpx_small_icon_margin" />
<TextView <TextView
android:id="@+id/time" android:id="@+id/time"
@ -116,7 +126,8 @@
android:layout_marginRight="@dimen/gpx_small_text_margin" android:layout_marginRight="@dimen/gpx_small_text_margin"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:includeFontPadding="false" android:includeFontPadding="false"
android:textSize="@dimen/default_sub_text_size"/> android:textSize="@dimen/default_sub_text_size"
android:layout_marginEnd="@dimen/gpx_small_text_margin" />
</LinearLayout> </LinearLayout>
@ -153,7 +164,8 @@
android:layout_marginLeft="@dimen/favorites_icon_right_margin" android:layout_marginLeft="@dimen/favorites_icon_right_margin"
android:background="?attr/dashboard_button" android:background="?attr/dashboard_button"
android:src="@drawable/ic_action_gsave_dark" android:src="@drawable/ic_action_gsave_dark"
android:visibility="gone"/> android:visibility="gone"
android:layout_marginStart="@dimen/favorites_icon_right_margin" />
<ImageButton <ImageButton
android:id="@+id/stop" android:id="@+id/stop"
@ -179,14 +191,15 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:layout_marginRight="@dimen/list_content_padding" android:layout_marginRight="@dimen/list_content_padding"
android:visibility="gone"> android:visibility="gone"
android:layout_marginEnd="@dimen/list_content_padding">
<android.support.v7.widget.SwitchCompat <android.support.v7.widget.SwitchCompat
android:id="@+id/toggle_item" android:id="@+id/toggle_item"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="4dp" android:paddingTop="@dimen/list_item_button_padding"
android:paddingBottom="4dp" android:paddingBottom="@dimen/list_item_button_padding"
android:clickable="false" android:clickable="false"
android:focusable="false" android:focusable="false"
android:focusableInTouchMode="false" android:focusableInTouchMode="false"
@ -196,8 +209,8 @@
android:id="@+id/toggle_checkbox_item" android:id="@+id/toggle_checkbox_item"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="4dp" android:paddingTop="@dimen/list_item_button_padding"
android:paddingBottom="4dp" android:paddingBottom="@dimen/list_item_button_padding"
android:clickable="false" android:clickable="false"
android:focusable="false" android:focusable="false"
android:focusableInTouchMode="false" android:focusableInTouchMode="false"

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

@ -27,7 +27,9 @@
android:scaleType="center" android:scaleType="center"
android:paddingLeft="@dimen/list_content_padding" android:paddingLeft="@dimen/list_content_padding"
android:src="@drawable/ic_action_start_navigation" android:src="@drawable/ic_action_start_navigation"
android:layout_marginRight="@dimen/favorites_icon_right_margin" /> android:layout_marginRight="@dimen/favorites_icon_right_margin"
android:layout_marginEnd="@dimen/favorites_icon_right_margin"
android:paddingStart="@dimen/list_content_padding" />
<TextView <TextView
android:id="@+id/name" android:id="@+id/name"
@ -47,7 +49,8 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/dashFavIconMargin" android:layout_marginLeft="@dimen/dashFavIconMargin"
android:background="?attr/dashboard_button" android:background="?attr/dashboard_button"
android:src="@drawable/ic_play_dark" /> android:src="@drawable/ic_play_dark"
android:layout_marginStart="@dimen/dashFavIconMargin" />
<ImageButton <ImageButton
android:id="@+id/cancel" android:id="@+id/cancel"

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

@ -8,7 +8,9 @@
android:layout_marginBottom="@dimen/dash_margin" android:layout_marginBottom="@dimen/dash_margin"
android:layout_marginLeft="@dimen/dash_margin_h" android:layout_marginLeft="@dimen/dash_margin_h"
android:layout_marginRight="@dimen/dash_margin_h" android:layout_marginRight="@dimen/dash_margin_h"
android:orientation="vertical"> android:orientation="vertical"
android:layout_marginEnd="@dimen/dash_margin_h"
android:layout_marginStart="@dimen/dash_margin_h">
<LinearLayout <LinearLayout
android:id="@+id/parking_header" android:id="@+id/parking_header"
@ -26,7 +28,9 @@
android:layout_marginRight="@dimen/dashFavIconMargin" android:layout_marginRight="@dimen/dashFavIconMargin"
android:src="@drawable/ic_action_start_navigation" android:src="@drawable/ic_action_start_navigation"
android:scaleType="center" android:scaleType="center"
android:background="@drawable/btn_inset_circle_no_shadow"/> android:background="@drawable/btn_inset_circle_no_shadow"
android:layout_marginStart="@dimen/dashboard_parking_left_margin"
android:layout_marginEnd="@dimen/dashFavIconMargin" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -61,7 +65,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="@dimen/dashFavIconMargin" android:layout_marginRight="@dimen/dashFavIconMargin"
tools:text="@string/app_mode_aircraft"/> tools:text="@string/app_mode_aircraft"
android:layout_marginEnd="@dimen/dashFavIconMargin" />
</LinearLayout> </LinearLayout>
@ -86,6 +91,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="0dp" android:layout_marginRight="0dp"
android:text="@string/remove_the_tag"/> android:text="@string/remove_the_tag"
android:layout_marginEnd="0dp" />
</LinearLayout> </LinearLayout>

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

@ -74,7 +74,9 @@
android:maxLines="1" android:maxLines="1"
android:ellipsize="end" android:ellipsize="end"
osmand:textAllCapsCompat="true" osmand:textAllCapsCompat="true"
osmand:typeface="@string/font_roboto_medium"/> osmand:typeface="@string/font_roboto_medium"
android:paddingEnd="9.5dp"
android:paddingStart="9.5dp" />
<net.osmand.plus.widgets.ButtonEx <net.osmand.plus.widgets.ButtonEx
android:id="@+id/get_plugin" android:id="@+id/get_plugin"
@ -93,7 +95,9 @@
android:maxLines="1" android:maxLines="1"
android:ellipsize="end" android:ellipsize="end"
osmand:textAllCapsCompat="true" osmand:textAllCapsCompat="true"
osmand:typeface="@string/font_roboto_medium"/> osmand:typeface="@string/font_roboto_medium"
android:paddingEnd="9.5dp"
android:paddingStart="9.5dp" />
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>

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

@ -8,7 +8,9 @@
android:layout_marginBottom="@dimen/dash_margin" android:layout_marginBottom="@dimen/dash_margin"
android:layout_marginLeft="@dimen/dash_margin_h" android:layout_marginLeft="@dimen/dash_margin_h"
android:layout_marginRight="@dimen/dash_margin_h" android:layout_marginRight="@dimen/dash_margin_h"
android:orientation="vertical"> android:orientation="vertical"
android:layout_marginStart="@dimen/dash_margin_h"
android:layout_marginEnd="@dimen/dash_margin_h">
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/header" android:id="@+id/header"
@ -21,7 +23,9 @@
android:paddingLeft="@dimen/list_content_padding" android:paddingLeft="@dimen/list_content_padding"
android:paddingRight="@dimen/list_content_padding" android:paddingRight="@dimen/list_content_padding"
android:paddingTop="8dp" android:paddingTop="8dp"
osmand:typeface="@string/font_roboto_medium"/> osmand:typeface="@string/font_roboto_medium"
android:paddingEnd="@dimen/list_content_padding"
android:paddingStart="@dimen/list_content_padding" />
<TextView <TextView
android:id="@+id/subheader" android:id="@+id/subheader"

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

@ -9,7 +9,9 @@
android:layout_marginBottom="@dimen/dash_margin" android:layout_marginBottom="@dimen/dash_margin"
android:layout_marginLeft="@dimen/dash_margin_h" android:layout_marginLeft="@dimen/dash_margin_h"
android:layout_marginRight="@dimen/dash_margin_h" android:layout_marginRight="@dimen/dash_margin_h"
android:orientation="vertical"> android:orientation="vertical"
android:layout_marginStart="@dimen/dash_margin_h"
android:layout_marginEnd="@dimen/dash_margin_h">
<TextView <TextView
android:id="@+id/run_full_osmand_header" android:id="@+id/run_full_osmand_header"

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

@ -8,12 +8,14 @@
android:layout_marginRight="@dimen/dash_margin_h" android:layout_marginRight="@dimen/dash_margin_h"
android:layout_marginTop="@dimen/dash_margin" android:layout_marginTop="@dimen/dash_margin"
android:background="?attr/bg_card" android:background="?attr/bg_card"
android:orientation="vertical"> android:orientation="vertical"
android:layout_marginEnd="@dimen/dash_margin_h"
android:layout_marginStart="@dimen/dash_margin_h">
<LinearLayout <LinearLayout
android:id="@+id/search_card" android:id="@+id/search_card"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="56dp" android:layout_height="@dimen/wpt_list_item_height"
android:background="?attr/selectableItemBackground"> android:background="?attr/selectableItemBackground">
<TextView <TextView

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

@ -25,7 +25,8 @@
android:layout_marginLeft="@dimen/local_index_check_right_margin" android:layout_marginLeft="@dimen/local_index_check_right_margin"
android:layout_marginTop="@dimen/favorites_icon_top_margin" android:layout_marginTop="@dimen/favorites_icon_top_margin"
android:focusable="false" android:focusable="false"
android:visibility="gone" /> android:visibility="gone"
android:layout_marginStart="@dimen/local_index_check_right_margin" />
<ImageView <ImageView
android:id="@+id/icon" android:id="@+id/icon"
@ -34,7 +35,8 @@
android:layout_marginLeft="@dimen/list_content_padding" android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginTop="@dimen/favorites_icon_top_margin" android:layout_marginTop="@dimen/favorites_icon_top_margin"
android:src="@drawable/ic_gpx_track" android:src="@drawable/ic_gpx_track"
android:visibility="gone" /> android:visibility="gone"
android:layout_marginStart="@dimen/list_content_padding" />
<TextView <TextView
android:id="@+id/name" android:id="@+id/name"
@ -46,7 +48,9 @@
android:layout_marginLeft="@dimen/subHeaderMarginLeft" android:layout_marginLeft="@dimen/subHeaderMarginLeft"
android:layout_marginRight="@dimen/showAllButtonMarginRight" android:layout_marginRight="@dimen/showAllButtonMarginRight"
android:layout_weight="1" android:layout_weight="1"
tools:text="@string/validate_gpx_upload_name_pwd" /> tools:text="@string/validate_gpx_upload_name_pwd"
android:layout_marginEnd="@dimen/showAllButtonMarginRight"
android:layout_marginStart="@dimen/subHeaderMarginLeft" />
<ImageButton <ImageButton
android:id="@+id/stop" android:id="@+id/stop"

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

@ -9,7 +9,9 @@
android:layout_marginRight="@dimen/dash_margin_h" android:layout_marginRight="@dimen/dash_margin_h"
android:layout_marginTop="@dimen/dash_margin" android:layout_marginTop="@dimen/dash_margin"
android:background="?attr/bg_card" android:background="?attr/bg_card"
android:orientation="vertical"> android:orientation="vertical"
android:layout_marginStart="@dimen/dash_margin_h"
android:layout_marginEnd="@dimen/dash_margin_h">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -18,7 +20,9 @@
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="@dimen/list_content_padding" android:paddingLeft="@dimen/list_content_padding"
android:paddingRight="@dimen/list_content_padding" android:paddingRight="@dimen/list_content_padding"
android:paddingTop="@dimen/list_content_padding"> android:paddingTop="@dimen/list_content_padding"
android:paddingEnd="@dimen/list_content_padding"
android:paddingStart="@dimen/list_content_padding">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -79,7 +83,9 @@
android:paddingRight="@dimen/list_content_padding" android:paddingRight="@dimen/list_content_padding"
android:paddingTop="3dp" android:paddingTop="3dp"
android:text="@string/android_19_location_disabled" android:text="@string/android_19_location_disabled"
android:textSize="@dimen/default_list_text_size"/> android:textSize="@dimen/default_list_text_size"
android:paddingEnd="@dimen/list_content_padding"
android:paddingStart="@dimen/list_content_padding" />
<View <View
android:id="@+id/divider" android:id="@+id/divider"
@ -108,7 +114,9 @@
android:paddingRight="5dp" android:paddingRight="5dp"
android:text="@string/shared_string_cancel" android:text="@string/shared_string_cancel"
osmand:textAllCapsCompat="true" osmand:textAllCapsCompat="true"
osmand:typeface="@string/font_roboto_medium"/> osmand:typeface="@string/font_roboto_medium"
android:paddingStart="5dp"
android:paddingEnd="5dp" />
<net.osmand.plus.widgets.ButtonEx <net.osmand.plus.widgets.ButtonEx
android:id="@+id/dont_copy_maps" android:id="@+id/dont_copy_maps"

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

@ -71,10 +71,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="100dp" android:layout_marginTop="100dp"
android:gravity="center" android:gravity="center"
android:paddingLeft="16dp" android:paddingLeft="@dimen/content_padding"
android:paddingRight="16dp" android:paddingRight="@dimen/content_padding"
android:textSize="@dimen/default_list_text_size_large" android:textSize="@dimen/default_list_text_size_large"
android:visibility="gone"/> android:visibility="gone"
android:paddingStart="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding" />
</LinearLayout> </LinearLayout>

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

@ -6,24 +6,26 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/list_item_height" android:layout_height="@dimen/list_item_height"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:paddingLeft="20dp" android:paddingLeft="@dimen/context_menu_padding_margin_large"
android:orientation="horizontal"> android:orientation="horizontal"
android:paddingStart="@dimen/context_menu_padding_margin_large">
<include layout="@layout/check_item_rel"/> <include layout="@layout/check_item_rel"/>
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/text" android:id="@+id/text"
style="@style/DashboardSubHeader" style="@style/DashboardSubHeader"
android:layout_marginLeft="16dp" android:layout_marginLeft="@dimen/content_padding"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular" osmand:typeface="@string/font_roboto_regular"
tools:text="@string/lorem_ipsum"/> tools:text="@string/lorem_ipsum"
android:layout_marginStart="@dimen/content_padding" />
<net.osmand.plus.widgets.ButtonEx <net.osmand.plus.widgets.ButtonEx
android:layout_width="48dp" android:layout_width="@dimen/bottom_sheet_list_item_height"
android:layout_height="48dp" android:layout_height="@dimen/bottom_sheet_list_item_height"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:id="@+id/numberOfRowsTextView" android:id="@+id/numberOfRowsTextView"
android:textColor="@color/active_color_primary_light" android:textColor="@color/active_color_primary_light"

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

@ -15,7 +15,7 @@
android:contentDescription="@string/back_to_map" android:contentDescription="@string/back_to_map"
android:layout_width="@dimen/list_item_height" android:layout_width="@dimen/list_item_height"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="left" android:layout_gravity="start"
android:background="@drawable/dashboard_button_light" android:background="@drawable/dashboard_button_light"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_arrow_back" android:src="@drawable/ic_arrow_back"
@ -26,7 +26,7 @@
android:contentDescription="@string/backToMenu" android:contentDescription="@string/backToMenu"
android:layout_width="@dimen/list_item_height" android:layout_width="@dimen/list_item_height"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="left" android:layout_gravity="start"
android:background="@drawable/dashboard_button_light" android:background="@drawable/dashboard_button_light"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_navigation_drawer" android:src="@drawable/ic_navigation_drawer"
@ -37,7 +37,7 @@
android:contentDescription="@string/shared_string_settings" android:contentDescription="@string/shared_string_settings"
android:layout_width="@dimen/list_item_height" android:layout_width="@dimen/list_item_height"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="right" android:layout_gravity="end"
android:background="@drawable/dashboard_button_light" android:background="@drawable/dashboard_button_light"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_configure_screen_dark"/> android:src="@drawable/ic_configure_screen_dark"/>
@ -46,7 +46,7 @@
android:id="@+id/toolbar_text" android:id="@+id/toolbar_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="left" android:layout_gravity="start"
android:scaleType="center" android:scaleType="center"
android:textColor="@color/abc_primary_text_material_dark" android:textColor="@color/abc_primary_text_material_dark"
android:textSize="@dimen/abc_text_size_large_material" android:textSize="@dimen/abc_text_size_large_material"
@ -58,7 +58,7 @@
android:contentDescription="@string/shared_string_ok" android:contentDescription="@string/shared_string_ok"
android:layout_width="@dimen/list_item_height" android:layout_width="@dimen/list_item_height"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="right" android:layout_gravity="end"
android:background="@drawable/dashboard_button_light" android:background="@drawable/dashboard_button_light"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_action_done"/> android:src="@drawable/ic_action_done"/>
@ -68,7 +68,7 @@
android:contentDescription="@string/intermediate_points_change_order" android:contentDescription="@string/intermediate_points_change_order"
android:layout_width="@dimen/list_item_height" android:layout_width="@dimen/list_item_height"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="right" android:layout_gravity="end"
android:background="@drawable/dashboard_button_light" android:background="@drawable/dashboard_button_light"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_sort_waypoint_dark"/> android:src="@drawable/ic_sort_waypoint_dark"/>
@ -79,7 +79,7 @@
android:contentDescription="@string/drawer" android:contentDescription="@string/drawer"
android:layout_width="@dimen/list_item_height" android:layout_width="@dimen/list_item_height"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="right" android:layout_gravity="end"
android:background="@drawable/dashboard_button_light" android:background="@drawable/dashboard_button_light"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_flat_list_dark" android:src="@drawable/ic_flat_list_dark"
@ -90,7 +90,7 @@
android:contentDescription="@string/shared_string_edit" android:contentDescription="@string/shared_string_edit"
android:layout_width="@dimen/list_item_height" android:layout_width="@dimen/list_item_height"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="right" android:layout_gravity="end"
android:background="@drawable/dashboard_button_light" android:background="@drawable/dashboard_button_light"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_action_edit_dark" android:src="@drawable/ic_action_edit_dark"

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

@ -27,7 +27,9 @@
android:layout_marginRight="@dimen/content_padding" android:layout_marginRight="@dimen/content_padding"
android:layout_gravity="center" android:layout_gravity="center"
android:src="@drawable/mm_storage_tank" android:src="@drawable/mm_storage_tank"
tools:tint="?attr/default_icon_color"/> tools:tint="?attr/default_icon_color"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding" />
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
@ -35,7 +37,9 @@
android:layout_weight="1" android:layout_weight="1"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding" android:paddingRight="@dimen/content_padding"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding">
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@android:id/title" android:id="@android:id/title"
@ -64,7 +68,8 @@
android:paddingRight="@dimen/content_padding" android:paddingRight="@dimen/content_padding"
android:background="@null" android:background="@null"
android:clickable="true" android:clickable="true"
android:focusable="true" /> android:focusable="true"
android:paddingEnd="@dimen/content_padding" />
</LinearLayout> </LinearLayout>
@ -81,14 +86,17 @@
android:layout_marginRight="@dimen/content_padding" android:layout_marginRight="@dimen/content_padding"
android:layout_gravity="center" android:layout_gravity="center"
android:visibility="invisible" android:visibility="invisible"
android:src="@drawable/mm_storage_tank"/> android:src="@drawable/mm_storage_tank"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding" />
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:paddingStart="@dimen/content_padding">
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/additionalDescription" android:id="@+id/additionalDescription"
@ -98,7 +106,8 @@
android:paddingRight="@dimen/content_padding" android:paddingRight="@dimen/content_padding"
osmand:typeface="@string/font_roboto_regular" osmand:typeface="@string/font_roboto_regular"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
tools:text="@string/internal_app_storage_description" /> tools:text="@string/internal_app_storage_description"
android:paddingEnd="@dimen/content_padding" />
<FrameLayout <FrameLayout
android:id="@+id/divider" android:id="@+id/divider"

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

@ -20,7 +20,9 @@
android:layout_marginRight="@dimen/content_padding" android:layout_marginRight="@dimen/content_padding"
android:src="@drawable/mm_storage_tank" android:src="@drawable/mm_storage_tank"
android:tint="?attr/default_icon_color" android:tint="?attr/default_icon_color"
tools:tint="?attr/default_icon_color" /> tools:tint="?attr/default_icon_color"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding" />
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@android:id/title" android:id="@android:id/title"
@ -32,7 +34,8 @@
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_regular" osmand:typeface="@string/font_roboto_regular"
tools:text="Internal application memory" /> tools:text="Internal application memory"
android:paddingStart="@dimen/content_padding" />
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/memory" android:id="@+id/memory"
@ -46,7 +49,9 @@
android:paddingRight="@dimen/content_padding" android:paddingRight="@dimen/content_padding"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_regular" osmand:typeface="@string/font_roboto_regular"
tools:text="6.7 GB" /> tools:text="6.7 GB"
android:paddingStart="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout

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

@ -18,7 +18,9 @@
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding" android:paddingRight="@dimen/content_padding"
android:paddingTop="@dimen/content_padding" android:paddingTop="@dimen/content_padding"
android:paddingBottom="@dimen/content_padding_half"> android:paddingBottom="@dimen/content_padding_half"
android:paddingStart="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding">
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:layout_width="match_parent" android:layout_width="match_parent"
@ -61,7 +63,9 @@
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding" android:paddingRight="@dimen/content_padding"
android:paddingTop="@dimen/content_padding" android:paddingTop="@dimen/content_padding"
android:paddingBottom="@dimen/content_padding_half"> android:paddingBottom="@dimen/content_padding_half"
android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding">
<include <include
android:id="@+id/default_speed_layout" android:id="@+id/default_speed_layout"
@ -83,7 +87,9 @@
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding" android:paddingRight="@dimen/content_padding"
android:paddingTop="@dimen/content_padding" android:paddingTop="@dimen/content_padding"
android:paddingBottom="@dimen/content_padding_half"> android:paddingBottom="@dimen/content_padding_half"
android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding">
<include <include
android:id="@+id/max_speed_layout" android:id="@+id/max_speed_layout"

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

@ -44,7 +44,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:orientation="vertical"> android:orientation="vertical"
android:layout_marginStart="8dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -60,7 +61,8 @@
android:paddingRight="8dp" android:paddingRight="8dp"
android:text="@string/arrived_at_destination" android:text="@string/arrived_at_destination"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textSize="@dimen/dialog_header_text_size"/> android:textSize="@dimen/dialog_header_text_size"
android:paddingEnd="8dp" />
<ImageButton <ImageButton
android:id="@+id/closeImageButton" android:id="@+id/closeImageButton"
@ -84,10 +86,13 @@
android:paddingRight="8dp" android:paddingRight="8dp"
android:drawableLeft="@drawable/ic_action_parking_dark" android:drawableLeft="@drawable/ic_action_parking_dark"
android:drawablePadding="12dp" android:drawablePadding="12dp"
android:gravity="left|center_vertical" android:gravity="start|center_vertical"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
style="@style/Widget.AppCompat.Button.Borderless" style="@style/Widget.AppCompat.Button.Borderless"
android:text="@string/find_parking"/> android:text="@string/find_parking"
android:drawableStart="@drawable/ic_action_parking_dark"
android:paddingEnd="8dp"
android:paddingStart="8dp" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
@ -105,10 +110,13 @@
android:paddingRight="8dp" android:paddingRight="8dp"
android:drawableLeft="@drawable/ic_action_gdirections_dark" android:drawableLeft="@drawable/ic_action_gdirections_dark"
android:drawablePadding="12dp" android:drawablePadding="12dp"
android:gravity="left|center_vertical" android:gravity="start|center_vertical"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
style="@style/Widget.AppCompat.Button.Borderless" style="@style/Widget.AppCompat.Button.Borderless"
android:text="@string/recalculate_route"/> android:text="@string/recalculate_route"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:drawableStart="@drawable/ic_action_gdirections_dark" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
@ -126,10 +134,13 @@
android:paddingRight="8dp" android:paddingRight="8dp"
android:drawableLeft="@drawable/ic_action_done" android:drawableLeft="@drawable/ic_action_done"
android:drawablePadding="12dp" android:drawablePadding="12dp"
android:gravity="left|center_vertical" android:gravity="start|center_vertical"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
style="@style/Widget.AppCompat.Button.Borderless" style="@style/Widget.AppCompat.Button.Borderless"
android:text="@string/finish_navigation"/> android:text="@string/finish_navigation"
android:paddingEnd="8dp"
android:paddingStart="8dp"
android:drawableStart="@drawable/ic_action_done" />
</LinearLayout> </LinearLayout>

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

@ -12,13 +12,15 @@
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="24dp" android:paddingLeft="24dp"
android:paddingRight="24dp" android:paddingRight="24dp"
android:paddingTop="15dp"> android:paddingTop="15dp"
android:paddingEnd="24dp"
android:paddingStart="24dp">
<TextView <TextView
android:id="@+id/regionNameTextView" android:id="@+id/regionNameTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp" android:layout_marginBottom="@dimen/content_padding_half"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/color_white" android:textColor="@color/color_white"
tools:text="Flevoland"/> tools:text="Flevoland"/>
@ -33,11 +35,11 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginBottom="8dp" android:layout_marginBottom="@dimen/content_padding_half"
android:layout_marginTop="8dp" android:layout_marginTop="@dimen/content_padding_half"
android:gravity="center" android:gravity="center"
android:textColor="@color/color_white" android:textColor="@color/color_white"
android:textSize="12sp" android:textSize="@dimen/default_sub_text_size"
tools:text="@string/last_map_change"/> tools:text="@string/last_map_change"/>
<TextView <TextView
@ -45,10 +47,10 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginBottom="8dp" android:layout_marginBottom="@dimen/content_padding_half"
android:gravity="center" android:gravity="center"
android:textColor="@color/color_white" android:textColor="@color/color_white"
android:textSize="12sp" android:textSize="@dimen/default_sub_text_size"
tools:text="@string/last_update"/> tools:text="@string/last_update"/>
</LinearLayout> </LinearLayout>
@ -59,14 +61,16 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="16dp" android:layout_marginBottom="@dimen/content_padding"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="54dp" android:layout_height="54dp"
android:layout_marginLeft="24dp" android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"> android:layout_marginRight="24dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp">
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@ -75,7 +79,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/live_update" android:text="@string/live_update"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textSize="16sp"/> android:textSize="@dimen/default_list_text_size"/>
<android.support.v7.widget.SwitchCompat <android.support.v7.widget.SwitchCompat
android:id="@+id/toggle_item" android:id="@+id/toggle_item"
@ -89,7 +93,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="54dp" android:layout_height="54dp"
android:layout_marginLeft="24dp" android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"> android:layout_marginRight="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp">
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@ -98,23 +104,25 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/only_download_over_wifi" android:text="@string/only_download_over_wifi"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textSize="16sp" android:textSize="@dimen/default_list_text_size"
tools:text="Only download over WiFi long text like really long"/> tools:text="Only download over WiFi long text like really long"/>
<CheckBox <CheckBox
android:id="@+id/downloadOverWiFiSwitch" android:id="@+id/downloadOverWiFiSwitch"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="right|center_vertical" android:layout_gravity="end|center_vertical"
android:checked="true" android:checked="true"
android:textSize="16sp"/> android:textSize="@dimen/default_list_text_size"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="54dp" android:layout_height="54dp"
android:layout_marginLeft="24dp" android:layout_marginLeft="24dp"
android:layout_marginRight="16dp"> android:layout_marginRight="@dimen/content_padding"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="24dp">
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@ -123,7 +131,7 @@
android:layout_weight="1" android:layout_weight="1"
android:text="@string/shared_string_update" android:text="@string/shared_string_update"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textSize="16sp"/> android:textSize="@dimen/default_list_text_size"/>
<!--style="@style/OsmandLightTheme.Spinner"--> <!--style="@style/OsmandLightTheme.Spinner"-->
<Spinner <Spinner
@ -131,8 +139,9 @@
style="@style/OsmandLightTheme.Spinner" style="@style/OsmandLightTheme.Spinner"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="right" android:gravity="end"
android:paddingLeft="0dp"/> android:paddingLeft="0dp"
android:paddingStart="0dp" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -140,7 +149,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="54dp" android:layout_height="54dp"
android:layout_marginLeft="24dp" android:layout_marginLeft="24dp"
android:layout_marginRight="16dp"> android:layout_marginRight="@dimen/content_padding"
android:layout_marginStart="24dp"
android:layout_marginEnd="@dimen/content_padding">
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@ -150,22 +161,25 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/update_time" android:text="@string/update_time"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textSize="16sp"/> android:textSize="@dimen/default_list_text_size"/>
<Spinner <Spinner
android:id="@+id/updateTimesOfDaySpinner" android:id="@+id/updateTimesOfDaySpinner"
style="@style/OsmandLightTheme.Spinner" style="@style/OsmandLightTheme.Spinner"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="right" android:gravity="end"
android:paddingLeft="0dp"/> android:paddingLeft="0dp"
android:paddingStart="0dp" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="54dp" android:layout_height="54dp"
android:layout_marginLeft="24dp" android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"> android:layout_marginRight="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp">
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@ -174,7 +188,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/updates_size" android:text="@string/updates_size"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textSize="16sp"/> android:textSize="@dimen/default_list_text_size"/>
<TextView <TextView
android:id="@+id/sizeTextView" android:id="@+id/sizeTextView"
@ -182,7 +196,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textSize="16sp" android:textSize="@dimen/default_list_text_size"
tools:text="64MB"/> tools:text="64MB"/>
</LinearLayout> </LinearLayout>

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

@ -13,4 +13,6 @@
android:paddingTop="10dp" android:paddingTop="10dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:ellipsize="marquee" android:ellipsize="marquee"
android:textAlignment="inherit"/> android:textAlignment="inherit"
android:paddingStart="24dp"
android:paddingEnd="24dp" />

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

@ -3,8 +3,10 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="@dimen/list_item_height" android:minHeight="@dimen/list_item_height"
android:paddingLeft="16dp" android:paddingLeft="@dimen/content_padding"
android:paddingRight="10dp"> android:paddingRight="10dp"
android:paddingEnd="10dp"
android:paddingStart="@dimen/content_padding">
<TextView <TextView
android:id="@+id/download_tag" android:id="@+id/download_tag"
@ -23,6 +25,7 @@
android:layout_width="90dp" android:layout_width="90dp"
android:maxLines="2" android:maxLines="2"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="@dimen/default_desc_text_size"/> android:textSize="@dimen/default_desc_text_size"
android:layout_marginStart="3dp" />
</LinearLayout> </LinearLayout>

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