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

Merge pull request #11485 from osmandapp/Split-interval-title

Browse source 
"Split interval:" not translated
This commit is contained in:
Vitaliy 2021-04-21 14:14:12 +03:00 committed by GitHub
commit a5f0fa9aac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 50 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_width="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"> android:orientation="vertical">
<View <View
@ -58,7 +59,7 @@
android:layout_gravity="center_vertical|start" android:layout_gravity="center_vertical|start"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size_large" android:textSize="@dimen/default_list_text_size_large"
android:text="Item title"/> tools:text="Item title"/>
</LinearLayout> </LinearLayout>

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

@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:orientation="horizontal"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:paddingLeft="16dp" android:layout_height="wrap_content"
android:paddingRight="16dp" android:paddingLeft="16dp"
android:minHeight="50dp" android:paddingRight="16dp"
android:layout_marginBottom="5dp" android:minHeight="50dp"
android:layout_marginBottom="5dp"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp"> android:paddingEnd="16dp">
@ -69,7 +70,7 @@
android:textColor="@color/color_myloc_distance" android:textColor="@color/color_myloc_distance"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:text="Cinema" tools:text="Cinema"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:layout_marginEnd="16dp" /> android:layout_marginEnd="16dp" />

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

@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical" xmlns:tools="http://schemas.android.com/tools"
android:paddingLeft="?dialogPreferredPadding" android:orientation="vertical"
android:paddingRight="?dialogPreferredPadding" android:paddingLeft="?dialogPreferredPadding"
android:paddingRight="?dialogPreferredPadding"
android:paddingStart="?dialogPreferredPadding" android:paddingStart="?dialogPreferredPadding"
android:paddingEnd="?dialogPreferredPadding"> android:paddingEnd="?dialogPreferredPadding">
@ -32,7 +33,7 @@
android:id="@+id/user_name_field" android:id="@+id/user_name_field"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="NoName"/> tools:text="NoName"/>
<TextView <TextView

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

@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:osmand="http://schemas.android.com/apk/res-auto" xmlns:osmand="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"> xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -51,7 +52,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:background="@null" android:background="@null"
android:text="Filling station" tools:text="Filling station"
android:textColor="@color/color_white" android:textColor="@color/color_white"
android:textSize="@dimen/default_desc_text_size"/> android:textSize="@dimen/default_desc_text_size"/>

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

@ -94,7 +94,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:background="@null" android:background="@null"
android:text="Split interval:" tools:text="Split interval:"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
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" />

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

@ -2,6 +2,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:background="?attr/spinnerListBackground" android:background="?attr/spinnerListBackground"
android:orientation="vertical"> android:orientation="vertical">
@ -212,7 +213,7 @@
android:paddingLeft="2dp" android:paddingLeft="2dp"
android:paddingEnd="0dp" android:paddingEnd="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="Ukraine" tools:text="Ukraine"
app:drawableEndCompat="@drawable/ic_action_arrow_drop_down" app:drawableEndCompat="@drawable/ic_action_arrow_drop_down"
app:drawableRightCompat="@drawable/ic_action_arrow_drop_down" /> app:drawableRightCompat="@drawable/ic_action_arrow_drop_down" />

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

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:osmand="http://schemas.android.com/apk/res-auto"
xmlns:osmand="http://schemas.android.com/apk/res-auto" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" xmlns:tools="http://schemas.android.com/tools"
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="48dp" android:minHeight="48dp"
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:paddingEnd="@dimen/list_content_padding" android:paddingEnd="@dimen/list_content_padding"
android:paddingStart="@dimen/list_content_padding"> android:paddingStart="@dimen/list_content_padding">
@ -36,7 +36,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:text="Avoid selected roads" tools:text="Avoid selected roads"
android:textSize="@dimen/default_list_text_size"/> android:textSize="@dimen/default_list_text_size"/>
<TextView <TextView
@ -44,7 +44,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:text="Select roads you want to avoid during navigation" tools:text="Select roads you want to avoid during navigation"
android:textSize="@dimen/default_desc_text_size"/> android:textSize="@dimen/default_desc_text_size"/>
</LinearLayout> </LinearLayout>

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

@ -118,7 +118,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/content_padding" android:layout_marginTop="@dimen/content_padding"
android:text="Actions" tools:text="Actions"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size" /> android:textSize="@dimen/default_list_text_size" />

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

@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:background="@drawable/popup_bg" xmlns:tools="http://schemas.android.com/tools"
android:gravity="center" android:background="@drawable/popup_bg"
android:orientation="horizontal"> android:gravity="center"
android:orientation="horizontal">
<TextView <TextView
android:id="@+id/text" android:id="@+id/text"
@ -37,6 +38,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:text="UNDO" tools:text="UNDO"
android:textColor="@color/popup_text_color"/> android:textColor="@color/popup_text_color"/>
</LinearLayout> </LinearLayout>

2
OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentDialogFragment.java
View file

@ -287,6 +287,8 @@ public class SplitSegmentDialogFragment extends DialogFragment {
} }
int color = app.getResources().getColor(colorId); int color = app.getResources().getColor(colorId);
title.setTextColor(color); title.setTextColor(color);
String titleText = getString(R.string.gpx_split_interval);
title.setText(getString(R.string.ltr_or_rtl_combine_via_colon, titleText, ""));
text.setTextColor(color); text.setTextColor(color);
img.setImageDrawable(ic.getIcon(R.drawable.ic_action_arrow_drop_down, colorId)); img.setImageDrawable(ic.getIcon(R.drawable.ic_action_arrow_drop_down, colorId));
} }