Room type selector edited

MafiaTelegramBot/Models/Commands/ConnectGameCommand.cs

@@ -14,7 +14,8 @@ namespace MafiaTelegramBot.Models.Commands
             var user = await UserDao.GetUserById(UserId);
             if (user.GetRoomKey() != "")
                 return await Bot.SendWithMarkdown2(ChatId, strings.user_already_in_game);
-            return await Bot.SendWithMarkdown2(ChatId, strings.choose_type_room, Keyboards.ConnectToRoomKeyboard(UserId));
+            return await Bot.SendWithMarkdown2(ChatId, strings.choose_type_room, 
+                Keyboards.RoomTypeKeyboard(UserId, Callback.ConnectToPrivateRoom, Callback.ConnectToPublicRoom));
         }
     }
 }

MafiaTelegramBot/Models/Commands/CreateGameCommand.cs

@@ -14,7 +14,8 @@ namespace MafiaTelegramBot.Models.Commands
             var user = await UserDao.GetUserById(UserId);
             if (user.GetRoomKey() != "")
                 return await Bot.SendWithMarkdown2(ChatId, strings.user_already_in_game);
-            return await Bot.SendWithMarkdown2(ChatId, strings.settings_room, Keyboards.MakeRoomKeyboard(UserId));
+            return await Bot.SendWithMarkdown2(ChatId, strings.choose_type_room, 
+                Keyboards.RoomTypeKeyboard(UserId, Callback.MakePrivateRoom, Callback.MakePublicRoom));
         }
     }
 }

MafiaTelegramBot/Resources/Keyboards.cs

@@ -29,21 +29,12 @@ namespace MafiaTelegramBot.Resources
             }, true
         );
 
-        public static InlineKeyboardMarkup ConnectToRoomKeyboard(long userId)
+        public static InlineKeyboardMarkup RoomTypeKeyboard(long userId, Callback callbackPrivate, Callback callbackPublic)
         {
             return new(new[]
             {
-                new[] {InlineKeyboardButton.WithCallbackData(strings.connect_to_public_room, $"{Callback.ConnectToPublicRoom}|{userId}")},
-                new[] {InlineKeyboardButton.WithCallbackData(strings.connect_to_private_room, $"{Callback.ConnectToPrivateRoom}|{userId}")}
-            });
-        }
-
-        public static InlineKeyboardMarkup MakeRoomKeyboard(long userId)
-        {
-            return new(new[]
-            {
-                new[] {InlineKeyboardButton.WithCallbackData(strings.make_public_room, $"{Callback.MakePublicRoom}|{userId}")},
-                new[] {InlineKeyboardButton.WithCallbackData(strings.make_private_room, $"{Callback.MakePrivateRoom}|{userId}")}
+                InlineKeyboardButton.WithCallbackData(strings._public, $"{callbackPublic}|{userId}"),
+                InlineKeyboardButton.WithCallbackData(strings._private, $"{callbackPrivate}|{userId}"),
             });
         }
 
@@ -111,9 +102,8 @@ namespace MafiaTelegramBot.Resources
                 var s = rooms[i].IsExtended ? "Р" : "C";
                 inlineButtons[i] = new InlineKeyboardButton
                 {
-                    Text = $"{rooms[i].RoomName} ({rooms[i].Players.Values.Count.ToString()}/{rooms[i].MaxPlayers.ToString()})",
+                    Text = $"\\[{s}] {rooms[i].RoomName} ({rooms[i].Players.Values.Count.ToString()}/{rooms[i].MaxPlayers.ToString()})",
                     CallbackData = $"{Callback.ConnectToSelectedRoom}|{userId}|{RoomEncrypter.FullToShort(rooms[i].RoomName)}"
-                       
                 };
             }
             return new InlineKeyboardMarkup(inlineButtons);

MafiaTelegramBot/Resources/strings.Designer.cs

