mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00
Code Issues Releases Wiki Activity

Added all available calling codes on each country to CountrySelectBox.

Browse Source
This commit is contained in:
23rd
2021-09-02 21:41:31 +03:00
committed by John Preston
parent 45360adbc2
commit 48f7d715d6
4 changed files with 86 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Telegram/SourceFiles/ui/boxes/country_select_box.cpp
View File

@@ -40,7 +40,7 @@ public:
void refresh();
[[nodiscard]] rpl::producer<QString> countryChosen() const {
[[nodiscard]] rpl::producer<Entry> countryChosen() const {
return _countryChosen.events();
}
@@ -64,7 +64,7 @@ private:
void updateSelectedRow();
void updateRow(int index);
void setPressed(int pressed);
const std::vector<not_null<const Countries::Info*>> &current() const;
const std::vector<Entry> &current() const;
Type _type = Type::Phones;
int _rowHeight = 0;
@@ -76,12 +76,12 @@ private:
std::vector<std::unique_ptr<RippleAnimation>> _ripples;
std::vector<not_null<const Countries::Info*>> _list;
std::vector<not_null<const Countries::Info*>> _filtered;
std::vector<Entry> _list;
std::vector<Entry> _filtered;
base::flat_map<QChar, std::vector<int>> _byLetter;
std::vector<std::vector<QString>> _namesList;
rpl::event_stream<QString> _countryChosen;
rpl::event_stream<Entry> _countryChosen;
rpl::event_stream<ScrollToRequest> _mustScrollTo;
};
@@ -98,6 +98,16 @@ CountrySelectBox::CountrySelectBox(QWidget*, const QString &iso, Type type)
rpl::producer<QString> CountrySelectBox::countryChosen() const {
Expects(_ownedInner != nullptr || _inner != nullptr);
return (_ownedInner
? _ownedInner.data()
: _inner.data())->countryChosen() | rpl::map([](const Entry &e) {
return e.iso2;
});
}
rpl::producer<CountrySelectBox::Entry> CountrySelectBox::entryChosen() const {
Expects(_ownedInner != nullptr || _inner != nullptr);
return (_ownedInner
? _ownedInner.data()
: _inner.data())->countryChosen();
@@ -180,25 +190,36 @@ CountrySelectBox::Inner::Inner(
LastValidISO = iso;
}
const auto extractEntries = [&](const Countries::Info &info) {
for (const auto &code : info.codes) {
_list.push_back(Entry{
.country = info.name,
.iso2 = info.iso2,
.code = code.callingCode,
.alternativeName = info.alternativeName,
});
}
};
_list.reserve(byISO2.size());
_namesList.reserve(byISO2.size());
const auto l = byISO2.constFind(LastValidISO);
const auto lastValid = (l != byISO2.cend()) ? (*l) : nullptr;
if (lastValid) {
_list.emplace_back(lastValid);
extractEntries(*lastValid);
}
for (const auto &entry : Countries::Instance().list()) {
if (&entry != lastValid) {
_list.emplace_back(&entry);
extractEntries(entry);
}
}
auto index = 0;
for (const auto info : _list) {
auto full = info->name
auto full = info.country
+ ' '
+ (!info->alternativeName.isEmpty()
? info->alternativeName
+ (!info.alternativeName.isEmpty()
? info.alternativeName
: QString());
const auto namesList = std::move(full).toLower().split(
QRegularExpression("[\\s\\-]"),
@@ -256,10 +277,10 @@ void CountrySelectBox::Inner::paintEvent(QPaintEvent *e) {
}
}
auto code = QString("+") + list[i]->codes.front().callingCode;
auto code = QString("+") + list[i].code;
auto codeWidth = st::countryRowCodeFont->width(code);
auto name = list[i]->name;
auto name = list[i].country;
auto nameWidth = st::countryRowNameFont->width(name);
auto availWidth = width() - st::countryRowPadding.left() - st::countryRowPadding.right() - codeWidth - st::boxScroll.width;
if (nameWidth > availWidth) {
@@ -399,9 +420,9 @@ void CountrySelectBox::Inner::selectSkipPage(int32 h, int32 dir) {
void CountrySelectBox::Inner::chooseCountry() {
const auto &list = current();
_countryChosen.fire((_selected >= 0 && _selected < list.size())
? QString(list[_selected]->iso2)
: QString());
_countryChosen.fire_copy((_selected >= 0 && _selected < list.size())
? list[_selected]
: Entry());
}
void CountrySelectBox::Inner::refresh() {
@@ -424,7 +445,7 @@ void CountrySelectBox::Inner::updateSelected(QPoint localPos) {
}
auto CountrySelectBox::Inner::current() const
-> const std::vector<not_null<const Countries::Info*>> & {
-> const std::vector<CountrySelectBox::Entry> & {
return _filter.isEmpty() ? _list : _filtered;
}