Split functional, add namespace

Signed-off-by: Vasiliy Doylov <nekocwd@mainlining.org>

vala-quick-setting/extension.vala

@@ -0,0 +1,22 @@
+namespace Extension {
+  [ModuleInit]
+  [CCode (cname = "g_io_phosh_plugin_vala_quick_setting_load")]
+  public static void load (GLib.TypeModule module) {
+    IOExtensionPoint.implement ("phosh-quick-setting-widget",
+                                typeof (QuickSetting),
+                                "vala-quick-setting",
+                                10);
+  }
+
+  [CCode (cname = "g_io_phosh_plugin_vala_quick_setting_unload")]
+  public static void unload (GLib.IOModule module) {
+  }
+
+  [CCode (cname = "g_io_phosh_plugin_vala_quick_setting_query")]
+  public static string[] query () {
+    StrvBuilder builder = new StrvBuilder ();
+
+    builder.add ("phosh-quick-setting-widget");
+    return builder.end ();
+  }
+}

vala-quick-setting/meson.build

@@ -2,11 +2,14 @@ name = 'vala-quick-setting'
 
 vala_quick_setting_resources = gnome.compile_resources(
   'phosh-plugin-vala-quick-setting-resources',
-  'phosh-plugin-vala-quick-setting.gresources.xml',
+  'extension.gresources.xml',
   c_name: 'phosh_plugin_vala_quick_setting',
 )
 
-vala_quick_setting_plugin_sources = files('phosh-plugin-vala-quick-setting.vala')
+vala_quick_setting_plugin_sources = files(
+  'extension.vala',
+  'qs.vala',
+)
 
 phosh_vala_quick_setting_plugin = shared_module(
   'phosh-plugin-vala-quick-setting',

vala-quick-setting/qs.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.24"/>
-  <template class="ValaQuickSetting" parent="PhoshQuickSetting">
+  <template class="ExtensionQuickSetting" parent="PhoshQuickSetting">
     <property name="status-icon">info</property>
     <property name="status-page">status_page</property>
     <signal name="clicked" handler="on_clicked" object="PhoshValaQuickSetting" swapped="yes"/>

vala-quick-setting/qs.vala

@@ -11,17 +11,13 @@ using GLib;
 
 
 [GtkTemplate (ui = "/mobi/phosh/plugins/vala-quick-setting/qs.ui")]
-public class ValaQuickSetting : QuickSetting
+public class Extension.QuickSetting : Phosh.QuickSetting {
-{
   [GtkChild]
   private unowned StatusIcon info;
 
   [GtkCallback]
-  private void
+  private void on_clicked (Phosh.QuickSetting qs) {
-  on_clicked (Phosh.QuickSetting qs)
-  {
     bool active = get_active ();
-
     if (active) {
       info.set_icon_name ("face-shutmouth-symbolic");
       info.set_info ("I'm Inactive");
@@ -38,30 +34,3 @@ public class ValaQuickSetting : QuickSetting
     info.set_info ("I'm Inactive");
   }
 }
-
-
-[ModuleInit]
-public void
-g_io_phosh_plugin_vala_quick_setting_load (GLib.TypeModule module)
-{
-  GLib.IOExtensionPoint.implement ("phosh-quick-setting-widget",
-                                   typeof(ValaQuickSetting),
-                                   "vala-quick-setting",
-                                   10);
-}
-
-
-public void
-g_io_phosh_plugin_vala_quick_setting_unload (GLib.IOModule module)
-{
-}
-
-
-public string[]
-g_io_phosh_plugin_vala_quick_setting_query ()
-{
-  StrvBuilder builder = new StrvBuilder ();
-
-  builder.add ("phosh-quick-setting-widget");
-  return builder.end ();
-}