Add style field support for keyboard buttons

Author: Al-Muhandis

test/testtelegram.pas

@@ -85,6 +85,13 @@   TTestReactionUpdates=class(TTestCase)
     procedure ParseMessageReactionCountUpdate;
   end;
 
+  { TTestSenderTypes }
+
+  TTestSenderTypes=class(TTestCase)
+  published
+    procedure KeyboardButtonsStyle;
+  end;
+
   { TTestReceiveLongPollingBase }
   { Test receiving updates via longpolling from the test bot. Please send test messages to the bot
     immediately before running the test! }
@@ -467,6 +474,38 @@ procedure TTestMessageQuote.ParseMessageExternalReply;
   end;
 end;
 
+{ TTestSenderTypes }
+
+procedure TTestSenderTypes.KeyboardButtonsStyle;
+var
+  aReplyMarkup: TReplyMarkup;
+  aReplyButtons: TKeyboardButtons;
+  aInlineButtons: TInlineKeyboardButtons;
+  aReplyButton: TKeyboardButton;
+  aInlineButton: TInlineKeyboardButton;
+begin
+  aReplyMarkup:=TReplyMarkup.Create;
+  try
+    aReplyButtons:=aReplyMarkup.CreateReplyKeyboard.Add;
+    aReplyButton:=TKeyboardButton.Create('Reply button');
+    aReplyButton.Style:='primary';
+    aReplyButtons.Add(aReplyButton);
+
+    aInlineButtons:=aReplyMarkup.CreateInlineKeyBoard.Add;
+    aInlineButton:=TInlineKeyboardButton.Create('Inline button');
+    aInlineButton.Callback_Data:='cb';
+    aInlineButton.Style:='secondary';
+    aInlineButtons.Add(aInlineButton);
+
+    AssertEquals('primary', aReplyButton.Style);
+    AssertEquals('secondary', aInlineButton.Style);
+    AssertTrue('Reply keyboard JSON should contain style', Pos('"style" : "primary"', aReplyMarkup.AsJSON)>0);
+    AssertTrue('Inline keyboard JSON should contain style', Pos('"style" : "secondary"', aReplyMarkup.AsJSON)>0);
+  finally
+    aReplyMarkup.Free;
+  end;
+end;
+
 { TTestSender }
 
 procedure TTestSender.SetUp;
@@ -794,6 +833,6 @@ procedure TTestSender.getChatAdministators;
 
 initialization
   RegisterTests([TTestSender, TTestSenderProcedure, TTestProxySender, TTestReceiveLongPolling,
-    TTestPayments, TTestReactionUpdates, TTestMessageQuote]);
+    TTestPayments, TTestReactionUpdates, TTestMessageQuote, TTestSenderTypes]);
 
 end.

tgsendertypes.pas

@@ -104,20 +104,23 @@   TReplyMarkupClass=class of TReplyMarkup;
 
   { TKeyboardButton }
 
-  TKeyboardButton = class(TJSONObject)
-  private
-    function GetRequestContact: Boolean;
-    function GetRequestLocation: Boolean;
-    function Gettext: String;
-    procedure SetRequestContact(AValue: Boolean);
-    procedure SetRequestLocation(AValue: Boolean);
-    procedure Settext(AValue: String);
-  public
-    constructor Create(const AText: String);
-    property text: String read Gettext write Settext;
-    property RequestContact: Boolean read GetRequestContact write SetRequestContact; // Optional
-    property RequestLocation: Boolean read GetRequestLocation write SetRequestLocation; // Optional
-  end;
+  TKeyboardButton = class(TJSONObject)
+  private
+    function GetRequestContact: Boolean;
+    function GetRequestLocation: Boolean;
+    function GetStyle: String;
+    function Gettext: String;
+    procedure SetRequestContact(AValue: Boolean);
+    procedure SetRequestLocation(AValue: Boolean);
+    procedure SetStyle(AValue: String);
+    procedure Settext(AValue: String);
+  public
+    constructor Create(const AText: String);
+    property text: String read Gettext write Settext;
+    property Style: String read GetStyle write SetStyle; // Optional
+    property RequestContact: Boolean read GetRequestContact write SetRequestContact; // Optional
+    property RequestLocation: Boolean read GetRequestLocation write SetRequestLocation; // Optional
+  end;
 
   { TKeyboardButtons }
 
@@ -140,21 +143,24 @@   TInlineKeyboardButton = class(TJSONObject)
     function CheckOptnlNull: Boolean;
     procedure CheckOptnlAndSet(const ParamName, ParamValue: String);
     function Getcallback_data: String;
