Change keyboard to maximum set

MafiaTelegramBot.sln.DotSettings.user

@@ -1,7 +1,7 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=MafiaTelegramBot_002Fappsettings/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=MafiaTelegramBot_002FResources_002Fcallback/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=MafiaTelegramBot_002FResources_002Fkeyboard/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=MafiaTelegramBot_002FResources_002Fcallback/@EntryIndexedValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=MafiaTelegramBot_002FResources_002Fkeyboard/@EntryIndexedValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=MafiaTelegramBot_002FResources_002Fstrings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=MafiaTelegramBot_002Fstrings/@EntryIndexedValue">True</s:Boolean>
 	

MafiaTelegramBot/Models/Bot.cs

@@ -69,11 +69,10 @@ namespace MafiaTelegramBot.Models
                 new MakeExtendedGameQuery(),
                 new MakePublicRoomQuery(),
                 new SettingsQuery(),
-                new ChangeNameQuery(),
+                new ChangeNickNameQuery(),
                 new SettingsRoomQuery(),
                 new ConnectToPrivateRoomQuery(),
-                new IncreaseRoomMaxCapacityQuery(),
-                new DecreaseRoomMaxCapacity(),
+                new SetPlayersMaximumQuery(),
                 new ConnectToPublicRoomQuery(),
                 new ConnectToSelectedRoomQuery()
             };

MafiaTelegramBot/Models/Commands/RoomSettingsCommand.cs

@@ -17,7 +17,7 @@ namespace MafiaTelegramBot.Models.Commands
             var room = await RoomController.GetRoom(roomKey);
             var roomMaxCapacity = room.MaxPlayers;
             var message = $"{strings.max_capacity_message}: {roomMaxCapacity}";
-            return await Bot.SendWithMarkdown2(ChatId, message, Keyboards.IncreaseDecreaseKeyboard(UserId));
+            return await Bot.SendWithMarkdown2(ChatId, message, Keyboards.SetMaximumKeyboard(UserId));
         }
     }
 }

MafiaTelegramBot/Models/Inlines/ChangeNameQuery.cs → MafiaTelegramBot/Models/Inlines/ChangeNickNameQuery.cs

@@ -4,9 +4,9 @@ using Telegram.Bot.Types;
 
 namespace MafiaTelegramBot.Models.Inlines
 {
-    public class ChangeNameQuery : Query
+    public class ChangeNickNameQuery : Query
     {
-        protected override string Name => callback.change_name;
+        protected override string Name => callback.change_nick_name;
 
         protected override async Task<Message> Execute(Update update)
         {

MafiaTelegramBot/Models/Inlines/DecreaseRoomMaxCapacity.cs

@@ -1,24 +0,0 @@
-using System.Threading.Tasks;
-using MafiaTelegramBot.Controllers;
-using MafiaTelegramBot.DataBase;
-using MafiaTelegramBot.Resources;
-using Telegram.Bot.Types;
-
-namespace MafiaTelegramBot.Models.Inlines
-{
-    public class DecreaseRoomMaxCapacity:Query
-    {
-        protected override string Name => callback.decrease_number_of_players;
-
-        protected override async Task<Message> Execute(Update update)
-        {
-            var messageId = update.CallbackQuery.Message.MessageId;
-            var user = await UserDao.GetUserById(UserId);
-            var roomKey = user.GetRoomKey();
-            var room = await RoomController.GetRoom(roomKey);
-            if (room.MaxPlayers > Constants.PLAYER_LIMITS_MIN) --room.MaxPlayers;
-            var message = $"{strings.max_capacity_message}: {room.MaxPlayers}";
-            return await Bot.Get().EditMessageTextAsync(ChatId, messageId, message, replyMarkup:Keyboards.IncreaseDecreaseKeyboard(UserId));
-        }
-    }
-}

MafiaTelegramBot/Models/Inlines/IncreaseRoomMaxCapacityQuery.cs

@@ -1,24 +0,0 @@
-using System.Threading.Tasks;
-using MafiaTelegramBot.Controllers;
-using MafiaTelegramBot.DataBase;
-using MafiaTelegramBot.Resources;
-using Telegram.Bot.Types;
-
-namespace MafiaTelegramBot.Models.Inlines
-{
-    public class IncreaseRoomMaxCapacityQuery : Query
-    {
-        protected override string Name => callback.increase_number_of_players;
-
-        protected override async Task<Message> Execute(Update update)
-        {
-            var messageId = update.CallbackQuery.Message.MessageId;
-            var user = await UserDao.GetUserById(UserId);
-            var roomKey = user.GetRoomKey();
-            var room = await RoomController.GetRoom(roomKey);
-            if (room.MaxPlayers < Constants.PLAYER_LIMITS_MAX) ++room.MaxPlayers;
-            var message = $"{strings.max_capacity_message}: {room.MaxPlayers}";
-            return await Bot.Get().EditMessageTextAsync(ChatId, messageId, message, replyMarkup:Keyboards.IncreaseDecreaseKeyboard(UserId));
-        }
-    }
-}

MafiaTelegramBot/Models/Inlines/SetPlayersMaximumQuery.cs

@@ -0,0 +1,26 @@
+using System.Threading.Tasks;
+using MafiaTelegramBot.Controllers;
+using MafiaTelegramBot.DataBase;
+using MafiaTelegramBot.Resources;
+using Telegram.Bot.Types;
+
+namespace MafiaTelegramBot.Models.Inlines
+{
+    public class SetPlayersMaximumQuery : Query
+    {
+        protected override string Name => callback.set_players_maximum;
+
+        protected override async Task<Message> Execute(Update update)
+        {
+            await DeletePreviousMessage(ChatId, update.CallbackQuery.Message.MessageId);
+            var data = update.CallbackQuery.Data;
+            var count = int.Parse(data.Split('|')[2]);
+            var user = await UserDao.GetUserById(UserId);
+            var roomKey = user.GetRoomKey();
+            var room = await RoomController.GetRoom(roomKey);
+            room.MaxPlayers = count;
+            var message = $"{strings.maximum_was_set_to}: _*{count}*_ {strings.players}";
+            return await Bot.SendWithMarkdown2(ChatId, message);
+        }
+    }
+}

MafiaTelegramBot/Resources/Keyboards.cs

@@ -46,12 +46,31 @@ namespace MafiaTelegramBot.Resources
             });
         }
 
