From 2c49b8f5c923d5f60faa1d1ecfa41ca7ed5400bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Quentin=20Guid=C3=A9e?= <quentin.guidee@gmail.com>
Date: Sat, 30 Nov 2019 13:31:01 +0100
Subject: [PATCH] New fixes for the themes

---
 apps/graph/graph/graph_view.cpp                           | 2 +-
 .../scrollable_exact_approximate_expressions_view.cpp     | 4 ++--
 escher/include/escher/palette.h                           | 5 +++++
 escher/src/palette.cpp                                    | 8 ++++++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/apps/graph/graph/graph_view.cpp b/apps/graph/graph/graph_view.cpp
index 3a09ba708..47d1e0c2e 100644
--- a/apps/graph/graph/graph_view.cpp
+++ b/apps/graph/graph/graph_view.cpp
@@ -59,7 +59,7 @@ void GraphView::drawRect(KDContext * ctx, KDRect rect) const {
         drawCartesianCurve(ctx, rect, -INFINITY, INFINITY, [](float t, void * model, void * context) {
               float * tangent = (float *)model;
               return Poincare::Coordinate2D<float>(t, tangent[0]*t+tangent[1]);
-            }, tangentParameter, nullptr, Palette::GreyVeryDark);
+            }, tangentParameter, nullptr, Palette::GraphTangent);
       }
       continue;
     }
diff --git a/apps/shared/scrollable_exact_approximate_expressions_view.cpp b/apps/shared/scrollable_exact_approximate_expressions_view.cpp
index 0a6843418..94b534a85 100644
--- a/apps/shared/scrollable_exact_approximate_expressions_view.cpp
+++ b/apps/shared/scrollable_exact_approximate_expressions_view.cpp
@@ -9,7 +9,7 @@ static inline KDCoordinate maxCoordinate(KDCoordinate x, KDCoordinate y) { retur
 
 ScrollableExactApproximateExpressionsView::ContentCell::ContentCell() :
   m_rightExpressionView(),
-  m_approximateSign(KDFont::LargeFont, I18n::Message::AlmostEqual, 0.5f, 0.5f, Palette::GreyVeryDark),
+  m_approximateSign(KDFont::LargeFont, I18n::Message::AlmostEqual, 0.5f, 0.5f, Palette::ApproximateSignText),
   m_leftExpressionView(),
   m_selectedSubviewPosition((SubviewPosition)0),
   m_displayLeftExpression(true)
@@ -47,7 +47,7 @@ void ScrollableExactApproximateExpressionsView::ContentCell::reloadTextColor() {
   if (numberOfSubviews() == 1) {
     m_rightExpressionView.setTextColor(Palette::PrimaryText);
   } else {
-    m_rightExpressionView.setTextColor(Palette::GreyVeryDark);
+    m_rightExpressionView.setTextColor(Palette::ApproximateExpressionText);
   }
 }
 
diff --git a/escher/include/escher/palette.h b/escher/include/escher/palette.h
index 7c818b781..4e2feddb8 100644
--- a/escher/include/escher/palette.h
+++ b/escher/include/escher/palette.h
@@ -19,6 +19,8 @@ public:
   constexpr static KDColor Battery = KDColor::RGB24(0xffffff);
   constexpr static KDColor BatteryInCharge = KDColor::RGB24(0x179e1f);
   constexpr static KDColor BatteryLow = KDColor::RGB24(0x992321);
+  constexpr static KDColor ApproximateSignText = KDColor::RGB24(0x595959);
+  constexpr static KDColor ApproximateExpressionText = KDColor::RGB24(0x595959);
 
   // Controls (switches, gauge, arrows...)
   constexpr static KDColor Control = KDColor::RGB24(0x00857f);
@@ -48,6 +50,9 @@ public:
   constexpr static KDColor StatisticsBox = KDColor::RGB24(0x00857f);
   constexpr static KDColor StatisticsSelect = KDColor::RGB24(0xe0e0e0);
 
+  // Graph
+  constexpr static KDColor GraphTangent = KDColor::RGB24(0x595959);
+
   // SubMenus
   constexpr static KDColor SubMenuBackground = KDColor::RGB24(0xe0e0e0);
   constexpr static KDColor SubMenuBorder = KDColor::RGB24(0xfafafa);
diff --git a/escher/src/palette.cpp b/escher/src/palette.cpp
index 6f04a399d..aa2218730 100644
--- a/escher/src/palette.cpp
+++ b/escher/src/palette.cpp
@@ -12,6 +12,8 @@ constexpr KDColor Palette::ExpressionInputBackground;
 constexpr KDColor Palette::Battery;
 constexpr KDColor Palette::BatteryInCharge;
 constexpr KDColor Palette::BatteryLow;
+constexpr KDColor Palette::ApproximateSignText;
+constexpr KDColor Palette::ApproximateExpressionText;
 
 constexpr KDColor Palette::Control;
 constexpr KDColor Palette::ControlEnabled;
@@ -35,6 +37,8 @@ constexpr KDColor Palette::ProbabilityCurve;
 
 constexpr KDColor Palette::StatisticsBox;
 
+constexpr KDColor Palette::GraphTangent;
+
 constexpr KDColor Palette::SubMenuBackground;
 constexpr KDColor Palette::SubMenuBorder;
 constexpr KDColor Palette::SubMenuText;
@@ -89,8 +93,8 @@ constexpr KDColor Palette::PurpleDark; // DONE
 constexpr KDColor Palette::GreyWhite;
 constexpr KDColor Palette::GreyBright;
 constexpr KDColor Palette::GreyMiddle;
-constexpr KDColor Palette::GreyDark;
-constexpr KDColor Palette::GreyVeryDark;
+constexpr KDColor Palette::GreyDark; // Done
+constexpr KDColor Palette::GreyVeryDark; // Done
 constexpr KDColor Palette::Select; // Done
 constexpr KDColor Palette::SelectDark; // Done
 constexpr KDColor Palette::WallScreen; // Done