@@ -61,56 +61,56 @@ namespace MafiaTelegramBot {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Сменить имя.
+        ///   Looks up a localized string similar to Приватная.
         /// </summary>
-        internal static string change_name {
+        internal static string _private {
             get {
-                return ResourceManager.GetString("change_name", resourceCulture);
+                return ResourceManager.GetString("private", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Выберите режим игры.
+        ///   Looks up a localized string similar to Публичная.
         /// </summary>
-        internal static string choose_game_type {
+        internal static string _public {
             get {
-                return ResourceManager.GetString("choose_game_type", resourceCulture);
+                return ResourceManager.GetString("public", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Выберите тип комнаты.
+        ///   Looks up a localized string similar to Сменить имя.
         /// </summary>
-        internal static string choose_type_room {
+        internal static string change_name {
             get {
-                return ResourceManager.GetString("choose_type_room", resourceCulture);
+                return ResourceManager.GetString("change_name", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Команда не найдена.
+        ///   Looks up a localized string similar to Выберите режим игры.
         /// </summary>
-        internal static string command_not_found {
+        internal static string choose_game_type {
             get {
-                return ResourceManager.GetString("command_not_found", resourceCulture);
+                return ResourceManager.GetString("choose_game_type", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Приватная комната.
+        ///   Looks up a localized string similar to Выберите тип комнаты.
         /// </summary>
-        internal static string connect_to_private_room {
+        internal static string choose_type_room {
             get {
-                return ResourceManager.GetString("connect_to_private_room", resourceCulture);
+                return ResourceManager.GetString("choose_type_room", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Публичная комната.
+        ///   Looks up a localized string similar to Команда не найдена.
         /// </summary>
-        internal static string connect_to_public_room {
+        internal static string command_not_found {
             get {
-                return ResourceManager.GetString("connect_to_public_room", resourceCulture);
+                return ResourceManager.GetString("command_not_found", resourceCulture);
             }
         }
         
@@ -258,24 +258,6 @@ namespace MafiaTelegramBot {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Приватная комната.
-        /// </summary>
-        internal static string make_private_room {
-            get {
-                return ResourceManager.GetString("make_private_room", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Публичная комната.
-        /// </summary>
-        internal static string make_public_room {
-            get {
-                return ResourceManager.GetString("make_public_room", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Максимальное кол-во игроков.
         /// </summary>
@@ -483,15 +465,6 @@ namespace MafiaTelegramBot {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Переключить.
-        /// </summary>
-        internal static string switch_timer {
-            get {
-                return ResourceManager.GetString("switch_timer", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Таймер.
         /// </summary>

MafiaTelegramBot/Resources/strings.resx

@@ -42,12 +42,6 @@
     <data name="settings" xml:space="preserve">
         <value>Настройки</value>
     </data>
-    <data name="make_public_room" xml:space="preserve">
-        <value>Публичная комната</value>
-    </data>
-    <data name="make_private_room" xml:space="preserve">
-        <value>Приватная комната</value>
-    </data>
     <data name="your_name" xml:space="preserve">
         <value>Ваше имя:</value>
     </data>
@@ -105,12 +99,6 @@
     <data name="choose_type_room" xml:space="preserve">
         <value>Выберите тип комнаты</value>
     </data>
-    <data name="connect_to_private_room" xml:space="preserve">
-        <value>Приватная комната</value>
-    </data>
-    <data name="connect_to_public_room" xml:space="preserve">
-        <value>Публичная комната</value>
-    </data>
     <data name="enter_private_code" xml:space="preserve">
         <value>Введите код от комнаты</value>
     </data>
@@ -192,13 +180,16 @@
     <data name="disabled" xml:space="preserve">
         <value>отключен</value>
     </data>
-    <data name="switch_timer" xml:space="preserve">
-        <value>Переключить</value>
-    </data>
     <data name="enable" xml:space="preserve">
         <value>Включить</value>
     </data>
     <data name="disable" xml:space="preserve">
         <value>Отключить</value>
     </data>
+    <data name="public" xml:space="preserve">
+        <value>Публичная</value>
+    </data>
+    <data name="private" xml:space="preserve">
+        <value>Приватная</value>
+    </data>
 </root>