-    function Getswitch_inline_query: String;
-    function Getswitch_inline_query_current_chat: String;
-    function Gettext: String;
-    function Geturl: String;
-    procedure Setcallback_data(AValue: String);
-    procedure Setswitch_inline_query(AValue: String);
-    procedure Setswitch_inline_query_current_chat(AValue: String);
-    procedure Settext(AValue: String);
+    function Getswitch_inline_query: String;
+    function Getswitch_inline_query_current_chat: String;
+    function GetStyle: String;
+    function Gettext: String;
+    function Geturl: String;
+    procedure Setcallback_data(AValue: String);
+    procedure SetStyle(AValue: String);
+    procedure Setswitch_inline_query(AValue: String);
+    procedure Setswitch_inline_query_current_chat(AValue: String);
+    procedure Settext(AValue: String);
     procedure Seturl(AValue: String);
   public
     constructor Create(const AText: String);
-    property text: String read Gettext write Settext;
-    property url: String read Geturl write Seturl;
-    property callback_data: String read Getcallback_data write Setcallback_data;
-    property switch_inline_query: String read Getswitch_inline_query write Setswitch_inline_query;
+    property text: String read Gettext write Settext;
+    property Style: String read GetStyle write SetStyle;
+    property url: String read Geturl write Seturl;
+    property callback_data: String read Getcallback_data write Setcallback_data;
+    property switch_inline_query: String read Getswitch_inline_query write Setswitch_inline_query;
     property switch_inline_query_current_chat: String read Getswitch_inline_query_current_chat
       write Setswitch_inline_query_current_chat;
   end;
@@ -854,9 +860,10 @@ implementation
   s_RemoveKeyboard = 'remove_keyboard';
   s_ResizeKeyboard = 'resize_keyboard';
   s_OneTimeKeyboard = 'one_time_keyboard';
-  s_RequestContact = 'request_contact';
-  s_RequestLocation = 'request_location';
-  s_SwitchInlineQuery = 'switch_inline_query';
+  s_RequestContact = 'request_contact';
+  s_RequestLocation = 'request_location';
+  s_Style = 'style';
+  s_SwitchInlineQuery = 'switch_inline_query';
   s_CallbackData = 'callback_data';
   s_SwitchInlineQueryCurrentChat = 's_switch_inline_query_current_chat';
   s_Selective = 'selective';
@@ -1692,10 +1699,15 @@ function TKeyboardButton.GetRequestLocation: Boolean;
   Result:=Get(s_RequestLocation, False);
 end;
 
-function TKeyboardButton.Gettext: String;
-begin
-  Result:=Strings[s_text];
-end;
+function TKeyboardButton.Gettext: String;
+begin
+  Result:=Strings[s_text];
+end;
+
+function TKeyboardButton.GetStyle: String;
+begin
+  Result:=Strings[s_Style];
+end;
 
 procedure TKeyboardButton.SetRequestContact(AValue: Boolean);
 begin
@@ -1707,10 +1719,15 @@ procedure TKeyboardButton.SetRequestLocation(AValue: Boolean);
   Booleans[s_RequestLocation]:=AValue;
 end;
 
-procedure TKeyboardButton.Settext(AValue: String);
-begin
-  Strings[s_text]:=AValue;
-end;
+procedure TKeyboardButton.Settext(AValue: String);
+begin
+  Strings[s_text]:=AValue;
+end;
+
+procedure TKeyboardButton.SetStyle(AValue: String);
+begin
+  Strings[s_Style]:=AValue;
+end;
 
 constructor TKeyboardButton.Create(const AText: String);
 begin
@@ -1905,20 +1922,30 @@ function TReplyMarkup.CreateReplyKeyboard: TKeyboardButtonArray;
 
 { TInlineKeyboardButton }
 
-procedure TInlineKeyboardButton.Settext(AValue: String);
-begin
-  Strings[s_text]:=AValue;
-end;
+procedure TInlineKeyboardButton.Settext(AValue: String);
+begin
+  Strings[s_text]:=AValue;
+end;
+
+procedure TInlineKeyboardButton.SetStyle(AValue: String);
+begin
+  Strings[s_Style]:=AValue;
+end;
 
 procedure TInlineKeyboardButton.Setcallback_data(AValue: String);
 begin
   CheckOptnlAndSet(s_callbackdata, AValue);
 end;
 
-function TInlineKeyboardButton.Geturl: String;
-begin
-  Result:=Strings[s_url];
-end;
+function TInlineKeyboardButton.Geturl: String;
+begin
+  Result:=Strings[s_url];
+end;
+
+function TInlineKeyboardButton.GetStyle: String;
+begin
+  Result:=Strings[s_Style];
+end;
 
 function TInlineKeyboardButton.CheckOptnlNull: Boolean;
 begin