organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

WIP: [android] Implement Light, Dark, and System modes on android(Auto) #8309

Draft
SRSAS wants to merge 3 commits from SRSAS/systemUIMode into master
pull from: SRSAS/systemUIMode
merge into: organicmaps:master
Conversation 0 Commits 3 Files changed 58 +616 -242
58 changed files with 616 additions and 242 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
3party/harfbuzz/harfbuzz

@ -1 +1 @@
Subproject commit 49c8493f5ce67bc66610d5e4494ce3231c8229cf
Subproject commit bc90b29b37fe3809f9e48aa7be08fbf2208e481a

28
android/app/src/main/AndroidManifest.xml
View file

@ -331,10 +331,13 @@
</intent-filter>
</activity>
<activity
android:name="app.organicmaps.base.BaseMwmFragmentActivity"
android:configChanges="uiMode" />
<activity
android:name="app.organicmaps.DownloadResourcesLegacyActivity"
android:configChanges="orientation|screenLayout|screenSize"/>
android:configChanges="uiMode|orientation|screenLayout|screenSize" />
<activity-alias
android:name="app.organicmaps.DownloadResourcesActivity"
@ -355,21 +358,21 @@
<activity
android:name="app.organicmaps.downloader.DownloaderActivity"
android:configChanges="orientation|screenLayout|screenSize"
android:configChanges="uiMode|orientation|screenLayout|screenSize"
android:label="@string/download_maps"
android:parentActivityName="app.organicmaps.MwmActivity"
android:windowSoftInputMode="adjustResize" />
<activity
android:name="app.organicmaps.search.SearchActivity"
android:configChanges="orientation|screenLayout|screenSize"
android:configChanges="uiMode|orientation|screenLayout|screenSize"
android:label="@string/search_map"
android:parentActivityName="app.organicmaps.MwmActivity"
android:windowSoftInputMode="stateVisible|adjustResize" />
<activity
android:name="app.organicmaps.settings.SettingsActivity"
android:configChanges="orientation|screenLayout|screenSize"
android:configChanges="uiMode|orientation|screenLayout|screenSize"
android:label="@string/settings"
android:parentActivityName="app.organicmaps.MwmActivity" />
@ -377,6 +380,7 @@
android:name="app.organicmaps.help.HelpActivity"
android:label="@string/about_menu_title"
android:parentActivityName="app.organicmaps.MwmActivity"
android:configChanges="uiMode"
android:exported="false">
<intent-filter>
<action android:name="app.organicmaps.help.HelpActivity" />
@ -386,54 +390,62 @@
<activity
android:name="app.organicmaps.bookmarks.BookmarkCategoriesActivity"
android:configChanges="orientation|screenLayout|screenSize"
android:configChanges="uiMode|orientation|screenLayout|screenSize"
android:label="@string/bookmarks_and_tracks"
android:parentActivityName="app.organicmaps.MwmActivity"
android:windowSoftInputMode="adjustResize" />
<activity
android:name="app.organicmaps.bookmarks.BookmarkListActivity"
android:configChanges="orientation|screenLayout|screenSize"
android:configChanges="uiMode|orientation|screenLayout|screenSize"
android:label="@string/bookmarks"
android:parentActivityName="app.organicmaps.bookmarks.BookmarkCategoriesActivity"
android:windowSoftInputMode="adjustResize" />
<activity
android:name="app.organicmaps.editor.EditorActivity"
android:configChanges="orientation|screenLayout|screenSize"
android:configChanges="uiMode|orientation|screenLayout|screenSize"
android:label="@string/edit_place"
android:parentActivityName="app.organicmaps.MwmActivity"
android:windowSoftInputMode="adjustResize" />
<activity
android:name="app.organicmaps.editor.ProfileActivity"
android:configChanges="uiMode"
android:parentActivityName="app.organicmaps.settings.SettingsActivity" />
<activity
android:name="app.organicmaps.editor.FeatureCategoryActivity"
android:parentActivityName="app.organicmaps.MwmActivity"
android:configChanges="uiMode"
android:windowSoftInputMode="adjustResize" />
<activity
android:name="app.organicmaps.editor.ReportActivity"
android:configChanges="uiMode"
android:parentActivityName="app.organicmaps.MwmActivity" />
<activity
android:name="app.organicmaps.editor.OsmLoginActivity"
android:configChanges="uiMode"
android:parentActivityName="app.organicmaps.MwmActivity" />
<activity
android:name="app.organicmaps.bookmarks.BookmarkCategorySettingsActivity"
android:label="@string/edit"
android:configChanges="uiMode"
android:windowSoftInputMode="stateVisible"/>
<activity
android:name="app.organicmaps.widget.placepage.PlaceDescriptionActivity"
android:configChanges="uiMode"
android:label="@string/place_description_title"/>
<activity
android:name="app.organicmaps.settings.DrivingOptionsActivity"
android:configChanges="uiMode"
android:label="@string/driving_options_title"/>
<activity
android:name="app.organicmaps.MapPlaceholderActivity"/>
android:name="app.organicmaps.MapPlaceholderActivity"
android:configChanges="uiMode" />
<service
android:name="app.organicmaps.car.CarAppService"
android:foregroundServiceType="location"

16
android/app/src/main/java/app/organicmaps/SplashActivity.java
View file

