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

Merge branch 'master' of ssh://github.com/osmandapp/Osmand into Fix_5585

Browse source
This commit is contained in:
Chumva 2018-07-19 10:32:04 +03:00
commit f1dc95f8f7
21 changed files with 78 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
OsmAnd/res/layout-land/map_progress_top.xml
View file

@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="top|center"
android:orientation="horizontal">
<View
android:id="@+id/map_route_land_left_margin_external"
android:layout_width="@dimen/dashboard_land_width"
android:layout_height="0dp"
android:layout_gravity="top|left"
android:visibility="gone"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|center"
android:layout_marginTop="@dimen/map_button_margin"
android:background="@drawable/btn_round"
android:orientation="vertical">
<ProgressBar
android:id="@+id/map_horizontal_progress_external"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="@dimen/map_routing_progress_width"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/map_button_margin"
android:layout_marginRight="@dimen/map_button_margin"
android:max="100"
android:progress="60"/>
</LinearLayout>
</LinearLayout>

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

@ -56,16 +56,6 @@
android:id="@+id/MapHudButtonsOverlayQuickActions"/>
</FrameLayout>
<FrameLayout
android:id="@+id/progress_layout_external"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone">
<include layout="@layout/map_progress_top"/>
</FrameLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

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

@ -1,36 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="50dp"
android:gravity="top|center"
android:orientation="horizontal">
<View
android:id="@+id/map_route_land_left_margin_external"
android:layout_width="@dimen/map_route_planning_land_width_minus_shadow"
android:layout_height="0dp"
android:layout_gravity="top|left"
android:visibility="gone"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|center"
android:layout_marginTop="@dimen/map_button_margin"
android:background="@drawable/btn_round"
android:orientation="vertical">
<ProgressBar
android:id="@+id/map_horizontal_progress_external"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="@dimen/map_routing_progress_width"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/map_button_margin"
android:layout_marginRight="@dimen/map_button_margin"
android:max="100"
android:progress="60"/>
</LinearLayout>
</LinearLayout>

18
OsmAnd/res/layout/plan_route_progress_bar.xml Normal file
View file

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ProgressBar
android:id="@+id/progress_bar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="4dp"
android:max="100"
android:visibility="gone"
tools:progress="60"
tools:visibility="visible"/>
</FrameLayout>

1
OsmAnd/res/values-be-rBY/strings.xml
View file

@ -3098,4 +3098,5 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
<string name="coord_input_save_as_track">Zachavać jak slied</string>
<string name="coord_input_save_as_track_descr">Vy dadali %1$s kropak. Uviadzicie nazvu fajla i nacisnicie «zachavać».</string>
<string name="point_deleted">Kropka %1$s vydalienaja</string>
<string name="shared_string_world">Sviet</string>
</resources>

1
OsmAnd/res/values-be/strings.xml
View file

@ -3149,4 +3149,5 @@
<string name="coord_input_save_as_track">Захаваць як след</string>
<string name="coord_input_save_as_track_descr">Вы дадалі %1$s кропак. Увядзіце назву файла і націсніце «захаваць».</string>
<string name="point_deleted">Кропка %1$s выдаленая</string>
<string name="shared_string_world">Свет</string>
</resources>

11
OsmAnd/res/values-cs/phrases.xml
View file

@ -3604,8 +3604,8 @@
<string name="poi_water_place_access_multifamilies">Pro více rodin</string>
<string name="poi_socket_cee_blue">Počet zásuvek typu CEE modrá (kulatá karavanová)</string>
<string name="poi_socket_cee_blue_current">Maximální proud zásuvky CEE Modrá (kulatá karavanová) A</string>
<string name="poi_socket_cee_blue_output">Maximální výkon zásuvky CEE Modrá (kulatá karavanová) kW</string>
<string name="poi_socket_cee_blue_current">Maximální proud zásuvky CEE Modrá (tzv. karavanová) [A]</string>
<string name="poi_socket_cee_blue_output">Maximální výkon zásuvky CEE Modrá (tzv. karavanová) [kW]</string>
<string name="poi_socket_cee_red_16a">Počet zásuvek typu CEE červená 16A (pětikolík malý)</string>
<string name="poi_socket_cee_red_16a_current">Konektor: CEE Červený 16A (pětikolík malý): Maximální proud</string>
<string name="poi_socket_cee_red_16a_output">Konektor: CEE Červený 16A (pětikolík malý): Maximální výkon</string>
@ -3669,6 +3669,9 @@
<string name="poi_payment_contactless_no">Nelze platit bezkontaktně</string>
<string name="poi_socket_type1">Počet konektorů typu 1 (tzv. Yazaki, SAE J1772)</string>
<string name="poi_socket_type1_current">Maximální proud konektoru Typu 1 (tzv. Yazaki, SAE J1772) A</string>
<string name="poi_socket_type1_output">Maximální výkon konektoru Typu 1 (tzv. Yazaki, SAE J1772)</string>
<string name="poi_socket_type1_current">Maximální proud konektoru Typu 1 (tzv. Yazaki, SAE J1772) [A]</string>
<string name="poi_socket_type1_output">Maximální výkon konektoru Typu 1 (tzv. Yazaki, SAE J1772) [kW]</string>
<string name="poi_socket_type2">Počet konektorů typu 2 (tzv.Mennekes)</string>
<string name="poi_socket_type2_current">Maximální proud konektoru typu 2 (tzv. Mennekes) [A]</string>
<string name="poi_socket_type2_output">Maximální výkon konektoru typu 2 (tzv. Mennekes) [kW]</string>
</resources>

