kosyakmakc/TelegramBotFramework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moving TaggedButtonGrid icons into localization file

Browse Source
This commit is contained in:
FlorianDahn 2023-06-04 17:17:15 +02:00
parent 6ae92b0b29
commit 54513c0214
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
TelegramBotBase/Controls/Hybrid/TaggedButtonGrid.cs
View File

@ -41,6 +41,10 @@ public class TaggedButtonGrid : MultiView
public string UncheckAllLabel = Default.Language["ButtonGrid_UncheckAll"]; public string UncheckAllLabel = Default.Language["ButtonGrid_UncheckAll"];
public string SearchIcon = Default.Language["ButtonGrid_SearchIcon"];
public string TagIcon = Default.Language["ButtonGrid_TagIcon"];
public TaggedButtonGrid() public TaggedButtonGrid()
{ {
DataSource = new ButtonFormDataSource(); DataSource = new ButtonFormDataSource();
@ -427,7 +431,7 @@ public class TaggedButtonGrid : MultiView
} }
else if (EnableSearch) else if (EnableSearch)
{ {
if (result.MessageText.StartsWith("🔍")) if (result.MessageText.StartsWith(SearchIcon))
{ {
//Sent note about searching //Sent note about searching
if (SearchQuery == null) if (SearchQuery == null)
@ -452,7 +456,7 @@ public class TaggedButtonGrid : MultiView
} }
else if (Tags != null) else if (Tags != null)
{ {
if (result.MessageText == "📁") if (result.MessageText == TagIcon)
{ {
//Remove button click message //Remove button click message
if (DeletePreviousMessage && !Device.ActiveForm.IsAutoCleanForm()) if (DeletePreviousMessage && !Device.ActiveForm.IsAutoCleanForm())
@ -993,14 +997,14 @@ public class TaggedButtonGrid : MultiView
if (Tags != null && Tags.Count > 0) if (Tags != null && Tags.Count > 0)
{ {
row.Add(new ButtonBase("📁", "$filter$")); row.Add(new ButtonBase(TagIcon, "$filter$"));
} }
row.Add(new ButtonBase(NextPageLabel, "$next$")); row.Add(new ButtonBase(NextPageLabel, "$next$"));
if (EnableSearch) if (EnableSearch)
{ {
row.Insert(2, new ButtonBase("🔍 " + (SearchQuery ?? ""), "$search$")); row.Insert(2, new ButtonBase($"{SearchIcon} {(SearchQuery ?? "")}", "$search$"));
} }
dataForm.InsertButtonRow(0, row); dataForm.InsertButtonRow(0, row);

5
TelegramBotBase/Localizations/English.cs
View File

@ -10,8 +10,7 @@ public class English : Localization
Values["ButtonGrid_PreviousPage"] = "◀️"; Values["ButtonGrid_PreviousPage"] = "◀️";
Values["ButtonGrid_NextPage"] = "▶️"; Values["ButtonGrid_NextPage"] = "▶️";
Values["ButtonGrid_CurrentPage"] = "Page {0} of {1}"; Values["ButtonGrid_CurrentPage"] = "Page {0} of {1}";
Values["ButtonGrid_SearchFeature"] = Values["ButtonGrid_SearchFeature"] = "💡 Send a message to filter the list. Click the 🔍 to reset the filter.";
"💡 Send a message to filter the list. Click the 🔍 to reset the filter.";
Values["ButtonGrid_Back"] = "Back"; Values["ButtonGrid_Back"] = "Back";
Values["ButtonGrid_CheckAll"] = "Check all"; Values["ButtonGrid_CheckAll"] = "Check all";
Values["ButtonGrid_UncheckAll"] = "Uncheck all"; Values["ButtonGrid_UncheckAll"] = "Uncheck all";
@ -31,5 +30,7 @@ public class English : Localization
Values["MultiToggleButton_Changed"] = "Chosen"; Values["MultiToggleButton_Changed"] = "Chosen";
Values["PromptDialog_Back"] = "Back"; Values["PromptDialog_Back"] = "Back";
Values["ToggleButton_Changed"] = "Setting changed"; Values["ToggleButton_Changed"] = "Setting changed";
Values["ButtonGrid_SearchIcon"] = "🔍";
Values["ButtonGrid_TagIcon"] = "📁";
} }
} }