Use some icons from lib_ui.

57 files changed, 58 insertions, 40 deletions

diff --git a/.gitignore b/.gitignore
index 0cc39366d3..baa5290152 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,8 @@
 /out/
-/Debug/
-/Release/
-/Deploy/
+Debug/
+Release/
 /ThirdParty/
 /Telegram/build/target
-/Telegram/GeneratedFiles/
-/Telegram/SourceFiles/art/grid.png
-/Telegram/SourceFiles/art/grid_125x.png
-/Telegram/SourceFiles/art/grid_150x.png
-/Telegram/SourceFiles/art/grid_200x.png
-/Telegram/SourceFiles/art/sprite_125x.png
-/Telegram/SourceFiles/art/sprite_150x.png
-/Telegram/Resources/art/grid.png
-/Telegram/Resources/art/grid_125x.png
-/Telegram/Resources/art/grid_150x.png
-/Telegram/Resources/art/grid_200x.png
-/Telegram/Resources/art/sprite_125x.png
-/Telegram/Resources/art/sprite_150x.png
-/Telegram/Debug/
-/Telegram/Release/
 /Telegram/tests/
 /Telegram/gyp/tests/*.test
 /Telegram/out/
@@ -32,7 +16,6 @@
 *.VC.db
 *.aps
 *.xcodeproj
-/Win32/
 ipch/
 .vs/
 
diff --git a/Telegram/Resources/icons/box_button_close.png b/Telegram/Resources/icons/box_button_close.png
deleted file mode 100644
index 3b0402893a..0000000000
--- a/Telegram/Resources/icons/box_button_close.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/box_button_close@2x.png b/Telegram/Resources/icons/box_button_close@2x.png
deleted file mode 100644
index fea726bdbe..0000000000
--- a/Telegram/Resources/icons/box_button_close@2x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/box_button_close@3x.png b/Telegram/Resources/icons/box_button_close@3x.png
deleted file mode 100644
index e818a6a97a..0000000000
--- a/Telegram/Resources/icons/box_button_close@3x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/box_search.png b/Telegram/Resources/icons/box_search.png
deleted file mode 100644
index 0473526076..0000000000
--- a/Telegram/Resources/icons/box_search.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/box_search@2x.png b/Telegram/Resources/icons/box_search@2x.png
deleted file mode 100644
index 4d2c66f86e..0000000000
--- a/Telegram/Resources/icons/box_search@2x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/box_search@3x.png b/Telegram/Resources/icons/box_search@3x.png
deleted file mode 100644
index 3b681f682e..0000000000
--- a/Telegram/Resources/icons/box_search@3x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/default_checkbox_check.png b/Telegram/Resources/icons/default_checkbox_check.png
deleted file mode 100644
index 574f57123b..0000000000
--- a/Telegram/Resources/icons/default_checkbox_check.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/default_checkbox_check@2x.png b/Telegram/Resources/icons/default_checkbox_check@2x.png
deleted file mode 100644
index 6d3859c84c..0000000000
--- a/Telegram/Resources/icons/default_checkbox_check@2x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/default_checkbox_check@3x.png b/Telegram/Resources/icons/default_checkbox_check@3x.png
deleted file mode 100644
index 46f67cbde1..0000000000
--- a/Telegram/Resources/icons/default_checkbox_check@3x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/dropdown_submenu_arrow.png b/Telegram/Resources/icons/dropdown_submenu_arrow.png
deleted file mode 100644
index d7015e7e52..0000000000
--- a/Telegram/Resources/icons/dropdown_submenu_arrow.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/dropdown_submenu_arrow@2x.png b/Telegram/Resources/icons/dropdown_submenu_arrow@2x.png
deleted file mode 100644
index 49ca1c3936..0000000000
--- a/Telegram/Resources/icons/dropdown_submenu_arrow@2x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/dropdown_submenu_arrow@3x.png b/Telegram/Resources/icons/dropdown_submenu_arrow@3x.png
deleted file mode 100644
index 68130c224a..0000000000
--- a/Telegram/Resources/icons/dropdown_submenu_arrow@3x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/fade_horizontal.png b/Telegram/Resources/icons/fade_horizontal.png
deleted file mode 100644
index f10b4f9246..0000000000
--- a/Telegram/Resources/icons/fade_horizontal.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/fade_horizontal@2x.png b/Telegram/Resources/icons/fade_horizontal@2x.png
deleted file mode 100644
index ed229a5b79..0000000000
--- a/Telegram/Resources/icons/fade_horizontal@2x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/fade_horizontal@3x.png b/Telegram/Resources/icons/fade_horizontal@3x.png
deleted file mode 100644
index 5f7f76e800..0000000000
--- a/Telegram/Resources/icons/fade_horizontal@3x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_bottom.png b/Telegram/Resources/icons/round_shadow_bottom.png
deleted file mode 100644
index 28ff21173b..0000000000
--- a/Telegram/Resources/icons/round_shadow_bottom.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_bottom@2x.png b/Telegram/Resources/icons/round_shadow_bottom@2x.png
deleted file mode 100644
index a64ca5c8e3..0000000000
--- a/Telegram/Resources/icons/round_shadow_bottom@2x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_bottom@3x.png b/Telegram/Resources/icons/round_shadow_bottom@3x.png
deleted file mode 100644
index ab45b1bf02..0000000000
--- a/Telegram/Resources/icons/round_shadow_bottom@3x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_bottom_left.png b/Telegram/Resources/icons/round_shadow_bottom_left.png
deleted file mode 100644
index 8beb9a7e12..0000000000
--- a/Telegram/Resources/icons/round_shadow_bottom_left.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_bottom_left@2x.png b/Telegram/Resources/icons/round_shadow_bottom_left@2x.png
deleted file mode 100644
index c1704521b7..0000000000
--- a/Telegram/Resources/icons/round_shadow_bottom_left@2x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_bottom_left@3x.png b/Telegram/Resources/icons/round_shadow_bottom_left@3x.png
deleted file mode 100644
index 0e96060783..0000000000
--- a/Telegram/Resources/icons/round_shadow_bottom_left@3x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_box_bottom.png b/Telegram/Resources/icons/round_shadow_box_bottom.png
deleted file mode 100644
index 379c612d9d..0000000000
--- a/Telegram/Resources/icons/round_shadow_box_bottom.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_box_bottom@2x.png b/Telegram/Resources/icons/round_shadow_box_bottom@2x.png
deleted file mode 100644
index 27561668aa..0000000000
--- a/Telegram/Resources/icons/round_shadow_box_bottom@2x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_box_bottom@3x.png b/Telegram/Resources/icons/round_shadow_box_bottom@3x.png
deleted file mode 100644
index 5bd5153092..0000000000
--- a/Telegram/Resources/icons/round_shadow_box_bottom@3x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_box_bottom_left.png b/Telegram/Resources/icons/round_shadow_box_bottom_left.png
deleted file mode 100644
index 3bb8de3563..0000000000
--- a/Telegram/Resources/icons/round_shadow_box_bottom_left.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_box_bottom_left@2x.png b/Telegram/Resources/icons/round_shadow_box_bottom_left@2x.png
deleted file mode 100644
index f31b3eb929..0000000000
--- a/Telegram/Resources/icons/round_shadow_box_bottom_left@2x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_box_bottom_left@3x.png b/Telegram/Resources/icons/round_shadow_box_bottom_left@3x.png
deleted file mode 100644
index a8b2b8d0b8..0000000000
--- a/Telegram/Resources/icons/round_shadow_box_bottom_left@3x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_box_left.png b/Telegram/Resources/icons/round_shadow_box_left.png
deleted file mode 100644
index 7f5e183c99..0000000000
--- a/Telegram/Resources/icons/round_shadow_box_left.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_box_left@2x.png b/Telegram/Resources/icons/round_shadow_box_left@2x.png
deleted file mode 100644
index 1e28073414..0000000000
--- a/Telegram/Resources/icons/round_shadow_box_left@2x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_box_left@3x.png b/Telegram/Resources/icons/round_shadow_box_left@3x.png
deleted file mode 100644
index f52dac8931..0000000000
--- a/Telegram/Resources/icons/round_shadow_box_left@3x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_box_top.png b/Telegram/Resources/icons/round_shadow_box_top.png
deleted file mode 100644
index f2ff11208b..0000000000
--- a/Telegram/Resources/icons/round_shadow_box_top.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_box_top@2x.png b/Telegram/Resources/icons/round_shadow_box_top@2x.png
deleted file mode 100644
index 37eb988929..0000000000
--- a/Telegram/Resources/icons/round_shadow_box_top@2x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_box_top@3x.png b/Telegram/Resources/icons/round_shadow_box_top@3x.png
deleted file mode 100644
index 96de2ada8f..0000000000
--- a/Telegram/Resources/icons/round_shadow_box_top@3x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_box_top_left.png b/Telegram/Resources/icons/round_shadow_box_top_left.png
deleted file mode 100644
index a5736889a3..0000000000
--- a/Telegram/Resources/icons/round_shadow_box_top_left.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_box_top_left@2x.png b/Telegram/Resources/icons/round_shadow_box_top_left@2x.png
deleted file mode 100644
index b67f40c1b9..0000000000
--- a/Telegram/Resources/icons/round_shadow_box_top_left@2x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_box_top_left@3x.png b/Telegram/Resources/icons/round_shadow_box_top_left@3x.png
deleted file mode 100644
index d8e5c7fb18..0000000000
--- a/Telegram/Resources/icons/round_shadow_box_top_left@3x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_left.png b/Telegram/Resources/icons/round_shadow_left.png
deleted file mode 100644
index e7df24dc12..0000000000
--- a/Telegram/Resources/icons/round_shadow_left.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_left@2x.png b/Telegram/Resources/icons/round_shadow_left@2x.png
deleted file mode 100644
index 2f78de2ab9..0000000000
--- a/Telegram/Resources/icons/round_shadow_left@2x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_left@3x.png b/Telegram/Resources/icons/round_shadow_left@3x.png
deleted file mode 100644
index 2431067e23..0000000000
--- a/Telegram/Resources/icons/round_shadow_left@3x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_top.png b/Telegram/Resources/icons/round_shadow_top.png
deleted file mode 100644
index 39edc4a4eb..0000000000
--- a/Telegram/Resources/icons/round_shadow_top.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_top@2x.png b/Telegram/Resources/icons/round_shadow_top@2x.png
deleted file mode 100644
index af421f2a05..0000000000
--- a/Telegram/Resources/icons/round_shadow_top@2x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_top@3x.png b/Telegram/Resources/icons/round_shadow_top@3x.png
deleted file mode 100644
index 5e3c7b6ac0..0000000000
--- a/Telegram/Resources/icons/round_shadow_top@3x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_top_left.png b/Telegram/Resources/icons/round_shadow_top_left.png
deleted file mode 100644
index 555aeb74d8..0000000000
--- a/Telegram/Resources/icons/round_shadow_top_left.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_top_left@2x.png b/Telegram/Resources/icons/round_shadow_top_left@2x.png
deleted file mode 100644
index f8f634c11e..0000000000
--- a/Telegram/Resources/icons/round_shadow_top_left@2x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/round_shadow_top_left@3x.png b/Telegram/Resources/icons/round_shadow_top_left@3x.png
deleted file mode 100644
index 16d3a6862b..0000000000
--- a/Telegram/Resources/icons/round_shadow_top_left@3x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/simple_close.png b/Telegram/Resources/icons/simple_close.png
deleted file mode 100644
index 10f8b030e8..0000000000
--- a/Telegram/Resources/icons/simple_close.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/simple_close@2x.png b/Telegram/Resources/icons/simple_close@2x.png
deleted file mode 100644
index a53c4af643..0000000000
--- a/Telegram/Resources/icons/simple_close@2x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/simple_close@3x.png b/Telegram/Resources/icons/simple_close@3x.png
deleted file mode 100644
index 5a5f817033..0000000000
--- a/Telegram/Resources/icons/simple_close@3x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/slide_shadow.png b/Telegram/Resources/icons/slide_shadow.png
deleted file mode 100644
index 7fabf2120b..0000000000
--- a/Telegram/Resources/icons/slide_shadow.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/slide_shadow@2x.png b/Telegram/Resources/icons/slide_shadow@2x.png
deleted file mode 100644
index a0f8868202..0000000000
--- a/Telegram/Resources/icons/slide_shadow@2x.png
+++ /dev/null
diff --git a/Telegram/Resources/icons/slide_shadow@3x.png b/Telegram/Resources/icons/slide_shadow@3x.png
deleted file mode 100644
index a67d341e0e..0000000000
--- a/Telegram/Resources/icons/slide_shadow@3x.png
+++ /dev/null
diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index 50d25deb7e..9faae34d5c 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -10,8 +10,26 @@ using "ui/basic.style";
 using "ui/widgets/widgets.style";
 using "intro/intro.style";
 
-boxDuration: 200;
-boxRadius: 3px;
+UserpicButton {
+	size: size;
+	photoSize: pixels;
+	photoPosition: point;
+	changeButton: RoundButton;
+	changeIcon: icon;
+	changeIconPosition: point;
+	duration: int;
+	uploadHeight: pixels;
+	uploadBg: color;
+	uploadIcon: icon;
+	uploadIconPosition: point;
+}
+
+FeedUserpicButton {
+	size: size;
+	innerSize: pixels;
+	innerPosition: point;
+	innerPart: UserpicButton;
+}
 
 ServiceCheck {
 	margin: margins;
@@ -26,6 +44,9 @@ ServiceCheck {
 	duration: int;
 }
 
+boxDuration: 200;
+boxRadius: 3px;
+
 boxButtonFont: font(boxFontSize semibold);
 defaultBoxButton: RoundButton(defaultLightButton) {
 	width: -24px;
@@ -161,6 +182,28 @@ boxPhotoCompressedSkip: 20px;
 boxPhotoCaptionSkip: 8px;
 boxPhotoTextFg: windowSubTextFg;
 
+defaultChangeUserpicIcon: icon {{ "new_chat_photo", activeButtonFg }};
+defaultUploadUserpicIcon: icon {{ "upload_chat_photo", msgDateImgFg }};
+defaultUserpicButton: UserpicButton {
+	size: size(76px, 76px);
+	photoSize: 76px;
+	photoPosition: point(-1px, -1px);
+	changeButton: defaultActiveButton;
+	changeIcon: defaultChangeUserpicIcon;
+	changeIconPosition: point(23px, 25px);
+	duration: 500;
+	uploadHeight: 24px;
+	uploadBg: msgDateImgBgOver;
+	uploadIcon: defaultUploadUserpicIcon;
+	uploadIconPosition: point(-1px, 1px);
+}
+defaultFeedUserpicButton: FeedUserpicButton {
+	size: size(76px, 76px);
+	innerSize: 76px;
+	innerPosition: point(-1px, -1px);
+	innerPart: defaultUserpicButton;
+}
+
 boxLoadingAnimation: InfiniteRadialAnimation(defaultInfiniteRadialAnimation) {
 	color: windowSubTextFg;
 	thickness: 2px;
@@ -224,24 +267,6 @@ contactUserIcon: icon {{ "settings_name", menuIconFg }};
 contactPhoneIcon: icon {{ "settings_phone_number", menuIconFg }};
 contactIconPosition: point(-5px, 23px);
 
-contactsAddIconAbove: icon {{ "contacts_add", activeButtonFg, point(18px, 18px) }};
-contactsAdd: TwoIconButton {
-	width: 52px;
-	height: 52px;
-
-	iconBelow: contactsAddIconBelow;
-	iconBelowOver: contactsAddIconBelowOver;
-	iconAbove: contactsAddIconAbove;
-	iconAboveOver: contactsAddIconAbove;
-
-	rippleAreaPosition: point(5px, 5px);
-	rippleAreaSize: 42px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: activeButtonBgRipple;
-	}
-}
-contactsAddPosition: point(14px, 8px);
-
 contactPadding: margins(49px, 2px, 0px, 12px);
 contactSkip: 6px;
 contactPhoneSkip: 30px;
diff --git a/Telegram/SourceFiles/history/history.style b/Telegram/SourceFiles/history/history.style
index eebecd8666..d090907c81 100644
--- a/Telegram/SourceFiles/history/history.style
+++ b/Telegram/SourceFiles/history/history.style
@@ -47,6 +47,14 @@ historyToDownPosition: point(12px, 10px);
 historyToDownAbove: icon {{ "history_down_arrow", historyToDownFg, point(17px, 23px) }};
 historyToDownAboveOver: icon {{ "history_down_arrow", historyToDownFgOver, point(17px, 23px) }};
 historyToDownPaddingTop: 10px;
+historyToDownBelow: icon {
+	{ "history_down_shadow", historyToDownShadow },
+	{ "history_down_circle", historyToDownBg, point(4px, 4px) },
+};
+historyToDownBelowOver: icon {
+	{ "history_down_shadow", historyToDownShadow },
+	{ "history_down_circle", historyToDownBgOver, point(4px, 4px) },
+};
 historyToDown: TwoIconButton {
 	width: 52px;
 	height: 62px;
diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
index 0f3aa8934a..bd953a0d5d 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
@@ -17,7 +17,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/info_controller.h"
 #include "info/info_memento.h"
 #include "lang/lang_keys.h"
-#include "styles/style_info.h"
 #include "ui/widgets/labels.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/text/text_utilities.h" // Ui::Text::ToUpper
@@ -29,6 +28,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "main/main_session.h"
 #include "apiwrap.h"
+#include "styles/style_boxes.h"
+#include "styles/style_info.h"
 
 namespace Info {
 namespace Profile {
diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style
index 1a561099cf..9257c530cb 100644
--- a/Telegram/SourceFiles/window/window.style
+++ b/Telegram/SourceFiles/window/window.style
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 using "ui/basic.style";
 using "ui/widgets/widgets.style";
 using "history/history.style";
+using "boxes/boxes.style"; // UserpicButton
 
 windowMinWidth: 380px;
 windowMinHeight: 480px;
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
-Subproject 342fad864a30acc92f6cfc2cd5ad631c7133ee8
+Subproject 946c33ef251ea5a46340e72ae903487576baf9b