New UI

Navigation settings > Voice prompts
0. New UI

    Rename the Voice guidance menu item to Language.
    Language dialog changes:
    • Add toggle between "TTS | Recorded"
    • Remove "Install more" item and download "Recorded" voice packages without leaving the dialog.
    • Delete the "Don't use" option, because currently, we have the main switch on the "Voice prompts" screen in Navigation settings.
    • Add option "Use system language", detect system language (we do similar in Wikipedia, where we get system languages and put them at the top of the list), and use it by default.

OsmAnd/res/layout/list_item_icon_and_download.xml

@@ -81,9 +81,11 @@
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/secondary_icon"
-                    android:layout_width="@dimen/list_item_height"
+                    android:layout_width="wrap_content"
-                    android:layout_height="@dimen/list_item_height"
+                    android:layout_height="wrap_content"
                     android:scaleType="center"
+                    android:layout_marginEnd="@dimen/title_padding"
+                    android:layout_marginRight="@dimen/title_padding"
                     android:layout_gravity="center_vertical"
                     android:visibility="gone"
                     tools:src="@drawable/ic_action_import"

OsmAnd/res/values/strings.xml

@@ -12,6 +12,11 @@
 
 -->
 
+    <string name="use_system_language">Use system language</string>
+    <string name="recorded_description">Recorded voice sounds better, but can pronounce only prerecorded phrases: turn instructions. Can\'t announce street names or POI names.</string>
+    <string name="tts_title">TTS</string>
+    <string name="tts_description">Text-to-speech (TTS) can pronounce all types of instructions: street names, turn instruction, POI names etc.</string>
+    <string name="language_description">Select preferred language and type of voice guidance.</string>
     <string name="output">Output</string>
     <string name="user_points">User points</string>
     <string name="announce_when_exceeded">Announce when exceeded</string>

OsmAnd/src/net/osmand/plus/download/DownloadResources.java

@@ -645,6 +645,15 @@ public class DownloadResources extends DownloadResourceGroup {
 		return res;
 	}
 
+	public static List<DownloadItem> findIndexItemsAt(OsmandApplication app, String groupTypeVoice) throws IOException {
+		DownloadIndexesThread downloadThread = app.getDownloadThread();
+		DownloadResources indexes = downloadThread.getIndexes();
+		DownloadResourceGroup groupVoice = indexes.getGroupById(groupTypeVoice);
+		List<DownloadResourceGroup> groupList = groupVoice.getGroups();
+		List<DownloadItem> items = groupList.get(0).getIndividualDownloadItems();
+		return new ArrayList<>(items);
+	}
+
 	public static List<IndexItem> findIndexItemsAt(OsmandApplication app,
 	                                               List<String> names,
 	                                               DownloadActivityType type,

OsmAnd/src/net/osmand/plus/settings/fragments/VoiceAnnouncesFragment.java

@@ -110,7 +110,6 @@ public class VoiceAnnouncesFragment extends BaseSettingsFragment implements OnPr
 
 		setupKeepInformingPref();
 		setupArrivalAnnouncementPref();
-		setupVoiceProviderPref();
 
 		setupAudioStreamGuidancePref();
 		setupInterruptMusicPref();
@@ -168,37 +167,6 @@ public class VoiceAnnouncesFragment extends BaseSettingsFragment implements OnPr
 		arrivalDistanceFactor.setEntryValues(arrivalValues);
 	}
 
