From 034fc65bc2d216a6cb0fdea911e9032ca22ad8e7 Mon Sep 17 00:00:00 2001 From: Laury Date: Sat, 5 Feb 2022 19:00:33 +0100 Subject: [PATCH] [settings] Updated contributors ! --- apps/settings/main_controller.cpp | 2 +- apps/settings/main_controller.h | 2 +- apps/settings/sub_menu/about_controller.cpp | 12 +++---- apps/settings/sub_menu/about_controller.h | 3 +- .../sub_menu/contributors_controller.cpp | 35 ++++++------------- apps/shared.universal.i18n | 26 ++++++-------- 6 files changed, 30 insertions(+), 50 deletions(-) diff --git a/apps/settings/main_controller.cpp b/apps/settings/main_controller.cpp index df4880990..cfdbbcc2a 100644 --- a/apps/settings/main_controller.cpp +++ b/apps/settings/main_controller.cpp @@ -20,7 +20,7 @@ constexpr SettingsMessageTree s_usbProtectionLevelChildren[3] = {SettingsMessage constexpr SettingsMessageTree s_symbolFunctionChildren[3] = {SettingsMessageTree(I18n::Message::SymbolDefaultFunction), SettingsMessageTree(I18n::Message::SymbolArgDefaultFunction), SettingsMessageTree(I18n::Message::SymbolArgFunction)}; constexpr SettingsMessageTree s_modelMathOptionsChildren[6] = {SettingsMessageTree(I18n::Message::AngleUnit, s_modelAngleChildren), SettingsMessageTree(I18n::Message::DisplayMode, s_modelFloatDisplayModeChildren), SettingsMessageTree(I18n::Message::EditionMode, s_modelEditionModeChildren), SettingsMessageTree(I18n::Message::SymbolFunction, s_symbolFunctionChildren), SettingsMessageTree(I18n::Message::ComplexFormat, s_modelComplexFormatChildren), SettingsMessageTree(I18n::Message::SymbolMultiplication, s_symbolChildren)}; constexpr SettingsMessageTree s_accessibilityChildren[6] = {SettingsMessageTree(I18n::Message::AccessibilityInvertColors), SettingsMessageTree(I18n::Message::AccessibilityMagnify),SettingsMessageTree(I18n::Message::AccessibilityGamma),SettingsMessageTree(I18n::Message::AccessibilityGammaRed),SettingsMessageTree(I18n::Message::AccessibilityGammaGreen),SettingsMessageTree(I18n::Message::AccessibilityGammaBlue)}; -constexpr SettingsMessageTree s_contributorsChildren[23] = {SettingsMessageTree(I18n::Message::Developers), SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::JoachimLeFournis), SettingsMessageTree(I18n::Message::MaximeFriess), SettingsMessageTree(I18n::Message::JeanBaptisteBoric), SettingsMessageTree(I18n::Message::SandraSimmons), SettingsMessageTree(I18n::Message::David), SettingsMessageTree(I18n::Message::DamienNicolet), SettingsMessageTree(I18n::Message::EvannDreumont), SettingsMessageTree(I18n::Message::SzaboLevente), SettingsMessageTree(I18n::Message::VenceslasDuet), SettingsMessageTree(I18n::Message::CharlotteThomas), SettingsMessageTree(I18n::Message::AntoninLoubiere), SettingsMessageTree(I18n::Message::CyprienMejat), SettingsMessageTree(I18n::Message::BetaTesters), SettingsMessageTree(I18n::Message::TimeoArnouts), SettingsMessageTree(I18n::Message::JulieC), SettingsMessageTree(I18n::Message::LelahelHideux), SettingsMessageTree(I18n::Message::Madil), SettingsMessageTree(I18n::Message::HilaireLeRoux), SettingsMessageTree(I18n::Message::HectorNussbaumer), SettingsMessageTree(I18n::Message::RaphaelDyda), SettingsMessageTree(I18n::Message::ThibautC)}; +constexpr SettingsMessageTree s_contributorsChildren[18] = {SettingsMessageTree(I18n::Message::LaurianFournier), SettingsMessageTree(I18n::Message::YannCouturier), SettingsMessageTree(I18n::Message::LoicE), SettingsMessageTree(I18n::Message::DavidLuca), SettingsMessageTree(I18n::Message::VictorKretz), SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::JoachimLeFournis), SettingsMessageTree(I18n::Message::MaximeFriess), SettingsMessageTree(I18n::Message::JeanBaptisteBoric), SettingsMessageTree(I18n::Message::SandraSimmons), SettingsMessageTree(I18n::Message::David), SettingsMessageTree(I18n::Message::DamienNicolet), SettingsMessageTree(I18n::Message::EvannDreumont), SettingsMessageTree(I18n::Message::SzaboLevente), SettingsMessageTree(I18n::Message::VenceslasDuet), SettingsMessageTree(I18n::Message::CharlotteThomas), SettingsMessageTree(I18n::Message::AntoninLoubiere), SettingsMessageTree(I18n::Message::CyprienMejat)}; // Code Settings #ifdef HAS_CODE diff --git a/apps/settings/main_controller.h b/apps/settings/main_controller.h index cb3aae2f9..28c5b07d7 100644 --- a/apps/settings/main_controller.h +++ b/apps/settings/main_controller.h @@ -27,7 +27,7 @@ extern const Shared::SettingsMessageTree s_modelFontChildren[2]; extern const Shared::SettingsMessageTree s_codeChildren[4]; extern const Shared::SettingsMessageTree s_modelDateTimeChildren[3]; extern const Shared::SettingsMessageTree s_accessibilityChildren[6]; -extern const Shared::SettingsMessageTree s_contributorsChildren[23]; +extern const Shared::SettingsMessageTree s_contributorsChildren[18]; extern const Shared::SettingsMessageTree s_modelAboutChildren[10]; extern const Shared::SettingsMessageTree s_usbProtectionChildren[2]; extern const Shared::SettingsMessageTree s_usbProtectionLevelChildren[3]; diff --git a/apps/settings/sub_menu/about_controller.cpp b/apps/settings/sub_menu/about_controller.cpp index 901034a51..09debd6e9 100644 --- a/apps/settings/sub_menu/about_controller.cpp +++ b/apps/settings/sub_menu/about_controller.cpp @@ -26,7 +26,7 @@ AboutController::AboutController(Responder * parentResponder) : m_contributorsCell(KDFont::LargeFont, KDFont::SmallFont) //m_view(&m_selectableTableView) { - for (int i = 0; i < k_totalNumberOfCell; i++) { + for (int i = 0; i < k_totalNumberOfCell - 1; i++) { m_cells[i].setMessageFont(KDFont::LargeFont); m_cells[i].setAccessoryFont(KDFont::SmallFont); m_cells[i].setAccessoryTextColor(Palette::SecondaryText); @@ -138,8 +138,8 @@ int AboutController::numberOfRows() const { HighlightCell * AboutController::reusableCell(int index, int type) { assert(index >= 0); if (type == 0) { - assert(index < k_totalNumberOfCell-1-(!hasUsernameCell())); - return &m_cells[index+(!hasUsernameCell())]; + assert(index < k_totalNumberOfCell-1); + return &m_cells[index]; } assert(index == 0); return &m_contributorsCell; @@ -152,7 +152,7 @@ int AboutController::typeAtLocation(int i, int j) { int AboutController::reusableCellCount(int type) { switch (type) { case 0: - return k_totalNumberOfCell-1-(!hasUsernameCell()); + return k_totalNumberOfCell-1; case 1: return 1; default: @@ -177,12 +177,12 @@ void AboutController::willDisplayCellForIndex(HighlightCell * cell, int index) { memUseBuffer[len] = 'k'; memUseBuffer[len+1] = 'B'; memUseBuffer[len+2] = '/'; - + len = Poincare::Integer((int)((float) Ion::Storage::k_storageSize / 1024.f)).serialize(memUseBuffer + len + 3, 4) + len + 3; memUseBuffer[len] = 'k'; memUseBuffer[len+1] = 'B'; memUseBuffer[len+2] = '\0'; - + MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)cell; myCell->setAccessoryText(memUseBuffer); } else { diff --git a/apps/settings/sub_menu/about_controller.h b/apps/settings/sub_menu/about_controller.h index f72017af0..b661ac9e3 100644 --- a/apps/settings/sub_menu/about_controller.h +++ b/apps/settings/sub_menu/about_controller.h @@ -11,7 +11,6 @@ namespace Settings { class AboutController : public GenericSubController { public: AboutController(Responder * parentResponder); - //View * view() override { return &m_view; } View * view() override { return &m_selectableTableView; } void viewWillAppear() override; TELEMETRY_ID("About"); @@ -26,7 +25,7 @@ private: bool hasUsernameCell() const; ContributorsController m_contributorsController; MessageTableCellWithChevronAndMessage m_contributorsCell; - MessageTableCellWithBuffer m_cells[k_totalNumberOfCell]; + MessageTableCellWithBuffer m_cells[k_totalNumberOfCell - 1]; HardwareTest::PopUpController m_hardwareTestPopUpController; }; diff --git a/apps/settings/sub_menu/contributors_controller.cpp b/apps/settings/sub_menu/contributors_controller.cpp index 26bab3326..378bfc3f6 100644 --- a/apps/settings/sub_menu/contributors_controller.cpp +++ b/apps/settings/sub_menu/contributors_controller.cpp @@ -28,8 +28,14 @@ int ContributorsController::reusableCellCount(int type) { return k_totalNumberOfCell; } -constexpr static int s_numberOfDevelopers = 13; +constexpr static int s_numberOfDevelopers = 18; +constexpr static int s_numberOfUpsilonDevelopers = 5; constexpr static I18n::Message s_developersUsernames[s_numberOfDevelopers] = { + I18n::Message::PLaurianFournier, + I18n::Message::PYannCouturier, + I18n::Message::PDavidLuca, + I18n::Message::PLoicE, + I18n::Message::PVictorKretz, I18n::Message::PQuentinGuidee, I18n::Message::PJoachimLeFournis, I18n::Message::PMaximeFriess, @@ -45,32 +51,13 @@ constexpr static I18n::Message s_developersUsernames[s_numberOfDevelopers] = { I18n::Message::PCyprienMejat, }; -constexpr static int s_numberOfBetaTesters = 8; -constexpr static I18n::Message s_betaTestersUsernames[s_numberOfBetaTesters] = { - I18n::Message::PTimeoArnouts, - I18n::Message::PJulieC, - I18n::Message::PLelahelHideux, - I18n::Message::PMadil, - I18n::Message::PHilaireLeRoux, - I18n::Message::PHectorNussbaumer, - I18n::Message::PRaphaelDyda, - I18n::Message::PThibautC, -}; - void ContributorsController::willDisplayCellForIndex(HighlightCell * cell, int index) { MessageTableCellWithBuffer * myTextCell = (MessageTableCellWithBuffer *)cell; - if (index == 0) { - myTextCell->setAccessoryText(""); - myTextCell->setTextColor(KDColor::RGB24(0xC03535)); - } else if (index > 0 && index <= s_numberOfDevelopers) { - myTextCell->setAccessoryText(I18n::translate(s_developersUsernames[index - 1])); - myTextCell->setTextColor(Palette::PrimaryText); - } else if (index == s_numberOfDevelopers + 1) { - myTextCell->setAccessoryText(""); - myTextCell->setTextColor(KDColor::RGB24(0x1ABC9A)); + myTextCell->setAccessoryText(I18n::translate(s_developersUsernames[index])); + if (index < s_numberOfUpsilonDevelopers) { + myTextCell->setTextColor(KDColor::RGB24(0x5e81ac)); } else { - myTextCell->setAccessoryText(I18n::translate(s_betaTestersUsernames[index - 2 - s_numberOfDevelopers])); - myTextCell->setTextColor(Palette::PrimaryText); + myTextCell->setTextColor(KDColor::RGB24(0xc53431)); } myTextCell->setAccessoryTextColor(Palette::SecondaryText); GenericSubController::willDisplayCellForIndex(cell, index); diff --git a/apps/shared.universal.i18n b/apps/shared.universal.i18n index c93abe957..d1d3fc9b5 100644 --- a/apps/shared.universal.i18n +++ b/apps/shared.universal.i18n @@ -315,6 +315,16 @@ ElementTsMass = "294" ElementOgMass = "294" ElementUueMass = "295" ElementUbnMass = "297" +LaurianFournier = "Laurian Fournier" +PLaurianFournier = "@Lauryy06" +YannCouturier = "Yann Couturier" +PYannCouturier = "@Yaya-Cout" +LoicE = "Loïc E." +PLoicE = "@lolocomotive" +DavidLuca = "David Luca" +PDavidLuca = "@dl11" +VictorKretz = "Victor Kretz" +PVictorKretz = "@Mino" QuentinGuidee = "Quentin Guidée" PQuentinGuidee = "@quentinguidee" SandraSimmons = "Sandra Simmons" @@ -341,22 +351,6 @@ VenceslasDuet = "Venceslas Duet" PVenceslasDuet = "@Citorva" CyprienMejat = "Cyprien Méjat" PCyprienMejat = "@A2drien" -TimeoArnouts = "Timéo Arnouts" -PTimeoArnouts = "@Dogm" -JulieC = "Julie C." -PJulieC = "@windows9x95" -LelahelHideux = "Lélahel Hideux" -PLelahelHideux = "@Lelahelry" -Madil = "Madil" -PMadil = "@le-grand-mannitout" -HilaireLeRoux = "Hilaire Le Roux" -PHilaireLeRoux = "@0Babass2" -HectorNussbaumer = "Hector Nussbaumer" -PHectorNussbaumer = "@Sycorax" -RaphaelDyda = "Raphaël Dyda" -PRaphaelDyda = "@Trixciel" -ThibautC = "Thibaut Cellier" -PThibautC = "@Tibo_C" SpeedOfLight = "2.99792458·10^8_m_s^-1" YearLight = "9.461·10^15_m" Boltzmann = "1.380649·10^-23_J_K^-1"