v1.2.2

Storm21CH · Apr 3, 2023 · 89a1e07 · 89a1e07
1 parent 9c42737
commit 89a1e07
Show file tree

Hide file tree

Showing 36 changed files with 33,752 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -0,0 +1,223 @@
+#---------------------------------------------------------------------------------
+.SUFFIXES:
+#---------------------------------------------------------------------------------
+
+ifeq ($(strip $(DEVKITPRO)),)
+$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>/devkitpro")
+endif
+
+TOPDIR ?= $(CURDIR)
+include $(DEVKITPRO)/libnx/switch_rules
+
+#---------------------------------------------------------------------------------
+# TARGET is the name of the output
+# BUILD is the directory where object files & intermediate files will be placed
+# SOURCES is a list of directories containing source code
+# DATA is a list of directories containing data files
+# INCLUDES is a list of directories containing header files
+# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional)
+#
+# NO_ICON: if set to anything, do not use icon.
+# NO_NACP: if set to anything, no .nacp file is generated.
+# APP_TITLE is the name of the app stored in the .nacp file (Optional)
+# APP_AUTHOR is the author of the app stored in the .nacp file (Optional)
+# APP_VERSION is the version of the app stored in the .nacp file (Optional)
+# APP_TITLEID is the titleID of the app stored in the .nacp file (Optional)
+# ICON is the filename of the icon (.jpg), relative to the project folder.
+#   If not set, it attempts to use one of the following (in this order):
+#     - <Project name>.jpg
+#     - icon.jpg
+#     - <libnx folder>/default_icon.jpg
+#
+# CONFIG_JSON is the filename of the NPDM config file (.json), relative to the project folder.
+#   If not set, it attempts to use one of the following (in this order):
+#     - <Project name>.json
+#     - config.json
+#   If a JSON file is provided or autodetected, an ExeFS PFS0 (.nsp) is built instead
+#   of a homebrew executable (.nro). This is intended to be used for sysmodules.
+#   NACP building is skipped as well.
+#---------------------------------------------------------------------------------
+APP_TITLE	:=	Text Reader
+APP_VERSION	:=	1.2.2
+
+TARGET		:=	$(notdir $(CURDIR))
+BUILD		:=	build
+SOURCES		:=	source
+DATA		:=	data
+INCLUDES	:=	include libs/libtesla/include libs/json/include
+# ROMFS		:=	romfs
+NO_ICON		:=  1
+
+RELEASE_ZIP		:= $(TARGET)-$(APP_VERSION).zip
+
+#---------------------------------------------------------------------------------
+# options for code generation
+#---------------------------------------------------------------------------------
+ARCH	:=	-march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE
+
+CFLAGS	:=	-g -Wall -O2 -ffunction-sections \
+			$(ARCH) $(DEFINES) \
+			`freetype-config --cflags`
+
+CFLAGS	+=	$(INCLUDE) -D__SWITCH__
+
+CXXFLAGS	:= $(CFLAGS) -std=c++17
+
+ASFLAGS	:=	-g $(ARCH)
+LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
+
+LIBS	:=	-lnx `freetype-config --libs --static`
+
+#---------------------------------------------------------------------------------
+# list of directories containing libraries, this must be the top level containing
+# include and lib
+#---------------------------------------------------------------------------------
+LIBDIRS	:= $(PORTLIBS) $(LIBNX)
+
+
+#---------------------------------------------------------------------------------
+# no real need to edit anything past this point unless you need to add additional
+# rules for different file extensions
+#---------------------------------------------------------------------------------
+ifneq ($(BUILD),$(notdir $(CURDIR)))
+#---------------------------------------------------------------------------------
+
+export OUTPUT	:=	$(CURDIR)/$(TARGET)
+export TOPDIR	:=	$(CURDIR)
+
+export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
+			$(foreach dir,$(DATA),$(CURDIR)/$(dir))
+
+export DEPSDIR	:=	$(CURDIR)/$(BUILD)
+
+CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
+CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
+SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
+BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
+
+#---------------------------------------------------------------------------------
+# use CXX for linking C++ projects, CC for standard C
+#---------------------------------------------------------------------------------
+ifeq ($(strip $(CPPFILES)),)
+#---------------------------------------------------------------------------------
+	export LD	:=	$(CC)
+#---------------------------------------------------------------------------------
+else
+#---------------------------------------------------------------------------------
+	export LD	:=	$(CXX)
+#---------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------
+
+export OFILES_BIN	:=	$(addsuffix .o,$(BINFILES))
+export OFILES_SRC	:=	$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
+export OFILES 	:=	$(OFILES_BIN) $(OFILES_SRC)
+export HFILES_BIN	:=	$(addsuffix .h,$(subst .,_,$(BINFILES)))
+
+export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
+			$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
+			-I$(CURDIR)/$(BUILD)
+
+export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib)
+
+ifeq ($(strip $(CONFIG_JSON)),)
+	jsons := $(wildcard *.json)
+	ifneq (,$(findstring $(TARGET).json,$(jsons)))
+		export APP_JSON := $(TOPDIR)/$(TARGET).json
+	else
+		ifneq (,$(findstring config.json,$(jsons)))
+			export APP_JSON := $(TOPDIR)/config.json
+		endif
+	endif
+else
+	export APP_JSON := $(TOPDIR)/$(CONFIG_JSON)
+endif
+
+ifeq ($(strip $(ICON)),)
+	icons := $(wildcard *.jpg)
+	ifneq (,$(findstring $(TARGET).jpg,$(icons)))
+		export APP_ICON := $(TOPDIR)/$(TARGET).jpg
+	else
+		ifneq (,$(findstring icon.jpg,$(icons)))
+			export APP_ICON := $(TOPDIR)/icon.jpg
+		endif
+	endif
+else
+	export APP_ICON := $(TOPDIR)/$(ICON)
+endif
+
+ifeq ($(strip $(NO_ICON)),)
+	export NROFLAGS += --icon=$(APP_ICON)
+endif
+
+ifeq ($(strip $(NO_NACP)),)
+	export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp
+endif
+
+ifneq ($(APP_TITLEID),)
+	export NACPFLAGS += --titleid=$(APP_TITLEID)
+endif
+
+ifneq ($(ROMFS),)
+	export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS)
+endif
+
+.PHONY: $(BUILD) clean all
+
+#---------------------------------------------------------------------------------
+all: $(BUILD)
+
+
+$(BUILD):
+	@[ -d $@ ] || mkdir -p $@
+	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+
+#---------------------------------------------------------------------------------
+clean:
+	@rm -fr $(BUILD) $(TARGET).ovl $(TARGET).nro $(TARGET).nacp $(TARGET).elf $(RELEASE_ZIP)
+
+
+#---------------------------------------------------------------------------------
+else
+.PHONY:	all
+
+DEPENDS	:=	$(OFILES:.o=.d)
+
+#---------------------------------------------------------------------------------
+# main targets
+#---------------------------------------------------------------------------------
+all	:	 $(OUTPUT).ovl
+
+$(OUTPUT).ovl		:	$(OUTPUT).elf $(OUTPUT).nacp 
+	@elf2nro $< $@ $(NROFLAGS)
+	@echo "built ... $(notdir $(OUTPUT).ovl)"
+
+$(OUTPUT).elf	:	$(OFILES)
+
+$(OFILES_SRC)	: $(HFILES_BIN)
+
+#---------------------------------------------------------------------------------
+# you need a rule like this for each extension you use as binary data
+#---------------------------------------------------------------------------------
+%.bin.o	%_bin.h :	%.bin
+#---------------------------------------------------------------------------------
+	@echo $(notdir $<)
+	@$(bin2o)
+
+-include $(DEPENDS)
+
+#---------------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------------
+
+.PHONY:		release
+
+release:	$(RELEASE_ZIP)
+
+$(RELEASE_ZIP): $(OUTPUT).ovl
+	rm -rf sdfiles/
+	mkdir -p sdfiles/switch/.overlays/TextReaderOverlay/
+	cp $(OUTPUT).ovl sdfiles/switch/.overlays/
+	cp -r package/* sdfiles/switch/.overlays/TextReaderOverlay/
+	cd sdfiles/ && zip -r ../$(RELEASE_ZIP) * && cd ..
+	rm -rf sdfiles/
diff --git a/TextReaderOverlay/fonts/font.ttf b/TextReaderOverlay/fonts/font.ttf
diff --git a/include/CompositeElement.hpp b/include/CompositeElement.hpp
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <tesla.hpp>
+#include <vector>
+
+class CompositeElement : public tsl::elm::Element {
+public:
+    virtual ~CompositeElement() {
+        for (auto &elem : m_elems) {
+            delete elem.ptr;
+        }
+    }
+
+    void addElement(tsl::elm::Element *elem, s16 offsetX = 0, s16 offsetY = 0, s16 width = 0, s16 height = 0);
+
+    void draw(tsl::gfx::Renderer *renderer) override;
+    void layout(u16 parentX, u16 parentY, u16 parentWidth, u16 parentHeight) override;
+    virtual tsl::elm::Element* requestFocus(tsl::elm::Element *oldFocus, tsl::FocusDirection direction) override;
+
+private:
+    tsl::elm::Element* selectInitialElement(size_t idx);
+
+private:
+    struct ElementWrapper {
+        tsl::elm::Element *ptr;
+        s16 offsetX, offsetY, width, height;
+    };
+
+    std::vector<ElementWrapper> m_elems;
+    size_t m_focusIdx = 0;
+};
diff --git a/include/Config.hpp b/include/Config.hpp
@@ -0,0 +1,19 @@
+#pragma once
+
+#include <json.hpp>
+#include <functional>
+
+using nlohmann::json;
+
+class Config {
+public:
+    static json read();
+    static void update(std::function<void(json &)> const &updater);
+
+private:
+    static json initialize();
+
+private:
+    Config() {}
+    static const char* FILE_PATH;
+};
diff --git a/include/FavoritesMenu.hpp b/include/FavoritesMenu.hpp
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <tesla.hpp>
+#include <list>
+
+#include <FileSelectEntry.hpp>
+
+class FavoritesMenu : public tsl::Gui {
+public:
+    FavoritesMenu();
+    ~FavoritesMenu();
+
+    tsl::elm::Element* createUI() override;
+
+private:
+    std::list<FileSelectEntry*> m_entries;
+};
+
+class FavoritesMenuFrame : public tsl::elm::OverlayFrame {
+public:
+    FavoritesMenuFrame() : OverlayFrame("", "") {}
+
+    void draw(tsl::gfx::Renderer *renderer) override;
+};
diff --git a/include/FileSelect.hpp b/include/FileSelect.hpp
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <tesla.hpp>
+#include <string>
+#include <vector>
+
+class FileSelectEntry;
+
+class FileSelect : public tsl::Gui {
+public:
+    FileSelect(std::string const &path);
+    ~FileSelect();
+
+    tsl::elm::Element* createUI() override;
+
+private:
+    std::string m_path;
+    std::vector<FileSelectEntry*> m_entries;
+    bool m_failed;
+};
+
+class FileSelectFrame : public tsl::elm::OverlayFrame {
+public:
+    FileSelectFrame() : OverlayFrame("", "") {}
+
+    void draw(tsl::gfx::Renderer *renderer) override;
+};