From 1544106c5791911e622829665865548ef6bb6a7b Mon Sep 17 00:00:00 2001 From: jan madsen Date: Wed, 7 Oct 2015 12:28:45 +0200 Subject: [PATCH 1/7] Translated using Weblate (Danish) Currently translated at 100.0% (1720 of 1720 strings) --- OsmAnd/res/values-da/phrases.xml | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml index c408c5fa13..675ba9f825 100644 --- a/OsmAnd/res/values-da/phrases.xml +++ b/OsmAnd/res/values-da/phrases.xml @@ -262,7 +262,7 @@ Forskning IT kontor Avisredaktion - Arkitekt + Arkitektkontor Reklamebureau Uddannelsesinstitution Lydstudio @@ -1861,4 +1861,29 @@ Kunstværk: stele Kunstværk: springvand +Bredde + + Arkitekt + + Arkitektur: moderne + Arkitektur: stalinistisk nyklassicisme + Arkitektur: eklektisk + Arkitektur: nye objektivitet + Arkitektur: moderne + Arkitektur: konstruktivisme + Arkitektur: umgebinde + Arkitektur: træskelet + Arkitektur: art nouveau + Arkitektur: nyklassicisme + Arkitektur: victoriansk + Arkitektur: brutalisme + Arkitektur: klassicisme + Arkitektur: gothic + Arkitektur: oldrussian + Arkitektur: barok + Arkitektur: postkonstruktivisme + Arkitektur: wilheminsk stil + Arkitektur: renæssance + Arkitektur: romansk + From 5fe56a07b6d56ed45c5674946eab7b3745e47b08 Mon Sep 17 00:00:00 2001 From: xmd5a Date: Wed, 7 Oct 2015 15:47:44 +0300 Subject: [PATCH 2/7] Update license --- LICENSE | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 214f10fe11..61ae46b812 100644 --- a/LICENSE +++ b/LICENSE @@ -143,4 +143,6 @@ - Montreal: "Montreal Metro" by STM - http://www.stm.info/en-bref/pictometro.htm. Licensed under Public Domain via Commons - https://commons.wikimedia.org/wiki/File:Montreal_Metro.svg#/media/File:Montreal_Metro.svg - Toronto: "TTC" by Source. Licensed under Fair use via Wikipedia - https://en.wikipedia.org/wiki/File:TTC.svg#/media/File:TTC.svg - Bangkok: "MRT (Bangkok) logo" by Bangkok_Metro_logo.png: Paul_012.Original uploader was Paul 012 at en.wikipediaderivative work: Nevetsjc (talk)Revision traced from http://si0.twimg.com/profile_images/975897559/logo.jpg - Bangkok_Metro_logo.png. Licensed under Public Domain via Commons - https://commons.wikimedia.org/wiki/File:MRT_(Bangkok)_logo.svg#/media/File:MRT_(Bangkok)_logo.svg - - Rotterdam: "RET metro logo" by Sebastiaan1997 - Own work. Licensed under CC BY-SA 3.0 via Commons - https://commons.wikimedia.org/wiki/File:RET_metro_logo.svg#/media/File:RET_metro_logo.svg \ No newline at end of file + - Rotterdam: "RET metro logo" by Sebastiaan1997 - Own work. Licensed under CC BY-SA 3.0 via Commons - https://commons.wikimedia.org/wiki/File:RET_metro_logo.svg#/media/File:RET_metro_logo.svg + - Amsterdam: "Amsterdam metro" by Peeperman - Own work. Licensed under Public Domain via Commons - https://commons.wikimedia.org/wiki/File:Amsterdam_metro.svg#/media/File:Amsterdam_metro.svg + - Brussels: "Brussels Metro logo" by Source. Licensed under Fair use via Wikipedia - https://en.wikipedia.org/wiki/File:Brussels_Metro_logo.svg#/media/File:Brussels_Metro_logo.svg \ No newline at end of file From 8d55715a17ff90c2d9e2a4d977f92ccd4a627da0 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Wed, 7 Oct 2015 13:17:57 +0200 Subject: [PATCH 3/7] Translated using Weblate (Danish) Currently translated at 100.0% (1720 of 1720 strings) --- OsmAnd/res/values-da/phrases.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml index 675ba9f825..6c2434a882 100644 --- a/OsmAnd/res/values-da/phrases.xml +++ b/OsmAnd/res/values-da/phrases.xml @@ -1867,23 +1867,23 @@ Arkitektur: moderne Arkitektur: stalinistisk nyklassicisme - Arkitektur: eklektisk + Arkitektur: eklecticisme Arkitektur: nye objektivitet Arkitektur: moderne Arkitektur: konstruktivisme Arkitektur: umgebinde Arkitektur: træskelet - Arkitektur: art nouveau + Arkitektur: jugendstil Arkitektur: nyklassicisme Arkitektur: victoriansk Arkitektur: brutalisme Arkitektur: klassicisme - Arkitektur: gothic + Arkitektur: gotik Arkitektur: oldrussian Arkitektur: barok Arkitektur: postkonstruktivisme Arkitektur: wilheminsk stil Arkitektur: renæssance - Arkitektur: romansk + Arkitektur: romansk stil From e745937edf34284b881cce8c36d82124a8ed24eb Mon Sep 17 00:00:00 2001 From: GaidamakUA Date: Wed, 7 Oct 2015 17:02:39 +0300 Subject: [PATCH 4/7] Download progress and dialog flickering --- OsmAnd/res/layout/download.xml | 80 +-------- OsmAnd/res/layout/download_index_fragment.xml | 9 +- OsmAnd/res/layout/free_version_banner.xml | 18 +- .../plus/download/DownloadActivity.java | 164 ++++++++---------- .../download/items/RegionDialogFragment.java | 47 +++-- .../download/items/WorldItemsFragment.java | 6 +- 6 files changed, 126 insertions(+), 198 deletions(-) diff --git a/OsmAnd/res/layout/download.xml b/OsmAnd/res/layout/download.xml index 08e3656abc..3df15f54fb 100644 --- a/OsmAnd/res/layout/download.xml +++ b/OsmAnd/res/layout/download.xml @@ -3,7 +3,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="fill_parent" android:layout_height="match_parent" - android:orientation="vertical" > + android:orientation="vertical" + android:id="@+id/mainLayout"> - - + - - - - - - - - - - - - - - + - - - - - + android:background="?attr/ctx_menu_info_view_bg" + android:orientation="vertical"> \ No newline at end of file diff --git a/OsmAnd/res/layout/free_version_banner.xml b/OsmAnd/res/layout/free_version_banner.xml index ad7c33fc05..6dc2fd004a 100644 --- a/OsmAnd/res/layout/free_version_banner.xml +++ b/OsmAnd/res/layout/free_version_banner.xml @@ -1,10 +1,10 @@ @@ -47,8 +48,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:max="10" - tools:progress="5" - android:progressDrawable="@drawable/number_of_downloads_progress_bar_drawable"/> + android:progressDrawable="@drawable/number_of_downloads_progress_bar_drawable" + android:saveEnabled="false" + tools:progress="5"/> + android:text="@string/get_full_version" + osmand:textAllCapsCompat="true"/> + android:text="@string/later" + osmand:textAllCapsCompat="true"/> diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java index bd49a4ac86..df0df1c69f 100644 --- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java +++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java @@ -12,7 +12,6 @@ import android.os.Bundle; import android.support.v4.app.DialogFragment; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentTransaction; import android.support.v4.app.ListFragment; import android.support.v4.view.ViewPager; import android.view.MenuItem; @@ -22,12 +21,12 @@ import android.widget.BaseAdapter; import android.widget.BaseExpandableListAdapter; import android.widget.Button; import android.widget.ExpandableListAdapter; -import android.widget.ImageView; import android.widget.ListAdapter; import android.widget.ProgressBar; import android.widget.TextView; import net.osmand.IndexConstants; +import net.osmand.PlatformUtil; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; import net.osmand.plus.OsmandSettings; @@ -39,10 +38,13 @@ import net.osmand.plus.activities.OsmandBaseExpandableListAdapter; import net.osmand.plus.activities.OsmandExpandableListFragment; import net.osmand.plus.activities.TabActivity; import net.osmand.plus.base.BasicProgressAsyncTask; +import net.osmand.plus.download.items.RegionDialogFragment; import net.osmand.plus.download.items.WorldItemsFragment; import net.osmand.plus.srtmplugin.SRTMPlugin; import net.osmand.plus.views.controls.PagerSlidingTabStrip; +import org.apache.commons.logging.Log; + import java.io.File; import java.lang.ref.WeakReference; import java.util.ArrayList; @@ -53,15 +55,7 @@ import java.util.Map; import java.util.Set; -public class DownloadActivity extends BaseDownloadActivity { - - private View progressView; - private ProgressBar indeterminateProgressBar; - private ProgressBar determinateProgressBar; - private TextView progressMessage; - private TextView progressPercent; - private ImageView cancel; - +public class DownloadActivity extends BaseDownloadActivity implements RegionDialogFragment.DialogDismissListener { private List localIndexInfos = new ArrayList(); private String initialFilter = ""; @@ -134,21 +128,6 @@ public class DownloadActivity extends BaseDownloadActivity { settings = ((OsmandApplication) getApplication()).getSettings(); - indeterminateProgressBar = (ProgressBar) findViewById(R.id.IndeterminateProgressBar); - determinateProgressBar = (ProgressBar) findViewById(R.id.memory_progress); - progressView = findViewById(R.id.ProgressView); - progressMessage = (TextView) findViewById(R.id.ProgressMessage); - progressPercent = (TextView) findViewById(R.id.ProgressPercent); - cancel = (ImageView) findViewById(R.id.Cancel); - cancel.setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_remove_dark)); - cancel.setOnClickListener(new View.OnClickListener() { - - @Override - public void onClick(View v) { - makeSureUserCancelDownload(); - } - }); - findViewById(R.id.downloadButton).setOnClickListener(new View.OnClickListener() { @Override @@ -220,6 +199,7 @@ public class DownloadActivity extends BaseDownloadActivity { protected void onResume() { super.onResume(); getMyApplication().getAppCustomization().resumeActivity(DownloadActivity.class, this); + initFreeVersionBanner(findViewById(R.id.mainLayout)); } @@ -259,53 +239,15 @@ public class DownloadActivity extends BaseDownloadActivity { @Override public void updateProgress(boolean updateOnlyProgress) { - BasicProgressAsyncTask basicProgressAsyncTask = DownloadActivity.downloadListIndexThread.getCurrentRunningTask(); - final boolean isFinished = basicProgressAsyncTask == null - || basicProgressAsyncTask.getStatus() == AsyncTask.Status.FINISHED; - boolean indeterminate = true; - int percent = 0; - String message = ""; - if (!isFinished) { - indeterminate = basicProgressAsyncTask.isIndeterminate(); - message = basicProgressAsyncTask.getDescription(); - if (!indeterminate) { - percent = basicProgressAsyncTask.getProgressPercentage(); - } - } + BasicProgressAsyncTask basicProgressAsyncTask = + DownloadActivity.downloadListIndexThread.getCurrentRunningTask(); if (visibleBanner != null) { - visibleBanner.updateProgress(isFinished, indeterminate, percent, message); + final int countedDownloads = DownloadActivity.downloadListIndexThread.getCountedDownloads(); + visibleBanner.updateProgress(countedDownloads, basicProgressAsyncTask); } if (!updateOnlyProgress) { updateDownloadButton(); } - - - // TODO delete after refactoring! - //needed when rotation is performed and progress can be null - if (progressView == null) { - return; - } - - if (updateOnlyProgress) { - if (basicProgressAsyncTask != null && !basicProgressAsyncTask.isIndeterminate()) { - progressPercent.setText(basicProgressAsyncTask.getProgressPercentage() + "%"); - determinateProgressBar.setProgress(basicProgressAsyncTask.getProgressPercentage()); - } - } else { - progressView.setVisibility(!isFinished ? View.VISIBLE : View.GONE); - if (!isFinished) { - indeterminateProgressBar.setVisibility(!indeterminate ? View.GONE : View.VISIBLE); - determinateProgressBar.setVisibility(indeterminate ? View.GONE : View.VISIBLE); - cancel.setVisibility(indeterminate ? View.GONE : View.VISIBLE); - progressPercent.setVisibility(indeterminate ? View.GONE : View.VISIBLE); - - progressMessage.setText(basicProgressAsyncTask.getDescription()); - if (!indeterminate) { - progressPercent.setText(basicProgressAsyncTask.getProgressPercentage() + "%"); - determinateProgressBar.setProgress(basicProgressAsyncTask.getProgressPercentage()); - } - } - } } @Override @@ -628,14 +570,12 @@ public class DownloadActivity extends BaseDownloadActivity { public void showDialog(FragmentActivity activity, DialogFragment fragment) { - FragmentTransaction ft = activity.getSupportFragmentManager().beginTransaction(); - Fragment prev = activity.getSupportFragmentManager().findFragmentByTag("dialog"); - if (prev != null) { - ft.remove(prev); - } - ft.addToBackStack(null); + fragment.show(activity.getSupportFragmentManager(), "dialog"); + } - fragment.show(ft, "dialog"); + @Override + public void onDialogDismissed() { + initFreeVersionBanner(findViewById(R.id.mainLayout)); } private static class ToggleCollapseFreeVersionBanner implements View.OnClickListener { @@ -666,46 +606,57 @@ public class DownloadActivity extends BaseDownloadActivity { private final ProgressBar progressBar; private final TextView leftTextView; private final TextView rightTextView; - private final Context ctx; - private final boolean shouldShowFreeVersionBanner; private final ProgressBar downloadsLeftProgressBar; private final View buttonsLinearLayout; private final TextView freeVersionDescriptionTextView; - private OsmandApplication application; private final TextView downloadsLeftTextView; + private final View laterButton; + + private final Context ctx; + private final OsmandApplication application; + private final boolean shouldShowFreeVersionBanner; + private final View freeVersionBannerTitle; public BannerAndDownloadFreeVersion(View view, Context ctx) { this.ctx = ctx; + application = (OsmandApplication) ctx.getApplicationContext(); freeVersionBanner = view.findViewById(R.id.freeVersionBanner); downloadProgressLayout = view.findViewById(R.id.downloadProgressLayout); progressBar = (ProgressBar) view.findViewById(R.id.progressBar); leftTextView = (TextView) view.findViewById(R.id.leftTextView); rightTextView = (TextView) view.findViewById(R.id.rightTextView); - application = (OsmandApplication) ctx.getApplicationContext(); - shouldShowFreeVersionBanner = Version.isFreeVersion(application) - || application.getSettings().SHOULD_SHOW_FREE_VERSION_BANNER.get(); - initFreeVersionBanner(); downloadsLeftTextView = (TextView) freeVersionBanner.findViewById(R.id.downloadsLeftTextView); - downloadsLeftProgressBar = (ProgressBar) freeVersionBanner.findViewById(R.id.downloadsLeftProgressBar); + downloadsLeftProgressBar = (ProgressBar) freeVersionBanner.findViewById(R.id.downloadsLeftProgressBar); buttonsLinearLayout = freeVersionBanner.findViewById(R.id.buttonsLinearLayout); freeVersionDescriptionTextView = (TextView) freeVersionBanner .findViewById(R.id.freeVersionDescriptionTextView); + laterButton = freeVersionBanner.findViewById(R.id.laterButton); + freeVersionBannerTitle = freeVersionBanner.findViewById(R.id.freeVersionBannerTitle); + shouldShowFreeVersionBanner = Version.isFreeVersion(application) + || application.getSettings().SHOULD_SHOW_FREE_VERSION_BANNER.get(); + + initFreeVersionBanner(); + updateFreeVersionBanner(); } - public void updateProgress(boolean isFinished, boolean indeterminate, int percent, String message) { + public void updateProgress(int countedDownloads, + BasicProgressAsyncTask basicProgressAsyncTask) { + final boolean isFinished = basicProgressAsyncTask == null + || basicProgressAsyncTask.getStatus() == AsyncTask.Status.FINISHED; if (isFinished) { downloadProgressLayout.setVisibility(View.GONE); - // TODO -// freeVersionBanner.setVisibility(View.VISIBLE); + updateFreeVersionBanner(); } else { - if (freeVersionBanner.getVisibility() == View.VISIBLE) { - freeVersionBanner.setVisibility(View.GONE); - } + boolean indeterminate = basicProgressAsyncTask.isIndeterminate(); + String message = basicProgressAsyncTask.getDescription(); + int percent = basicProgressAsyncTask.getProgressPercentage(); + + setMinimizedFreeVersionBanner(true); + updateAvailableDownloads(countedDownloads); downloadProgressLayout.setVisibility(View.VISIBLE); progressBar.setIndeterminate(indeterminate); if (indeterminate) { - // TODO leftTextView.setText(message); } else { // TODO if only 1 map, show map name @@ -723,6 +674,7 @@ public class DownloadActivity extends BaseDownloadActivity { freeVersionBanner.setVisibility(View.GONE); return; } + freeVersionBanner.setVisibility(View.VISIBLE); downloadsLeftProgressBar.setMax(BaseDownloadActivity.MAXIMUM_AVAILABLE_FREE_DOWNLOADS); freeVersionDescriptionTextView.setText(ctx.getString(R.string.free_version_message, BaseDownloadActivity.MAXIMUM_AVAILABLE_FREE_DOWNLOADS)); @@ -738,21 +690,45 @@ public class DownloadActivity extends BaseDownloadActivity { } } }); - freeVersionBanner.findViewById(R.id.laterButton).setOnClickListener( + laterButton.setOnClickListener( new ToggleCollapseFreeVersionBanner(freeVersionDescriptionTextView, buttonsLinearLayout)); } private void updateFreeVersionBanner() { if (!shouldShowFreeVersionBanner) return; + setMinimizedFreeVersionBanner(false); OsmandSettings settings = application.getSettings(); - downloadsLeftProgressBar.setProgress(settings.NUMBER_OF_FREE_DOWNLOADS.get()); - final int downloadsLeft = BaseDownloadActivity.MAXIMUM_AVAILABLE_FREE_DOWNLOADS - - settings.NUMBER_OF_FREE_DOWNLOADS.get(); + final Integer mapsDownloaded = settings.NUMBER_OF_FREE_DOWNLOADS.get(); + downloadsLeftProgressBar.setProgress(mapsDownloaded); + int downloadsLeft = BaseDownloadActivity.MAXIMUM_AVAILABLE_FREE_DOWNLOADS + - mapsDownloaded; + downloadsLeft = Math.max(downloadsLeft, 0); + if (downloadsLeft <= 0) { + laterButton.setVisibility(View.GONE); + } downloadsLeftTextView.setText(ctx.getString(R.string.downloads_left_template, downloadsLeft)); // TODO review logic freeVersionBanner.setOnClickListener(new ToggleCollapseFreeVersionBanner(freeVersionDescriptionTextView, buttonsLinearLayout)); } + + private void updateAvailableDownloads(int activeTasks) { + OsmandSettings settings = application.getSettings(); + final Integer mapsDownloaded = settings.NUMBER_OF_FREE_DOWNLOADS.get() + activeTasks; + downloadsLeftProgressBar.setProgress(mapsDownloaded); + } + + private void setMinimizedFreeVersionBanner(boolean minimize) { + if (minimize) { + freeVersionDescriptionTextView.setVisibility(View.GONE); + buttonsLinearLayout.setVisibility(View.GONE); + freeVersionBannerTitle.setVisibility(View.GONE); + } else { + freeVersionDescriptionTextView.setVisibility(View.VISIBLE); + buttonsLinearLayout.setVisibility(View.VISIBLE); + freeVersionBannerTitle.setVisibility(View.VISIBLE); + } + } } } diff --git a/OsmAnd/src/net/osmand/plus/download/items/RegionDialogFragment.java b/OsmAnd/src/net/osmand/plus/download/items/RegionDialogFragment.java index ac326b448a..91446e3094 100644 --- a/OsmAnd/src/net/osmand/plus/download/items/RegionDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/download/items/RegionDialogFragment.java @@ -1,10 +1,6 @@ package net.osmand.plus.download.items; -import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.R; -import net.osmand.plus.WorldRegion; -import net.osmand.plus.download.DownloadActivity; +import android.content.DialogInterface; import android.os.Bundle; import android.support.v4.app.DialogFragment; import android.support.v4.app.Fragment; @@ -13,10 +9,18 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -public class RegionDialogFragment extends DialogFragment { +import net.osmand.plus.OsmandApplication; +import net.osmand.plus.OsmandSettings; +import net.osmand.plus.R; +import net.osmand.plus.WorldRegion; +import net.osmand.plus.download.DownloadActivity; + +public class RegionDialogFragment extends DialogFragment{ public static final String TAG = "RegionDialogFragment"; private static final String REGION_ID_DLG_KEY = "world_region_dialog_key"; private String regionId; + private DialogDismissListener dialogDismissListener; + private DialogDismissListener listener; @Override public void onCreate(Bundle savedInstanceState) { @@ -61,10 +65,16 @@ public class RegionDialogFragment extends DialogFragment { toolbar.setTitle(region.getName()); } } - ((DownloadActivity)getActivity()).initFreeVersionBanner(view); + ((DownloadActivity) getActivity()).initFreeVersionBanner(view); + listener = new DialogDismissListener() { + @Override + public void onDialogDismissed() { + ((DownloadActivity) getActivity()).initFreeVersionBanner(view); + } + }; return view; } - + @Override public void onSaveInstanceState(Bundle outState) { outState.putString(REGION_ID_DLG_KEY, regionId); @@ -76,7 +86,9 @@ public class RegionDialogFragment extends DialogFragment { } public void onRegionSelected(String regionId) { - ((DownloadActivity)getActivity()).showDialog(getActivity(), createInstance(regionId)); + final RegionDialogFragment regionDialogFragment = createInstance(regionId); + regionDialogFragment.setOnDismissListener(listener); + ((DownloadActivity) getActivity()).showDialog(getActivity(), regionDialogFragment); } public static RegionDialogFragment createInstance(String regionId) { @@ -86,4 +98,19 @@ public class RegionDialogFragment extends DialogFragment { fragment.setArguments(bundle); return fragment; } -} + + @Override + public void onDismiss(DialogInterface dialog) { + super.onDismiss(dialog); + if (dialogDismissListener != null) + dialogDismissListener.onDialogDismissed(); + } + + public void setOnDismissListener(DialogDismissListener listener) { + this.dialogDismissListener = listener; + } + + public interface DialogDismissListener { + void onDialogDismissed(); + } +} \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/plus/download/items/WorldItemsFragment.java b/OsmAnd/src/net/osmand/plus/download/items/WorldItemsFragment.java index 0627a1547f..d2163e8481 100644 --- a/OsmAnd/src/net/osmand/plus/download/items/WorldItemsFragment.java +++ b/OsmAnd/src/net/osmand/plus/download/items/WorldItemsFragment.java @@ -70,8 +70,6 @@ public class WorldItemsFragment extends OsmandExpandableListFragment { onCategorizationFinished(); - ((DownloadActivity) getActivity()).initFreeVersionBanner(view); - return view; } @@ -127,7 +125,9 @@ public class WorldItemsFragment extends OsmandExpandableListFragment { public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { if (groupPosition == worldRegionsIndex) { WorldRegion region = (WorldRegion)listAdapter.getChild(groupPosition, childPosition); - ((DownloadActivity)getActivity()).showDialog(getActivity(), RegionDialogFragment.createInstance(region.getRegionId())); + final RegionDialogFragment regionDialogFragment = RegionDialogFragment.createInstance(region.getRegionId()); + regionDialogFragment.setOnDismissListener((DownloadActivity) getActivity()); + ((DownloadActivity)getActivity()).showDialog(getActivity(), regionDialogFragment); return true; } else if (groupPosition == voicePromptsIndex) { if (childPosition == voicePromptsItemsRecordedSubIndex) { From 39421f4fe42a14e36a1b6a9b56bd76181f15c146 Mon Sep 17 00:00:00 2001 From: Evgenii Martynenko Date: Wed, 7 Oct 2015 15:56:15 +0200 Subject: [PATCH 5/7] Translated using Weblate (Russian) Currently translated at 98.4% (1728 of 1756 strings) --- OsmAnd/res/values-ru/strings.xml | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index 4a30564b00..f1cf85c0d6 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -574,12 +574,12 @@ GPS секунд мин. - Выберите интервал позиционирования для сервиса + Выберите интервал пробуждения для фоновой службы Интервал пробуждения GPS - Выберите источник позиционирования для сервиса + Выберите источник позиционирования для фоновой службы Источник позиционирования Запускает OsmAnd в фоновом режиме для отслеживания местоположения при выключенном экране - Сервис навигации + Запуск приложения в фоновом режиме Сервис маршрутизации OsmAnd включён, если отключить позиционирование, он перестанет вести по маршруту. Настройки навигации Навигация @@ -2103,4 +2103,23 @@ Остановить моделирование Добавить новую Выберите категорию + Выберите единицы измерения скорости + Единицы измерения скорости + Морские мили + Километр в час + Миля в час + Метр в секунду + Минута на километр + Минута на милю + Морская миля в час (узел) + мин/м + мин/км + м/с + + Запись поездки + Навигация + Информация об избранной точке + Избегать пригородных поездов + Избегать пригородных поездов + Опасность From 92300ac90be4589195f4dd3a178b30188fa37e3c Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Wed, 7 Oct 2015 16:02:52 +0200 Subject: [PATCH 6/7] Translated using Weblate (Chinese (Taiwan)) Currently translated at 89.7% (1544 of 1720 strings) --- OsmAnd/res/values-zh-rTW/phrases.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml index f43dee6a25..bfa9cabd52 100644 --- a/OsmAnd/res/values-zh-rTW/phrases.xml +++ b/OsmAnd/res/values-zh-rTW/phrases.xml @@ -1665,4 +1665,12 @@ 洗手間進出：社區 洗手間進出：公共 + 尿布更換室 + + 尿布更換台 + 無尿布更換台 + 停車時限 + + 停車票卡 + 香菸 From a072950f80540ea4bf820aeef5ed8d86a7b2d4fe Mon Sep 17 00:00:00 2001 From: jan madsen Date: Wed, 7 Oct 2015 15:51:51 +0200 Subject: [PATCH 7/7] Translated using Weblate (Danish) Currently translated at 100.0% (1720 of 1720 strings) --- OsmAnd/res/values-da/phrases.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml index 6c2434a882..7e5edb6cdb 100644 --- a/OsmAnd/res/values-da/phrases.xml +++ b/OsmAnd/res/values-da/phrases.xml @@ -1829,7 +1829,7 @@ Sheltertype: hytte Sheltertype: bygning Sheltertype: vildtskjul - Sheltertype: heller + Sheltertype: klippehule Sheltertype: solafskærming Sheltertype: feltly Sheltertype: telt @@ -1868,10 +1868,10 @@ Arkitektur: moderne Arkitektur: stalinistisk nyklassicisme Arkitektur: eklecticisme - Arkitektur: nye objektivitet + Arkitektur: ny objektivitet Arkitektur: moderne Arkitektur: konstruktivisme - Arkitektur: umgebinde + Arkitektur: umgebindehaus Arkitektur: træskelet Arkitektur: jugendstil Arkitektur: nyklassicisme @@ -1879,7 +1879,7 @@ Arkitektur: brutalisme Arkitektur: klassicisme Arkitektur: gotik - Arkitektur: oldrussian + Arkitektur: gammelrussisk Arkitektur: barok Arkitektur: postkonstruktivisme Arkitektur: wilheminsk stil