Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	MafiaTelegramBot/Models/Bot.cs
#	MafiaTelegramBot/Resources/strings.resx

MafiaTelegramBot/Models/Bot.cs

@@ -47,10 +47,10 @@ namespace MafiaTelegramBot.Models
             _queriesList = new List<Query>
             {
                 new MyRolesQuery(),
-                new SettingsQuery(),
                 new ShopQuery(),
                 
                 new MakePrivateRoom(),
+                new SettingsQuery()
             };
         }
     }

MafiaTelegramBot/Models/Inlines/SettingsQuery.cs

@@ -1,6 +1,8 @@
 using System.Threading.Tasks;
+using MafiaTelegramBot.DataBase;
 using Telegram.Bot.Types;
 using Telegram.Bot.Types.Enums;
+using Telegram.Bot.Types.ReplyMarkups;
 
 namespace MafiaTelegramBot.Models.Inlines
 {
@@ -12,7 +14,10 @@ namespace MafiaTelegramBot.Models.Inlines
         {
             var chatId = update.CallbackQuery.Message.Chat.Id;
             await Bot.Get().SendChatActionAsync(chatId, ChatAction.Typing);
-            return await Bot.Get().SendTextMessageAsync(chatId, Name);
+            var userId = update.CallbackQuery.From.Id;
+            var user = await UserDao.GetUserById(userId);
+            var inlineKeyboard = new InlineKeyboardMarkup(InlineKeyboardButton.WithCallbackData(strings.change_name, strings.change_name_callback));
+            return await Bot.Get().SendTextMessageAsync(chatId, $"{strings.your_name} {user.Username}", replyMarkup: inlineKeyboard);
         }
     }
 }

MafiaTelegramBot/Resources/strings.Designer.cs

@@ -60,6 +60,24 @@ namespace MafiaTelegramBot {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Сменить имя.
+        /// </summary>
+        internal static string change_name {
+            get {
+                return ResourceManager.GetString("change_name", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to change_name.
+        /// </summary>
+        internal static string change_name_callback {
+            get {
+                return ResourceManager.GetString("change_name_callback", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Присоединиться к игре.
         /// </summary>
@@ -221,5 +239,14 @@ namespace MafiaTelegramBot {
                 return ResourceManager.GetString("wins_count", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Ваше имя:.
+        /// </summary>
+        internal static string your_name {
+            get {
+                return ResourceManager.GetString("your_name", resourceCulture);
+            }
+        }
     }
 }

MafiaTelegramBot/Resources/strings.resx

@@ -72,4 +72,13 @@
     <data name="make_private_room_callback" xml:space="preserve">
         <value>make_private_room</value>
     </data>
+    <data name="your_name" xml:space="preserve">
+        <value>Ваше имя:</value>
+    </data>
+    <data name="change_name" xml:space="preserve">
+        <value>Сменить имя</value>
+    </data>
+    <data name="change_name_callback" xml:space="preserve">
+        <value>change_name</value>
+    </data>
 </root>