@ -1,11 +1,9 @@
package app.organicmaps;
import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
import static android.Manifest.permission.ACCESS_FINE_LOCATION;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
import android.os.Bundle;
import androidx.activity.result.ActivityResultLauncher;
@ -15,11 +13,11 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.appcompat.app.AppCompatActivity;
import app.organicmaps.display.DisplayManager;
import app.organicmaps.location.LocationHelper;
import app.organicmaps.util.Config;
import app.organicmaps.util.LocationUtils;
import app.organicmaps.util.ThemeSwitcher;
import app.organicmaps.util.ThemeUtils;
import app.organicmaps.util.concurrency.UiThread;
import app.organicmaps.util.log.Logger;
@ -28,6 +26,9 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import java.io.IOException;
import java.util.Objects;
import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
import static android.Manifest.permission.ACCESS_FINE_LOCATION;
public class SplashActivity extends AppCompatActivity
{
private static final String TAG = SplashActivity.class.getSimpleName();
@ -103,6 +104,13 @@ public class SplashActivity extends AppCompatActivity
mPermissionRequest = null;
biodranik commented 2024-05-27 20:53:08 +00:00 (Migrated from github.com)
Review
Copy link
  public void onConfigurationChanged(@NonNull Configuration newConfig)
  {
```suggestion public void onConfigurationChanged(@NonNull Configuration newConfig) { ```
}
@Override
public void onConfigurationChanged(@NonNull Configuration newConfig)
{
super.onConfigurationChanged(newConfig);
ThemeSwitcher.INSTANCE.restart(false);
UiThread.runLater(this::recreate);
}
private void showFatalErrorDialog(@StringRes int titleId, @StringRes int messageId)
{
mCanceled = true;

11
android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
View file

@ -3,6 +3,7 @@ package app.organicmaps.base;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
import android.media.AudioManager;
import android.os.Bundle;
import android.view.MenuItem;
@ -16,12 +17,12 @@ import androidx.appcompat.widget.Toolbar;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentFactory;
import androidx.fragment.app.FragmentManager;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.SplashActivity;
import app.organicmaps.util.Config;
import app.organicmaps.util.RtlUtils;
import app.organicmaps.util.ThemeSwitcher;
import app.organicmaps.util.ThemeUtils;
import app.organicmaps.util.concurrency.UiThread;
import app.organicmaps.util.log.Logger;
@ -128,6 +129,14 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
}
biodranik commented 2024-05-27 20:53:28 +00:00 (Migrated from github.com)
Review
Copy link
  public void onConfigurationChanged(@NonNull Configuration newConfig)
  {
```suggestion public void onConfigurationChanged(@NonNull Configuration newConfig) { ```
}
@Override
public void onConfigurationChanged(@NonNull Configuration newConfig)
{
super.onConfigurationChanged(newConfig);
ThemeSwitcher.INSTANCE.restart(false);
UiThread.runLater(this::recreate);
}
@Override
public boolean onOptionsItemSelected(MenuItem item)
{

3
android/app/src/main/java/app/organicmaps/car/screens/settings/ThemeScreen.java
View file

@ -11,7 +11,6 @@ import androidx.car.app.model.Row;
import androidx.car.app.model.Template;
import androidx.car.app.navigation.model.MapWithContentTemplate;
import androidx.core.graphics.drawable.IconCompat;
import app.organicmaps.R;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.base.BaseMapScreen;
@ -56,7 +55,7 @@ public class ThemeScreen extends BaseMapScreen
{
final ItemList.Builder builder = new ItemList.Builder();
final ThemeUtils.ThemeMode currentThemeMode = ThemeUtils.getThemeMode(getCarContext());
builder.addItem(createRadioButton(ThemeUtils.ThemeMode.AUTO, currentThemeMode));
builder.addItem(createRadioButton(ThemeUtils.ThemeMode.FOLLOW_SYSTEM, currentThemeMode));
builder.addItem(createRadioButton(ThemeUtils.ThemeMode.NIGHT, currentThemeMode));
builder.addItem(createRadioButton(ThemeUtils.ThemeMode.LIGHT, currentThemeMode));
return new ListTemplate.Builder().setHeader(createHeader()).setSingleList(builder.build()).build();

19
android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java
View file

@ -8,7 +8,6 @@ import androidx.annotation.NonNull;
import androidx.annotation.StringRes;
import androidx.annotation.UiThread;
import androidx.car.app.CarContext;
import app.organicmaps.Framework;
import app.organicmaps.R;
import app.organicmaps.routing.RoutingController;
@ -17,9 +16,9 @@ public final class ThemeUtils
{
public enum ThemeMode
{
AUTO(R.string.auto, R.string.theme_auto),
LIGHT(R.string.off, R.string.theme_default),
NIGHT(R.string.on, R.string.theme_night);
LIGHT(R.string.light, R.string.theme_default),
NIGHT(R.string.dark, R.string.theme_night),
FOLLOW_SYSTEM(R.string.system, R.string.theme_follow_system);
ThemeMode(@StringRes int titleId, @StringRes int prefsKeyId)
{
@ -58,7 +57,7 @@ public final class ThemeUtils
@UiThread
public static void update(@NonNull CarContext context, @NonNull ThemeMode oldThemeMode)
{
final ThemeMode newThemeMode = oldThemeMode == ThemeMode.AUTO ? (context.isDarkMode() ? ThemeMode.NIGHT : ThemeMode.LIGHT) : oldThemeMode;
final ThemeMode newThemeMode = oldThemeMode == ThemeMode.FOLLOW_SYSTEM ? (context.isDarkMode() ? ThemeMode.NIGHT : ThemeMode.LIGHT) : oldThemeMode;
@Framework.MapStyle
int newMapStyle;
@ -74,7 +73,7 @@ public final class ThemeUtils
public static boolean isNightMode(@NonNull CarContext context)
{
final ThemeMode themeMode = getThemeMode(context);
return themeMode == ThemeMode.NIGHT || (themeMode == ThemeMode.AUTO && context.isDarkMode());
return themeMode == ThemeMode.NIGHT || (themeMode == ThemeMode.FOLLOW_SYSTEM && context.isDarkMode());
}
@SuppressLint("ApplySharedPref")
@ -88,13 +87,13 @@ public final class ThemeUtils
@NonNull
biodranik commented 2024-05-27 20:54:02 +00:00 (Migrated from github.com)
Review
Copy link

One-liners don't need braces.

    if (themeMode.equals(followSystemTheme))
      return ThemeMode.FOLLOW_SYSTEM;
One-liners don't need braces. ```suggestion if (themeMode.equals(followSystemTheme)) return ThemeMode.FOLLOW_SYSTEM; ```
public static ThemeMode getThemeMode(@NonNull CarContext context)
{
final String autoTheme = context.getString(R.string.theme_auto);
final String followSystemTheme = context.getString(R.string.theme_follow_system);
final String lightTheme = context.getString(R.string.theme_default);
final String nightTheme = context.getString(R.string.theme_night);
final String themeMode = getSharedPreferences(context).getString(THEME_KEY, autoTheme);
final String themeMode = getSharedPreferences(context).getString(THEME_KEY, followSystemTheme);
if (themeMode.equals(autoTheme))
return ThemeMode.AUTO;
if (themeMode.equals(followSystemTheme))
return ThemeMode.FOLLOW_SYSTEM;
else if (themeMode.equals(lightTheme))
return ThemeMode.LIGHT;
else if (themeMode.equals(nightTheme))

1
android/app/src/main/java/app/organicmaps/help/HelpActivity.java
View file

@ -1,7 +1,6 @@
package app.organicmaps.help;
import androidx.fragment.app.Fragment;
import app.organicmaps.base.BaseToolbarActivity;
public class HelpActivity extends BaseToolbarActivity

6
android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
View file

@ -22,6 +22,7 @@ import app.organicmaps.help.HelpActivity;
import app.organicmaps.location.LocationHelper;
import app.organicmaps.location.LocationProviderFactory;
import app.organicmaps.routing.RoutingOptions;
import app.organicmaps.search.SearchRecents;
import app.organicmaps.util.Config;
import app.organicmaps.util.NetworkPolicy;
import app.organicmaps.util.PowerManagment;
@ -29,7 +30,6 @@ import app.organicmaps.util.SharedPropertiesUtils;
import app.organicmaps.util.ThemeSwitcher;
import app.organicmaps.util.Utils;
import app.organicmaps.util.log.LogsManager;
import app.organicmaps.search.SearchRecents;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
public class SettingsPrefsFragment extends BaseXmlSettingsFragment
@ -455,7 +455,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
{
DEFAULT(R.string.theme_default),
NIGHT(R.string.theme_night),
AUTO(R.string.theme_auto);
FOLLOW_SYSTEM(R.string.theme_follow_system);
private final int mModeStringId;
@ -472,7 +472,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
if (context.getResources().getString(each.mModeStringId).equals(src))
return each;
}
return AUTO;
return FOLLOW_SYSTEM;
}
}

9
android/app/src/main/java/app/organicmaps/util/Config.java
View file

@ -6,7 +6,6 @@ import android.os.Build;
import androidx.annotation.NonNull;
import androidx.preference.PreferenceManager;
import app.organicmaps.BuildConfig;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
@ -255,12 +254,12 @@ public final class Config
@NonNull
public static String getUiThemeSettings(@NonNull Context context)
{
String autoTheme = MwmApplication.from(context).getString(R.string.theme_auto);
String res = getString(KEY_MISC_UI_THEME_SETTINGS, autoTheme);
if (ThemeUtils.isValidTheme(context, res) || ThemeUtils.isAutoTheme(context, res))
String followSystemTheme = MwmApplication.from(context).getString(R.string.theme_follow_system);
String res = getString(KEY_MISC_UI_THEME_SETTINGS, followSystemTheme);
if (ThemeUtils.isValidTheme(context, res) || ThemeUtils.isFollowSystemTheme(context, res))
return res;
return autoTheme;
return followSystemTheme;
}
public static boolean setUiThemeSettings(@NonNull Context context, String theme)

83
android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java
View file

@ -1,21 +1,15 @@
package app.organicmaps.util;
import android.app.Activity;
import android.app.UiModeManager;
import android.content.Context;
import android.location.Location;
import android.os.Build;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatDelegate;
import app.organicmaps.Framework;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.display.DisplayManager;
import app.organicmaps.downloader.DownloaderStatusIcon;
import app.organicmaps.location.LocationHelper;
import app.organicmaps.routing.RoutingController;
import app.organicmaps.util.concurrency.UiThread;
public enum ThemeSwitcher
{
@ -24,38 +18,6 @@ public enum ThemeSwitcher
private static final long CHECK_INTERVAL_MS = 30 * 60 * 1000;
private static boolean mRendererActive = false;
private final Runnable mAutoThemeChecker = new Runnable()
{
@Override
public void run()
{
String nightTheme = MwmApplication.from(mContext).getString(R.string.theme_night);
String defaultTheme = MwmApplication.from(mContext).getString(R.string.theme_default);
String theme = defaultTheme;
if (RoutingController.get().isNavigating())
{
Location last = LocationHelper.from(mContext).getSavedLocation();
if (last == null)
{
theme = Config.getCurrentUiTheme(mContext);
}
else
{
boolean day = Framework.nativeIsDayTime(System.currentTimeMillis() / 1000,
last.getLatitude(), last.getLongitude());
theme = (day ? defaultTheme : nightTheme);
}
}
setThemeAndMapStyle(theme);
UiThread.cancelDelayedTasks(mAutoThemeChecker);
if (ThemeUtils.isAutoTheme(mContext))
UiThread.runLater(mAutoThemeChecker, CHECK_INTERVAL_MS);
}
};
@SuppressWarnings("NotNullFieldNotInitialized")
@NonNull
private Context mContext;
@ -78,33 +40,30 @@ public enum ThemeSwitcher
public void restart(boolean isRendererActive)
{
mRendererActive = isRendererActive;
String theme = Config.getUiThemeSettings(mContext);
if (ThemeUtils.isAutoTheme(mContext, theme))
{
mAutoThemeChecker.run();
return;
}
final String theme = Config.getUiThemeSettings(mContext);
setAndroidTheme(theme);
UiThread.cancelDelayedTasks(mAutoThemeChecker);
setThemeAndMapStyle(theme);
final String themeToApply = ThemeUtils.getAndroidTheme(mContext);
biodranik commented 2024-05-27 20:54:30 +00:00 (Migrated from github.com)
Review
Copy link

?

?
biodranik commented 2024-05-27 20:54:35 +00:00 (Migrated from github.com)
Review
Copy link

?

?
biodranik commented 2024-05-27 20:55:12 +00:00 (Migrated from github.com)
Review
Copy link

Marking constant variables as final often helps the reader.

Marking constant variables as final often helps the reader.
biodranik commented 2024-05-27 20:55:59 +00:00 (Migrated from github.com)
Review
Copy link

Please follow existing code style.

  private void setAndroidTheme(@NonNull String theme)
  {
    if (ThemeUtils.isFollowSystemTheme(mContext, theme))
      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
    else if (ThemeUtils.isNightTheme(mContext, theme))
      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
    else if (ThemeUtils.isDefaultTheme(mContext, theme))
      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
Please follow existing code style. ```suggestion private void setAndroidTheme(@NonNull String theme) { if (ThemeUtils.isFollowSystemTheme(mContext, theme)) AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM); else if (ThemeUtils.isNightTheme(mContext, theme)) AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES); else if (ThemeUtils.isDefaultTheme(mContext, theme)) AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO); ```
biodranik commented 2024-05-27 20:56:10 +00:00 (Migrated from github.com)
Review
Copy link
  private int getStyle(@NonNull String theme)
  {
```suggestion private int getStyle(@NonNull String theme) { ```
biodranik commented 2024-05-27 20:56:18 +00:00 (Migrated from github.com)
Review
Copy link
    if (ThemeUtils.isNightTheme(mContext, theme))
    {
```suggestion if (ThemeUtils.isNightTheme(mContext, theme)) { ```
biodranik commented 2024-05-27 20:56:31 +00:00 (Migrated from github.com)
Review
Copy link
    }
    else
    {
```suggestion } else { ```
rtsisyk commented 2024-06-09 12:34:07 +00:00
Review
Copy link

We really need to add a formatter. A lot of time and effort is spent on these nit comments.

We really need to add a formatter. A lot of time and effort is spent on these nit comments.
final int style = getStyle(themeToApply);
setThemeAndMapStyle(themeToApply, style);
}
private void setThemeAndMapStyle(@NonNull String theme)
private void setAndroidTheme(@NonNull String theme)
{
UiModeManager uiModeManager = (UiModeManager) mContext.getSystemService(Context.UI_MODE_SERVICE);
String oldTheme = Config.getCurrentUiTheme(mContext);
@Framework.MapStyle
int oldStyle = Framework.nativeGetMapStyle();
if (ThemeUtils.isFollowSystemTheme(mContext, theme))
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
else if (ThemeUtils.isNightTheme(mContext, theme))
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
else if (ThemeUtils.isDefaultTheme(mContext, theme))
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
}
private int getStyle(@NonNull String theme)
{
@Framework.MapStyle
int style;
if (ThemeUtils.isNightTheme(mContext, theme))
{
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
uiModeManager.setApplicationNightMode(UiModeManager.MODE_NIGHT_YES);
else
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
if (RoutingController.get().isVehicleNavigation())
style = Framework.MAP_STYLE_VEHICLE_DARK;
else if (Framework.nativeIsOutdoorsLayerEnabled())
@ -114,11 +73,6 @@ public enum ThemeSwitcher
}
else
{
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
uiModeManager.setApplicationNightMode(UiModeManager.MODE_NIGHT_NO);
else
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
if (RoutingController.get().isVehicleNavigation())
style = Framework.MAP_STYLE_VEHICLE_CLEAR;
else if (Framework.nativeIsOutdoorsLayerEnabled())
@ -127,6 +81,13 @@ public enum ThemeSwitcher
style = Framework.MAP_STYLE_CLEAR;
}
return style;
}
private void setThemeAndMapStyle(@NonNull String theme, @Framework.MapStyle int style)
{
String oldTheme = Config.getCurrentUiTheme(mContext);
if (!theme.equals(oldTheme))
{
Config.setCurrentUiTheme(mContext, theme);

32
android/app/src/main/java/app/organicmaps/util/ThemeUtils.java
View file

@ -1,6 +1,7 @@
package app.organicmaps.util;
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.TypedArray;
import android.util.TypedValue;
@ -8,7 +9,7 @@ import androidx.annotation.AttrRes;
import androidx.annotation.ColorInt;
import androidx.annotation.NonNull;
import androidx.annotation.StyleRes;
import androidx.appcompat.app.AppCompatDelegate;
import app.organicmaps.R;
public final class ThemeUtils
@ -45,6 +46,25 @@ public final class ThemeUtils
return VALUE_BUFFER.resourceId;
biodranik commented 2024-05-27 20:56:49 +00:00 (Migrated from github.com)
Review
Copy link

Please fix braces in other places.

Please fix braces in other places.
}
public static String getAndroidTheme(@NonNull Context context)
{
String nightTheme = context.getString(R.string.theme_night);
String defaultTheme = context.getString(R.string.theme_default);
if (AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES)
return nightTheme;
if (AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_NO)
return defaultTheme;
int nightModeFlags = context.getResources()
.getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
if (nightModeFlags == Configuration.UI_MODE_NIGHT_YES)
return nightTheme;
else
return defaultTheme;
}
public static boolean isDefaultTheme(@NonNull Context context)
{
return isDefaultTheme(context, Config.getCurrentUiTheme(context));
@ -67,15 +87,15 @@ public final class ThemeUtils
return nightTheme.equals(theme);
}
public static boolean isAutoTheme(@NonNull Context context)
public static boolean isFollowSystemTheme(@NonNull Context context)
{
return isAutoTheme(context, Config.getCurrentUiTheme(context));
return isFollowSystemTheme(context, Config.getCurrentUiTheme(context));
}
public static boolean isAutoTheme(@NonNull Context context, String theme)
public static boolean isFollowSystemTheme(@NonNull Context context, String theme)
{
String autoTheme = context.getString(R.string.theme_auto);
return autoTheme.equals(theme);
String followSystemTheme = context.getString(R.string.theme_follow_system);
return followSystemTheme.equals(theme);
}
public static boolean isValidTheme(@NonNull Context context, String theme)

10
android/app/src/main/res/values-ar/strings.xml
View file

@ -220,14 +220,20 @@
<string name="prefs_group_route">الملاحة</string>
<string name="pref_zoom_title">أزرار التكبير والتصغير</string>
<string name="pref_zoom_summary">عرض على الشاشة</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">الوضع الليلي</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">المظهر</string>
<!-- Generic «Off» string -->
<string name="off">تعطيل</string>
<!-- Generic «On» string -->
<string name="on">تشغيل</string>
<!-- Generic «Auto» string -->
<string name="auto">تلقائي</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">فاتح</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">داكن</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">النظام</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">العرض المنظوري</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-az/strings.xml
View file

@ -219,14 +219,20 @@
<string name="prefs_group_route">Naviqasiya</string>
<string name="pref_zoom_title">Böyütmə düymələri</string>
<string name="pref_zoom_summary">Xəritədə göstər</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Gecə rejimi</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Görünüş</string>
<!-- Generic «Off» string -->
<string name="off">Bağlı</string>
<!-- Generic «On» string -->
<string name="on">Açıq</string>
<!-- Generic «Auto» string -->
<string name="auto">Avtomatik</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Parlaq</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Tünd</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">Sistem</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Perspektiv baxış</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-be/strings.xml
View file

@ -218,14 +218,20 @@
<string name="prefs_group_route">Навігацыя</string>
<string name="pref_zoom_title">Кнопкі маштабавання</string>
<string name="pref_zoom_summary">Паказаць на мапе</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Начны рэжым</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Выгляд</string>
<!-- Generic «Off» string -->
<string name="off">Выключаны</string>
<!-- Generic «On» string -->
<string name="on">Уключаны</string>
<!-- Generic «Auto» string -->
<string name="auto">Аўтаматычна</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Светлы</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Цемны</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">сістэма</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Перспектыўны выгляд</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-bg/strings.xml
View file

@ -207,14 +207,20 @@
<string name="prefs_group_route">Навигация</string>
<string name="pref_zoom_title">Мащабни бутони</string>
<string name="pref_zoom_summary">Показване на картата</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Нощен режим</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Изглед</string>
<!-- Generic «Off» string -->
<string name="off">Изключен</string>
<!-- Generic «On» string -->
<string name="on">Включен</string>
<!-- Generic «Auto» string -->
<string name="auto">Автоматично</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Светъл</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Тъмен</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">Система</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Перспективен изглед</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-ca/strings.xml
View file

@ -211,14 +211,20 @@
<string name="prefs_group_route">Navegació</string>
<string name="pref_zoom_title">Botons de zoom</string>
<string name="pref_zoom_summary">Mostra\'ls al mapa</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Mode nocturn</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Aspecte</string>
<!-- Generic «Off» string -->
<string name="off">Desactivat</string>
<!-- Generic «On» string -->
<string name="on">Activat</string>
<!-- Generic «Auto» string -->
<string name="auto">Automàtic</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Clar</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Fosc</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">Sistema</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Vista en perspectiva</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-cs/strings.xml
View file

@ -204,14 +204,20 @@
<string name="prefs_group_route">Navigace</string>
<string name="pref_zoom_title">Tlačítka přiblížení/oddálení</string>
<string name="pref_zoom_summary">Zobrazit na obrazovce</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Noční režim</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Vzhled</string>
<!-- Generic «Off» string -->
<string name="off">Vypnuto</string>
<!-- Generic «On» string -->
<string name="on">Zapnuto</string>
<!-- Generic «Auto» string -->
<string name="auto">Automaticky</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Světlý</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Tmavý</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">Systém</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Zobrazení perspektivy</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-da/strings.xml
View file

@ -200,14 +200,20 @@
<string name="prefs_group_route">Navigation</string>
<string name="pref_zoom_title">Zoom knapper</string>
<string name="pref_zoom_summary">Vis på skærmen</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Nattilstand</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Udseende</string>
<!-- Generic «Off» string -->
<string name="off">Fra</string>
<!-- Generic «On» string -->
<string name="on">Til</string>
<!-- Generic «Auto» string -->
<string name="auto">Auto</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Lys</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Mørk</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">System</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Perspektivvisning</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-de/strings.xml
View file

@ -217,14 +217,20 @@
<string name="prefs_group_route">Navigation</string>
<string name="pref_zoom_title">Zoom-Tasten</string>
<string name="pref_zoom_summary">Auf der Karte anzeigen</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Nachtmodus</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Erscheinungsbild</string>
<!-- Generic «Off» string -->
<string name="off">Aus</string>
<!-- Generic «On» string -->
<string name="on">An</string>
<!-- Generic «Auto» string -->
<string name="auto">Auto</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Hell</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Dunkel</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">System</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Perspektivische Ansicht</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-el/strings.xml
View file

@ -218,14 +218,20 @@
<string name="prefs_group_route">Πλοήγηση</string>
<string name="pref_zoom_title">Πλήκτρα μεγέθυνσης</string>
<string name="pref_zoom_summary">Εμφάνιση στο χάρτη</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Νυχτερινή λειτουργία</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Εμφάνιση</string>
<!-- Generic «Off» string -->
<string name="off">Απενεργ.</string>
<!-- Generic «On» string -->
<string name="on">Ενεργ.</string>
<!-- Generic «Auto» string -->
<string name="auto">Αυτόματα</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Ανοιχτόχρωμη</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Σκουρόχρωμη</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">Σύστημα</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Οπτική γωνία</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-es/strings.xml
View file

@ -217,14 +217,20 @@
<string name="prefs_group_route">Navegación</string>
<string name="pref_zoom_title">Botones de zoom</string>
<string name="pref_zoom_summary">Visualización en la pantalla</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Modo nocturno</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Aspecto</string>
<!-- Generic «Off» string -->
<string name="off">Desactivado</string>
<!-- Generic «On» string -->
<string name="on">Activado</string>
<!-- Generic «Auto» string -->
<string name="auto">Automático</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Claro</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Oscuro</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">Sistema</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Vista en perspectiva</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-et/strings.xml
View file

@ -211,14 +211,20 @@
<string name="prefs_group_route">Navigeerimine</string>
<string name="pref_zoom_title">Zoomi nupud</string>
<string name="pref_zoom_summary">Kuva kaardil</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Öörežiim</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Välimus</string>
<!-- Generic «Off» string -->
<string name="off">Väljas</string>
<!-- Generic «On» string -->
<string name="on">Sees</string>
<!-- Generic «Auto» string -->
<string name="auto">Automaatne</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Valgus</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Tume</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">Süsteem</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Perspektiivi vaade</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-eu/strings.xml
View file

@ -217,14 +217,20 @@
<string name="prefs_group_route">Nabigazioa</string>
<string name="pref_zoom_title">Zoom botoiak</string>
<string name="pref_zoom_summary">Erakutsi mapan</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Gaueko modua</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Itxura</string>
<!-- Generic «Off» string -->
<string name="off">Desgaituta</string>
<!-- Generic «On» string -->
<string name="on">Aktibatuta</string>
<!-- Generic «Auto» string -->
<string name="auto">Automatikoa</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Argi</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Iluna</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">Sistema</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Perspektiba ikuspegia</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-fa/strings.xml
View file

@ -193,14 +193,20 @@
<string name="prefs_group_route">مسیریابی</string>
<string name="pref_zoom_title">دکمه‌های بزرگنمایی</string>
<string name="pref_zoom_summary">نمایش بر روی نقشه</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">حالت شب</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">ظاهری</string>
<!-- Generic «Off» string -->
<string name="off">خاموش</string>
<!-- Generic «On» string -->
<string name="on">روشن</string>
<!-- Generic «Auto» string -->
<string name="auto">خودکار</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">نور</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">تاریک</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">سیستم</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">نمای چشم انداز</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-fi/strings.xml
View file

@ -219,14 +219,20 @@
<string name="prefs_group_route">Navigointi</string>
<string name="pref_zoom_title">Zoomauspainikkeet</string>
<string name="pref_zoom_summary">Näytä kartalla</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Yötila</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Ulkoasu</string>
<!-- Generic «Off» string -->
<string name="off">Pois päältä</string>
<!-- Generic «On» string -->
<string name="on">Päällä</string>
<!-- Generic «Auto» string -->
<string name="auto">Automaattinen</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Vaalea</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Tumma</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">Järjestelmä</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Perspektiivinäkymä</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-fr/strings.xml
View file

@ -219,14 +219,20 @@
<string name="prefs_group_route">Navigation</string>
<string name="pref_zoom_title">Boutons de zoom</string>
<string name="pref_zoom_summary">Afficher à l\'écran</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Mode nuit</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Apparence</string>
<!-- Generic «Off» string -->
<string name="off">Désactivé</string>
<!-- Generic «On» string -->
<string name="on">Activé</string>
<!-- Generic «Auto» string -->
<string name="auto">Automatique</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Claire</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Sombre</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">Système</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Vue en perspective</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-hi/strings.xml
View file

@ -218,14 +218,20 @@
<string name="prefs_group_route">मार्गदर्शन</string>
<string name="pref_zoom_title">ज़ूम बटन</string>
<string name="pref_zoom_summary">मानचित्र पर बटन प्रदर्शित करें</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">रात का मोड</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">प्रकटन</string>
<!-- Generic «Off» string -->
<string name="off">बंद</string>
<!-- Generic «On» string -->
<string name="on">चालू</string>
<!-- Generic «Auto» string -->
<string name="auto">स्वचालित</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">हल्का</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">गहरा</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">प्रणाली</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">परिप्रेक्ष्य दृश्य</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-hu/strings.xml
View file

@ -214,14 +214,20 @@
<string name="prefs_group_route">Navigáció</string>
<string name="pref_zoom_title">Nagyítás/kicsinyítés gombok</string>
<string name="pref_zoom_summary">Mutassa a kijelzőn</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Éjszakai üzemmód</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Megjelenés</string>
<!-- Generic «Off» string -->
<string name="off">Ki</string>
<!-- Generic «On» string -->
<string name="on">Be</string>
<!-- Generic «Auto» string -->
<string name="auto">Automatikus</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Világos</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Sötét</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">Rendszer</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Perspektivikus nézet</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-in/strings.xml
View file

@ -202,14 +202,20 @@
<string name="prefs_group_route">Navigasi</string>
<string name="pref_zoom_title">Tombol perbesaran</string>
<string name="pref_zoom_summary">Tampilkan pada layar</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Mode Malam</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Tampilan</string>
<!-- Generic «Off» string -->
<string name="off">Tidak Aktif</string>
<!-- Generic «On» string -->
<string name="on">Aktif</string>
<!-- Generic «Auto» string -->
<string name="auto">Otomatis</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Terang</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Gelap</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">Sistem</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Pandangan perspektif</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-it/strings.xml
View file

@ -205,14 +205,20 @@
<string name="prefs_group_route">Navigazione</string>
<string name="pref_zoom_title">Pulsanti per lo zoom</string>
<string name="pref_zoom_summary">Mostra sulla mappa</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Modalità notturna</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Aspetto</string>
<!-- Generic «Off» string -->
<string name="off">Spento</string>
<!-- Generic «On» string -->
<string name="on">Acceso</string>
<!-- Generic «Auto» string -->
<string name="auto">Automatico</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Chiaro</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Scuro</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">Sistema</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Vista in prospettiva</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-iw/strings.xml
View file

@ -215,14 +215,20 @@
<string name="prefs_group_route">ניווט</string>
<string name="pref_zoom_title">כפתורי זום</string>
<string name="pref_zoom_summary">הצג על המסך</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">מצב לילה</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">מראה</string>
<!-- Generic «Off» string -->
<string name="off">כבוי</string>
<!-- Generic «On» string -->
<string name="on">מופעל</string>
<!-- Generic «Auto» string -->
<string name="auto">אוטומטי</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">בהיר</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">כהה</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">מערכת</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">פרספקטיבה</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-ja/strings.xml
View file

@ -217,14 +217,20 @@
<string name="prefs_group_route">ナビゲーション</string>
<string name="pref_zoom_title">ズームボタン</string>
<string name="pref_zoom_summary">画面上に表示</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">夜間モード</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">外観</string>
<!-- Generic «Off» string -->
<string name="off">オフ</string>
<!-- Generic «On» string -->
<string name="on">オン</string>
<!-- Generic «Auto» string -->
<string name="auto">自動</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">ライト</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">ダーク</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">システム</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">パースペクティブ表示</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-ko/strings.xml
View file

@ -200,14 +200,20 @@
<string name="prefs_group_route">네비게이션</string>
<string name="pref_zoom_title">확대/축소 버튼</string>
<string name="pref_zoom_summary">화면에 표시</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">나이트 모드</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">모양</string>
<!-- Generic «Off» string -->
<string name="off">끄기</string>
<!-- Generic «On» string -->
<string name="on">켜기</string>
<!-- Generic «Auto» string -->
<string name="auto">자동</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">라이트</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">다크</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">시스템</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">원근 보기</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-mr/strings.xml
View file

@ -195,14 +195,20 @@
<string name="prefs_group_route">मार्गनिर्देशन</string>
<string name="pref_zoom_title">झूम बटणे</string>
<string name="pref_zoom_summary">नकाशावर दाखवा</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">रात्र मोड</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">प्रतिमा</string>
<!-- Generic «Off» string -->
<string name="off">बंद</string>
<!-- Generic «On» string -->
<string name="on">चालू</string>
<!-- Generic «Auto» string -->
<string name="auto">स्वयं</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">प्रकाश</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">अंधार</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">प्रणाली</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">यथार्थ दृश्य</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-nb/strings.xml
View file

@ -219,14 +219,20 @@
<string name="prefs_group_route">Navigasjon</string>
<string name="pref_zoom_title">Zoom-knapper</string>
<string name="pref_zoom_summary">Vis på skjermen</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Nattmodus</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Utseende</string>
<!-- Generic «Off» string -->
<string name="off">Av</string>
<!-- Generic «On» string -->
<string name="on">På</string>
<!-- Generic «Auto» string -->
<string name="auto">Auto</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Lys</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Mørke</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">System</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Perspektivvisning</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-nl/strings.xml
View file

@ -217,14 +217,20 @@
<string name="prefs_group_route">Navigatie</string>
<string name="pref_zoom_title">Zoomknoppen</string>
<string name="pref_zoom_summary">Toon op de kaart</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Nachtmodus</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Weergave</string>
<!-- Generic «Off» string -->
<string name="off">Uit</string>
<!-- Generic «On» string -->
<string name="on">Aan</string>
<!-- Generic «Auto» string -->
<string name="auto">Automatisch</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Licht</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Donker</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">Systeem</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Perspectiefbeeld</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-pl/strings.xml
View file

@ -217,14 +217,20 @@
<string name="prefs_group_route">Nawigacja</string>
<string name="pref_zoom_title">Przyciski przybliżania</string>
<string name="pref_zoom_summary">Wyświetla na ekranie</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Tryb nocny</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Wygląd</string>
<!-- Generic «Off» string -->
<string name="off">Wyłączony</string>
<!-- Generic «On» string -->
<string name="on">Włączony</string>
<!-- Generic «Auto» string -->
<string name="auto">Automatycznie</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Jasny</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Ciemny</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">System</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Widok z perspektywy</string>
<!-- Settings «Map» category: «3D buildings» title -->

6
android/app/src/main/res/values-pt-rBR/strings.xml
View file

@ -213,8 +213,14 @@
<string name="prefs_group_route">Navegação</string>
<string name="pref_zoom_title">Botões de zoom</string>
<string name="pref_zoom_summary">Mostrar na tela</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Aparência</string>
<!-- Generic «Auto» string -->
<string name="auto">Automático</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Clara</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Escura</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Visão em perspectiva</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-pt/strings.xml
View file

@ -205,14 +205,20 @@
<string name="prefs_group_route">Navegação</string>
<string name="pref_zoom_title">Botões de ampliação</string>
<string name="pref_zoom_summary">Mostrar no ecrã</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Modo noturno</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Apresentação</string>
<!-- Generic «Off» string -->
<string name="off">Desligado</string>
<!-- Generic «On» string -->
<string name="on">Ligado</string>
<!-- Generic «Auto» string -->
<string name="auto">Automático</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Tons claros</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Tons escuros</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">Sistema</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Visão em perspetiva</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-ro/strings.xml
View file

@ -205,14 +205,20 @@
<string name="prefs_group_route">Navigare</string>
<string name="pref_zoom_title">Butoane zoom</string>
<string name="pref_zoom_summary">Arată pe hartă</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Mod nocturn</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Aspect</string>
<!-- Generic «Off» string -->
<string name="off">Oprit</string>
<!-- Generic «On» string -->
<string name="on">Pornit</string>
<!-- Generic «Auto» string -->
<string name="auto">Automat</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Luminos</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Întunecat</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">Sistem</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Vedere în perspectivă</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-ru/strings.xml
View file

@ -220,14 +220,20 @@
<string name="prefs_group_route">Навигация</string>
<string name="pref_zoom_title">Кнопки масштаба</string>
<string name="pref_zoom_summary">Показать на карте</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Ночной режим</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Оформление</string>
<!-- Generic «Off» string -->
<string name="off">Выключен</string>
<!-- Generic «On» string -->
<string name="on">Включен</string>
<!-- Generic «Auto» string -->
<string name="auto">Автоматически</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Светлое</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Темное</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">Система</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Перспективный вид</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-sk/strings.xml
View file

@ -217,14 +217,20 @@
<string name="prefs_group_route">Navigácia</string>
<string name="pref_zoom_title">Tlačidlá priblíženia/oddialenia</string>
<string name="pref_zoom_summary">Zobraziť na obrazovke</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Nočný režim</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Vzhľad</string>
<!-- Generic «Off» string -->
<string name="off">Vypnúť</string>
<!-- Generic «On» string -->
<string name="on">Zapnúť</string>
<!-- Generic «Auto» string -->
<string name="auto">Automaticky</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Svetlý</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Tmavý</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">Systém</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Perspektívne zobrazenie</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-sv/strings.xml
View file

@ -198,14 +198,20 @@
<string name="prefs_group_route">Navigering</string>
<string name="pref_zoom_title">Zoom-knappar</string>
<string name="pref_zoom_summary">Visa på skärmen</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Nattläge</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Utseende</string>
<!-- Generic «Off» string -->
<string name="off">Av</string>
<!-- Generic «On» string -->
<string name="on">På</string>
<!-- Generic «Auto» string -->
<string name="auto">Auto</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Ljust</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Mörkt</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">Systemet</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Perspektivvy</string>
<!-- Settings «Map» category: «3D buildings» title -->

2
android/app/src/main/res/values-sw/strings.xml
View file

@ -50,6 +50,8 @@
<string name="data_version">Data ya OpenStreetMap: %s</string>
<!-- Generic «Auto» string -->
<string name="auto">Auto</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">Mfumo</string>
<!-- A message in Settings/Preferences explaining why is it not possible to enable 3D buildings when max power saving mode is enabled -->
<string name="pref_map_3d_buildings_disabled_summary">Majengo ya 3D yamezimwa katika hali ya kuokoa nishati</string>
<!-- Settings «Route» category: «Tts enabled» title -->

10
android/app/src/main/res/values-th/strings.xml
View file

@ -202,14 +202,20 @@
<string name="prefs_group_route">การนำทาง</string>
<string name="pref_zoom_title">ปุ่มซูม</string>
<string name="pref_zoom_summary">แสดงบนหน้าจอ</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">โหมดกลางคืน</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">รูปแบบ</string>
<!-- Generic «Off» string -->
<string name="off">ปิด</string>
<!-- Generic «On» string -->
<string name="on">เปิด</string>
<!-- Generic «Auto» string -->
<string name="auto">อัตโนมัติ</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">สว่าง</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">มืด</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">ระบบ</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">มุมมองเพอร์สเปกทีฟ</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-tr/strings.xml
View file

@ -219,14 +219,20 @@
<string name="prefs_group_route">Navigasyon</string>
<string name="pref_zoom_title">Yakınlaştırma butonları</string>
<string name="pref_zoom_summary">Haritada göster</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Gece Modu</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Görünüş</string>
<!-- Generic «Off» string -->
<string name="off">Kapalı</string>
<!-- Generic «On» string -->
<string name="on">Açık</string>
<!-- Generic «Auto» string -->
<string name="auto">Otomatik</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Açık</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Koyu</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">Sistem</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Perspektif görünüm</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-uk/strings.xml
View file

@ -220,14 +220,20 @@
<string name="prefs_group_route">Навігація</string>
<string name="pref_zoom_title">Кнопки трансфокації</string>
<string name="pref_zoom_summary">Відображення на екрані</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Нічний режим</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Вигляд</string>
<!-- Generic «Off» string -->
<string name="off">Вимкнуто</string>
<!-- Generic «On» string -->
<string name="on">Увімкнуто</string>
<!-- Generic «Auto» string -->
<string name="auto">Автоматично</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Світлий</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Темний</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">Система</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Перспективний вид</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-vi/strings.xml
View file

@ -200,14 +200,20 @@
<string name="prefs_group_route">Điều hướng</string>
<string name="pref_zoom_title">Nút Phóng to/Thu nhỏ</string>
<string name="pref_zoom_summary">Hiển thị trên màn hình</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Chế độ ban đêm</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Giao diện</string>
<!-- Generic «Off» string -->
<string name="off">Tắt</string>
<!-- Generic «On» string -->
<string name="on">Bật</string>
<!-- Generic «Auto» string -->
<string name="auto">Tự động</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Sáng</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Tối</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">Hệ thống</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Góc nhìn phối cảnh</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-zh-rTW/strings.xml
View file

@ -205,14 +205,20 @@
<string name="prefs_group_route">導航</string>
<string name="pref_zoom_title">縮放按鈕</string>
<string name="pref_zoom_summary">在螢幕上顯示</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">夜間模式</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">外觀</string>
<!-- Generic «Off» string -->
<string name="off">關閉</string>
<!-- Generic «On» string -->
<string name="on">開啟</string>
<!-- Generic «Auto» string -->
<string name="auto">自動</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">淺色</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">深色</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">系統</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">透視圖</string>
<!-- Settings «Map» category: «3D buildings» title -->

10
android/app/src/main/res/values-zh/strings.xml
View file

@ -204,14 +204,20 @@
<string name="prefs_group_route">导航</string>
<string name="pref_zoom_title">缩放按钮</string>
<string name="pref_zoom_summary">在屏幕上显示</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">夜间模式</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">外观</string>
<!-- Generic «Off» string -->
<string name="off">关闭</string>
<!-- Generic «On» string -->
<string name="on">开启</string>
<!-- Generic «Auto» string -->
<string name="auto">自动</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">浅色</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">深色</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">系统</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">透视图</string>
<!-- Settings «Map» category: «3D buildings» title -->

2
android/app/src/main/res/values/donottranslate.xml
View file

@ -50,7 +50,7 @@
<!-- UI themes -->
<string name="theme_default" translatable="false">default</string>
<string name="theme_night" translatable="false">night</string>
<string name="theme_auto" translatable="false">auto</string>
<string name="theme_follow_system" translatable="false">follow system</string>
<!-- Tags -->
<string name="tag_menu_collapse" translatable="false">collapse</string>

14
android/app/src/main/res/values/string-arrays.xml
View file

@ -23,18 +23,16 @@
<item>0</item>
<item>1</item>
</string-array>
<string-array name="map_style">
<item>@string/off</item>
<item>@string/on</item>
<item>@string/auto</item>
<string-array name="appearance">
<item>@string/light</item>
<item>@string/dark</item>
<item>@string/system</item>
</string-array>
<string-array name="map_style_values"
<string-array name="appearance_values"
translatable="false">
<item>@string/theme_default</item>
<item>@string/theme_night</item>
<item>@string/theme_auto</item>
<item>@string/theme_follow_system</item>
</string-array>
<string-array name="speed_cameras">

12
android/app/src/main/res/values/strings.xml
View file

@ -220,14 +220,20 @@
<string name="prefs_group_route">Navigation</string>
<string name="pref_zoom_title">Zoom buttons</string>
<string name="pref_zoom_summary">Display on the map</string>
<!-- Settings «Map» category: «Night style» title -->
<string name="pref_map_style_title">Night Mode</string>
<!-- Settings «Map» category: «Appearance» title -->
<string name="pref_map_style_title">Appearance</string>
<!-- Generic «Off» string -->
<string name="off">Off</string>
<!-- Generic «On» string -->
<string name="on">On</string>
<!-- Generic «Auto» string -->
<string name="auto">Auto</string>
<!-- Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation. -->
<string name="light">Light</string>
<!-- Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation. -->
<string name="dark">Dark</string>
<!-- Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation. -->
<string name="system">System</string>
<!-- Settings «Map» category: «Perspective view» title -->
<string name="pref_map_3d_title">Perspective view</string>
<!-- Settings «Map» category: «3D buildings» title -->
@ -245,7 +251,7 @@
<!-- Settings «Route» category: «Test Voice Directions» title -->
<string name="pref_tts_test_voice_title">Test Voice Directions (TTS, Text-To-Speech)</string>
<!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
<string name="pref_tts_playing_test_voice">Check the volume or system Text-To-Speech settings if you don\'t hear the voice now.</string>
<string name="pref_tts_playing_test_voice">Check the volume or system Text-To-Speech settings if you don\'zi hear the voice now.</string>
<!-- Settings «Route» category: «Tts unavailable» subtitle -->
<string name="pref_tts_unavailable">Not Available</string>
<string name="pref_map_auto_zoom">Auto zoom</string>

1
android/app/src/main/res/xml/locales_config.xml
View file

@ -29,6 +29,7 @@
<locale android:name="ko" />
<locale android:name="lt" />
<locale android:name="mr" />
<locale android:name="mt" />
<locale android:name="nb" />
<locale android:name="nl" />
<locale android:name="pl" />

22
android/app/src/main/res/xml/prefs_main.xml
View file

@ -97,39 +97,39 @@
android:summary="@string/enable_show_on_lock_screen_description"
android:defaultValue="true"
android:order="17"/>
<ListPreference
android:entries="@array/appearance"
android:entryValues="@array/appearance_values"
android:key="@string/pref_map_style"
android:order="18"
android:title="@string/pref_map_style_title"
app:singleLineTitle="false" />
</androidx.preference.PreferenceCategory>
<androidx.preference.PreferenceCategory
android:key="@string/pref_navigation"
android:title="@string/prefs_group_route"
android:order="3">
<ListPreference
android:key="@string/pref_map_style"
android:title="@string/pref_map_style_title"
app:singleLineTitle="false"
android:entries="@array/map_style"
android:entryValues="@array/map_style_values"
android:order="1"/>
<SwitchPreferenceCompat
android:key="@string/pref_3d"
android:title="@string/pref_map_3d_title"
app:singleLineTitle="false"
android:order="2"/>
android:order="1" />
<SwitchPreferenceCompat
android:key="@string/pref_auto_zoom"
android:title="@string/pref_map_auto_zoom"
app:singleLineTitle="false"
android:order="3"/>
android:order="2" />
<Preference
android:key="@string/pref_tts_screen"
android:title="@string/pref_tts_enable_title"
app:singleLineTitle="false"
android:persistent="false"
android:order="4">
android:order="3">
</Preference>
<PreferenceScreen
android:key="@string/prefs_routing"
android:order="5"
android:order="4"
android:title="@string/driving_options_title">
<intent
android:targetClass="app.organicmaps.settings.DrivingOptionsActivity"

2
android/gradle.properties
View file

@ -12,4 +12,4 @@ android.nonFinalResIds=false
enableVulkanDiagnostics=OFF
# Autogenerated by tools/unix/generate_localizations.sh
supportedLocalizations=af,ar,az,be,bg,ca,cs,da,de,el,en,en_GB,es,es_MX,et,eu,fa,fi,fr,fr_CA,iw,hi,hu,in,it,ja,ko,lt,mr,nb,nl,pl,pt,pt_BR,ro,ru,sk,sv,sw,th,tr,uk,vi,zh,zh_HK,zh_MO,zh_TW
supportedLocalizations=af,ar,az,be,bg,ca,cs,da,de,el,en,en_GB,es,es_MX,et,eu,fa,fi,fr,fr_CA,iw,hi,hu,in,it,ja,ko,lt,mr,mt,nb,nl,pl,pt,pt_BR,ro,ru,sk,sv,sw,th,tr,uk,vi,zh,zh_HK,zh_MO,zh_TW

215
data/strings/strings.txt
View file

@ -5366,48 +5366,48 @@
zh-Hant = 在螢幕上顯示
[pref_map_style_title]
comment = Settings «Map» category: «Night style» title
comment = Settings «Map» category: «Appearance» title
tags = android
en = Night Mode
af = Nagmodus
ar = الوضع الليلي
az = Gecə rejimi
be = Начны рэжым
bg = Нощен режим
ca = Mode nocturn
cs = Noční režim
da = Nattilstand
de = Nachtmodus
el = Νυχτερινή λειτουργία
es = Modo nocturno
et = Öörežiim
eu = Gaueko modua
fa = حالت شب
fi = Yötila
fr = Mode nuit
he = מצב לילה
hi = रात का मोड
hu = Éjszakai üzemmód
id = Mode Malam
it = Modalità notturna
ja = 夜間モード
ko = 나이트 모드
lt = Nakties režimas
mr = रात्र मोड
nb = Nattmodus
nl = Nachtmodus
pl = Tryb nocny
pt = Modo noturno
ro = Mod nocturn
ru = Ночной режим
sk = Nočný režim
sv = Nattläge
th = โหมดกลางคืน
tr = Gece Modu
uk = Нічний режим
vi = Chế độ ban đêm
zh-Hans = 夜间模式
zh-Hant = 夜間模式
en = Appearance
ar = المظهر
az = Görünüş
be = Выгляд
bg = Изглед
ca = Aspecte
cs = Vzhled
da = Udseende
de = Erscheinungsbild
el = Εμφάνιση
es = Aspecto
et = Välimus
eu = Itxura
fa = ظاهری
fi = Ulkoasu
fr = Apparence
he = מראה
hi = प्रकटन
hu = Megjelenés
id = Tampilan
it = Aspetto
ja = 外観
ko = 모양
lt = Išvaizda
mr = प्रतिमा
nb = Utseende
nl = Weergave
pl = Wygląd
pt = Apresentação
pt-BR = Aparência
ro = Aspect
ru = Оформление
sk = Vzhľad
sv = Utseende
th = รูปแบบ
tr = Görünüş
uk = Вигляд
vi = Giao diện
zh-Hans = 外观
zh-Hant = 外觀
[pref_appearance_title]
comment = Settings «Map» category: «Appearance» title
@ -5675,6 +5675,139 @@
zh-Hans = 自动
zh-Hant = 自動
[light]
comment = Settings "Appearance" category: "Light" title, should be consistent with the pref_map_title translation.
tags = android
en = Light
ar = فاتح
az = Parlaq
be = Светлы
bg = Светъл
ca = Clar
cs = Světlý
da = Lys
de = Hell
el = Ανοιχτόχρωμη
es = Claro
et = Valgus
eu = Argi
fa = نور
fi = Vaalea
fr = Claire
he = בהיר
hi = हल्का
hu = Világos
id = Terang
it = Chiaro
ja = ライト
ko = 라이트
lt = Šviesus
mr = प्रकाश
nb = Lys
nl = Licht
pl = Jasny
pt = Tons claros
pt-BR = Clara
ro = Luminos
ru = Светлое
sk = Svetlý
sv = Ljust
th = สว่าง
tr = Açık
uk = Світлий
vi = Sáng
zh-Hans = 浅色
zh-Hant = 淺色
[dark]
comment = Settings "Appearance" category: "Dark" title, should be consistent with the pref_map_style_title translation.
tags = android
en = Dark
ar = داكن
az = Tünd
be = Цемны
bg = Тъмен
ca = Fosc
cs = Tmavý
da = Mørk
de = Dunkel
el = Σκουρόχρωμη
es = Oscuro
et = Tume
eu = Iluna
fa = تاریک
fi = Tumma
fr = Sombre
he = כהה
hi = गहरा
hu = Sötét
id = Gelap
it = Scuro
ja = ダーク
ko = 다크
lt = Tamsus
mr = अंधार
nb = Mørke
nl = Donker
pl = Ciemny
pt = Tons escuros
pt-BR = Escura
ro = Întunecat
ru = Темное
sk = Tmavý
sv = Mörkt
th = มืด
tr = Koyu
uk = Темний
vi = Tối
zh-Hans = 深色
zh-Hant = 深色
[system]
comment = Settings "Appearance" category: "System" title, should be consistent with the pref_map_style_title translation.
tags = android
en = System
af = Stelsel
ar = النظام
az = Sistem
be = сістэма
bg = Система
ca = Sistema
cs = Systém
da = System
de = System
el = Σύστημα
es = Sistema
et = Süsteem
eu = Sistema
fa = سیستم
fi = Järjestelmä
fr = Système
he = מערכת
hi = प्रणाली
hu = Rendszer
id = Sistem
it = Sistema
ja = システム
ko = 시스템
lt = Sistema
mr = प्रणाली
nb = System
nl = Systeem
pl = System
pt = Sistema
ro = Sistem
ru = Система
sk = Systém
sv = Systemet
sw = Mfumo
th = ระบบ
tr = Sistem
uk = Система
vi = Hệ thống
zh-Hans = 系统
zh-Hant = 系統
[pref_map_3d_title]
comment = Settings «Map» category: «Perspective view» title
tags = android,ios

2
iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
View file

@ -1738,7 +1738,7 @@
"type.barrier.chain" = "Cadena";
"type.barrier.city_wall" = "Muro de la ciudad";
"type.barrier.city_wall" = "City Wall";
"type.barrier.cycle_barrier" = "Barrera para bicicletas";