Remaining incompatibilities

This commit is contained in:
jpirnay
2026-04-15 12:52:49 +02:00
parent 21fba147d1
commit 84dbabc772
3 changed files with 57 additions and 57 deletions
@@ -183,7 +183,7 @@ void GlobalBookmarksActivity::renameSelected() {
entry.bookmarks[bookmarkIndex].name.empty() ? getRowTitle(selectorIndex) : entry.bookmarks[bookmarkIndex].name; entry.bookmarks[bookmarkIndex].name.empty() ? getRowTitle(selectorIndex) : entry.bookmarks[bookmarkIndex].name;
startActivityForResult(std::make_unique<KeyboardEntryActivity>(renderer, mappedInput, tr(STR_RENAME), initial, startActivityForResult(std::make_unique<KeyboardEntryActivity>(renderer, mappedInput, tr(STR_RENAME), initial,
BookmarkStore::MAX_NAME_LENGTH, false), BookmarkStore::MAX_NAME_LENGTH, InputType::Text),
[this, bookIndex, bookmarkIndex](const ActivityResult& result) { [this, bookIndex, bookmarkIndex](const ActivityResult& result) {
if (!result.isCancelled) { if (!result.isCancelled) {
const auto& kr = std::get<KeyboardResult>(result.data); const auto& kr = std::get<KeyboardResult>(result.data);
@@ -49,7 +49,7 @@ void StarredPagesActivity::startRename() {
const std::string initial = const std::string initial =
all[renamingIndex].name.empty() ? getDefaultLabel(renamingIndex) : all[renamingIndex].name; all[renamingIndex].name.empty() ? getDefaultLabel(renamingIndex) : all[renamingIndex].name;
startActivityForResult(std::make_unique<KeyboardEntryActivity>(renderer, mappedInput, tr(STR_RENAME), initial, startActivityForResult(std::make_unique<KeyboardEntryActivity>(renderer, mappedInput, tr(STR_RENAME), initial,
BookmarkStore::MAX_NAME_LENGTH, false), BookmarkStore::MAX_NAME_LENGTH, InputType::Text),
[this, renamingIndex](const ActivityResult& result) { [this, renamingIndex](const ActivityResult& result) {
if (!result.isCancelled) { if (!result.isCancelled) {
const auto& kr = std::get<KeyboardResult>(result.data); const auto& kr = std::get<KeyboardResult>(result.data);
@@ -114,8 +114,8 @@ void WeatherSettingsActivity::handleSelection() {
} }
void WeatherSettingsActivity::launchCitySearch() { void WeatherSettingsActivity::launchCitySearch() {
startActivityForResult( startActivityForResult(std::make_unique<KeyboardEntryActivity>(renderer, mappedInput, tr(STR_WEATHER_SEARCH_CITY), "",
std::make_unique<KeyboardEntryActivity>(renderer, mappedInput, tr(STR_WEATHER_SEARCH_CITY), "", 64, false), 64, InputType::Text),
[this](const ActivityResult& result) { [this](const ActivityResult& result) {
if (result.isCancelled) return; if (result.isCancelled) return;
@@ -143,8 +143,8 @@ void WeatherSettingsActivity::launchCitySearch() {
void WeatherSettingsActivity::launchLatitudeEntry() { void WeatherSettingsActivity::launchLatitudeEntry() {
std::string current = std::to_string(WEATHER_SETTINGS.getLatitude()); std::string current = std::to_string(WEATHER_SETTINGS.getLatitude());
startActivityForResult( startActivityForResult(std::make_unique<KeyboardEntryActivity>(renderer, mappedInput, tr(STR_WEATHER_LATITUDE),
std::make_unique<KeyboardEntryActivity>(renderer, mappedInput, tr(STR_WEATHER_LATITUDE), current, 12, false), current, 12, InputType::Text),
[this](const ActivityResult& result) { [this](const ActivityResult& result) {
if (!result.isCancelled) { if (!result.isCancelled) {
const auto& kb = std::get<KeyboardResult>(result.data); const auto& kb = std::get<KeyboardResult>(result.data);
@@ -163,8 +163,8 @@ void WeatherSettingsActivity::launchLatitudeEntry() {
void WeatherSettingsActivity::launchLongitudeEntry() { void WeatherSettingsActivity::launchLongitudeEntry() {
std::string current = std::to_string(WEATHER_SETTINGS.getLongitude()); std::string current = std::to_string(WEATHER_SETTINGS.getLongitude());
startActivityForResult( startActivityForResult(std::make_unique<KeyboardEntryActivity>(renderer, mappedInput, tr(STR_WEATHER_LONGITUDE),
std::make_unique<KeyboardEntryActivity>(renderer, mappedInput, tr(STR_WEATHER_LONGITUDE), current, 12, false), current, 12, InputType::Text),
[this](const ActivityResult& result) { [this](const ActivityResult& result) {
if (!result.isCancelled) { if (!result.isCancelled) {
const auto& kb = std::get<KeyboardResult>(result.data); const auto& kb = std::get<KeyboardResult>(result.data);