From 2d1e48eb799189fde9c4bc4fa4ac5a412bde16d3 Mon Sep 17 00:00:00 2001
From: M4x1m3 <M4x1me@protonmail.com>
Date: Fri, 12 Jun 2020 21:16:18 +0200
Subject: [PATCH] [apps/external] Fixed external app color bug

---
 apps/home/app_cell.cpp | 10 ++++++----
 apps/home/app_cell.h   |  1 +
 escher/src/palette.cpp |  2 ++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/apps/home/app_cell.cpp b/apps/home/app_cell.cpp
index 26a8c11f7..2a5f472ee 100644
--- a/apps/home/app_cell.cpp
+++ b/apps/home/app_cell.cpp
@@ -8,7 +8,7 @@ namespace Home {
 AppCell::AppCell() :
   HighlightCell(),
   m_nameView(KDFont::SmallFont, (I18n::Message)0, 0.5f, 0.5f, Palette::HomeCellText, Palette::HomeCellTextActive),
-  m_visible(true)
+  m_visible(true), m_external_app(false)
 {
 }
 
@@ -34,17 +34,19 @@ void AppCell::layoutSubviews(bool force) {
 }
 
 void AppCell::setExtAppDescriptor(const char* name, const Image* icon) {
+  m_external_app = true;
   m_iconView.setImage(icon);
   m_nameView.setText(name);
-  m_nameView.setTextColor(Palette::AccentText);
+  m_nameView.setTextColor(Palette::HomeCellTextExternal);
   m_nameView.setMessage(I18n::Message::Default);
   layoutSubviews();
 }
 
 void AppCell::setAppDescriptor(::App::Descriptor * descriptor) {
+  m_external_app = false;
   m_iconView.setImage(descriptor->icon());
   m_nameView.setMessage(descriptor->name());
-  m_nameView.setTextColor(Palette::PrimaryText);
+  m_nameView.setTextColor(Palette::HomeCellText);
   m_nameView.setText(nullptr);
   layoutSubviews();
 }
@@ -57,7 +59,7 @@ void AppCell::setVisible(bool visible) {
 }
 
 void AppCell::reloadCell() {
-  m_nameView.setTextColor(isHighlighted() ? Palette::HomeCellTextActive : Palette::HomeCellText);
+  m_nameView.setTextColor(isHighlighted() ? (m_external_app ? Palette::HomeCellTextExternalActive : Palette::HomeCellTextActive) : (m_external_app ? Palette::HomeCellTextExternal : Palette::HomeCellText));
   m_nameView.setBackgroundColor(isHighlighted() ? Palette::HomeCellBackgroundActive : Palette::HomeCellBackground);
 }
 
diff --git a/apps/home/app_cell.h b/apps/home/app_cell.h
index 52cbe0ca8..fb4c682c7 100644
--- a/apps/home/app_cell.h
+++ b/apps/home/app_cell.h
@@ -27,6 +27,7 @@ private:
   ImageView m_iconView;
   MessageTextView m_nameView;
   bool m_visible;
+  bool m_external_app;
 };
 
 }
diff --git a/escher/src/palette.cpp b/escher/src/palette.cpp
index fcf9f5a55..2d7ae9708 100644
--- a/escher/src/palette.cpp
+++ b/escher/src/palette.cpp
@@ -98,6 +98,8 @@ constexpr KDColor Palette::HomeCellBackground;
 constexpr KDColor Palette::HomeCellBackgroundActive;
 constexpr KDColor Palette::HomeCellText;
 constexpr KDColor Palette::HomeCellTextActive;
+constexpr KDColor Palette::HomeCellTextExternal;
+constexpr KDColor Palette::HomeCellTextExternalActive;
 
 constexpr KDColor Palette::YellowDark; // Done
 constexpr KDColor Palette::YellowLight; // Done