From a60521f2c897f645a567f910fab1d11f9c4d0531 Mon Sep 17 00:00:00 2001 From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> Date: Thu, 4 Jul 2024 17:13:20 +0200 Subject: [PATCH 1/2] [placepage] Use localized WiFi string Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> --- iphone/Maps/Classes/MapsAppDelegate.mm | 1 - iphone/Maps/UI/Editor/MWMEditorViewController.mm | 2 +- map/framework.cpp | 3 --- map/place_page_info.cpp | 2 +- map/place_page_info.hpp | 3 --- 5 files changed, 2 insertions(+), 9 deletions(-) diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index 344d3916e5..3007974074 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -55,7 +55,6 @@ void InitLocalizedStrings() { f.AddString("core_my_position", L(@"core_my_position").UTF8String); f.AddString("core_placepage_unknown_place", L(@"core_placepage_unknown_place").UTF8String); f.AddString("postal_code", L(@"postal_code").UTF8String); - f.AddString("wifi", L(@"wifi").UTF8String); } } // namespace diff --git a/iphone/Maps/UI/Editor/MWMEditorViewController.mm b/iphone/Maps/UI/Editor/MWMEditorViewController.mm index 7d984e4f7f..922cb7d9e1 100644 --- a/iphone/Maps/UI/Editor/MWMEditorViewController.mm +++ b/iphone/Maps/UI/Editor/MWMEditorViewController.mm @@ -524,7 +524,7 @@ void registerCellsForTableView(std::vector const & cells, UITab // TODO(Vlad, IgorTomko): Support all other possible Internet statuses. [tCell configWithDelegate:self icon:[UIImage imageNamed:@"ic_placepage_wifi"] - text:L(@"wifi") + text:L(@"category_wifi") on:m_mapObject.GetInternet() == feature::Internet::Wlan]; break; } diff --git a/map/framework.cpp b/map/framework.cpp index 80311c6fec..aeedf59fa5 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -307,8 +307,6 @@ Framework::Framework(FrameworkParams const & params, bool loadMaps) m_stringsBundle.SetDefaultString("core_my_places", "My Places"); m_stringsBundle.SetDefaultString("core_my_position", "My Position"); m_stringsBundle.SetDefaultString("postal_code", "Postal Code"); - // Wi-Fi string is used in categories that's why does not have core_ prefix - m_stringsBundle.SetDefaultString("wifi", "WiFi"); m_featuresFetcher.InitClassificator(); m_featuresFetcher.SetOnMapDeregisteredCallback(bind(&Framework::OnMapDeregistered, this, _1)); @@ -672,7 +670,6 @@ void Framework::FillInfoFromFeatureType(FeatureType & ft, place_page::Info & inf ASSERT_NOT_EQUAL(featureStatus, FeatureStatus::Deleted, ("Deleted features cannot be selected from UI.")); info.SetFeatureStatus(featureStatus); - info.SetLocalizedWifiString(m_stringsBundle.GetString("wifi")); if (ftypes::IsAddressObjectChecker::Instance()(ft)) info.SetAddress(GetAddressAtPoint(feature::GetCenter(ft)).FormatAddress()); diff --git a/map/place_page_info.cpp b/map/place_page_info.cpp index 7280859d66..247cd68b2e 100644 --- a/map/place_page_info.cpp +++ b/map/place_page_info.cpp @@ -184,7 +184,7 @@ std::string Info::FormatSubtitle(bool withTypes, bool withMainType) const // Internet. if (HasWifi()) - append(m_localizedWifiString); + append(platform::GetLocalizedString("category_wifi")); // Toilets. if (HasToilets()) diff --git a/map/place_page_info.hpp b/map/place_page_info.hpp index 28ce82dd93..1b5479e605 100644 --- a/map/place_page_info.hpp +++ b/map/place_page_info.hpp @@ -142,7 +142,6 @@ public: void SetCustomNameWithCoordinates(m2::PointD const & mercator, std::string const & name); void SetAddress(std::string && address) { m_address = std::move(address); } void SetCanEditOrAdd(bool canEditOrAdd) { m_canEditOrAdd = canEditOrAdd; } - void SetLocalizedWifiString(std::string const & str) { m_localizedWifiString = str; } /// Bookmark void SetFromBookmarkProperties(kml::Properties const & p); @@ -226,8 +225,6 @@ private: std::string m_uiSecondaryTitle; std::string m_uiAddress; std::string m_description; - // TODO(AlexZ): Temporary solution. It's better to use a wifi icon in UI instead of text. - std::string m_localizedWifiString; /// Booking rating string std::string m_localizedRatingString; -- 2.45.3 From 75859e126a204634854292cd9b30b89c6219ba80 Mon Sep 17 00:00:00 2001 From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> Date: Tue, 9 Jul 2024 16:16:28 +0200 Subject: [PATCH 2/2] =?UTF-8?q?[placepage]=20Use=20WiFi=20emoji=20symbol?= =?UTF-8?q?=20=F0=9F=9B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> --- indexer/feature_utils.hpp | 1 + map/place_page_info.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/indexer/feature_utils.hpp b/indexer/feature_utils.hpp index 95974e0f4e..7e1a4724fe 100644 --- a/indexer/feature_utils.hpp +++ b/indexer/feature_utils.hpp @@ -16,6 +16,7 @@ namespace feature static constexpr std::string_view kToiletsSymbol = "🚻"; static constexpr std::string_view kAtmSymbol = "💳"; static constexpr std::string_view kWheelchairSymbol = "♿️"; + static constexpr std::string_view kWifiSymbol = "🛜"; /// OSM internet_access tag values. enum class Internet diff --git a/map/place_page_info.cpp b/map/place_page_info.cpp index 247cd68b2e..6df6943a4a 100644 --- a/map/place_page_info.cpp +++ b/map/place_page_info.cpp @@ -184,7 +184,7 @@ std::string Info::FormatSubtitle(bool withTypes, bool withMainType) const // Internet. if (HasWifi()) - append(platform::GetLocalizedString("category_wifi")); + append(feature::kWifiSymbol); // Toilets. if (HasToilets()) -- 2.45.3