-	private void setupVoiceProviderPref() {
-		Activity activity = getActivity();
-		if (activity == null) {
-			return;
-		}
-		Set<String> voiceFiles = app.getRoutingOptionsHelper().getVoiceFiles(activity);
-		String[] entries = new String[voiceFiles.size() + 2];
-		String[] entryValues = new String[voiceFiles.size() + 2];
-
-		int k = 0;
-		// entries[k++] = getString(R.string.shared_string_none);
-		entryValues[k] = OsmandSettings.VOICE_PROVIDER_NOT_USE;
-		entries[k++] = getString(R.string.shared_string_do_not_use);
-		for (String s : voiceFiles) {
-			entries[k] = (s.contains("tts") ? getString(R.string.ttsvoice) + " " : "") + FileNameTranslationHelper.getVoiceName(activity, s);
-			entryValues[k] = s;
-			k++;
-		}
-		entryValues[k] = MORE_VALUE;
-		entries[k] = getString(R.string.install_more);
-
-		Drawable disabled = getContentIcon(R.drawable.ic_action_volume_mute);
-		Drawable enabled = getActiveIcon(R.drawable.ic_action_volume_up);
-		Drawable icon = getPersistentPrefIcon(enabled, disabled);
-
-		ListPreferenceEx voiceProvider = findPreference(settings.VOICE_PROVIDER.getId());
-		voiceProvider.setEntries(entries);
-		voiceProvider.setEntryValues(entryValues);
-		voiceProvider.setIcon(icon);
-	}
-
 	private void setupAudioStreamGuidancePref() {
 		String[] streamTypes = new String[]{
 				getString(R.string.voice_stream_music),
@@ -238,17 +206,7 @@ public class VoiceAnnouncesFragment extends BaseSettingsFragment implements OnPr
 	@Override
 	protected void onBindPreferenceViewHolder(Preference preference, PreferenceViewHolder holder) {
 		super.onBindPreferenceViewHolder(preference, holder);
-		if (settings.VOICE_PROVIDER.getId().equals(preference.getKey()) && preference instanceof ListPreferenceEx) {
+		 if (settings.SPEED_CAMERAS_UNINSTALLED.getId().equals(preference.getKey())) {
-			TextView titleView = (TextView) holder.findViewById(android.R.id.title);
-			if (titleView != null) {
-				titleView.setTextColor(preference.isEnabled() ? getActiveTextColor() : getDisabledTextColor());
-			}
-			ImageView imageView = (ImageView) holder.findViewById(android.R.id.icon);
-			if (imageView != null) {
-				Object currentValue = ((ListPreferenceEx) preference).getValue();
-				imageView.setEnabled(preference.isEnabled() && !OsmandSettings.VOICE_PROVIDER_NOT_USE.equals(currentValue));
-			}
-		} else if (settings.SPEED_CAMERAS_UNINSTALLED.getId().equals(preference.getKey())) {
 			setupPrefRoundedBg(holder);
 		}
 	}
@@ -257,20 +215,6 @@ public class VoiceAnnouncesFragment extends BaseSettingsFragment implements OnPr
 	public boolean onPreferenceChange(Preference preference, Object newValue) {
 		String prefId = preference.getKey();
 		ApplicationMode selectedMode = getSelectedAppMode();
-
-		if (prefId.equals(settings.VOICE_PROVIDER.getId())) {
-			if (MORE_VALUE.equals(newValue)) {
-				// listPref.set(oldValue); // revert the change..
-				final Intent intent = new Intent(getContext(), DownloadActivity.class);
-				intent.putExtra(DownloadActivity.TAB_TO_OPEN, DownloadActivity.DOWNLOAD_TAB);
-				intent.putExtra(DownloadActivity.FILTER_CAT, DownloadActivityType.VOICE_FILE.getTag());
-				startActivity(intent);
-				return false;
-			} else if (newValue instanceof String) {
-				onConfirmPreferenceChange(settings.VOICE_PROVIDER.getId(), newValue, ApplyQueryType.SNACK_BAR);
-			}
-			return true;
-		}
 		if (prefId.equals(settings.SPEAK_SPEED_CAMERA.getId())) {
 			if (!settings.SPEAK_SPEED_CAMERA.getModeValue(selectedMode)) {
 				return onConfirmPreferenceChange(
@@ -290,15 +234,7 @@ public class VoiceAnnouncesFragment extends BaseSettingsFragment implements OnPr
 
 	@Override
 	public void onApplyPreferenceChange(String prefId, boolean applyToAllProfiles, Object newValue) {
-		if (prefId.equals(settings.VOICE_PROVIDER.getId()) && newValue instanceof String) {
+		 if (prefId.equals(settings.AUDIO_MANAGER_STREAM.getId())) {
-			if (VOICE_PROVIDER_NOT_USE.equals(newValue)) {
-				applyPreference(settings.VOICE_MUTE.getId(), applyToAllProfiles, true);
-				updateToolbar();
-			}
-			applyPreference(settings.VOICE_PROVIDER.getId(), applyToAllProfiles, newValue);
-			app.initVoiceCommandPlayer(getActivity(), getSelectedAppMode(),
-					false, null, true, false, applyToAllProfiles);
-		} else if (prefId.equals(settings.AUDIO_MANAGER_STREAM.getId())) {
 			// Sync DEFAULT value with CAR value, as we have other way to set it for now
 
 			if (getSelectedAppMode().equals(ApplicationMode.CAR) && newValue instanceof Integer) {
@@ -317,6 +253,8 @@ public class VoiceAnnouncesFragment extends BaseSettingsFragment implements OnPr
 		String prefId = preference.getKey();
 		if (settings.SPEED_CAMERAS_UNINSTALLED.getId().equals(prefId)) {
 			SpeedCamerasBottomSheet.showInstance(requireActivity().getSupportFragmentManager(), this);
+		} else if (settings.VOICE_PROVIDER.getId().equals(prefId)) {
+			VoiceLanguageBottomSheetFragment.showInstance(requireActivity().getSupportFragmentManager(), this);
 		}
 		return super.onPreferenceClick(preference);
 	}

OsmAnd/src/net/osmand/plus/settings/fragments/VoiceLanguageBottomSheetFragment.java

@@ -0,0 +1,341 @@
+package net.osmand.plus.settings.fragments;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+
+import net.osmand.AndroidUtils;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.UiUtilities;
+import net.osmand.plus.base.MenuBottomSheetDialogFragment;
+import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
+import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithCompoundButton;
+import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithDescription;
+import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerHalfItem;
+import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerSpaceItem;
+import net.osmand.plus.download.DownloadIndexesThread;
+import net.osmand.plus.download.DownloadItem;
+import net.osmand.plus.download.DownloadResources;
+import net.osmand.plus.download.DownloadValidationManager;
+import net.osmand.plus.download.IndexItem;
+import net.osmand.plus.helpers.AndroidUiHelper;
+import net.osmand.plus.routing.RoutingHelper;
+import net.osmand.plus.settings.backend.ApplicationMode;
+import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.track.TrackSelectSegmentBottomSheet;
+import net.osmand.plus.widgets.MultiStateToggleButton;
+import net.osmand.plus.widgets.MultiStateToggleButton.RadioItem;
+
+import java.io.IOException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+
+public class VoiceLanguageBottomSheetFragment extends MenuBottomSheetDialogFragment implements DownloadIndexesThread.DownloadEvents {
+	private static final String TAG = TrackSelectSegmentBottomSheet.class.getSimpleName();
+	private static final String VOICE_REC = "#other_group#voice_rec";
+	private static final String VOICE_TTS = "#other_group#voice_tts";
+	private static final int DEFAULT_LANGUAGE_POSITION = 6;
+	protected OsmandSettings settings;
+	private OsmandApplication app;
+	private Context context;
+	private Context themedCtx;
+	private InfoType selectedVoiceType = InfoType.TTS;
+	private boolean isTtsDescription;
+	private int padding;
+
+	public static void showInstance(@NonNull FragmentManager fm, Fragment targetFragment) {
+		VoiceLanguageBottomSheetFragment fragment = new VoiceLanguageBottomSheetFragment();
+		fragment.setTargetFragment(targetFragment, 0);
+		fragment.show(fm, TAG);
+	}
+
+	@Override
+	public void newDownloadIndexes() {
+		updateItems();
+	}
+
+	private void updateItems() {
+		Activity activity = getActivity();
+		themedCtx = UiUtilities.getThemedContext(activity, nightMode);
+		View mainView = getView();
+		if (activity != null && mainView != null) {
+			LinearLayout itemsContainer = (LinearLayout) mainView.findViewById(useScrollableItemsContainer()
+					? R.id.scrollable_items_container : R.id.non_scrollable_items_container);
+			if (itemsContainer != null) {
+				itemsContainer.removeAllViews();
+			}
+			items.clear();
+			createMenuItems(null);
+			for (BaseBottomSheetItem item : items) {
+				item.inflate(themedCtx, itemsContainer, nightMode);
+			}
+			setupHeightAndBackground(mainView);
+		}
+	}
+
+	@Override
+	public void downloadInProgress() {
+		final OsmandApplication app = getMyApplication();
+		if (app == null) {
+			return;
+		}
+		DownloadIndexesThread downloadThread = app.getDownloadThread();
+		IndexItem downloadIndexItem = downloadThread.getCurrentDownloadingItem();
+		if (downloadIndexItem != null) {
+			for (BaseBottomSheetItem item : items) {
+				if (item instanceof BottomSheetItemWithDescription) {
+					Object tag = item.getTag();
+					if (tag instanceof IndexItem) {
+						IndexItem indexItem = (IndexItem) tag;
+						BottomSheetItemWithDescription mapItem = (BottomSheetItemWithDescription) item;
+						ProgressBar progressBar = mapItem.getView().findViewById(R.id.ProgressBar);
+						if (downloadIndexItem.equals(indexItem)) {
+							progressBar.setProgress(downloadThread.getCurrentDownloadingItemProgress());
+							progressBar.setIndeterminate(false);
+						} else if (indexItem.isDownloaded()) {
+							AndroidUiHelper.updateVisibility(progressBar, false);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	@Override
+	public void downloadHasFinished() {
+		updateItems();
+	}
+
+	@Override
+	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+		super.onViewCreated(view, savedInstanceState);
+		createVoiceView();
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		app = requiredMyApplication();
+	}
+
+	@Override
+	public void createMenuItems(Bundle savedInstanceState) {
+		app = requiredMyApplication();
+		context = requireContext();
+		themedCtx = UiUtilities.getThemedContext(app, nightMode);
+		settings = app.getSettings();
+		padding = getResources().getDimensionPixelSize(R.dimen.content_padding_small);
+
+		LayoutInflater inflater = UiUtilities.getInflater(app, nightMode);
+		BaseBottomSheetItem titleItem = new BottomSheetItemWithDescription.Builder()
+				.setDescription(getString(R.string.language_description))
+				.setTitle(getString(R.string.shared_string_language))
+				.setLayoutId(R.layout.bottom_sheet_item_title_with_description)
+				.create();
+		items.add(titleItem);
+
+		items.add(new DividerSpaceItem(themedCtx, padding));
+
+		LinearLayout voiceTypeButtons = (LinearLayout) inflater.inflate(R.layout.custom_radio_buttons, null);
+		LinearLayout.MarginLayoutParams itemTimeOfDayParams = new LinearLayout.MarginLayoutParams(
+				LinearLayout.MarginLayoutParams.MATCH_PARENT, LinearLayout.MarginLayoutParams.WRAP_CONTENT);
+		AndroidUtils.setMargins(itemTimeOfDayParams, padding, 0, padding, 0);
+		voiceTypeButtons.setLayoutParams(itemTimeOfDayParams);
+		setupTypeRadioGroup(voiceTypeButtons);
+		items.add(new BaseBottomSheetItem.Builder()
+				.setCustomView(voiceTypeButtons)
+				.create()
+		);
+		createVoiceView();
+	}
+
+	private void setupTypeRadioGroup(LinearLayout buttonsContainer) {
+		RadioItem tts = createRadioButton(InfoType.TTS, R.string.tts_title);
+		RadioItem recorded = createRadioButton(InfoType.RECORDED, R.string.shared_string_recorded);
+
+		MultiStateToggleButton radioGroup = new MultiStateToggleButton(app, buttonsContainer, nightMode);
+		radioGroup.setItems(tts, recorded);
+
+		if (selectedVoiceType == InfoType.TTS) {
+			radioGroup.setSelectedItem(tts);
+		} else {
+			radioGroup.setSelectedItem(recorded);
+		}
+	}
+
+	private RadioItem createRadioButton(final InfoType voiceType, int titleId) {
+		String title = app.getString(titleId);
+		RadioItem item = new RadioItem(title);
+		item.setOnClickListener(new MultiStateToggleButton.OnRadioItemClickListener() {
+			@Override
+			public boolean onRadioItemClick(RadioItem radioItem, View view) {
+				selectedVoiceType = voiceType;
+				createVoiceView();
+				updateItems();
+				return true;
+			}
+		});
+		return item;
+	}
+
+	private void createVoiceView() {
+		List<DownloadItem> voiceItems;
+		if (selectedVoiceType == InfoType.TTS) {
+			voiceItems = getVoiceList(VOICE_TTS);
+			isTtsDescription = true;
+		} else {
+			voiceItems = getVoiceList(VOICE_REC);
+			isTtsDescription = false;
+		}
+		createSuggestedVoiceItems(voiceItems);
+	}
+
+	private void createSuggestedVoiceItems(List<DownloadItem> suggestedMaps) {
+		final OsmandApplication app = requiredMyApplication();
+		themedCtx = UiUtilities.getThemedContext(app, nightMode);
+		RoutingHelper routingHelper = app.getRoutingHelper();
+		final ApplicationMode applicationMode = routingHelper.getAppMode();
+
+		items.add(new DividerSpaceItem(themedCtx, padding));
+		BaseBottomSheetItem switchStartAndEndItem = new BottomSheetItemWithDescription.Builder()
+				.setDescription(getString(isTtsDescription ? R.string.tts_description : R.string.recorded_description))
+				.setLayoutId(R.layout.bottom_sheet_item_description_long)
+				.create();
+		items.add(switchStartAndEndItem);
+
+		items.add(new DividerHalfItem(themedCtx));
+
+		final DownloadIndexesThread downloadThread = app.getDownloadThread();
+
+		for (final DownloadItem indexItem : suggestedMaps) {
+			View view = UiUtilities.getInflater(themedCtx, nightMode).inflate(R.layout.list_item_icon_and_download, null);
+			AndroidUtils.setBackground(view, UiUtilities.getSelectableDrawable(themedCtx));
+			view.findViewById(R.id.divider).setVisibility(View.GONE);
+
+			String systemLanguage = Locale.getDefault().getLanguage();
+			DateFormat df = SimpleDateFormat.getDateInstance(DateFormat.DEFAULT);
+			boolean isDefault = indexItem.isDownloaded() && indexItem.getBasename().contains(systemLanguage);
+			String title = isDefault ? getString(R.string.use_system_language) : indexItem.getVisibleName(app, app.getRegions(), false);
+			String dateUpdate = ((IndexItem) indexItem).getDate(df);
+			String description = isDefault ? indexItem.getVisibleName(app, app.getRegions(), false) : indexItem.getSizeDescription(app) + " • " + dateUpdate;
+			int position = isDefault ? DEFAULT_LANGUAGE_POSITION : -1;
+
+			final ImageView secondaryIcon = view.findViewById(R.id.secondary_icon);
+			int color = ContextCompat.getColor(context, nightMode ? R.color.wikivoyage_active_dark : R.color.wikivoyage_active_light);
+			secondaryIcon.setColorFilter(color, android.graphics.PorterDuff.Mode.MULTIPLY);
+
+			final ProgressBar progressBar = view.findViewById(R.id.ProgressBar);
+			final TextView textDescription = view.findViewById(R.id.description);
+
+			AndroidUiHelper.updateVisibility(secondaryIcon, true);
+			AndroidUiHelper.updateVisibility(progressBar, downloadThread.isDownloading((IndexItem) indexItem));
+
+			if (indexItem == downloadThread.getCurrentDownloadingItem()) {
+				progressBar.setProgress(downloadThread.getCurrentDownloadingItemProgress());
+				progressBar.setIndeterminate(false);
+				secondaryIcon.setImageDrawable(getContentIcon(R.drawable.ic_action_remove_dark));
+			} else {
+				progressBar.setIndeterminate(downloadThread.isDownloading());
+				secondaryIcon.setImageDrawable(getContentIcon(R.drawable.ic_action_gsave_dark));
+			}
+
+			if (indexItem.isDownloaded()) {
+				final BottomSheetItemWithCompoundButton[] voiceDownloadedItem = new BottomSheetItemWithCompoundButton[1];
+				voiceDownloadedItem[0] = (BottomSheetItemWithCompoundButton) new BottomSheetItemWithCompoundButton.Builder()
+						.setChecked(settings.VOICE_PROVIDER.getModeValue(applicationMode).contains(indexItem.getBasename()))
+						.setDescription(description)
+						.setIconHidden(true)
+						.setTitle(title)
+						.setPosition(position)
+						.setLayoutId(R.layout.bottom_sheet_item_with_descr_and_radio_btn)
+						.setOnClickListener(new View.OnClickListener() {
+							@Override
+							public void onClick(View v) {
+								boolean checked = !voiceDownloadedItem[0].isChecked();
+								voiceDownloadedItem[0].setChecked(checked);
+								settings.VOICE_PROVIDER.setModeValue(applicationMode, indexItem.getBasename());
+								updateItems();
+							}
+						})
+						.create();
+				items.add(voiceDownloadedItem[0]);
+			} else {
+				BaseBottomSheetItem voiceItem = new BottomSheetItemWithDescription.Builder()
+						.setDescription(description)
+						.setTitle(title)
+						.setIconHidden(true)
+						.setOnClickListener(new View.OnClickListener() {
+							@Override
+							public void onClick(View v) {
+								if (downloadThread.isDownloading((IndexItem) indexItem)) {
+									downloadThread.cancelDownload(indexItem);
+									AndroidUiHelper.updateVisibility(progressBar, false);
+									AndroidUiHelper.updateVisibility(textDescription, true);
+									secondaryIcon.setImageDrawable(getContentIcon(R.drawable.ic_action_gsave_dark));
+								} else {
+									AndroidUiHelper.updateVisibility(progressBar, true);
+									AndroidUiHelper.updateVisibility(textDescription, false);
+									progressBar.setIndeterminate(downloadThread.isDownloading());
+									secondaryIcon.setImageDrawable(getContentIcon(R.drawable.ic_action_remove_dark));
+									new DownloadValidationManager(app).startDownload(getActivity(), (IndexItem) indexItem);
+								}
+							}
+						})
+						.setTag(indexItem)
+						.setCustomView(view)
+						.create();
+				items.add(voiceItem);
+			}
+		}
+	}
+
+	public List<DownloadItem> getVoiceList(String type) {
+		List<DownloadItem> suggestedVoice = new ArrayList<>();
+
+		DownloadIndexesThread downloadThread = app.getDownloadThread();
+		if (!downloadThread.getIndexes().isDownloadedFromInternet && settings.isInternetConnectionAvailable()) {
+			downloadThread.runReloadIndexFiles();
+		}
+
+		boolean downloadIndexes = settings.isInternetConnectionAvailable()
+				&& !downloadThread.getIndexes().isDownloadedFromInternet
+				&& !downloadThread.getIndexes().downloadFromInternetFailed;
+
+		if (!downloadIndexes) {
+			suggestedVoice.addAll(getVoiceItems(type));
+		}
+
+		return suggestedVoice;
+	}
+
+	private List<DownloadItem> getVoiceItems(String type) {
+		try {
+			return DownloadResources.findIndexItemsAt(app, type);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return Collections.emptyList();
+	}
+
+	private enum InfoType {
+		TTS,
+		RECORDED
+	}
+}