Skip to content

Commit 58ff198

Browse files
quentinguideequentinguidee
committed
[omega] 1.22.0
2 parents 9eff895 + f1d1502 commit 58ff198

File tree

84 files changed

+965
-757
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+965
-757
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[submodule "apps/rpn"]
22
path = apps/rpn
33
url = https://github.com/Omega-Numworks/Omega-RPN.git
4-
[submodule "apps/atom"]
5-
path = apps/atom
6-
url = https://github.com/Omega-Numworks/Omega-Atom.git
4+
[submodule "apps/atomic"]
5+
path = apps/atomic
6+
url = https://github.com/Omega-Numworks/Omega-Atomic.git

‎README.fr.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<p align="center"><img src="https://user-images.githubusercontent.com/12123721/109067616-08b0d500-76ef-11eb-9e23-78f40c335c18.png" /></p>
1+
<p align="center"><img src="https://user-images.githubusercontent.com/12123721/111199951-80bd3d00-85c1-11eb-936c-28cf590208b8.png" /></p>
22

33
<p align="center">
44
<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
155155
* [Omega Themes](https://github.com/Omega-Numworks/Omega-Themes)
156156
* [Omega Website](https://github.com/Omega-Numworks/Omega-Website)
157157
* [Omega RPN `APP`](https://github.com/Omega-Numworks/Omega-RPN)
158-
* [Omega Atom `APP`](https://github.com/Omega-Numworks/Omega-Atom)
158+
* [Omega Atomic `APP`](https://github.com/Omega-Numworks/Omega-Atomic)
159159
* [Omega Design](https://github.com/Omega-Numworks/Omega-Design)
160160
* [Omega Discord Bot](https://github.com/Omega-Numworks/Omega-Discord-Bot)
161161
* [Omega App Template `BETA`](https://github.com/Omega-Numworks/Omega-App-Template)

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<p align="center"><img src="https://user-images.githubusercontent.com/12123721/109067616-08b0d500-76ef-11eb-9e23-78f40c335c18.png" /></p>
1+
<p align="center"><img src="https://user-images.githubusercontent.com/12123721/111199951-80bd3d00-85c1-11eb-936c-28cf590208b8.png" /></p>
22

33
<p align="center">
44
<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
154154
* [Omega Themes](https://github.com/Omega-Numworks/Omega-Themes)
155155
* [Omega Website](https://github.com/Omega-Numworks/Omega-Website)
156156
* [Omega RPN `APP`](https://github.com/Omega-Numworks/Omega-RPN)
157-
* [Omega Atom `APP`](https://github.com/Omega-Numworks/Omega-Atom)
157+
* [Omega Atomic `APP`](https://github.com/Omega-Numworks/Omega-Atomic)
158158
* [Omega Design](https://github.com/Omega-Numworks/Omega-Design)
159159
* [Omega Discord Bot](https://github.com/Omega-Numworks/Omega-Discord-Bot)
160160
* [Omega App Template `BETA`](https://github.com/Omega-Numworks/Omega-App-Template)

‎apps/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ $(BUILD_DIR)/apps/i18n.h: $(BUILD_DIR)/apps/i18n.cpp
110110
$(eval $(call depends_on_image,apps/title_bar_view.cpp,apps/exam_icon.png))
111111

112112
$(call object_for,$(apps_src) $(tests_src)): $(BUILD_DIR)/apps/i18n.h
113+
$(call object_for,$(apps_src) $(tests_src)): $(BUILD_DIR)/apps/home/apps_layout.h
113114
$(call object_for,$(apps_src) $(tests_src)): $(BUILD_DIR)/python/port/genhdr/qstrdefs.generated.h
114115

115116
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‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
#include <ion/backlight.h>
99
#include <poincare/preferences.h>
1010

11+
#include <algorithm>
12+
1113
extern "C" {
1214
#include <assert.h>
1315
}
@@ -218,6 +220,13 @@ bool AppsContainer::dispatchEvent(Ion::Events::Event event) {
218220
return didProcessEvent || alphaLockWantsRedraw;
219221
}
220222

223+
static constexpr Ion::Events::Event switch_events[] = {
224+
Ion::Events::ShiftSeven, Ion::Events::ShiftEight, Ion::Events::ShiftNine,
225+
Ion::Events::ShiftFour, Ion::Events::ShiftFive, Ion::Events::ShiftSix,
226+
Ion::Events::ShiftOne, Ion::Events::ShiftTwo, Ion::Events::ShiftThree,
227+
Ion::Events::ShiftZero, Ion::Events::ShiftDot, Ion::Events::ShiftEE
228+
};
229+
221230
bool AppsContainer::processEvent(Ion::Events::Event event) {
222231
// Warning: if the window is dirtied, you need to call window()->redraw()
223232
if (event == Ion::Events::USBPlug) {
@@ -242,6 +251,15 @@ bool AppsContainer::processEvent(Ion::Events::Event event) {
242251
switchTo(appSnapshotAtIndex(1));
243252
return true;
244253
}
254+
255+
for(int i = 0; i < std::min((int) (sizeof(switch_events) / sizeof(Ion::Events::Event)), APPS_CONTAINER_SNAPSHOT_COUNT); i++) {
256+
if (event == switch_events[i]) {
257+
m_window.redraw(true);
258+
switchTo(appSnapshotAtIndex(i+1));
259+
return true;
260+
}
261+
}
262+
245263
if (event == Ion::Events::OnOff) {
246264
suspend(true);
247265
return true;

‎apps/atom‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎apps/atomic‎

Submodule atomic added at 69f7a06

‎apps/calculation/expression_field.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ bool ExpressionField::handleEvent(Ion::Events::Event event) {
1717
event == Ion::Events::Power ||
1818
event == Ion::Events::Square ||
1919
event == Ion::Events::Division ||
20-
event == Ion::Events::Sto)) {
20+
event == Ion::Events::Sto ||
21+
event == Ion::Events::EE)) {
2122
handleEventWithText(Poincare::Symbol::k_ans);
2223
}
2324
return(::ExpressionField::handleEvent(event));

‎apps/code/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ app_code_src = $(addprefix apps/code/,\
1515
sandbox_controller.cpp \
1616
script_name_cell.cpp \
1717
script_parameter_controller.cpp \
18+
toolbox_ion_keys.cpp \
1819
)
1920

2021
app_code_test_src = $(addprefix apps/code/,\

‎apps/code/app.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,10 @@ Toolbox * App::toolboxForInputEventHandler(InputEventHandler * textInput) {
124124
return &m_toolbox;
125125
}
126126

127+
Code::toolboxIonKeys * App::toolboxIonKeys() {
128+
return &m_toolboxIonKeys;
129+
}
130+
127131
VariableBoxController * App::variableBoxForInputEventHandler(InputEventHandler * textInput) {
128132
return &m_variableBoxController;
129133
}

0 commit comments

Comments
 (0)