1
OsmAnd/res/values-da/strings.xml
View file

@ -3169,4 +3169,5 @@ Repræsenterer område: %1$s x %2$s</string>
<string name="coord_input_save_as_track">Gem som spor</string>
<string name="coord_input_save_as_track_descr">%1$s punkter tilføjet. Indtast et filnavn og tryk på “Gem“.</string>
<string name="point_deleted">Punkt %1$s er blevet slettet</string>
<string name="shared_string_world">Verden</string>
</resources>

1
OsmAnd/res/values-eo/strings.xml
View file

@ -2938,4 +2938,5 @@ Indikas lokon: %1$s x %2$s"</string>
<string name="coord_input_save_as_track">Konservi kiel spuron</string>
<string name="coord_input_save_as_track_descr">Vi aldonis %1$s punktojn. Entajpu dosiernomon kaj frapetu “konservi”.</string>
<string name="point_deleted">Forigis la punkton %1$s</string>
<string name="shared_string_world">Mondo</string>
</resources>

1
OsmAnd/res/values-es-rAR/strings.xml
View file

@ -2975,4 +2975,5 @@ Lon %2$s</string>
<string name="coord_input_save_as_track">Guardar como traza</string>
<string name="coord_input_save_as_track_descr">Añadiste %1$s puntos. Escribe un nombre de archivo y pulsa en «Guardar».</string>
<string name="point_deleted">Punto %1$s borrado</string>
<string name="shared_string_world">Mundo</string>
</resources>

1
OsmAnd/res/values-es-rUS/strings.xml
View file

@ -2975,4 +2975,5 @@ Lon %2$s</string>
<string name="coord_input_save_as_track">Guardar como traza</string>
<string name="coord_input_save_as_track_descr">Añadiste %1$s puntos. Escribe un nombre de archivo y pulsa en «Guardar».</string>
<string name="point_deleted">Punto %1$s borrado</string>
<string name="shared_string_world">Mundo</string>
</resources>

1
OsmAnd/res/values-fa/strings.xml
View file

@ -3165,4 +3165,5 @@
<string name="coord_input_save_as_track">ذخیره به‌عنوان مسیر</string>
<string name="coord_input_save_as_track_descr">%1$s نقطه افزودید. نام فایل را بنویسید و روی «ذخیره» بزنید.</string>
<string name="point_deleted">نقطهٔ %1$s پاک شد</string>
<string name="shared_string_world">جهان</string>
</resources>

3
OsmAnd/res/values-fr/strings.xml
View file

@ -3031,7 +3031,7 @@ représentant la zone : %1$s x %2$s</string>
<string name="south_abbreviation">S</string>
<string name="north_abbreviation">N</string>
<string name="optional_point_name">Nom optionnel du point</string>
<string name="transport_nearby_routes_within">Itinéraires à proximité avec</string>
<string name="transport_nearby_routes_within">Itinéraires à proximité dans</string>
<string name="enter_lon">Saisissez la longitude</string>
<string name="enter_lat">Saisissez la latitude</string>
<string name="enter_lat_and_lon">Saisissez la latitude et la longitude</string>
@ -3148,4 +3148,5 @@ représentant la zone : %1$s x %2$s</string>
<string name="coord_input_save_as_track">Enregistrer comme trace</string>
<string name="coord_input_save_as_track_descr">Vous avez ajouté %1$s points. Donnez un nom au fichier et cliquez sur Enregistrer.</string>
<string name="point_deleted">Point %1$s supprimé</string>
<string name="shared_string_world">Monde</string>
</resources>

1
OsmAnd/res/values-he/strings.xml
View file

@ -3061,4 +3061,5 @@
<string name="coord_input_save_as_track">שמירה כמסלול</string>
<string name="coord_input_save_as_track_descr">הוספת %1$s נקודות. נא להקליד שם קובץ וללחוץ על ‚שמירה’.</string>
<string name="point_deleted">הנקודה %1$s נמחקה</string>
<string name="shared_string_world">עולם</string>
</resources>

