RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #5452 from rokuz/simp-traffic-settings-android

Browse source 
[Android] Added simplified colors to settings
This commit is contained in:
Aleksandr Zatsepin 2017-02-20 18:09:24 +03:00 • committed by GitHub
commit cc8deb008f
36 changed files with 93 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/res/values-ru/strings.xml
View file

@ -333,6 +333,7 @@
<!-- Settings «Map» category: «Record track» title -->
<string name="pref_track_record_title">Недавний путь</string>
<string name="pref_map_auto_zoom">Автозум</string>
<string name="pref_traffic_simplified_colors_title">Простая цветовая схема для пробок</string>
<string name="duration_disabled">Выключено</string>
<string name="duration_1_hour">1 час</string>
<string name="duration_2_hours">2 часа</string>

1
android/res/values/donottranslate.xml
View file

@ -51,6 +51,7 @@
<string name="pref_auto_zoom" translatable="false">AutoZoom</string>
<string name="pref_large_fonts_size" translatable="false">LargeFontSize</string>
<string name="pref_use_mobile_data" translatable="false">UseMobileData</string>
<string name="pref_traffic_simplified_colors" translatable="false">TrafficSimplifiedColors</string>
<string name="notification_ticker_ltr" translatable="false">%1$s: %2$s</string>
<string name="notification_ticker_rtl" translatable="false">%2$s :%1$s</string>

1
android/res/values/strings.xml
View file

@ -335,6 +335,7 @@
<!-- Settings «Map» category: «Record track» title -->
<string name="pref_track_record_title">Recent track</string>
<string name="pref_map_auto_zoom">Auto zoom</string>
<string name="pref_traffic_simplified_colors_title">Simplified colour scheme for traffic</string>
<string name="duration_disabled">Off</string>
<string name="duration_1_hour">1 hour</string>
<string name="duration_2_hours">2 hours</string>

14
android/res/xml-v21/prefs_route.xml
View file

@ -19,8 +19,14 @@
android:switchTextOff=""/>
<SwitchPreference
android:key="@string/pref_auto_zoom"
android:title="@string/pref_map_auto_zoom"
android:switchTextOn=""
android:switchTextOff=""/>
android:key="@string/pref_auto_zoom"
android:title="@string/pref_map_auto_zoom"
android:switchTextOn=""
android:switchTextOff=""/>
<SwitchPreference
android:key="@string/pref_traffic_simplified_colors"
android:title="@string/pref_traffic_simplified_colors_title"
android:switchTextOn=""
android:switchTextOff=""/>
</PreferenceScreen>

4
android/res/xml/prefs_route.xml
View file

@ -17,4 +17,8 @@
<CheckBoxPreference
android:key="@string/pref_auto_zoom"
android:title="@string/pref_map_auto_zoom"/>
<CheckBoxPreference
android:key="@string/pref_traffic_simplified_colors"
android:title="@string/pref_traffic_simplified_colors_title"/>
</PreferenceScreen>

14
android/src/com/mapswithme/maps/settings/RoutePrefsFragment.java
View file

@ -181,6 +181,20 @@ public class RoutePrefsFragment extends PreferenceFragment
}
});
boolean simplifiedColorsEnabled = Framework.nativeGetSimplifiedTrafficColorsEnabled();
final TwoStatePreference prefSimplifiedColors = (TwoStatePreference)findPreference(
getString(R.string.pref_traffic_simplified_colors));
prefSimplifiedColors.setChecked(simplifiedColorsEnabled);
prefSimplifiedColors.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
{
@Override
public boolean onPreferenceChange(Preference preference, Object newValue)
{
Framework.nativeSetSimplifiedTrafficColorsEnabled((Boolean)newValue);
return true;
}
});
update();
}

2
iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "تكبير تلقائي";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "لا يعمل";
"duration_1_hour" = "1 ساعة";

2
iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "Automatické zvětšení";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "Vypnuto";
"duration_1_hour" = "1 hodina";

2
iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "Auto zoom";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "Fra";
"duration_1_hour" = "1 time";

2
iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "Auto-Zoom";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "Aus";
"duration_1_hour" = "1 Stunde";

2
iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "Αυτόματη μεγέθυνση";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "Απενεργ.";
"duration_1_hour" = "1 ώρα";

2
iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "Auto zoom";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "Off";
"duration_1_hour" = "1 hour";

2
iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "Auto zoom";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "Off";
"duration_1_hour" = "1 hour";

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

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "Autozoom";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "Desactivada";
"duration_1_hour" = "1 hora";

2
iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "Automaattinen zoomaus";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "Pois päältä";
"duration_1_hour" = "1 tunti";

2
iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "Zoom automatique";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "Désactivé";
"duration_1_hour" = "1 heure";

2
iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "Auto-zoom";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "Kikapcsolva";
"duration_1_hour" = "1 óra";

2
iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "Perbesar otomatis";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "Nonaktif";
"duration_1_hour" = "1 jam";

2
iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "Zoom automatico";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "Disabilitato";
"duration_1_hour" = "1 ora";

2
iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "自動ズーム";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "オフ";
"duration_1_hour" = "1時間";

2
iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "자동 줌";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "선택 안 함";
"duration_1_hour" = "1시간";

2
iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "Automatisk zooming";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "Av";
"duration_1_hour" = "1 time";

2
iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "Automatisch zoomen";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "Uit";
"duration_1_hour" = "1 uur";

2
iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "Auto zoom";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "Wyłączona";
"duration_1_hour" = "1 godzina";

2
iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "Zoom automático";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "Desligado";
"duration_1_hour" = "1 hora";

2
iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "Zoom automat";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "Oprit";
"duration_1_hour" = "1 oră";

2
iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "Автозум";
"pref_traffic_simplified_colors_title" = "Простая цветовая схема для пробок";
"duration_disabled" = "Выключено";
"duration_1_hour" = "1 час";

2
iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "Automatický zoom";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "Vypnúť";
"duration_1_hour" = "1 hodina";

2
iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "Automatisk zoom";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "Av";
"duration_1_hour" = "1 timme";

2
iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "ซูมอัตโนมัติ";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "ปิด";
"duration_1_hour" = "1 ชั่วโมง";

2
iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "Otomatik yakınlaştırma";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "Kapalı";
"duration_1_hour" = "1 saat";

2
iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "Автозум";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "Вимкнуто";
"duration_1_hour" = "1 година";

2
iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "Ống dòm tự động";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "Tắt";
"duration_1_hour" = "1 giờ";

2
iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "自动缩放";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "关闭";
"duration_1_hour" = "1小时";

2
iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
View file

@ -519,6 +519,8 @@
"pref_map_auto_zoom" = "自動縮放";
"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic";
"duration_disabled" = "關閉";
"duration_1_hour" = "1小時";

4
strings.txt
View file

@ -5700,6 +5700,10 @@
el = Αυτόματη μεγέθυνση
sk = Automatický zoom
[pref_traffic_simplified_colors_title]
en = Simplified colour scheme for traffic
ru = Простая цветовая схема для пробок
[duration_disabled]
tags = ios,android
en = Off