Commit: 9f81329673884763df51364426013d58905d172a - haxeui-koreader (hg)

Commit MetaInfo

• Revision: 9f81329673884763df51364426013d58905d172a (tree)
• Time: 2022-07-16 05:57:36
• Author: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fast...>
• Commiter: Jaime Marquínez Ferrándiz

Log Message

Remove duplicated code

Change Summary

• modified: src/haxe/ui/backend/AppImpl.hx
• modified: src/haxe/ui/backend/koreader/creators/DialogCreator.hx
• add: src/haxe/ui/backend/koreader/WindowHelper.hx

Incremental Difference

diff -r 49243744bee2 -r 9f8132967388 src/haxe/ui/backend/AppImpl.hx
--- a/src/haxe/ui/backend/AppImpl.hx	Fri Jul 15 22:44:15 2022 +0200
+++ b/src/haxe/ui/backend/AppImpl.hx	Fri Jul 15 22:57:36 2022 +0200
@@ -5,14 +5,8 @@
 package haxe.ui.backend;
 
 import haxe.ui.backend.koreader.WidgetWrapper;
-import koreader.Device;
-import koreader.ffi.Blitbuffer;
 import koreader.ui.UIManager;
-import koreader.ui.Size;
-import koreader.ui.widget.container.CenterContainer;
-import koreader.ui.widget.container.FrameContainer;
-import koreader.ui.widget.container.MovableContainer;
-import koreader.ui.widget.VerticalGroup;
+import haxe.ui.backend.koreader.WindowHelper;
 
 class AppImpl extends AppBase {
     private var _mainWindow : WidgetWrapper;
@@ -25,26 +19,10 @@
     override function build() {
         super.build();
 
-        var frame = FrameContainer.create({
-            background: Blitbuffer.COLOR_WHITE,
-            bordersize: Size.border.window,
-            radius: Size.radius.window,
-            padding: Size.padding.default_,
-        });
+        var createdWindow = WindowHelper.createWindow();
 
-        var group = VerticalGroup.create({});
-        this._mainContainer = new WidgetWrapper(group);
-        frame.addWidget(group);
-
-        var container = CenterContainer.create({
-            dimen: Device.screen.getSize(),
-            widgets: [
-                MovableContainer.create({
-                    widgets: [frame],
-                }),
-            ],
-        });
-        this._mainWindow = new WidgetWrapper(container);   
+        this._mainContainer = new WidgetWrapper(createdWindow.widgetContainer);
+        this._mainWindow = new WidgetWrapper(createdWindow.window);   
     }
 
     override function start() {

diff -r 49243744bee2 -r 9f8132967388 src/haxe/ui/backend/koreader/WindowHelper.hx
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/haxe/ui/backend/koreader/WindowHelper.hx	Fri Jul 15 22:57:36 2022 +0200
@@ -0,0 +1,37 @@
+// SPDX-FileCopyrightText: 2022 Jaime Marquínez Ferrándiz <[e-mail]>
+//
+// SPDX-License-Identifier: Unlicense
+
+package haxe.ui.backend.koreader;
+
+import koreader.ui.widget.container.MovableContainer;
+import koreader.ui.widget.container.CenterContainer;
+import koreader.Device;
+import koreader.ui.widget.VerticalGroup;
+import koreader.ui.Size;
+import koreader.ffi.Blitbuffer;
+import koreader.ui.widget.container.FrameContainer;
+
+class WindowHelper {
+    public static function createWindow() {
+        var frame = FrameContainer.create({
+            background: Blitbuffer.COLOR_WHITE,
+            bordersize: Size.border.window,
+            radius: Size.radius.window,
+            padding: Size.padding.default_,
+        });
+
+        var widgetContainer = VerticalGroup.create({});
+        frame.addWidget(widgetContainer);
+
+        var window = CenterContainer.create({
+            dimen: Device.screen.getSize(),
+            widgets: [
+                MovableContainer.create({
+                    widgets: [frame],
+                }),
+            ],
+        });
+        return {window: window, widgetContainer: widgetContainer};
+    }
+}
\ No newline at end of file

diff -r 49243744bee2 -r 9f8132967388 src/haxe/ui/backend/koreader/creators/DialogCreator.hx
--- a/src/haxe/ui/backend/koreader/creators/DialogCreator.hx	Fri Jul 15 22:44:15 2022 +0200
+++ b/src/haxe/ui/backend/koreader/creators/DialogCreator.hx	Fri Jul 15 22:57:36 2022 +0200
@@ -1,12 +1,5 @@
 package haxe.ui.backend.koreader.creators;
 
-import koreader.ui.widget.container.MovableContainer;
-import koreader.Device;
-import koreader.ui.widget.container.CenterContainer;
-import koreader.ffi.Blitbuffer;
-import koreader.ui.widget.VerticalGroup;
-import koreader.ui.Size;
-import koreader.ui.widget.container.FrameContainer;
 import koreader.ui.widget.Widget;
 
 @:keep
@@ -23,24 +16,7 @@
 	}
 
     override function createWrapper(parent : WidgetWrapper) : WidgetWrapper {
-        var frame = FrameContainer.create({
-            background: Blitbuffer.COLOR_GRAY,
-            bordersize: Size.border.window,
-            radius: Size.radius.window,
-            padding: Size.padding.default_,
-        });
-
-        var group = VerticalGroup.create({});
-        frame.addWidget(group);
-
-        var dialog = CenterContainer.create({
-            dimen: Device.screen.getSize(),
-            widgets: [
-                MovableContainer.create({
-                    widgets: [frame],
-                }),
-            ],
-        });
-        return new DialogWrapper(dialog, group);
+        var createdWindow = WindowHelper.createWindow();
+        return new DialogWrapper(createdWindow.window, createdWindow.widgetContainer);
     }
 }
\ No newline at end of file