Added simple calculator tab view layout

EmmmaTech · Jul 23, 2021 · 0073030 · 0073030
1 parent 026240d
commit 0073030
Show file tree

Hide file tree

Showing 12 changed files with 256 additions and 3 deletions.
diff --git a/include/calculatorTab.hpp b/include/calculatorTab.hpp
@@ -0,0 +1,12 @@
+#pragma once
+
+#include <borealis.hpp>
+
+struct CalculatorTab : public brls::Box
+{
+    CalculatorTab();
+
+    static brls::View* create();
+
+    private:
+};
diff --git a/include/mainActivity.hpp b/include/mainActivity.hpp
@@ -0,0 +1,8 @@
+#pragma once
+
+#include <borealis.hpp>
+
+struct MainActivity : public brls::Activity
+{
+    CONTENT_FROM_XML_RES("activity/main.xml")
+};
diff --git a/resources/.gitignore b/resources/.gitignore
@@ -0,0 +1 @@
+shaders/**
diff --git a/resources/i18n/en-US/text.json b/resources/i18n/en-US/text.json
@@ -0,0 +1,13 @@
+{
+    "title": "Calculator_NX Rewrite",
+
+    "tabs": {
+        "calculator": "Calculator",
+        "settings": "Settings",
+        "about": "About Calculator_NX"
+    },
+
+    "calculator": {
+        "expression_enter": "Enter an expression"
+    }
+}
diff --git a/resources/shaders/fill_aa_fsh.dksh b/resources/shaders/fill_aa_fsh.dksh
diff --git a/resources/shaders/fill_fsh.dksh b/resources/shaders/fill_fsh.dksh
diff --git a/resources/shaders/fill_vsh.dksh b/resources/shaders/fill_vsh.dksh
diff --git a/resources/xml/activity/main.xml b/resources/xml/activity/main.xml
@@ -0,0 +1,16 @@
+<brls:TabFrame
+    title="@i18n/text/title"
+    iconInterpolation="linear"
+    icon="@res/icon/Calculator_NX_Icon_Alt.jpg">
+
+    <brls:Tab label="@i18n/text/tabs/calculator">
+        <CalculatorTab />
+    </brls:Tab>
+
+    <brls:Tab label="@i18n/text/tabs/settings"/>
+
+    <brls:Separator/>
+
+    <brls:Tab label="@i18n/text/tabs/about"/>
+
+</brls:TabFrame>
diff --git a/resources/xml/tabs/calculator.xml b/resources/xml/tabs/calculator.xml
@@ -0,0 +1,179 @@
+<brls:Box
+    width="auto"
+    height="auto"
+    axis="column">
+
+    <brls:Box
+        width="500" 
+        height="500"
+        axis="column">
+
+        <brls:Box
+            width="100%"
+            height="20%">
+
+            <brls:Label
+                width="auto"
+                height="auto"
+                text="@i18n/text/calculator/expression_enter"
+                fontSize="25"/>
+
+        </brls:Box>
+
+        <brls:Box
+            width="100%"
+            height="80%">
+
+            <brls:Box
+                width="20%"
+                height="100%"
+                axis="column">
+
+                <brls:Button
+                    width="auto"
+                    height="auto"
+                    style="primary"
+                    text="("/>
+
+                <brls:Button
+                    width="auto"
+                    height="auto"
+                    style="primary"
+                    text=")"/>
+
+            </brls:Box>
+
+            <brls:Box
+                width="20%"
+                height="100%"
+                axis="column">
+
+                <brls:Button
+                    width="auto"
+                    height="auto"
+                    style="primary"
+                    text="9"/>
+
+                <brls:Button
+                    width="auto"
+                    height="auto"
+                    style="primary"
+                    text="6"/>
+
+                <brls:Button
+                    width="auto"
+                    height="auto"
+                    style="primary"
+                    text="3"/>
+
+                <brls:Button
+                    width="auto"
+                    height="auto"
+                    style="primary"
+                    text="0"/>
+
+            </brls:Box>
+
+            <brls:Box
+                width="20%"
+                height="100%"
+                axis="column">
+
+                <brls:Button
+                    width="auto"
+                    height="auto"
+                    style="primary"
+                    text="8"/>
+
+                <brls:Button
+                    width="auto"
+                    height="auto"
+                    style="primary"
+                    text="5"/>
+
+                <brls:Button
+                    width="auto"
+                    height="auto"
+                    style="primary"
+                    text="2"/>
+
+                <brls:Button
+                    width="auto"
+                    height="auto"
+                    style="primary"
+                    text="."/>
+
+            </brls:Box>
+
+            <brls:Box
+                width="20%"
+                height="100%"
+                axis="column">
+
+                <brls:Button
+                    width="auto"
+                    height="auto"
+                    style="primary"
+                    text="7"/>
+
+                <brls:Button
+                    width="auto"
+                    height="auto"
+                    style="primary"
+                    text="4"/>
+
+                <brls:Button
+                    width="auto"
+                    height="auto"
+                    style="primary"
+                    text="1"/>
+
+                <brls:Rectangle
+                    width="auto"
+                    height="auto"
+                    color="#000000"/>
+
+            </brls:Box>
+
+            <brls:Box
+                width="20%"
+                height="100%"
+                axis="column">
+
+                <brls:Button
+                    width="auto"
+                    height="auto"
+                    style="primary"
+                    text="+"/>
+
+                <brls:Button
+                    width="auto"
+                    height="auto"
+                    style="primary"
+                    text="-"/>
+
+                <brls:Button
+                    width="auto"
+                    height="auto"
+                    style="primary"
+                    text="*"/>
+
+                <brls:Button
+                    width="auto"
+                    height="auto"
+                    style="primary"
+                    text="/"/>
+
+                <brls:Button
+                    width="auto"
+                    height="auto"
+                    style="primary"
+                    text="="/>
+
+            </brls:Box>
+
+        </brls:Box>
+
+    </brls:Box>
+
+</brls:Box>
diff --git a/source/calculatorTab.cpp b/source/calculatorTab.cpp
@@ -0,0 +1,11 @@
+#include <calculatorTab.hpp>
+
+CalculatorTab::CalculatorTab()
+{
+    this->inflateFromXMLRes("xml/tabs/calculator.xml");
+}
+
+brls::View* CalculatorTab::create()
+{
+    return new CalculatorTab();
+}
diff --git a/source/main.cpp b/source/main.cpp
@@ -1,12 +1,24 @@
 #include <borealis.hpp>
 
-#include <vector>
-#include <stdlib.h>
+#include <calculatorTab.hpp>
+#include <mainActivity.hpp>
 
-#include <calculator.hpp>
+using namespace brls::literals;
 
 int main(int argc, char *argv[])
 {
+    if (!brls::Application::init())
+    {
+        brls::Logger::error("Unable to init Borealis application");
+        return EXIT_FAILURE;
+    }
+    brls::Application::createWindow("Calculator_NX rewrite");
+    brls::Application::setGlobalQuit(true);
 
+    brls::Application::registerXMLView("CalculatorTab", CalculatorTab::create);
+    brls::Application::pushActivity(new MainActivity());
+
+    while (brls::Application::mainLoop());
+
     return EXIT_SUCCESS;
 }
diff --git a/source/mainActivity.cpp b/source/mainActivity.cpp
@@ -0,0 +1 @@
+#include <mainActivity.hpp>