From 29432d5d6a793a3ebdd121bec82afd215aefdbf4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 29 Sep 2018 09:53:30 +0300
Subject: [PATCH] Remove some unused themes code.

---
 .../SourceFiles/settings/settings_chat.cpp    | 25 -------------------
 .../window/themes/window_theme.cpp            | 14 +----------
 .../SourceFiles/window/themes/window_theme.h  |  4 ---
 3 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_chat.cpp b/Telegram/SourceFiles/settings/settings_chat.cpp
index 471dd4336..72fecd6b9 100644
--- a/Telegram/SourceFiles/settings/settings_chat.cpp
+++ b/Telegram/SourceFiles/settings/settings_chat.cpp
@@ -710,29 +710,6 @@ void SetupChatBackground(not_null<Ui::VerticalLayout*> container) {
 	}, adaptive->lifetime());
 }
 
-void SetupUseDefaultTheme(not_null<Ui::VerticalLayout*> container) {
-	using Update = const Window::Theme::BackgroundUpdate;
-	container->add(
-		object_ptr<Ui::SlideWrap<Button>>(
-			container,
-			object_ptr<Button>(
-				container,
-				Lang::Viewer(lng_settings_bg_use_default),
-				st::settingsButton))
-	)->toggleOn(rpl::single(
-		Window::Theme::SuggestThemeReset()
-	) | rpl::then(base::ObservableViewer(
-		*Window::Theme::Background()
-	) | rpl::filter([](const Update &update) {
-		return (update.type == Update::Type::ApplyingTheme
-			|| update.type == Update::Type::New);
-	}) | rpl::map([] {
-		return Window::Theme::SuggestThemeReset();
-	})))->entity()->addClickHandler([] {
-		Window::Theme::ApplyDefault();
-	});
-}
-
 void SetupDefaultThemes(not_null<Ui::VerticalLayout*> container) {
 	using Type = DefaultTheme::Type;
 	using Scheme = DefaultTheme::Scheme;
@@ -932,8 +909,6 @@ void SetupThemeOptions(not_null<Ui::VerticalLayout*> container) {
 		container,
 		[] { Window::Theme::Editor::Start(); }));
 
-	//SetupUseDefaultTheme(container);
-
 	AddSkip(container);
 }
 
diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp
index c991e6aa8..aa5063cc6 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme.cpp
@@ -451,7 +451,7 @@ void ChatBackground::setPreparedImage(QImage &&image) {
 
 		if (testingPalette()) {
 			return false;
-		} else if (IsNonDefaultThemeOrBackground() || nightMode()) {
+		} else if (isNonDefaultThemeOrBackground() || nightMode()) {
 			return !usingThemeBackground();
 		}
 		return !usingDefaultBackground();
@@ -857,10 +857,6 @@ bool Apply(std::unique_ptr<Preview> preview) {
 	return true;
 }
 
-void ApplyDefault() {
-	ApplyDefaultWithPath(IsNightMode() ? NightThemePath() : QString());
-}
-
 void ApplyDefaultWithPath(const QString &themePath) {
 	if (!themePath.isEmpty()) {
 		if (auto preview = PreviewFromFile(themePath)) {
@@ -937,10 +933,6 @@ QString NightThemePath() {
 	return str_const_toString(kNightThemeFile);
 }
 
-bool IsNonDefaultThemeOrBackground() {
-	return Background()->isNonDefaultThemeOrBackground();
-}
-
 bool IsNonDefaultBackground() {
 	return Background()->isNonDefaultBackground();
 }
@@ -963,10 +955,6 @@ void ToggleNightMode(const QString &path) {
 	Background()->toggleNightMode(path);
 }
 
-bool SuggestThemeReset() {
-	return IsNonDefaultThemeOrBackground();
-}
-
 bool LoadFromFile(const QString &path, Instance *out, QByteArray *outContent) {
 	*outContent = readThemeContent(path);
 	if (outContent->size() < 4) {
diff --git a/Telegram/SourceFiles/window/themes/window_theme.h b/Telegram/SourceFiles/window/themes/window_theme.h
index 6ddf725ed..7169cb2bb 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.h
+++ b/Telegram/SourceFiles/window/themes/window_theme.h
@@ -56,7 +56,6 @@ struct Preview {
 
 bool Apply(const QString &filepath);
 bool Apply(std::unique_ptr<Preview> preview);
-void ApplyDefault();
 void ApplyDefaultWithPath(const QString &themePath);
 bool ApplyEditedPalette(const QString &path, const QByteArray &content);
 void KeepApplied();
@@ -66,8 +65,6 @@ void SetNightModeValue(bool nightMode);
 void ToggleNightMode();
 void ToggleNightMode(const QString &themePath);
 bool IsNonDefaultBackground();
-bool IsNonDefaultThemeOrBackground();
-bool SuggestThemeReset();
 void Revert();
 
 bool LoadFromFile(const QString &file, Instance *out, QByteArray *outContent);
@@ -154,7 +151,6 @@ private:
 	friend void ToggleNightMode(const QString &themePath);
 	friend void KeepApplied();
 	friend bool IsNonDefaultBackground();
-	friend bool IsNonDefaultThemeOrBackground();
 
 	int32 _id = internal::kUninitializedBackground;
 	QPixmap _pixmap;