3
OsmAnd/res/values-pt-rBR/strings.xml
View file

@ -356,7 +356,7 @@
<string name="local_index_tile_data_minzoom">Zoom mínimo: %1$s</string>
<string name="edit_tilesource_successfully">A fonte da quadrícula %1$s foi salva com sucesso</string>
<string name="speak_traffic_warnings">Moderadores de tráfego</string>
<string name="context_menu_item_directions_from">Direções de</string>
<string name="context_menu_item_directions_from">Rota a partir daqui</string>
<string name="app_mode_default">Explorar</string>
<string name="local_indexes_cat_av">Dados de Áudio/Vídeo</string>
<string name="stop_routing_confirm">Confirma que quer parar a navegação?</string>
@ -2935,4 +2935,5 @@ Pôr do Sol: %2$s</string>
\n• Gravação de viagem opcional também em modo background (enquanto o dispositivo está no modo sleep)
\nOsmAnd é um software de código aberto desenvolvido ativamente. Todos podem contribuir para o app, reportando bugs, melhorando as traduções ou programando novas funcionalidades. Além disso, o projeto conta com as contribuições financeiras para financiar o desenvolvimento e testes de novas funcionalidades.</string>
<string name="point_deleted">Ponto %1$s foi excluído</string>
<string name="shared_string_world">Mundo</string>
</resources>

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

@ -3104,4 +3104,5 @@ Pro praghere iscrie su còdighe intreu</string>
<string name="coord_input_save_as_track">Sarva comente rasta</string>
<string name="coord_input_save_as_track_descr">As annantu %1$s puntos. Iscrie unu nùmene pro su documentu e incarca \"Sarva\".</string>
<string name="point_deleted">Puntu %1$s iscantzelladu</string>
<string name="shared_string_world">Mundu</string>
</resources>

1
OsmAnd/res/values-sk/strings.xml
View file

@ -2964,4 +2964,5 @@ Zodpovedá oblasti: %1$s x %2$s</string>
<string name="coord_input_save_as_track">Uložiť ako stopu</string>
<string name="coord_input_save_as_track_descr">Pridali ste %1$s bodov. Zadajte názov súboru a stlačte \"Uložiť\".</string>
<string name="point_deleted">Bod %1$s vymazaný</string>
<string name="shared_string_world">Celý svet</string>
</resources>

1
OsmAnd/res/values-sr/strings.xml
View file

@ -2966,4 +2966,5 @@
\n
\nОвај поглед се може искључити тако што се или овде деактивира, или тако што се, по жељи, промени \"Стил карте\" под \"Подеси карту\".</string>
<string name="point_deleted">Тачка %1$s обрисана</string>
<string name="shared_string_world">Свет</string>
</resources>

1
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -3122,4 +3122,5 @@
<string name="coord_input_save_as_track">儲存為軌跡</string>
<string name="coord_input_save_as_track_descr">您已新增了 %1$s 標點。輸入檔案名稱並輕點「儲存」。</string>
<string name="point_deleted">已刪除標點 %1$s</string>
<string name="shared_string_world">世界</string>
</resources>

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