-        public static InlineKeyboardMarkup IncreaseDecreaseKeyboard(long userId)
+        public static InlineKeyboardMarkup SetMaximumKeyboard(long userId)
         {
             return new (new[]
             {
-                new[] {InlineKeyboardButton.WithCallbackData(strings.decrease_number_of_players, $"{callback.decrease_number_of_players}|{userId}"),
-                    InlineKeyboardButton.WithCallbackData(strings.increase_number_of_players, $"{callback.increase_number_of_players}|{userId}")}
+                new[] {
+                    InlineKeyboardButton.WithCallbackData(strings.minimum_players_count, $"{callback.set_players_maximum}|{userId}|6"),
+                },
+                new[] {
+                    InlineKeyboardButton.WithCallbackData("7", $"{callback.set_players_maximum}|{userId}|7"),
+                    InlineKeyboardButton.WithCallbackData("8", $"{callback.set_players_maximum}|{userId}|8"),
+                    InlineKeyboardButton.WithCallbackData("9", $"{callback.set_players_maximum}|{userId}|9"),
+                },
+                new[] {
+                    InlineKeyboardButton.WithCallbackData("10", $"{callback.set_players_maximum}|{userId}|10"),
+                    InlineKeyboardButton.WithCallbackData("11", $"{callback.set_players_maximum}|{userId}|11"),
+                    InlineKeyboardButton.WithCallbackData("12", $"{callback.set_players_maximum}|{userId}|12"),
+                },
+                new[] {
+                    InlineKeyboardButton.WithCallbackData("13", $"{callback.set_players_maximum}|{userId}|13"),
+                    InlineKeyboardButton.WithCallbackData("14", $"{callback.set_players_maximum}|{userId}|14"),
+                    InlineKeyboardButton.WithCallbackData("15", $"{callback.set_players_maximum}|{userId}|15"),
+                },
+                new[] {
+                    InlineKeyboardButton.WithCallbackData(strings.maximum_players_count, $"{callback.set_players_maximum}|{userId}|16"),
+                }
             });
         }
 
@@ -80,7 +99,7 @@ namespace MafiaTelegramBot.Resources
 
         public static InlineKeyboardMarkup ChangeNameKeyboard(long userId)
         {
-            return new(InlineKeyboardButton.WithCallbackData(strings.change_name, $"{callback.change_name}|{userId}"));
+            return new(InlineKeyboardButton.WithCallbackData(strings.change_name, $"{callback.change_nick_name}|{userId}"));
         }
 
         public static InlineKeyboardMarkup RoomsKeyboard(List<GameRoom> rooms, long userId)

