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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2017-02-19 13:35:18 +01:00
commit 880e551c60
5 changed files with 44 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -83,13 +83,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="visible">
android:visibility="visible"
android:gravity="center_vertical">
<ImageView
android:id="@+id/distance_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginRight="@dimen/gpx_small_icon_margin"
android:src="@drawable/ic_small_distance"/>
@ -105,7 +105,6 @@
android:id="@+id/points_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginRight="@dimen/gpx_small_icon_margin"
android:src="@drawable/ic_small_point"/>

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

@ -4,9 +4,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/expandable_list_item_background"
android:minHeight="@dimen/list_item_height"
android:orientation="vertical"
android:gravity="center_vertical">
android:orientation="vertical">
<View
android:id="@+id/divider_list"
@ -26,6 +24,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:minHeight="@dimen/list_item_height"
android:gravity="center_vertical">
<CheckBox
@ -41,19 +40,18 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/list_content_padding"
android:src="@drawable/ic_gpx_track"
android:visibility="gone"/>
android:src="@drawable/ic_action_polygom_dark"
android:visibility="visible"/>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/gpx_text_top_margin"
android:layout_marginBottom="@dimen/gpx_text_top_margin"
android:layout_marginLeft="@dimen/subHeaderMarginLeft"
android:layout_marginRight="@dimen/showAllButtonMarginRight"
android:paddingTop="@dimen/gpx_text_top_margin"
android:paddingBottom="@dimen/gpx_text_top_margin"
android:paddingLeft="@dimen/subHeaderMarginLeft"
android:paddingRight="@dimen/showAllButtonMarginRight"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
@ -62,20 +60,20 @@
android:layout_height="wrap_content"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"
tools:text="@string/validate_gpx_upload_name_pwd"/>
tools:text="@string/current_track"/>
<LinearLayout
android:id="@+id/read_section"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="visible">
android:visibility="visible"
android:gravity="center_vertical">
<ImageView
android:id="@+id/distance_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginRight="@dimen/gpx_small_icon_margin"
android:src="@drawable/ic_small_distance"/>
@ -91,7 +89,6 @@
android:id="@+id/points_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginRight="@dimen/gpx_small_icon_margin"
android:src="@drawable/ic_small_point"/>
@ -107,7 +104,6 @@
android:id="@+id/time_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginRight="@dimen/gpx_small_icon_margin"
android:src="@drawable/ic_small_time"/>
@ -118,6 +114,7 @@
android:layout_marginRight="@dimen/gpx_small_text_margin"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_sub_text_size"/>
</LinearLayout>
<LinearLayout
@ -136,7 +133,6 @@
</LinearLayout>
<TextView
android:id="@+id/description"
android:layout_width="wrap_content"
@ -144,8 +140,8 @@
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_sub_text_size"
android:visibility="gone"/>
</LinearLayout>
</LinearLayout>
<ImageButton
android:id="@+id/show_on_map"
@ -154,8 +150,7 @@
android:layout_marginLeft="@dimen/favorites_icon_right_margin"
android:background="?attr/dashboard_button"
android:src="@drawable/ic_action_gsave_dark"
android:visibility="gone"
tools:visibility="visible"/>
android:visibility="gone"/>
<ImageButton
android:id="@+id/stop"
@ -163,8 +158,7 @@
android:layout_height="@dimen/list_item_height"
android:background="?attr/dashboard_button"
android:src="@drawable/ic_action_rec_stop"
android:visibility="gone"
tools:visibility="visible"/>
android:visibility="gone"/>
<ImageButton
android:id="@+id/options"
@ -181,7 +175,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:layout_marginRight="@dimen/list_content_padding">
android:layout_marginRight="@dimen/list_content_padding"
android:visibility="gone">
<include android:layout_width="wrap_content"
android:layout_height="wrap_content"

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

@ -6,7 +6,12 @@
android:orientation="vertical"
tools:context="com.antonioleiva.materialeverywhere.SettingsActivity" >
<android.support.v7.widget.Toolbar
<android.support.design.widget.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -14,19 +19,21 @@
android:minHeight="?attr/actionBarSize"
app:theme="@style/ThemeOverlay.AppCompat.ActionBar">
<Spinner
<Spinner
android:id="@+id/spinner_nav"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:popupBackground="?attr/spinnerListBackground"/>
<ProgressBar android:id="@+id/ProgressBar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"/>
<ProgressBar android:id="@+id/ProgressBar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"/>
</android.support.v7.widget.Toolbar>
</android.support.v7.widget.Toolbar>
</android.support.design.widget.AppBarLayout>
<FrameLayout
android:layout_width="match_parent"

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

@ -4,11 +4,18 @@
android:layout_height="match_parent"
android:orientation="vertical">
<net.osmand.plus.views.controls.PagerSlidingTabStrip
android:id="@+id/sliding_tabs"
android:layout_width="match_parent"
<android.support.design.widget.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<net.osmand.plus.views.controls.PagerSlidingTabStrip
android:id="@+id/sliding_tabs"
android:layout_width="match_parent"
android:layout_height="@dimen/list_item_height"
android:background="?attr/colorPrimary"/>
android:background="?attr/colorPrimary"/>
</android.support.design.widget.AppBarLayout>
<android.support.v4.view.ViewPager
android:id="@+id/pager"

15
OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
View file

@ -974,21 +974,6 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
adjustIndicator(app, groupPosition, isExpanded, v, light);
TextView nameView = ((TextView) v.findViewById(R.id.category_name));
List<GpxInfo> list = isSelectedGroup(groupPosition) ? selected : data.get(group);
int size = 0;
for (int i = 0; i < list.size(); i++) {
int sz = list.get(i).getSize();
if (sz < 0) {
size = 0;
break;
} else {
size += sz;
}
}
size = size / (1 << 10);
if (size > 0) {
t.append(" [").append(size).append(" MB]");
}
nameView.setText(t.toString());
return v;