@ -429,8 +429,6 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
private void createProgressBarForRouting() {
final ProgressBar pb = (ProgressBar) findViewById(R.id.map_horizontal_progress);
final View pbExtView = findViewById(R.id.progress_layout_external);
final ProgressBar pbExt = (ProgressBar) findViewById(R.id.map_horizontal_progress_external);
app.getRoutingHelper().setProgressBar(new RouteCalculationProgressCallback() {
@ -446,11 +444,9 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
@Override
public void updateProgress(int progress) {
mapLayers.getMapControlsLayer().getMapRouteInfoMenu().updateRouteCalculationProgress(progress);
dashboardOnMap.updateRouteCalculationProgress(progress);
if (findViewById(R.id.MapHudButtonsOverlay).getVisibility() == View.VISIBLE) {
if (pbExtView.getVisibility() == View.VISIBLE) {
pbExtView.setVisibility(View.GONE);
}
if (MapRouteInfoMenu.isVisible()) {
if (MapRouteInfoMenu.isVisible() || dashboardOnMap.isVisible()) {
pb.setVisibility(View.GONE);
return;
}
@ -460,16 +456,6 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
pb.setProgress(progress);
pb.invalidate();
pb.requestLayout();
} else {
if (pb.getVisibility() == View.VISIBLE) {
pb.setVisibility(View.GONE);
}
if (pbExtView.getVisibility() == View.GONE) {
pbExtView.setVisibility(View.VISIBLE);
}
pbExt.setProgress(progress);
pbExt.invalidate();
pbExt.requestLayout();
}
}
@ -507,7 +493,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
@Override
public void finish() {
mapLayers.getMapControlsLayer().getMapRouteInfoMenu().routeCalculationFinished();
pbExtView.setVisibility(View.GONE);
dashboardOnMap.routeCalculationFinished();
pb.setVisibility(View.GONE);
}
});

54
OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
View file

@ -20,6 +20,7 @@ import android.support.v4.view.ViewCompat;
import android.support.v7.widget.Toolbar;
import android.util.TypedValue;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewAnimationUtils;
@ -35,6 +36,7 @@ import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.ImageView.ScaleType;
import android.widget.ListView;
import android.widget.ProgressBar;
import android.widget.ScrollView;
import android.widget.TextView;
@ -164,6 +166,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
private long lastUpOrCancelMotionEventTime;
private TextView listEmptyTextView;
private int[] animationCoordinates;
private ProgressBar planRouteProgressBar;
int baseColor;
@ -215,6 +218,21 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
return waypointDialogHelper;
}
public void updateRouteCalculationProgress(int progress) {
if (planRouteProgressBar != null) {
if (planRouteProgressBar.getVisibility() != View.VISIBLE) {
planRouteProgressBar.setVisibility(View.VISIBLE);
}
planRouteProgressBar.setProgress(progress);
}
}
public void routeCalculationFinished() {
if (planRouteProgressBar != null) {
planRouteProgressBar.setVisibility(View.GONE);
}
}
public void createDashboardView() {
baseColor = ContextCompat.getColor(mapActivity, R.color.osmand_orange) & 0x00ffffff;
waypointDialogHelper = new WaypointDialogHelper(mapActivity);
@ -382,6 +400,10 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
dashboardView.findViewById(R.id.animateContent).setOnClickListener(listener);
dashboardView.findViewById(R.id.map_part_dashboard).setOnClickListener(listener);
View pbContainer = LayoutInflater.from(mapActivity).inflate(R.layout.plan_route_progress_bar, null);
planRouteProgressBar = (ProgressBar) pbContainer.findViewById(R.id.progress_bar);
listView.addHeaderView(pbContainer);
initActionButtons();
dashboardView.addView(actionButton);
}
@ -756,12 +778,6 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
}
mapActivity.findViewById(R.id.toolbar_back).setVisibility(isBackButtonVisible() ? View.VISIBLE : View.GONE);
mapActivity.getMapLayers().getMapControlsLayer().hideMapControls();
boolean portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
if (!portrait) {
AndroidUiHelper.updateVisibility(mapActivity.findViewById(R.id.map_route_land_left_margin_external), true);
mapActivity.getMapView().setMapPositionX(1);
mapActivity.refreshMap();
}
updateToolbarActions();
//fabButton.showFloatingActionButton();
@ -772,13 +788,6 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
} else {
mapActivity.getMapViewTrackingUtilities().setDashboard(null);
hide(animation);
if (!MapRouteInfoMenu.isVisible()) {
AndroidUiHelper.updateVisibility(mapActivity.findViewById(R.id.map_route_land_left_margin_external), false);
mapActivity.getMapView().setMapPositionX(0);
mapActivity.getMapView().refreshMap();
}
mapActivity.getMapLayers().getMapControlsLayer().showMapControlsIfHidden();
hideActionButton();
for (WeakReference<DashBaseFragment> df : fragList) {
@ -829,6 +838,14 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
listView.setDivider(null);
}
AndroidUtils.setTextSecondaryColor(mapActivity, listEmptyTextView, nightMode);
if (planRouteProgressBar != null) {
int bgColor = ContextCompat.getColor(mapActivity, nightMode
? R.color.map_progress_bar_bg_dark : R.color.map_progress_bar_bg_light);
planRouteProgressBar.setProgressDrawable(AndroidUtils.createProgressDrawable(
bgColor, mapActivity.getMapLayers().getRouteLayer().getRouteLineColor(nightMode)
));
}
}
private int dpToPx(float dp) {
@ -1372,17 +1389,14 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
private void updateListAdapter(ArrayAdapter<?> listAdapter, OnItemClickListener listener) {
this.listAdapter = listAdapter;
this.listAdapterOnClickListener = listener;
if (this.listView != null) {
listAdapterOnClickListener = listener;
if (listView != null) {
listView.setAdapter(listAdapter);
if (!portrait) {
listView.setOnItemClickListener(this.listAdapterOnClickListener);
} else if (this.listAdapterOnClickListener != null) {
if (listAdapterOnClickListener != null) {
listView.setOnItemClickListener(new OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
listAdapterOnClickListener.onItemClick(parent, view, position - 1, id);
listAdapterOnClickListener.onItemClick(parent, view, position - listView.getHeaderViewsCount(), id);
}
});
} else {