From a15849b19750a94401d715772873108c9ce687ea Mon Sep 17 00:00:00 2001 From: GaidamakUA Date: Tue, 27 Oct 2015 15:13:24 +0200 Subject: [PATCH] Data storage folder dialog styling. --- .../fragment_data_storage_place_dialog.xml | 1 + OsmAnd/res/values/styles.xml | 16 +++++++++++----- .../ui/DataStoragePlaceDialogFragment.java | 6 +++++- .../plus/osmedit/AdvancedEditPoiFragment.java | 1 + .../plus/osmedit/DashOsmEditsFragment.java | 2 +- .../osmand/plus/osmedit/OsmEditsFragment.java | 14 +++++++++++++- 6 files changed, 32 insertions(+), 8 deletions(-) diff --git a/OsmAnd/res/layout/fragment_data_storage_place_dialog.xml b/OsmAnd/res/layout/fragment_data_storage_place_dialog.xml index f8c24fb1d1..d41fa844ce 100644 --- a/OsmAnd/res/layout/fragment_data_storage_place_dialog.xml +++ b/OsmAnd/res/layout/fragment_data_storage_place_dialog.xml @@ -3,6 +3,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" + android:background="?attr/bottom_menu_view_bg" tools:context="net.osmand.plus.download.ui.DataStoragePlaceDialogFragment"> @color/color_white - + + + diff --git a/OsmAnd/src/net/osmand/plus/download/ui/DataStoragePlaceDialogFragment.java b/OsmAnd/src/net/osmand/plus/download/ui/DataStoragePlaceDialogFragment.java index cfd806e5d6..5dfa9bcf7f 100644 --- a/OsmAnd/src/net/osmand/plus/download/ui/DataStoragePlaceDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/download/ui/DataStoragePlaceDialogFragment.java @@ -34,7 +34,11 @@ public class DataStoragePlaceDialogFragment extends DialogFragment { @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - final Dialog dialog = new Dialog(getActivity(), R.style.BottomSheet_Dialog); + boolean isLightTheme = ((OsmandApplication) getActivity().getApplication()) + .getSettings().OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME; + int themeId = isLightTheme ? R.style.OsmandLightTheme_BottomSheet + : R.style.OsmandDarkTheme_BottomSheet; + final Dialog dialog = new Dialog(getActivity(), themeId); dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE); return dialog; } diff --git a/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java index 1d38c7d428..c918851163 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java @@ -82,6 +82,7 @@ public class AdvancedEditPoiFragment extends Fragment (LinearLayout) view.findViewById(R.id.editTagsList); final MapPoiTypes mapPoiTypes = ((OsmandApplication) getActivity().getApplication()).getPoiTypes(); + // TODO: 10/27/15 Probably use executor so loading would be paralleled. new InitTranslatedTypesTask(mapPoiTypes).execute(); mAdapter = new TagAdapterLinearLayoutHack(editTagsLineaLayout, getData()); // TODO do not restart initialization every time, and probably move initialization to appInit diff --git a/OsmAnd/src/net/osmand/plus/osmedit/DashOsmEditsFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/DashOsmEditsFragment.java index a4815c9648..7a126a424f 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/DashOsmEditsFragment.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/DashOsmEditsFragment.java @@ -133,7 +133,7 @@ public class DashOsmEditsFragment extends DashBaseFragment // TODO: 9/7/15 Redesign osm notes. private void uploadItem(final OsmPoint point) { AlertDialog.Builder b = new AlertDialog.Builder(getActivity()); - b.setMessage(getString(R.string.local_osm_changes_upload_all_confirm, 1)); + b.setMessage(getString(R.string.local_osm_changes_upload_all_confirm)); b.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java index 863405ac22..b915e1c412 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java @@ -52,6 +52,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.Map; /** * Created by Denis @@ -509,7 +510,18 @@ public class OsmEditsFragment extends OsmAndListFragment getString(R.string.local_openstreetmap_uploading), ProgressDialog.STYLE_HORIZONTAL).getDialog(); OsmEditsUploadListener listener = new OsmEditsUploadListenerHelper(getActivity(), - getString(R.string.local_openstreetmap_were_uploaded)); + getString(R.string.local_openstreetmap_were_uploaded)) { + @Override + public void uploadEnded(Map loadErrorsMap) { + super.uploadEnded(loadErrorsMap); + for (OsmPoint osmPoint : loadErrorsMap.keySet()) { + if (loadErrorsMap.get(osmPoint) == null) { + listAdapter.remove(osmPoint); + } + } + listAdapter.notifyDataSetChanged(); + } + }; UploadOpenstreetmapPointAsyncTask uploadTask = new UploadOpenstreetmapPointAsyncTask( dialog, listener, plugin, remotepoi, remotebug, points.length, closeChangeSet); uploadTask.execute(points);