MafiaTelegramBot/Resources/callback.Designer.cs

@@ -61,11 +61,11 @@ namespace MafiaTelegramBot.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to change_name.
+        ///   Looks up a localized string similar to change_nick_name.
         /// </summary>
-        internal static string change_name {
+        internal static string change_nick_name {
             get {
-                return ResourceManager.GetString("change_name", resourceCulture);
+                return ResourceManager.GetString("change_nick_name", resourceCulture);
             }
         }
         
@@ -150,6 +150,15 @@ namespace MafiaTelegramBot.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to set_players_maximum.
+        /// </summary>
+        internal static string set_players_maximum {
+            get {
+                return ResourceManager.GetString("set_players_maximum", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to settings_profile.
         /// </summary>

MafiaTelegramBot/Resources/callback.resx

@@ -18,8 +18,8 @@
     <resheader name="writer">
         <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
     </resheader>
-    <data name="change_name" xml:space="preserve">
-        <value>change_name</value>
+    <data name="change_nick_name" xml:space="preserve">
+        <value>change_nick_name</value>
     </data>
     <data name="connect_to_private_room" xml:space="preserve">
         <value>connect_to_private_room</value>
@@ -60,4 +60,7 @@
     <data name="connect_to_selected_room" xml:space="preserve">
         <value>connect_to_selected_room</value>
     </data>
+    <data name="set_players_maximum" xml:space="preserve">
+        <value>set_players_maximum</value>
+    </data>
 </root>

MafiaTelegramBot/Resources/strings.Designer.cs

@@ -114,15 +114,6 @@ namespace MafiaTelegramBot {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to -.
-        /// </summary>
-        internal static string decrease_number_of_players {
-            get {
-                return ResourceManager.GetString("decrease_number_of_players", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Введите код от комнаты.
         /// </summary>
@@ -195,15 +186,6 @@ namespace MafiaTelegramBot {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to +.
-        /// </summary>
-        internal static string increase_number_of_players {
-            get {
-                return ResourceManager.GetString("increase_number_of_players", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Вы покинули игру.
         /// </summary>
@@ -240,6 +222,33 @@ namespace MafiaTelegramBot {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Максимум - 16 игроков.
+        /// </summary>
+        internal static string maximum_players_count {
+            get {
+                return ResourceManager.GetString("maximum_players_count", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Максимум был установлен на.
+        /// </summary>
+        internal static string maximum_was_set_to {
+            get {
+                return ResourceManager.GetString("maximum_was_set_to", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Минимум - 6 игроков.
+        /// </summary>
+        internal static string minimum_players_count {
+            get {
+                return ResourceManager.GetString("minimum_players_count", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Мои роли.
         /// </summary>
@@ -267,6 +276,15 @@ namespace MafiaTelegramBot {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to игроков.
+        /// </summary>
+        internal static string players {
+            get {
+                return ResourceManager.GetString("players", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Сначала покиньте комнату.
         /// </summary>
@@ -448,7 +466,7 @@ namespace MafiaTelegramBot {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to В комнате нет игроков, кроме вас .
+        ///   Looks up a localized string similar to В комнате нет игроков, кроме Вас.
         /// </summary>
         internal static string users_list_empty {
             get {

MafiaTelegramBot/Resources/strings.resx

@@ -130,13 +130,7 @@
         <value>Участники в комнате</value>
     </data>
     <data name="users_list_empty" xml:space="preserve">
-        <value>В комнате нет игроков, кроме вас </value>
-    </data>
-    <data name="decrease_number_of_players" xml:space="preserve">
-        <value>-</value>
-    </data>
-    <data name="increase_number_of_players" xml:space="preserve">
-        <value>+</value>
+        <value>В комнате нет игроков, кроме Вас</value>
     </data>
     <data name="max_capacity_message" xml:space="preserve">
         <value>Максимальное кол-во игроков</value>
@@ -162,4 +156,16 @@
     <data name="game_already_running" xml:space="preserve">
         <value>Игра уже запущена</value>
     </data>
+    <data name="minimum_players_count" xml:space="preserve">
+        <value>Минимум - 6 игроков</value>
+    </data>
+    <data name="maximum_players_count" xml:space="preserve">
+        <value>Максимум - 16 игроков</value>
+    </data>
+    <data name="maximum_was_set_to" xml:space="preserve">
+        <value>Максимум был установлен на</value>
+    </data>
+    <data name="players" xml:space="preserve">
+        <value>игроков</value>
+    </data>
 </root>