[omega] 1.22.0

Author: quentinguidee

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "apps/rpn"]
 	path = apps/rpn
 	url = https://github.com/Omega-Numworks/Omega-RPN.git
-[submodule "apps/atom"]
-	path = apps/atom
-	url = https://github.com/Omega-Numworks/Omega-Atom.git
+[submodule "apps/atomic"]
+	path = apps/atomic
+	url = https://github.com/Omega-Numworks/Omega-Atomic.git

README.fr.md

@@ -1,4 +1,4 @@
-<p align="center"><img src="https://user-images.githubusercontent.com/12123721/109067616-08b0d500-76ef-11eb-9e23-78f40c335c18.png" /></p>
+<p align="center"><img src="https://user-images.githubusercontent.com/12123721/111199951-80bd3d00-85c1-11eb-936c-28cf590208b8.png" /></p>
 
 <p align="center">
   <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="cc by-nc-sa 4.0" src="https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-525252.svg?labelColor=292929&logo=creative%20commons&style=for-the-badge" /></a>
@@ -155,7 +155,7 @@ Pour contribuer, merci de lire le [Wiki](https://github.com/Omega-Numworks/Omega
 * [Omega Themes](https://github.com/Omega-Numworks/Omega-Themes)
 * [Omega Website](https://github.com/Omega-Numworks/Omega-Website)
 * [Omega RPN `APP`](https://github.com/Omega-Numworks/Omega-RPN)
-* [Omega Atom `APP`](https://github.com/Omega-Numworks/Omega-Atom)
+* [Omega Atomic `APP`](https://github.com/Omega-Numworks/Omega-Atomic)
 * [Omega Design](https://github.com/Omega-Numworks/Omega-Design)
 * [Omega Discord Bot](https://github.com/Omega-Numworks/Omega-Discord-Bot)
 * [Omega App Template `BETA`](https://github.com/Omega-Numworks/Omega-App-Template)

README.md

@@ -1,4 +1,4 @@
-<p align="center"><img src="https://user-images.githubusercontent.com/12123721/109067616-08b0d500-76ef-11eb-9e23-78f40c335c18.png" /></p>
+<p align="center"><img src="https://user-images.githubusercontent.com/12123721/111199951-80bd3d00-85c1-11eb-936c-28cf590208b8.png" /></p>
 
 <p align="center">
   <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="cc by-nc-sa 4.0" src="https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-525252.svg?labelColor=292929&logo=creative%20commons&style=for-the-badge" /></a>
@@ -154,7 +154,7 @@ To contribute, please refer to the [Wiki](https://github.com/Omega-Numworks/Omeg
 * [Omega Themes](https://github.com/Omega-Numworks/Omega-Themes)
 * [Omega Website](https://github.com/Omega-Numworks/Omega-Website)
 * [Omega RPN `APP`](https://github.com/Omega-Numworks/Omega-RPN)
-* [Omega Atom `APP`](https://github.com/Omega-Numworks/Omega-Atom)
+* [Omega Atomic `APP`](https://github.com/Omega-Numworks/Omega-Atomic)
 * [Omega Design](https://github.com/Omega-Numworks/Omega-Design)
 * [Omega Discord Bot](https://github.com/Omega-Numworks/Omega-Discord-Bot)
 * [Omega App Template `BETA`](https://github.com/Omega-Numworks/Omega-App-Template)

apps/Makefile

@@ -110,6 +110,7 @@ $(BUILD_DIR)/apps/i18n.h: $(BUILD_DIR)/apps/i18n.cpp
 $(eval $(call depends_on_image,apps/title_bar_view.cpp,apps/exam_icon.png))
 
 $(call object_for,$(apps_src) $(tests_src)): $(BUILD_DIR)/apps/i18n.h
+$(call object_for,$(apps_src) $(tests_src)): $(BUILD_DIR)/apps/home/apps_layout.h
 $(call object_for,$(apps_src) $(tests_src)): $(BUILD_DIR)/python/port/genhdr/qstrdefs.generated.h
 
 apps_tests_src = $(app_calculation_test_src) $(app_code_test_src) $(app_graph_test_src) $(app_probability_test_src) $(app_regression_test_src) $(app_sequence_test_src) $(app_shared_test_src) $(app_statistics_test_src) $(app_settings_test_src) $(app_solver_test_src)

apps/apps_container.cpp

@@ -8,6 +8,8 @@
 #include <ion/backlight.h>
 #include <poincare/preferences.h>
 
+#include <algorithm>
+
 extern "C" {
 #include <assert.h>
 }
@@ -218,6 +220,13 @@ bool AppsContainer::dispatchEvent(Ion::Events::Event event) {
   return didProcessEvent || alphaLockWantsRedraw;
 }
 
+static constexpr Ion::Events::Event switch_events[] = {
+    Ion::Events::ShiftSeven, Ion::Events::ShiftEight, Ion::Events::ShiftNine,
+    Ion::Events::ShiftFour, Ion::Events::ShiftFive, Ion::Events::ShiftSix,
+    Ion::Events::ShiftOne, Ion::Events::ShiftTwo, Ion::Events::ShiftThree,
+    Ion::Events::ShiftZero, Ion::Events::ShiftDot, Ion::Events::ShiftEE
+};
+
 bool AppsContainer::processEvent(Ion::Events::Event event) {
   // Warning: if the window is dirtied, you need to call window()->redraw()
   if (event == Ion::Events::USBPlug) {
@@ -242,6 +251,15 @@ bool AppsContainer::processEvent(Ion::Events::Event event) {
     switchTo(appSnapshotAtIndex(1));
     return true;
   }
+
+  for(int i = 0; i < std::min((int) (sizeof(switch_events) / sizeof(Ion::Events::Event)), APPS_CONTAINER_SNAPSHOT_COUNT); i++) {
+    if (event == switch_events[i]) {
+      m_window.redraw(true);
+      switchTo(appSnapshotAtIndex(i+1));
+      return true;
+    }
+  }
+
   if (event == Ion::Events::OnOff) {
     suspend(true);
     return true;

apps/atom

@@ -17,7 +17,8 @@ bool ExpressionField::handleEvent(Ion::Events::Event event) {
        event == Ion::Events::Power ||
        event == Ion::Events::Square ||
        event == Ion::Events::Division ||
-       event == Ion::Events::Sto)) {
+       event == Ion::Events::Sto ||
+       event == Ion::Events::EE)) {
     handleEventWithText(Poincare::Symbol::k_ans);
   }
   return(::ExpressionField::handleEvent(event));

apps/atomic

@@ -15,6 +15,7 @@ app_code_src = $(addprefix apps/code/,\
   sandbox_controller.cpp \
   script_name_cell.cpp \
   script_parameter_controller.cpp \
+  toolbox_ion_keys.cpp \
 )
 
 app_code_test_src = $(addprefix apps/code/,\

apps/calculation/expression_field.cpp

@@ -124,6 +124,10 @@ Toolbox * App::toolboxForInputEventHandler(InputEventHandler * textInput) {
   return &m_toolbox;
 }
 
+Code::toolboxIonKeys * App::toolboxIonKeys() {
+  return &m_toolboxIonKeys;
+}
+
 VariableBoxController * App::variableBoxForInputEventHandler(InputEventHandler * textInput) {
   return &m_variableBoxController;
 }

apps/code/Makefile

@@ -10,6 +10,7 @@
 #include "python_toolbox.h"
 #include "variable_box_controller.h"
 #include "../shared/shared_app.h"
+#include "toolbox_ion_keys.h"
 
 namespace Code {
 
@@ -77,6 +78,8 @@ class App : public Shared::InputEventHandlerDelegateApp {
 
   static constexpr int k_pythonHeapSize = 100000;
 
+  Code::toolboxIonKeys * toolboxIonKeys();
+
 private:
   /* Python delegate:
    * MicroPython requires a heap. To avoid dynamic allocation, we keep a working
@@ -93,6 +96,7 @@ class App : public Shared::InputEventHandlerDelegateApp {
   StackViewController m_codeStackViewController;
   PythonToolbox m_toolbox;
   VariableBoxController m_variableBoxController;
+  Code::toolboxIonKeys m_toolboxIonKeys;
 };
 
 }

apps/code/app.cpp

@@ -12,4 +12,4 @@ ImportedModulesAndScripts = "Modules et scripts importés"
 NoWordAvailableHere = "Aucun mot disponible à cet endroit."
 ScriptInProgress = "Script en cours"
 ScriptOptions = "Options de script"
-ScriptSize = "Script size"
+ScriptSize = "Taille du script"

apps/code/app.h

@@ -45,6 +45,7 @@ PythonCosh = "Hyperbolic cosine"
 PythonCount = "Zählt wie oft x vorkommt"
 PythonDegrees = "x von Radian zu Grad umwandeln"
 PythonDivMod = "Quotient und Rest"
+PythonDrawLine = "Draw a line"
 PythonDrawString = "Schreibt Text bei (x,y)"
 PythonErf = "Fehlerfunktion"
 PythonErfc = "Complementary error function"
@@ -86,52 +87,6 @@ PythonIsInfinite = "Prüft ob x unendlich ist"
 PythonIsNaN = "Prüft ob x NaN ist"
 PythonIsKeyDown = "true wenn k gedrückt ist"
 PythonKandinskyFunction = "kandinsky module function prefix"
-PythonKeyLeft = "Linke Pfeiltaste"
-PythonKeyUp = "Pfeiltaste nach oben"
-PythonKeyDown = "Pfeiltaste nach unten"
-PythonKeyRight = "Rechte Pfeiltaste"
-PythonKeyOk = "OK Taste"
-PythonKeyBack = "ZURÜCK Taste"
-PythonKeyHome = "HOME Taste"
-PythonKeyOnOff = "AN/AUS Taste"
-PythonKeyShift = "SHIFT Taste"
-PythonKeyAlpha = "ALPHA Taste"
-PythonKeyXnt = "X,N,T Taste"
-PythonKeyVar = "VAR Taste"
-PythonKeyToolbox = "WERKZEUGBOX Taste"
-PythonKeyBackspace = "LÖSCHEN Taste"
-PythonKeyExp = "EXPONENTIAL Taste"
-PythonKeyLn = "NATURAL LOGARITHM Taste"
-PythonKeyLog = "DECIMAL LOGARITHM Taste"
-PythonKeyImaginary = "IMAGINÄRES I Taste"
-PythonKeyComma = "KOMMA Taste"
-PythonKeyPower = "HOCH Taste"
-PythonKeySine = "SINUS Taste"
-PythonKeyCosine = "COSINUS Taste"
-PythonKeyTangent = "TANGENZ Taste"
-PythonKeyPi = "PI Taste"
-PythonKeySqrt = "WURZEL Taste"
-PythonKeySquare = "QUADRAT Taste"
-PythonKeySeven = "7 Taste"
-PythonKeyEight = "8 Taste"
-PythonKeyNine = "9 Taste"
-PythonKeyLeftParenthesis = "LEFT PARENTHESIS key"
-PythonKeyRightParenthesis = "RIGHT PARENTHESIS key"
-PythonKeyFour = "4 Taste"
-PythonKeyFive = "5 Taste"
-PythonKeySix = "6 Taste"
-PythonKeyMultiplication = "MULTIPLIKATIONSTASTE"
-PythonKeyDivision = "DIVISIONSTASTE"
-PythonKeyOne = "1 Taste"
-PythonKeyTwo = "2 Taste"
-PythonKeyThree = "3 Taste"
-PythonKeyPlus = "PLUS Taste"
-PythonKeyMinus = "MINUS Taste"
-PythonKeyZero = "0 Taste"
-PythonKeyDot = "PUNKT Taste"
-PythonKeyEe = "10 HOCH X Taste"
-PythonKeyAns = "ANS Taste"
-PythonKeyExe = "EXE Taste"
 PythonLdexp = "Return x*(2**i), inverse of frexp"
 PythonLength = "Length of an object"
 PythonLgamma = "Log-gamma function"

apps/code/base.fr.i18n

@@ -45,6 +45,7 @@ PythonCosh = "Hyperbolic cosine"
 PythonCount = "Count the occurrences of x"
 PythonDegrees = "Convert x from radians to degrees"
 PythonDivMod = "Quotient and remainder"
+PythonDrawLine = "Draw a line"
 PythonDrawString = "Display a text from pixel (x,y)"
 PythonErf = "Error function"
 PythonErfc = "Complementary error function"
@@ -81,52 +82,6 @@ PythonIsInfinite = "Check if x is infinity"
 PythonIsKeyDown = "Return True if the k key is down"
 PythonIsNaN = "Check if x is a NaN"
 PythonKandinskyFunction = "kandinsky module function prefix"
-PythonKeyLeft = "LEFT ARROW key"
-PythonKeyUp = "UP ARROW key"
-PythonKeyDown = "DOWN ARROW key"
-PythonKeyRight = "RIGHT ARROW key"
-PythonKeyOk = "OK key"
-PythonKeyBack = "BACK key"
-PythonKeyHome = "HOME key"
-PythonKeyOnOff = "ON/OFF key"
-PythonKeyShift = "SHIFT key"
-PythonKeyAlpha = "ALPHA key"
-PythonKeyXnt = "X,N,T key"
-PythonKeyVar = "VAR key"
-PythonKeyToolbox = "TOOLBOX key"
-PythonKeyBackspace = "BACKSPACE key"
-PythonKeyExp = "EXPONENTIAL key"
-PythonKeyLn = "NATURAL LOGARITHM key"
-PythonKeyLog = "DECIMAL LOGARITHM key"
-PythonKeyImaginary = "IMAGINARY I key"
-PythonKeyComma = "COMMA key"
-PythonKeyPower = "POWER key"
-PythonKeySine = "SINE key"
-PythonKeyCosine = "COSINE key"
-PythonKeyTangent = "TANGENT key"
-PythonKeyPi = "PI key"
-PythonKeySqrt = "SQUARE ROOT key"
-PythonKeySquare = "SQUARE key"
-PythonKeySeven = "7 key"
-PythonKeyEight = "8 key"
-PythonKeyNine = "9 key"
-PythonKeyLeftParenthesis = "LEFT PARENTHESIS key"
-PythonKeyRightParenthesis = "RIGHT PARENTHESIS key"
-PythonKeyFour = "4 key"
-PythonKeyFive = "5 key"
-PythonKeySix = "6 key"
-PythonKeyMultiplication = "MULTIPLICATION key"
-PythonKeyDivision = "DIVISION key"
-PythonKeyOne = "1 key"
-PythonKeyTwo = "2 key"
-PythonKeyThree = "3 key"
-PythonKeyPlus = "PLUS key"
-PythonKeyMinus = "MINUS key"
-PythonKeyZero = "0 key"
-PythonKeyDot = "DOT key"
-PythonKeyEe = "10 POWER X key"
-PythonKeyAns = "ANS key"
-PythonKeyExe = "EXE key"
 PythonLdexp = "Return x*(2**i), inverse of frexp"
 PythonLength = "Length of an object"
 PythonLgamma = "Log-gamma function"

apps/code/catalog.de.i18n

@@ -45,6 +45,7 @@ PythonCosh = "Hyperbolic cosine"
 PythonCount = "Count the occurrences of x"
 PythonDegrees = "Convert x from radians to degrees"
 PythonDivMod = "Quotient and remainder"
+PythonDrawLine = "Draw a line"
 PythonDrawString = "Display a text from pixel (x,y)"
 PythonErf = "Error function"
 PythonErfc = "Complementary error function"
@@ -81,52 +82,6 @@ PythonIsInfinite = "Check if x is infinity"
 PythonIsKeyDown = "Return True if the k key is down"
 PythonIsNaN = "Check if x is a NaN"
 PythonKandinskyFunction = "kandinsky module function prefix"
-PythonKeyLeft = "LEFT ARROW key"
-PythonKeyUp = "UP ARROW key"
-PythonKeyDown = "DOWN ARROW key"
-PythonKeyRight = "RIGHT ARROW key"
-PythonKeyOk = "OK key"
-PythonKeyBack = "BACK key"
-PythonKeyHome = "HOME key"
-PythonKeyOnOff = "ON/OFF key"
-PythonKeyShift = "SHIFT key"
-PythonKeyAlpha = "ALPHA key"
-PythonKeyXnt = "X,N,T key"
-PythonKeyVar = "VAR key"
-PythonKeyToolbox = "TOOLBOX key"
-PythonKeyBackspace = "BACKSPACE key"
-PythonKeyExp = "EXPONENTIAL key"
-PythonKeyLn = "NATURAL LOGARITHM key"
-PythonKeyLog = "DECIMAL LOGARITHM key"
-PythonKeyImaginary = "IMAGINARY I key"
-PythonKeyComma = "COMMA key"
-PythonKeyPower = "POWER key"
-PythonKeySine = "SINE key"
-PythonKeyCosine = "COSINE key"
-PythonKeyTangent = "TANGENT key"
-PythonKeyPi = "PI key"
-PythonKeySqrt = "SQUARE ROOT key"
-PythonKeySquare = "SQUARE key"
-PythonKeySeven = "7 key"
-PythonKeyEight = "8 key"
-PythonKeyNine = "9 key"
-PythonKeyLeftParenthesis = "LEFT PARENTHESIS key"
-PythonKeyRightParenthesis = "RIGHT PARENTHESIS key"
-PythonKeyFour = "4 key"
-PythonKeyFive = "5 key"
-PythonKeySix = "6 key"
-PythonKeyMultiplication = "MULTIPLICATION key"
-PythonKeyDivision = "DIVISION key"
-PythonKeyOne = "1 key"
-PythonKeyTwo = "2 key"
-PythonKeyThree = "3 key"
-PythonKeyPlus = "PLUS key"
-PythonKeyMinus = "MINUS key"
-PythonKeyZero = "0 key"
-PythonKeyDot = "DOT key"
-PythonKeyEe = "10 POWER X key"
-PythonKeyAns = "ANS key"
-PythonKeyExe = "EXE key"
 PythonLdexp = "Return x*(2**i), inverse of frexp"
 PythonLength = "Length of an object"
 PythonLgamma = "Log-gamma function"