Added dark scheme tiles support

1. Added dark scheme tiles support. 2. Added corresponding fields in settings. 3. Added ranslations for settings (!!! Review all langs, please !!!)
mahomaps · Jul 21, 2023 · bfdf876 · bfdf876
1 parent efae746
commit bfdf876
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 11 deletions.
diff --git a/res/ar.txt b/res/ar.txt
@@ -164,4 +164,5 @@
 الإحداثيات
 ساعات العمل
 الموقع الإلكتروني
-الهاتف
+الهاتف
+مخطط ، موضوع مظلم
diff --git a/res/en.txt b/res/en.txt
@@ -53,7 +53,7 @@ Debug info
 Save tiles
 File system
 Download tiles
-Scheme, bright pallete
+Scheme, light theme
 Control buttons size (restart needed)
 Auto
 Tiles & search language (restart needed)
@@ -164,4 +164,5 @@ Description
 Coords
 Opening hours
 Website
-Phone
+Phone
+Scheme, dark theme
diff --git a/res/fr.txt b/res/fr.txt
@@ -164,4 +164,5 @@ Description
 Coordonnées
 Mode de fonctionnement
 Site Internet
-Téléphone
+Téléphone
+Schéma, palette sombre
diff --git a/res/ru.txt b/res/ru.txt
@@ -164,4 +164,5 @@ J2ME клиент растровых Яндекс.Карт.
 Координаты
 Режим работы
 Сайт
-Телефон
+Телефон
+Схема, темная палитра
diff --git a/src/mahomaps/MahoMapsApp.java b/src/mahomaps/MahoMapsApp.java
@@ -309,7 +309,7 @@ public static void LoadLocale(String name) {
 		text = splitFull(getStringFromJAR("/" + name + ".txt"), '\n');
 		if (text == null)
 			throw new RuntimeException("Lang is not loaded");
-		if (text.length != 167)
+		if (text.length != 168)
 			throw new RuntimeException("Lang is outdated");
 		for (int i = 0; i < text.length; i++) {
 			if (text[i].endsWith("\r")) {

diff --git a/src/mahomaps/api/YmapsApiBase.java b/src/mahomaps/api/YmapsApiBase.java
@@ -1,20 +1,20 @@
 package mahomaps.api;
 
+import cc.nnproject.json.*;
 import java.io.ByteArrayOutputStream;
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Enumeration;
 import java.util.Hashtable;
-
 import javax.microedition.io.Connector;
 import javax.microedition.io.HttpConnection;
-
-import cc.nnproject.json.*;
 import mahomaps.MahoMapsApp;
 import mahomaps.Settings;
 
+
+
 public abstract class YmapsApiBase {
 
 	private final String tokenMark = "token\":\"";

diff --git a/src/mahomaps/map/TilesProvider.java b/src/mahomaps/map/TilesProvider.java
@@ -56,8 +56,10 @@ public class TilesProvider implements Runnable {
 	private Thread cacheTh;
 
 	public static final String[] tilesUrls = new String[] {
-			// scheme
+			// scheme light
 			"https://core-renderer-tiles.maps.yandex.net/tiles?l=map&lang=",
+			// scheme dark
+			"https://core-renderer-tiles.maps.yandex.net/tiles?l=map&theme=dark&lang=",
 			// sat
 			"https://core-sat.maps.yandex.net/tiles?l=sat&lang=",
 			// hybrid

diff --git a/src/mahomaps/screens/SettingsScreen.java b/src/mahomaps/screens/SettingsScreen.java
@@ -29,7 +29,7 @@ public class SettingsScreen extends Form implements CommandListener {
 	private ChoiceGroup download = new ChoiceGroup(MahoMapsApp.text[54], Choice.MULTIPLE,
 			new String[] { MahoMapsApp.text[17] }, null);
 	private ChoiceGroup map = new ChoiceGroup(MahoMapsApp.text[153], Choice.EXCLUSIVE,
-			new String[] { MahoMapsApp.text[55], MahoMapsApp.text[154], MahoMapsApp.text[155] }, null);
+			new String[] { MahoMapsApp.text[55],  MahoMapsApp.text[167], MahoMapsApp.text[154], MahoMapsApp.text[155] }, null);
 	private ChoiceGroup proxyUsage = new ChoiceGroup(MahoMapsApp.text[19], Choice.MULTIPLE,
 			new String[] { MahoMapsApp.text[156], MahoMapsApp.text[157], }, null);
 	private TextField proxyServer = new TextField(MahoMapsApp.text[158], "", 256, TextField.URL);