stuff

Author: igagis

src/ruisapp/glue/android/android_configuration.hxx

@@ -5,10 +5,16 @@
 namespace {
 class android_configuration_wrapper
 {
-	const AConfiguration* config;
+	AConfiguration* config;
 
 public:
-	android_configuration_wrapper(AAssetManager& am);
+	explicit android_configuration_wrapper(AAssetManager& am);
+
+	android_configuration_wrapper(const android_configuration_wrapper&) = delete;
+	android_configuration_wrapper& operator=(const android_configuration_wrapper&) = delete;
+
+	android_configuration_wrapper(android_configuration_wrapper&&) = delete;
+	android_configuration_wrapper& operator=(android_configuration_wrapper&&) = delete;
 
 	~android_configuration_wrapper();
 

src/ruisapp/glue/android/application.cxx

@@ -1,7 +1,9 @@
 #include "application.hxx"
 
-#include "android_globals.hxx"
+#include <ruis/render/opengles/context.hpp>
+
 #include "asset_file.hxx"
+#include "globals.hxx"
 #include "window.hxx"
 
 application_glue::application_glue(utki::version_duplet gl_version) :
@@ -18,11 +20,23 @@ app_window& application_glue::make_window(ruisapp::window_parameters window_para
 
 	utki::assert(!this->window.has_value(), SL);
 
-	auto ruis_native_window = utki::make_shared<native_window>(this->gl_version, window_params);
+	auto ruis_native_window = utki::make_shared<native_window>(
+		this->gl_version, //
+		window_params
+	);
 
-	// TODO: std::move(ruis_native_window)?
 	auto rendering_context = utki::make_shared<ruis::render::opengles::context>(ruis_native_window);
 
+	auto common_render_objects = utki::make_shared<ruis::render::renderer::objects>(rendering_context);
+	auto common_shaders = rendering_context.get().make_shaders();
+
+	auto ruis_resource_loader = utki::make_shared<ruis::resource_loader>(
+		rendering_context, //
+		common_render_objects
+	);
+
+	auto ruis_style_provider = utki::make_shared<ruis::style_provider>(std::move(ruis_resource_loader));
+
 	auto ruis_context = utki::make_shared<ruis::context>(ruis::context::parameters{
 		.post_to_ui_thread_function =
 			[this](std::function<void()> procedure) {
@@ -40,19 +54,19 @@ app_window& application_glue::make_window(ruisapp::window_parameters window_para
 			},
 		.updater = this->updater,
 		.renderer = utki::make_shared<ruis::render::renderer>(
-			rendering_context,
-			this->rendering_context.get().make_shaders(),
-			utki::make_shared<ruis::render::renderer::objects>(rendering_context)
+			std::move(rendering_context),
+			std::move(common_shaders),
+			std::move(common_render_objects)
 		),
-		.style_provider = this->ruis_style_provider,
+		.style_provider = std::move(ruis_style_provider),
 		// TODO:
 		// .units = ruis::units(
 		// 	ruis_native_window.get().get_dots_per_inch(), //
 		// 	ruis_native_window.get().get_dots_per_pp()
 		// )
 	});
 
-	auto ruisapp_window = utki::make_shared<app_window>(
+	this->window.emplace(
 		std::move(ruis_context), //
 		std::move(ruis_native_window)
 	);
@@ -67,8 +81,6 @@ app_window& application_glue::make_window(ruisapp::window_parameters window_para
 	// 	)
 	// );
 
-	this->window = std::move(ruisapp_window);
-
 	utki::assert(this->window.has_value(), SL);
 	return this->window.value();
 }
@@ -121,3 +133,39 @@ ruisapp::window& ruisapp::application::make_window(ruisapp::window_parameters wi
 	auto& glue = get_glue(*this);
 	return glue.make_window(std::move(window_params));
 }
+
+void ruisapp::application::destroy_window(ruisapp::window& w)
+{
+	auto& glue = get_glue(*this);
+
+	utki::assert(dynamic_cast<app_window*>(&w), SL);
+	glue.destroy_window();
+}
+
+void ruisapp::application::quit() noexcept
+{
+	utki::assert(globals_wrapper::native_activity, SL);
+	ANativeActivity_finish(globals_wrapper::native_activity);
+}
+
+void ruisapp::application::show_virtual_keyboard() noexcept
+{
+	// NOTE:
+	// ANativeActivity_showSoftInput(native_activity,
+	// ANATIVEACTIVITY_SHOW_SOFT_INPUT_FORCED); did not work for some reason.
+
+	auto& glob = get_glob();
+
+	glob.java_functions.show_virtual_keyboard();
+}
+
+void ruisapp::application::hide_virtual_keyboard() noexcept
+{
+	// NOTE:
+	// ANativeActivity_hideSoftInput(native_activity,
+	// ANATIVEACTIVITY_HIDE_SOFT_INPUT_NOT_ALWAYS); did not work for some reason
+
+	auto& glob = get_glob();
+
+	glob.java_functions.hide_virtual_keyboard();
+}

src/ruisapp/glue/android/application.hxx

@@ -5,11 +5,36 @@
 #include "../../application.hpp"
 #include "../../window.hpp"
 
+#include "window.hxx"
+
 namespace {
 class app_window : public ruisapp::window
 {
+	ruis::rect cur_win_rect{0, 0, 0, 0};
+
 public:
-	utki::shared_ref<native_window> ruis_native_Window;
+	utki::shared_ref<native_window> ruis_native_window;
+
+	app_window(utki::shared_ref<ruis::context> ruis_context, utki::shared_ref<native_window> ruis_native_window) :
+		ruisapp::window(std::move(ruis_context)),
+		ruis_native_window(std::move(ruis_native_window))
+	{}
+
+	void set_win_rect(const ruis::rect& r)
+	{
+		this->cur_win_rect = r;
+		this->gui.set_viewport(this->cur_win_rect);
+	}
+
+	const ruis::rect& get_win_rect() const noexcept
+	{
+		return this->cur_win_rect;
+	}
+
+	const ruis::vec2& get_win_dims() const noexcept
+	{
+		return this->get_win_rect().d;
+	}
 };
 } // namespace
 
@@ -28,28 +53,35 @@ public:
 
 	app_window& make_window(ruisapp::window_parameters window_params);
 
+	void destroy_window()
+	{
+		// TODO: defer destruction
+		this->window.reset();
+	}
+
 	void render();
 
 	void create_window_surface(ANativeWindow& android_window)
 	{
 		if (this->window.has_value()) {
-			this->window.create_surface(android_window);
+			this->window.value().ruis_native_window.get().create_surface(android_window);
 		}
 	}
 
 	void destroy_window_surface()
 	{
 		if (this->window.has_value()) {
-			this->window.value().destroy_surface();
+			this->window.value().ruis_native_window.get().destroy_surface();
 		}
 	}
 
-    app_window* get_window(){
-        if(this->window.has_value()){
-            return &this->window.value();
-        }
-        return nullptr;
-    }
+	app_window* get_window()
+	{
+		if (this->window.has_value()) {
+			return &this->window.value();
+		}
+		return nullptr;
+	}
 };
 } // namespace
 

src/ruisapp/glue/android/asset_file.hxx

@@ -138,8 +138,9 @@ public:
 			this->path().size() - 1
 		);
 
-		utki::assert(java_functions, SL);
-		return java_functions->list_dir_contents(p);
+		auto& glob = get_glob();
+
+		return glob.java_functions.list_dir_contents(p);
 	}
 
 	std::unique_ptr<papki::file> spawn() override

src/ruisapp/glue/android/globals.cxx

@@ -1,4 +1,6 @@
-#include "android_globals.hxx"
+#include "globals.hxx"
+
+ANativeActivity* globals_wrapper::native_activity = nullptr;
 
 void globals_wrapper::create(ANativeActivity* activity)
 {
@@ -95,7 +97,7 @@ int on_update_timer_expired(
 }
 } // namespace
 
-globals_wrapper()
+globals_wrapper::globals_wrapper()
 {
 	// add timer descriptor to looper, this is needed for updatable to work
 	if (ALooper_addFd(
@@ -124,7 +126,7 @@ globals_wrapper()
 	}
 }
 
-~globals_wrapper()
+globals_wrapper::~globals_wrapper()
 {
 	// remove UI message queue descriptor from looper
 	ALooper_removeFd(

src/ruisapp/glue/android/globals.hxx

@@ -15,18 +15,11 @@
 
 namespace {
 struct globals_wrapper final {
-	static ANativeActivity* native_activity = nullptr;
+	static ANativeActivity* native_activity;
 
 	static void create(ANativeActivity* activity);
 	static void destroy();
 
-	static globals_wrapper& get()
-	{
-		utki::assert(native_activity, SL);
-		utki::assert(native_activity->instance, SL);
-		return
-	}
-
 	globals_wrapper();
 
 	globals_wrapper(const globals_wrapper&) = delete;
@@ -54,11 +47,11 @@ struct globals_wrapper final {
 	nitki::queue ui_queue;
 
 	utki::unique_ref<android_configuration_wrapper> cur_android_configuration =
-		utki::make_unique<android_configuration_wrapper>(*android_configuration_wrapper::native_activity->assetManager);
+		utki::make_unique<android_configuration_wrapper>(*globals_wrapper::native_activity->assetManager);
 
 	AInputQueue* input_queue = nullptr;
 
-	ruis::vector2 cur_window_dims(0, 0);
+	ruis::vector2 cur_window_dims{0, 0};
 
 	ruis::vector2 android_win_coords_to_ruis_win_rect_coords(
 		const ruis::vector2& ruis_win_dims, //