void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved countries from Data to Countries namespace.

Browse source
This commit is contained in:
23rd 2021-08-26 17:46:24 +03:00
parent 1b3075ac2e
commit df02bbb0a3
14 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Telegram/SourceFiles/data/data_countries.cpp → Telegram/SourceFiles/countries/countries_instance.cpp
View file

@ -5,9 +5,9 @@ the official desktop application for the Telegram messaging service.
For license and copyright information please follow this link: For license and copyright information please follow this link:
https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#include "data/data_countries.h" #include "countries/countries_instance.h"
namespace Data { namespace Countries {
namespace { namespace {
const std::array<CountryInfo, 231> List = { { const std::array<CountryInfo, 231> List = { {
@ -292,10 +292,10 @@ QString CountryNameByISO2(const QString &iso) {
} }
QString CountryISO2ByPhone(const QString &phone) { QString CountryISO2ByPhone(const QString &phone) {
const auto &byCode = Data::CountriesByCode(); const auto &byCode = CountriesByCode();
const auto code = Data::ValidPhoneCode(phone); const auto code = ValidPhoneCode(phone);
const auto i = byCode.find(code); const auto i = byCode.find(code);
return (i != byCode.cend()) ? QString::fromUtf8((*i)->iso2) : QString(); return (i != byCode.cend()) ? QString::fromUtf8((*i)->iso2) : QString();
} }
} // namespace Data } // namespace Countries

4
Telegram/SourceFiles/data/data_countries.h → Telegram/SourceFiles/countries/countries_instance.h
View file

@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#pragma once #pragma once
namespace Data { namespace Countries {
struct CountryInfo { struct CountryInfo {
const char *name = nullptr; const char *name = nullptr;
@ -26,4 +26,4 @@ struct CountryInfo {
[[nodiscard]] QString CountryNameByISO2(const QString &iso); [[nodiscard]] QString CountryNameByISO2(const QString &iso);
[[nodiscard]] QString CountryISO2ByPhone(const QString &phone); [[nodiscard]] QString CountryISO2ByPhone(const QString &phone);
} // namespace Data } // namespace Countries

4
Telegram/SourceFiles/intro/intro_widget.cpp
View file

@ -24,7 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/history.h" #include "history/history.h"
#include "history/history_item.h" #include "history/history_item.h"
#include "data/data_user.h" #include "data/data_user.h"
#include "data/data_countries.h" #include "countries/countries_instance.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
#include "ui/text/format_values.h" // Ui::FormatPhone #include "ui/text/format_values.h" // Ui::FormatPhone
#include "ui/text/text_utilities.h" #include "ui/text/text_utilities.h"
@ -54,7 +54,7 @@ using namespace ::Intro::details;
if (const auto parent if (const auto parent
= Core::App().domain().maybeLastOrSomeAuthedAccount()) { = Core::App().domain().maybeLastOrSomeAuthedAccount()) {
if (const auto session = parent->maybeSession()) { if (const auto session = parent->maybeSession()) {
const auto iso = ::Data::CountryISO2ByPhone( const auto iso = Countries::CountryISO2ByPhone(
session->user()->phone()); session->user()->phone());
if (!iso.isEmpty()) { if (!iso.isEmpty()) {
return iso; return iso;

6
Telegram/SourceFiles/passport/passport_panel_controller.cpp
View file

@ -23,7 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/countryinput.h" #include "ui/countryinput.h"
#include "ui/text/format_values.h" #include "ui/text/format_values.h"
#include "core/update_checker.h" #include "core/update_checker.h"
#include "data/data_countries.h" #include "countries/countries_instance.h"
#include "styles/style_layers.h" #include "styles/style_layers.h"
namespace Passport { namespace Passport {
@ -123,7 +123,7 @@ EditDocumentScheme GetDocumentScheme(
using ValueClass = Scheme::ValueClass; using ValueClass = Scheme::ValueClass;
const auto DontFormat = nullptr; const auto DontFormat = nullptr;
const auto CountryFormat = [](const QString &value) { const auto CountryFormat = [](const QString &value) {
const auto result = Data::CountryNameByISO2(value); const auto result = Countries::CountryNameByISO2(value);
return result.isEmpty() ? value : result; return result.isEmpty() ? value : result;
}; };
const auto GenderFormat = [](const QString &value) { const auto GenderFormat = [](const QString &value) {
@ -322,7 +322,7 @@ EditDocumentScheme GetDocumentScheme(
if (!language.isEmpty()) { if (!language.isEmpty()) {
return tr::lng_passport_native_name_language_about(tr::now); return tr::lng_passport_native_name_language_about(tr::now);
} }
const auto name = Data::CountryNameByISO2(countryCode); const auto name = Countries::CountryNameByISO2(countryCode);
Assert(!name.isEmpty()); Assert(!name.isEmpty());
return tr::lng_passport_native_name_about( return tr::lng_passport_native_name_about(
tr::now, tr::now,

4
Telegram/SourceFiles/passport/passport_panel_edit_document.cpp
View file

@ -19,7 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/wrap/vertical_layout.h" #include "ui/wrap/vertical_layout.h"
#include "ui/wrap/fade_wrap.h" #include "ui/wrap/fade_wrap.h"
#include "ui/wrap/slide_wrap.h" #include "ui/wrap/slide_wrap.h"
#include "data/data_countries.h" #include "countries/countries_instance.h"
#include "data/data_user.h" // ->bot()->session() #include "data/data_user.h" // ->bot()->session()
#include "main/main_session.h" // ->session().user() #include "main/main_session.h" // ->session().user()
#include "ui/text/text_utilities.h" // Ui::Text::ToUpper #include "ui/text/text_utilities.h" // Ui::Text::ToUpper
@ -520,7 +520,7 @@ void PanelEditDocument::createDetailsRow(
object_ptr<Ui::BoxContent> box) { object_ptr<Ui::BoxContent> box) {
controller->show(std::move(box)); controller->show(std::move(box));
}; };
const auto isoByPhone = Data::CountryISO2ByPhone( const auto isoByPhone = Countries::CountryISO2ByPhone(
_controller->bot()->session().user()->phone()); _controller->bot()->session().user()->phone());
const auto [it, ok] = _details.emplace( const auto [it, ok] = _details.emplace(

6
Telegram/SourceFiles/passport/ui/passport_details_row.cpp
View file

@ -16,7 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/wrap/slide_wrap.h" #include "ui/wrap/slide_wrap.h"
#include "ui/layers/box_content.h" #include "ui/layers/box_content.h"
#include "ui/boxes/country_select_box.h" #include "ui/boxes/country_select_box.h"
#include "data/data_countries.h" #include "countries/countries_instance.h"
#include "styles/style_layers.h" #include "styles/style_layers.h"
#include "styles/style_passport.h" #include "styles/style_passport.h"
@ -304,7 +304,7 @@ void AbstractTextRow<Input>::finishInnerAnimating() {
} }
QString CountryString(const QString &code) { QString CountryString(const QString &code) {
const auto name = Data::CountryNameByISO2(code); const auto name = Countries::CountryNameByISO2(code);
return name.isEmpty() ? tr::lng_passport_country_choose(tr::now) : name; return name.isEmpty() ? tr::lng_passport_country_choose(tr::now) : name;
} }
@ -383,7 +383,7 @@ void CountryRow::errorAnimationCallback() {
void CountryRow::chooseCountry() { void CountryRow::chooseCountry() {
const auto top = _value.current(); const auto top = _value.current();
const auto name = Data::CountryNameByISO2(top); const auto name = Countries::CountryNameByISO2(top);
const auto country = !name.isEmpty() const auto country = !name.isEmpty()
? top ? top
: !_defaultCountry.isEmpty() : !_defaultCountry.isEmpty()

4
Telegram/SourceFiles/payments/payments_form.cpp
View file

@ -14,7 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_photo.h" #include "data/data_photo.h"
#include "data/data_photo_media.h" #include "data/data_photo_media.h"
#include "data/data_file_origin.h" #include "data/data_file_origin.h"
#include "data/data_countries.h" #include "countries/countries_instance.h"
#include "history/history_item.h" #include "history/history_item.h"
#include "history/history_service.h" // HistoryServicePayment. #include "history/history_service.h" // HistoryServicePayment.
#include "stripe/stripe_api_client.h" #include "stripe/stripe_api_client.h"
@ -465,7 +465,7 @@ QString Form::defaultPhone() const {
} }
QString Form::defaultCountry() const { QString Form::defaultCountry() const {
return Data::CountryISO2ByPhone(defaultPhone()); return Countries::CountryISO2ByPhone(defaultPhone());
} }
void Form::fillPaymentMethodInformation() { void Form::fillPaymentMethodInformation() {

8
Telegram/SourceFiles/payments/ui/payments_field.cpp
View file

@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/text/format_values.h" #include "ui/text/format_values.h"
#include "ui/ui_utility.h" #include "ui/ui_utility.h"
#include "ui/special_fields.h" #include "ui/special_fields.h"
#include "data/data_countries.h" #include "countries/countries_instance.h"
#include "base/platform/base_platform_info.h" #include "base/platform/base_platform_info.h"
#include "base/event_filter.h" #include "base/event_filter.h"
#include "styles/style_payments.h" #include "styles/style_payments.h"
@ -189,7 +189,7 @@ struct SimpleFieldState {
[[nodiscard]] QString Parse(const FieldConfig &config) { [[nodiscard]] QString Parse(const FieldConfig &config) {
if (config.type == FieldType::Country) { if (config.type == FieldType::Country) {
return Data::CountryNameByISO2(config.value); return Countries::CountryNameByISO2(config.value);
} else if (config.type == FieldType::Money) { } else if (config.type == FieldType::Money) {
const auto amount = config.value.toLongLong(); const auto amount = config.value.toLongLong();
if (!amount) { if (!amount) {
@ -490,7 +490,7 @@ void Field::setupCountry() {
QObject::connect(_masked, &MaskedInputField::focused, [=] { QObject::connect(_masked, &MaskedInputField::focused, [=] {
setFocus(); setFocus();
const auto name = Data::CountryNameByISO2(_countryIso2); const auto name = Countries::CountryNameByISO2(_countryIso2);
const auto country = !name.isEmpty() const auto country = !name.isEmpty()
? _countryIso2 ? _countryIso2
: !_config.defaultCountry.isEmpty() : !_config.defaultCountry.isEmpty()
@ -503,7 +503,7 @@ void Field::setupCountry() {
raw->countryChosen( raw->countryChosen(
) | rpl::start_with_next([=](QString iso2) { ) | rpl::start_with_next([=](QString iso2) {
_countryIso2 = iso2; _countryIso2 = iso2;
_masked->setText(Data::CountryNameByISO2(iso2)); _masked->setText(Countries::CountryNameByISO2(iso2));
_masked->hideError(); _masked->hideError();
raw->closeBox(); raw->closeBox();
if (!iso2.isEmpty()) { if (!iso2.isEmpty()) {

4
Telegram/SourceFiles/payments/ui/payments_form_summary.cpp
View file

@ -16,7 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/wrap/fade_wrap.h" #include "ui/wrap/fade_wrap.h"
#include "ui/text/format_values.h" #include "ui/text/format_values.h"
#include "ui/text/text_utilities.h" #include "ui/text/text_utilities.h"
#include "data/data_countries.h" #include "countries/countries_instance.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "base/unixtime.h" #include "base/unixtime.h"
#include "styles/style_payments.h" #include "styles/style_payments.h"
@ -508,7 +508,7 @@ void FormSummary::setupSections(not_null<VerticalLayout*> layout) {
push(_information.shippingAddress.address2); push(_information.shippingAddress.address2);
push(_information.shippingAddress.city); push(_information.shippingAddress.city);
push(_information.shippingAddress.state); push(_information.shippingAddress.state);
push(Data::CountryNameByISO2( push(Countries::CountryNameByISO2(
_information.shippingAddress.countryIso2)); _information.shippingAddress.countryIso2));
push(_information.shippingAddress.postcode); push(_information.shippingAddress.postcode);
add( add(

14
Telegram/SourceFiles/ui/boxes/country_select_box.cpp
View file

@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/widgets/scroll_area.h" #include "ui/widgets/scroll_area.h"
#include "ui/widgets/multi_select.h" #include "ui/widgets/multi_select.h"
#include "ui/effects/ripple_animation.h" #include "ui/effects/ripple_animation.h"
#include "data/data_countries.h" #include "countries/countries_instance.h"
#include "base/qt_adapters.h" #include "base/qt_adapters.h"
#include "styles/style_layers.h" #include "styles/style_layers.h"
#include "styles/style_boxes.h" #include "styles/style_boxes.h"
@ -64,7 +64,7 @@ private:
void updateSelectedRow(); void updateSelectedRow();
void updateRow(int index); void updateRow(int index);
void setPressed(int pressed); void setPressed(int pressed);
const std::vector<not_null<const Data::CountryInfo*>> &current() const; const std::vector<not_null<const Countries::CountryInfo*>> &current() const;
Type _type = Type::Phones; Type _type = Type::Phones;
int _rowHeight = 0; int _rowHeight = 0;
@ -76,8 +76,8 @@ private:
std::vector<std::unique_ptr<RippleAnimation>> _ripples; std::vector<std::unique_ptr<RippleAnimation>> _ripples;
std::vector<not_null<const Data::CountryInfo*>> _list; std::vector<not_null<const Countries::CountryInfo*>> _list;
std::vector<not_null<const Data::CountryInfo*>> _filtered; std::vector<not_null<const Countries::CountryInfo*>> _filtered;
base::flat_map<QChar, std::vector<int>> _byLetter; base::flat_map<QChar, std::vector<int>> _byLetter;
std::vector<std::vector<QString>> _namesList; std::vector<std::vector<QString>> _namesList;
@ -174,7 +174,7 @@ CountrySelectBox::Inner::Inner(
, _rowHeight(st::countryRowHeight) { , _rowHeight(st::countryRowHeight) {
setAttribute(Qt::WA_OpaquePaintEvent); setAttribute(Qt::WA_OpaquePaintEvent);
const auto &byISO2 = Data::CountriesByISO2(); const auto &byISO2 = Countries::CountriesByISO2();
if (byISO2.contains(iso)) { if (byISO2.contains(iso)) {
LastValidISO = iso; LastValidISO = iso;
@ -188,7 +188,7 @@ CountrySelectBox::Inner::Inner(
if (lastValid) { if (lastValid) {
_list.emplace_back(lastValid); _list.emplace_back(lastValid);
} }
for (const auto &entry : Data::Countries()) { for (const auto &entry : Countries::Countries()) {
if (&entry != lastValid) { if (&entry != lastValid) {
_list.emplace_back(&entry); _list.emplace_back(&entry);
} }
@ -424,7 +424,7 @@ void CountrySelectBox::Inner::updateSelected(QPoint localPos) {
} }
auto CountrySelectBox::Inner::current() const auto CountrySelectBox::Inner::current() const
-> const std::vector<not_null<const Data::CountryInfo*>> & { -> const std::vector<not_null<const Countries::CountryInfo*>> & {
return _filter.isEmpty() ? _list : _filtered; return _filter.isEmpty() ? _list : _filtered;
} }

4
Telegram/SourceFiles/ui/boxes/country_select_box.h
View file

@ -10,9 +10,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/abstract_box.h" #include "boxes/abstract_box.h"
#include "styles/style_widgets.h" #include "styles/style_widgets.h"
namespace Data { namespace Countries {
struct CountryInfo; struct CountryInfo;
} // namespace Data } // namespace Countries
namespace Ui { namespace Ui {

6
Telegram/SourceFiles/ui/countryinput.cpp
View file

@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/widgets/multi_select.h" #include "ui/widgets/multi_select.h"
#include "ui/effects/ripple_animation.h" #include "ui/effects/ripple_animation.h"
#include "ui/boxes/country_select_box.h" #include "ui/boxes/country_select_box.h"
#include "data/data_countries.h" #include "countries/countries_instance.h"
#include "base/qt_adapters.h" #include "base/qt_adapters.h"
#include "styles/style_layers.h" #include "styles/style_layers.h"
#include "styles/style_boxes.h" #include "styles/style_boxes.h"
@ -114,7 +114,7 @@ void CountryInput::onChooseCode(const QString &code) {
Ui::hideLayer(); Ui::hideLayer();
_chosenIso = QString(); _chosenIso = QString();
if (code.length()) { if (code.length()) {
const auto &byCode = Data::CountriesByCode(); const auto &byCode = Countries::CountriesByCode();
const auto i = byCode.constFind(code); const auto i = byCode.constFind(code);
if (i != byCode.cend()) { if (i != byCode.cend()) {
const auto info = *i; const auto info = *i;
@ -132,7 +132,7 @@ void CountryInput::onChooseCode(const QString &code) {
bool CountryInput::chooseCountry(const QString &iso) { bool CountryInput::chooseCountry(const QString &iso) {
Ui::hideLayer(); Ui::hideLayer();
const auto &byISO2 = Data::CountriesByISO2(); const auto &byISO2 = Countries::CountriesByISO2();
const auto i = byISO2.constFind(iso); const auto i = byISO2.constFind(iso);
const auto info = (i != byISO2.cend()) ? (*i) : nullptr; const auto info = (i != byISO2.cend()) ? (*i) : nullptr;

4
Telegram/SourceFiles/ui/special_fields.cpp
View file

@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/special_fields.h" #include "ui/special_fields.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "data/data_countries.h" // Data::ValidPhoneCode #include "countries/countries_instance.h" // Countries::ValidPhoneCode
#include "numbers.h" #include "numbers.h"
#include <QtCore/QRegularExpression> #include <QtCore/QRegularExpression>
@ -83,7 +83,7 @@ void CountryCodeInput::correctValue(
} }
} }
if (!addToNumber.isEmpty()) { if (!addToNumber.isEmpty()) {
auto validCode = Data::ValidPhoneCode(newText.mid(1)); auto validCode = Countries::ValidPhoneCode(newText.mid(1));
addToNumber = newText.mid(1 + validCode.length()) + addToNumber; addToNumber = newText.mid(1 + validCode.length()) + addToNumber;
newText = '+' + validCode; newText = '+' + validCode;
} }

4
Telegram/cmake/td_ui.cmake
View file

@ -58,8 +58,8 @@ PRIVATE
core/mime_type.cpp core/mime_type.cpp
core/mime_type.h core/mime_type.h
data/data_countries.cpp countries/countries_instance.cpp
data/data_countries.h countries/countries_instance.h
layout/abstract_layout_item.cpp layout/abstract_layout_item.cpp
layout/abstract_layout_item.h layout/abstract_layout_item.h