Merge
This commit is contained in:
GaidamakUA
commit
4c9525cef3
12 changed files with 207 additions and 25 deletions
|
|
@ -2511,4 +2511,6 @@
|
|||
|
||||
<string name="poi_craft_electronics">Reparation af elektronik</string>
|
||||
|
||||
<string name="poi_fireworks">Fyrværkeri butik</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2041,7 +2041,7 @@
|
|||
<string name="osn_close_dialog_success">Fejl lukket</string>
|
||||
<string name="osm_edit_modified_poi">Ændret OSM IP</string>
|
||||
<string name="osm_edit_deleted_poi">Slettet OSM IP</string>
|
||||
<string name="release_2_2">" • Ny kontekstafhængig brugergrænseflade til at trykke steder på kortet og på andre skærme\n\n • Kortskærmen vises direkte, medmindre \'Vis Oversigt ved start\' er valgt\n\n • Oversigten har konfiguration for hvordan kort kan vises\n\n • Kort kan vælges direkte og hentes fra verdenskortet\n\n • Bedre rutegenberegning (efter gentagene forsøg foreslås nu en anden vej)\n\n • IP søgning understøtter nu mere specifikke forespørgsler\n\n • Forbedret IP og OSM redigeringsfunktionalitet\n\n • Kort dataoverførsel struktur og grænseflade omarbejdet\n\n og mere... "</string>
|
||||
<string name="release_2_2">" • Ny kontekstafhængig brugergrænseflade til at trykke lokationer på kortet og på andre skærme\n\n • Kortskærmen vises direkte, medmindre \'Vis Oversigt ved start\' er valgt\n\n • Konfigurer, hvilke og hvor kortene vises på Dashboard\n\n • For at hente kort, regioner kan vælges direkte ved at trykke på verdenskortet\n\n • IP søgning understøtter nu mere specifikke forespørgsler\n\n • Forbedret IP og OSM redigeringsfunktionalitet\n\n • Kort dataoverførsel struktur og grænseflade omarbejdet\n\n og mere... "</string>
|
||||
<string name="osm_save_offline">Gem offline</string>
|
||||
<string name="rendering_attr_currentTrackColor_description">GPX-farve</string>
|
||||
<string name="rendering_attr_currentTrackWidth_description">GPX-bredde</string>
|
||||
|
|
|
|||
|
|
@ -2113,4 +2113,8 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
|
|||
<string name="osm_edit_commented_note">Note OSM commentée</string>
|
||||
<string name="osm_edit_modified_poi">PI OSM modifié</string>
|
||||
<string name="osm_edit_deleted_poi">PI OSM supprimé</string>
|
||||
<string name="osm_save_offline">Enregistrer pour utiliser hors-ligne</string>
|
||||
<string name="rendering_attr_currentTrackColor_description">Couleur GPX</string>
|
||||
<string name="rendering_attr_currentTrackWidth_description">Largeur GPX</string>
|
||||
<string name="rendering_attr_roadStyle_description">Style pour les routes</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1232,4 +1232,147 @@
|
|||
<string name="poi_cargo_container">Rakomány: konténer</string>
|
||||
<string name="poi_cargo_hgv">Rakomány: tehergépjármű</string>
|
||||
|
||||
<string name="poi_internet_access_fee_yes">Internetelérés - fizetős</string>
|
||||
<string name="poi_internet_access_fee_no">Internetelérés - ingyenes</string>
|
||||
|
||||
<string name="poi_events_venue">Rendezvényközpont</string>
|
||||
|
||||
<string name="poi_diet_vegetarian_only">Csak vegetáriánus ételek</string>
|
||||
<string name="poi_diet_vegetarian_yes">Vegetáriánus ételek</string>
|
||||
<string name="poi_diet_vegetarian_no">Nincs vegetáriánus étel</string>
|
||||
<string name="poi_diet_vegetarian_few">Néhány vegetáriánus étel</string>
|
||||
<string name="poi_diet_vegan_only">Csak vegán ételek</string>
|
||||
<string name="poi_diet_vegan_yes">Vegán ételek</string>
|
||||
<string name="poi_diet_vegan_no">Nincs vegán étel</string>
|
||||
<string name="poi_diet_gluten_free_only">Csak gluténmentes ételek</string>
|
||||
<string name="poi_diet_gluten_free_yes">Gluténmentes ételek</string>
|
||||
<string name="poi_diet_gluten_free_no">Nincs gluténmentes étel</string>
|
||||
<string name="poi_diet_kosher_only">Csak kóser ételek</string>
|
||||
<string name="poi_diet_kosher_yes">Kóser ételek</string>
|
||||
<string name="poi_diet_kosher_no">Nincs kóser étel</string>
|
||||
<string name="poi_diet_halal_only">Csak halal ételek</string>
|
||||
<string name="poi_diet_halal_yes">Halal ételek</string>
|
||||
<string name="poi_diet_halal_no">Nincs halal étel</string>
|
||||
<string name="poi_diet_lactose_free_only">Csak laktózmentes ételek</string>
|
||||
<string name="poi_diet_lactose_free_yes">Laktózmentes ételek</string>
|
||||
<string name="poi_diet_lactose_free_no">Nincs laktózmentes étel</string>
|
||||
<string name="poi_diet_pescetarian_yes">Peszko-vegetáriánus ételek</string>
|
||||
|
||||
<string name="poi_brewery_additional">Sörfőzde név</string>
|
||||
<string name="poi_microbrewery_yes">Házi sörfőzde</string>
|
||||
<string name="poi_microbrewery_no">Nincs házi sörfőzde</string>
|
||||
|
||||
<string name="poi_takeaway_yes">Elvitelre</string>
|
||||
<string name="poi_takeaway_no">Nincs elvitel</string>
|
||||
<string name="poi_takeaway_only">Csak elvitelre</string>
|
||||
|
||||
<string name="poi_delivery_yes">Házhoz szállítás</string>
|
||||
<string name="poi_delivery_no">Nincs házhoz szállítás</string>
|
||||
<string name="poi_delivery_only">Csak házhoz szállítás</string>
|
||||
|
||||
<string name="poi_outdoor_seating_yes">Kiülős helyek</string>
|
||||
<string name="poi_outdoor_seating_no">Nem kiülős</string>
|
||||
<string name="poi_outdoor_seating_terrace">Kiülős hely: terasz</string>
|
||||
<string name="poi_outdoor_seating_sidewalk">Kiülős hely: járda</string>
|
||||
<string name="poi_outdoor_seating_pedestrian_zone">Kiülős hely: sétálóutca</string>
|
||||
<string name="poi_outdoor_seating_garden">Kiülős hely: kert</string>
|
||||
<string name="poi_outdoor_seating_patio">Kiülős hely: belső udvar</string>
|
||||
|
||||
<string name="poi_cocktails_yes">Koktélok</string>
|
||||
|
||||
<string name="poi_second_hand_yes">Használt áruk</string>
|
||||
<string name="poi_second_hand_no">Nincs használt áru</string>
|
||||
<string name="poi_second_hand_only">Csak használt áruk</string>
|
||||
|
||||
<string name="poi_service_parts">Alkatrész</string>
|
||||
<string name="poi_service_dealer">Kereskedés</string>
|
||||
<string name="poi_service_repair">Szerviz</string>
|
||||
<string name="poi_service_repair_no">Nincs szerviz</string>
|
||||
<string name="poi_service_electrical">Elektromos autó szerviz</string>
|
||||
<string name="poi_motorcycle_repair">Motorkerékpár szerviz</string>
|
||||
<string name="poi_self_service_yes">Önkiszolgáló</string>
|
||||
<string name="poi_self_service_no">Nem önkiszolgáló</string>
|
||||
<string name="poi_automated_yes">Automatizált</string>
|
||||
<string name="poi_automated_no">Nem automata</string>
|
||||
<string name="poi_full_service_yes">Teljes kiszolgálás</string>
|
||||
<string name="poi_brushless_yes">Kefe nélküli</string>
|
||||
<string name="poi_brushless_no">Kefés</string>
|
||||
<string name="poi_car_wash_no">Nincs autómosó</string>
|
||||
|
||||
<string name="poi_aeroway_fuel">Repülőgép üzemanyagtöltő állomás</string>
|
||||
<string name="poi_public_bath">Közfürdő</string>
|
||||
|
||||
<string name="poi_male_yes">Férfi</string>
|
||||
<string name="poi_male_no">Férfiaknak tilos</string>
|
||||
<string name="poi_female_yes">Női</string>
|
||||
<string name="poi_female_no">Nőknek tilos</string>
|
||||
<string name="poi_indoor_yes">Beltéri</string>
|
||||
<string name="poi_indoor_no">Kültéri</string>
|
||||
<string name="poi_toilets_yes">WC van</string>
|
||||
<string name="poi_toilets_no">WC nincs</string>
|
||||
<string name="poi_toilets_wheelchair_yes">Akadálymentes WC</string>
|
||||
<string name="poi_toilets_wheelchair_no">Nincs akadálymentes WC</string>
|
||||
<string name="poi_toilets_access_customers">WC használat: vendégeknek</string>
|
||||
<string name="poi_toilets_access_permissive">WC használat: megengedett</string>
|
||||
<string name="poi_toilets_access_community">WC használat: közösség</string>
|
||||
<string name="poi_toilets_access_public">WC használat: nyilvános</string>
|
||||
|
||||
<string name="poi_diaper_yes">Pelenkázó asztal</string>
|
||||
<string name="poi_diaper_no">Nincs pelenkázó asztal</string>
|
||||
<string name="poi_diaper_room">Pelenkázó szoba</string>
|
||||
|
||||
<string name="poi_maxstay">Parkolási időkorlát</string>
|
||||
|
||||
<string name="poi_vending_parking_tickets">Parkolójegy</string>
|
||||
<string name="poi_vending_cigarettes">Cigaretta</string>
|
||||
<string name="poi_vending_excrement_bags">Ürülék felszedő zacskó</string>
|
||||
<string name="poi_vending_public_transport_tickets">Tömegközlekedési jegy</string>
|
||||
<string name="poi_vending_drinks">Ital</string>
|
||||
<string name="poi_vending_sweets">Édesség</string>
|
||||
<string name="poi_vending_condoms">Óvszer</string>
|
||||
<string name="poi_vending_stamps">Bélyeg</string>
|
||||
<string name="poi_vending_bicycle_tube">Kerékpár gumibelső</string>
|
||||
<string name="poi_vending_food">Étel</string>
|
||||
<string name="poi_vending_drinks_food">Étel és ital</string>
|
||||
<string name="poi_vending_fuel">Üzemanyag automata</string>
|
||||
<string name="poi_vending_milk">Tej</string>
|
||||
<string name="poi_vending_elongated_coin">Emlék érme</string>
|
||||
<string name="poi_vending_bread">Kenyér</string>
|
||||
<string name="poi_vending_chewing_gums">Rágógumi</string>
|
||||
<string name="poi_vending_parking_tickets_public_transport_tickets">Parkolójegy; tömegközlekedési jegy</string>
|
||||
<string name="poi_vending_coffee">Kávé</string>
|
||||
<string name="poi_vending_toll">Fizetőautomata</string>
|
||||
<string name="poi_vending_tickets">Jegyautomata</string>
|
||||
<string name="poi_vending_water">Ivóvíz</string>
|
||||
<string name="poi_vending_telephone_vouchers">Telefonkártya</string>
|
||||
<string name="poi_vending_animal_food">Állateledel</string>
|
||||
<string name="poi_vending_public_transport_plans">Tömegközlekedési térkép</string>
|
||||
<string name="poi_vending_drinks_sweets">Ital és édesség</string>
|
||||
<string name="poi_vending_dvd">DVD</string>
|
||||
<string name="poi_vending_candles">Gyertya</string>
|
||||
<string name="poi_vending_toys">Játék</string>
|
||||
<string name="poi_vending_ice_cream">Jégkrém</string>
|
||||
<string name="poi_vending_sim_cards">SIM-kártya</string>
|
||||
|
||||
<string name="poi_memorial_war">Háborús emlékmű</string>
|
||||
<string name="poi_memorial_plaque">Emléktábla</string>
|
||||
<string name="poi_memorial_statue">Szobor</string>
|
||||
<string name="poi_memorial_stone">Kő</string>
|
||||
<string name="poi_memorial_stele">Sztélé</string>
|
||||
<string name="poi_memorial_bust">Mellszobor</string>
|
||||
<string name="poi_memorial_vehicle">Jármű</string>
|
||||
<string name="poi_memorial_obelisk">Obeliszk</string>
|
||||
<string name="poi_memorial_column">Oszlop</string>
|
||||
<string name="poi_memorial_stupa">Sztúpa</string>
|
||||
<string name="poi_historic_quarry">Felhagyott kőfejtő</string>
|
||||
|
||||
<string name="poi_wetland_wet_meadow">Láprét</string>
|
||||
<string name="poi_wetland_swamp">Ingovány</string>
|
||||
<string name="poi_wetland_bog">Láp</string>
|
||||
<string name="poi_wetland_marsh">Mocsár</string>
|
||||
<string name="poi_wetland_reedbed">Nádas</string>
|
||||
<string name="poi_wetland_tidalflat">Árapálysíkság</string>
|
||||
<string name="poi_wetland_saltmarsh">Sós mocsár</string>
|
||||
<string name="poi_wetland_saltern">Sótelep</string>
|
||||
<string name="poi_wetland_mangrove">Mangrove mocsár</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources>
|
||||
<string name="send_files_to_osm">GPX fájl küldése OSM-re?</string>
|
||||
<string name="gpx_visibility_txt">Láthatóság</string>
|
||||
<string name="gpx_tags_txt">Címkék</string>
|
||||
|
|
@ -1997,4 +1998,34 @@
|
|||
<string name="lang_mk">Macedón</string>
|
||||
<string name="lang_fy">Fríz</string>
|
||||
<string name="lang_als">Albán (toszk)</string>
|
||||
</resources>
|
||||
<string name="osm_save_offline">Mentés offline</string>
|
||||
<string name="osm_edit_modified_poi">Módosított OSM POI</string>
|
||||
<string name="osm_edit_deleted_poi">Törölt OSM POI</string>
|
||||
<string name="context_menu_item_open_note">OSM Jegyzet nyitása</string>
|
||||
<string name="osm_edit_reopened_note">Újranyitott OSM Jegyzet</string>
|
||||
<string name="osm_edit_commented_note">Kommentált OSM Jegyzet</string>
|
||||
<string name="osm_edit_removed_note">Törölt OSM Jegyzet</string>
|
||||
<string name="osm_edit_created_note">Létrehozott OSM Jegyzet</string>
|
||||
<string name="osn_bug_name">OSM Jegyzet</string>
|
||||
<string name="osn_add_dialog_title">Jegyzet létrehozása</string>
|
||||
<string name="osn_comment_dialog_title">Megjegyzés hozzáfűzése</string>
|
||||
<string name="osn_reopen_dialog_title">Jegyzet újranyitása</string>
|
||||
<string name="osn_close_dialog_title">Jegyzet lezárása</string>
|
||||
<string name="osn_add_dialog_success">Jegyzet sikeresen létre lett hozva</string>
|
||||
<string name="osn_add_dialog_error">Kivétel történt: a jegyzet nem lett létrehozva</string>
|
||||
<string name="osn_close_dialog_success">Jegyzet sikeresen le lett zárva</string>
|
||||
<string name="osn_close_dialog_error">Kivétel történt: a jegyzet nem lett lezárva</string>
|
||||
<string name="shared_string_commit">Beküldés</string>
|
||||
|
||||
<string name="context_menu_item_delete_waypoint">Törlöd a GPX útpontot?</string>
|
||||
<string name="context_menu_item_edit_waypoint">GPX útpont szerkesztése</string>
|
||||
<string name="shared_string_location">Cím</string>
|
||||
<string name="rendering_attr_currentTrackColor_description">GPX szín</string>
|
||||
<string name="rendering_attr_currentTrackWidth_description">GPX vastagság</string>
|
||||
<string name="rendering_attr_roadStyle_description">Útstílus</string>
|
||||
<string name="poi_dialog_reopen">Újranyitás</string>
|
||||
<string name="save_poi_without_poi_type_message">Biztosan elmented a POI-t típus nélkül?</string>
|
||||
<string name="poi_context_menu_modify_osm_change">OSM szerkesztés módosítása</string>
|
||||
<string name="release_2_2">" • Új környezetérzékeny felhasználói felület térképre tapintáskor\n\n • Az alkalmazás már közvetlenül a térkép képernyővel indul a Műszerfal helyett\n\n • A Műszerfal kártyái elrejthetőek, testre szabhatóak\n\n • Térkép letöltéséhez elég a világtérkép régióira tapintani\n\n • A POI kereső már sokkal speciálisabb kérdéseket is megért\n\n • Továbbfejlesztett OSM POI szerkesztés\n\n • A térképletöltő felület felépítése és kezelőfelülete át lett dolgozva\n\n és sok egyéb fejlesztés… "</string>
|
||||
<string name="shared_string_card_was_hidden">Kártya el volt rejtve</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2462,5 +2462,5 @@
|
|||
<string name="poi_wiki_lang_nap">Википедия на неополитанском</string>
|
||||
|
||||
<string name="poi_craft_electronics">Ремонт электроники</string>
|
||||
|
||||
<string name="poi_fireworks">Магазин фейерверков</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2456,5 +2456,6 @@
|
|||
<string name="poi_wiki_lang_nap">Neapolitan wiki</string>
|
||||
|
||||
<string name="poi_craft_electronics">Electronics repair</string>
|
||||
<string name="poi_fireworks">Fireworks store</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -12,11 +12,10 @@
|
|||
<string name="release_2_2">
|
||||
\u2022 New context-sensitive UI for tapping locations on the map and on other screens\n\n
|
||||
\u2022 Map screen is now launched directly unless \'Show Dashboard on app start\' is selected\n\n
|
||||
\u2022 Dashboard has configuration how cards could be displayed\n\n
|
||||
\u2022 Maps could be directly selected and download on worldwide map \n\n
|
||||
\u2022 Better route recalculation (after repeated attempts engine now suggests a different route)\n\n
|
||||
\u2022 Configure which and how cards are displayed on the Dashboard\n\n
|
||||
\u2022 To download maps, regions can be directly selected by tapping on the world map\n\n
|
||||
\u2022 POI Search now supports more specific queries\n\n
|
||||
\u2022 Imporoved POI and OSM Editing functionality\n\n
|
||||
\u2022 Imporoved POI and OSM Editing functionality\n\n
|
||||
\u2022 Map data download structure and interface reworked\n\n
|
||||
and more...
|
||||
</string>
|
||||
|
|
|
|||
|
|
@ -52,13 +52,15 @@ import java.util.Random;
|
|||
import btools.routingapp.BRouterServiceConnection;
|
||||
|
||||
/**
|
||||
* Created by Denis
|
||||
* on 03.03.15.
|
||||
*/
|
||||
public class AppInitializer implements IProgress {
|
||||
// 22 - 2.2
|
||||
private static final int CURRENT_VERSION_FOR_UGPRADE = 22;
|
||||
|
||||
|
||||
public static final boolean TIPS_AND_TRICKS = false;
|
||||
private static final String FIRST_TIME_APP_RUN = "FIRST_TIME_APP_RUN"; //$NON-NLS-1$
|
||||
private static final String VERSION_INSTALLED_NUMBER = "VERSION_INSTALLED_NUMBER"; //$NON-NLS-1$
|
||||
public static final String NUMBER_OF_STARTS = "NUMBER_OF_STARTS"; //$NON-NLS-1$
|
||||
public static final String FIRST_INSTALLED = "FIRST_INSTALLED"; //$NON-NLS-1$
|
||||
private static final String VECTOR_INDEXES_CHECK = "VECTOR_INDEXES_CHECK"; //$NON-NLS-1$
|
||||
|
|
@ -130,7 +132,13 @@ public class AppInitializer implements IProgress {
|
|||
firstTime = true;
|
||||
startPrefs.edit().putBoolean(FIRST_TIME_APP_RUN, true).commit();
|
||||
startPrefs.edit().putString(VERSION_INSTALLED, Version.getFullVersion(app)).commit();
|
||||
startPrefs.edit().putInt(VERSION_INSTALLED_NUMBER, CURRENT_VERSION_FOR_UGPRADE).commit();
|
||||
} else if (!Version.getFullVersion(app).equals(startPrefs.getString(VERSION_INSTALLED, ""))) {
|
||||
if(startPrefs.getInt(VERSION_INSTALLED_NUMBER, 0) < 22) {
|
||||
app.getSettings().SHOW_DASHBOARD_ON_START.set(true);
|
||||
app.getSettings().SHOW_DASHBOARD_ON_MAP_SCREEN.set(true);
|
||||
app.getSettings().SHOW_CARD_TO_CHOOSE_DRAWER.set(true);
|
||||
}
|
||||
startPrefs.edit().putString(VERSION_INSTALLED, Version.getFullVersion(app)).commit();
|
||||
appVersionChanged = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -635,6 +635,10 @@ public class OsmandSettings {
|
|||
}
|
||||
public final CommonPreference<Boolean> USE_FAST_RECALCULATION = new BooleanPreference("use_fast_recalculation", true).makeGlobal().cache();
|
||||
|
||||
public final CommonPreference<Boolean> SHOW_CARD_TO_CHOOSE_DRAWER = new BooleanPreference("show_card_to_choose_drawer", false).makeGlobal();
|
||||
public final CommonPreference<Boolean> SHOW_DASHBOARD_ON_START = new BooleanPreference("should_show_dashboard_on_start", false).makeGlobal();
|
||||
public final CommonPreference<Boolean> SHOW_DASHBOARD_ON_MAP_SCREEN = new BooleanPreference("show_dashboard_on_map_screen", false).makeGlobal();
|
||||
|
||||
// this value string is synchronized with settings_pref.xml preference name
|
||||
public final CommonPreference<Boolean> USE_INTERNET_TO_DOWNLOAD_TILES = new BooleanPreference("use_internet_to_download_tiles", true).makeGlobal().cache();
|
||||
|
||||
|
|
|
|||
|
|
@ -141,8 +141,6 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents {
|
|||
private IMapDownloaderCallback downloaderCallback;
|
||||
private DrawerLayout drawerLayout;
|
||||
|
||||
public static final String SHOULD_SHOW_DASHBOARD_ON_START = "should_show_dashboard_on_start";
|
||||
|
||||
private Notification getNotification() {
|
||||
Intent notificationIndent = new Intent(this, getMyApplication().getAppCustomization().getMapActivity());
|
||||
notificationIndent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
||||
|
|
@ -393,21 +391,14 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents {
|
|||
super.onResume();
|
||||
long tm = System.currentTimeMillis();
|
||||
|
||||
LOG.debug("onResume()");
|
||||
if (app.isApplicationInitializing() || DashboardOnMap.staticVisible) {
|
||||
LOG.debug("dashboars stuff");
|
||||
if (!dashboardOnMap.isVisible()) {
|
||||
LOG.debug("dashboars is not visible");
|
||||
final OsmandSettings.CommonPreference<Boolean> shouldShowDashboardOnStart =
|
||||
settings.registerBooleanPreference(MapActivity.SHOULD_SHOW_DASHBOARD_ON_START, true);
|
||||
if (shouldShowDashboardOnStart.get()) {
|
||||
if (settings.SHOW_DASHBOARD_ON_START.get()) {
|
||||
dashboardOnMap.setDashboardVisibility(true, DashboardOnMap.staticVisibleType);
|
||||
} else {
|
||||
LOG.debug("Dashboard should not be shown");
|
||||
if (ErrorBottomSheetDialog.shouldShow(settings, this)) {
|
||||
new ErrorBottomSheetDialog().show(getFragmentManager(), "dialog");
|
||||
} else if (RateUsBottomSheetDialog.shouldShow(settings)) {
|
||||
LOG.debug("Rate us should show");
|
||||
new RateUsBottomSheetDialog().show(getFragmentManager(), "dialog");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -71,11 +71,10 @@ public class DashboardSettingsDialogFragment extends DialogFragment
|
|||
R.layout.show_dashboard_on_start_dialog_item, null, false);
|
||||
final TextView textView = (TextView) view.findViewById(R.id.text);
|
||||
textView.setText(R.string.show_on_start);
|
||||
final OsmandSettings.CommonPreference<Boolean> shouldShowDashboardOnStart =
|
||||
settings.registerBooleanPreference(MapActivity.SHOULD_SHOW_DASHBOARD_ON_START, true);
|
||||
final CompoundButton compoundButton = (CompoundButton) view.findViewById(R.id.check_item);
|
||||
compoundButton.setChecked(shouldShowDashboardOnStart.get());
|
||||
textView.setTextColor(shouldShowDashboardOnStart.get() ? textColorPrimary
|
||||
// FIXME Yura add settings.SHOW_DASHBOARD_ON_MAP_SCREEN
|
||||
compoundButton.setChecked(settings.SHOW_DASHBOARD_ON_MAP_SCREEN.get());
|
||||
textView.setTextColor(settings.SHOW_DASHBOARD_ON_MAP_SCREEN.get() ? textColorPrimary
|
||||
: textColorSecondary);
|
||||
compoundButton.setOnCheckedChangeListener(
|
||||
new CompoundButton.OnCheckedChangeListener() {
|
||||
|
|
@ -111,7 +110,7 @@ public class DashboardSettingsDialogFragment extends DialogFragment
|
|||
}
|
||||
}
|
||||
mapActivity.getDashboard().refreshDashboardFragments();
|
||||
shouldShowDashboardOnStart.set(compoundButton.isChecked());
|
||||
settings.SHOW_DASHBOARD_ON_MAP_SCREEN.set(compoundButton.isChecked());
|
||||
}
|
||||
})
|
||||
.setNegativeButton(R.string.shared_string_cancel, null);
|
||||
|
|
|
|||
Loading…
Reference in a new issue