From 6c08bab55070d591a0048e0fc069ccca82b62375 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 6 Apr 2020 15:54:05 +0400
Subject: [PATCH] Add explanation block to CreatePollBox.

---
 Telegram/Resources/langs/lang.strings         |  3 ++
 Telegram/SourceFiles/boxes/boxes.style        |  7 +++-
 .../SourceFiles/boxes/create_poll_box.cpp     | 39 +++++++++++++++++++
 Telegram/SourceFiles/boxes/create_poll_box.h  |  9 +++--
 4 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 6105b2b48..cbf5cb6ee 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2223,6 +2223,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_polls_choose_question" = "Please enter a question.";
 "lng_polls_choose_answers" = "Please enter at least two options.";
 "lng_polls_choose_correct" = "Please choose the correct answer.";
+"lng_polls_solution_title" = "Explanation";
+"lng_polls_solution_placeholder" = "Add a Comment (Optional)";
+"lng_polls_solution_about" = "Users will see this comment after choosing a wrong answer, good for educational purposes.";
 
 "lng_polls_poll_results_title" = "Poll results";
 "lng_polls_quiz_results_title" = "Quiz results";
diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index 4bb710fa6..e9a6cded9 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -800,7 +800,7 @@ themesMenuPosition: point(-2px, 25px);
 
 createPollField: InputField(defaultInputField) {
 	font: boxTextFont;
-	textMargins: margins(0px, 0px, 0px, 0px);
+	textMargins: margins(0px, 4px, 0px, 4px);
 	textAlign: align(left);
 	heightMin: 36px;
 	heightMax: 86px;
@@ -822,6 +822,11 @@ createPollOptionField: InputField(createPollField) {
 	placeholderMargins: margins(2px, 0px, 2px, 0px);
 	heightMax: 68px;
 }
+createPollSolutionField: InputField(createPollField) {
+	textMargins: margins(0px, 4px, 0px, 4px);
+	border: 1px;
+	borderActive: 2px;
+}
 createPollLimitLabel: FlatLabel(defaultFlatLabel) {
 	minWidth: 274px;
 	align: align(topleft);
diff --git a/Telegram/SourceFiles/boxes/create_poll_box.cpp b/Telegram/SourceFiles/boxes/create_poll_box.cpp
index 510b91bea..15e9969da 100644
--- a/Telegram/SourceFiles/boxes/create_poll_box.cpp
+++ b/Telegram/SourceFiles/boxes/create_poll_box.cpp
@@ -794,6 +794,40 @@ not_null<Ui::InputField*> CreatePollBox::setupQuestion(
 	return question;
 }
 
+not_null<Ui::InputField*> CreatePollBox::setupSolution(
+		not_null<Ui::VerticalLayout*> container,
+		rpl::producer<bool> shown) {
+	using namespace Settings;
+
+	const auto outer = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container))
+	)->setDuration(0)->toggleOn(std::move(shown));
+	const auto inner = outer->entity();
+
+	AddSkip(inner);
+	AddSubsectionTitle(inner, tr::lng_polls_solution_title());
+	const auto solution = inner->add(
+		object_ptr<Ui::InputField>(
+			inner,
+			st::createPollSolutionField,
+			Ui::InputField::Mode::MultiLine,
+			tr::lng_polls_solution_placeholder()),
+		st::createPollFieldPadding);
+	InitField(getDelegate()->outerContainer(), solution, _session);
+	solution->setMaxLength(kQuestionLimit + kErrorLimit);
+
+	inner->add(
+		object_ptr<Ui::FlatLabel>(
+			inner,
+			tr::lng_polls_solution_about(),
+			st::boxDividerLabel),
+		st::createPollFieldTitlePadding);
+
+	return solution;
+}
+
 object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 	using namespace Settings;
 
@@ -866,6 +900,11 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 			(_chosen & PollData::Flag::Quiz),
 			st::defaultCheckbox),
 		st::createPollCheckboxMargin);
+
+	const auto explanation = setupSolution(
+		container,
+		rpl::single(quiz->checked()) | rpl::then(quiz->checkedChanges()));
+
 	quiz->setDisabled(_disabled & PollData::Flag::Quiz);
 	if (multiple) {
 		multiple->setDisabled((_disabled & PollData::Flag::MultiChoice)
diff --git a/Telegram/SourceFiles/boxes/create_poll_box.h b/Telegram/SourceFiles/boxes/create_poll_box.h
index f05b1dce1..b9750858f 100644
--- a/Telegram/SourceFiles/boxes/create_poll_box.h
+++ b/Telegram/SourceFiles/boxes/create_poll_box.h
@@ -36,7 +36,7 @@ public:
 		PollData::Flags disabled,
 		Api::SendType sendType);
 
-	rpl::producer<Result> submitRequests() const;
+	[[nodiscard]] rpl::producer<Result> submitRequests() const;
 	void submitFailed(const QString &error);
 
 	void setInnerFocus() override;
@@ -54,9 +54,12 @@ private:
 	friend constexpr inline bool is_flag_type(Error) { return true; }
 	using Errors = base::flags<Error>;
 
-	object_ptr<Ui::RpWidget> setupContent();
-	not_null<Ui::InputField*> setupQuestion(
+	[[nodiscard]] object_ptr<Ui::RpWidget> setupContent();
+	[[nodiscard]] not_null<Ui::InputField*> setupQuestion(
 		not_null<Ui::VerticalLayout*> container);
+	[[nodiscard]] not_null<Ui::InputField*> setupSolution(
+		not_null<Ui::VerticalLayout*> container,
+		rpl::producer<bool> shown);
 
 	const not_null<Main::Session*> _session;
 	const PollData::Flags _chosen = PollData::Flags();