ruby-macrodroid 0.7.5 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34125d78f367eeff973953934d50436f964bb073ffef48591ce2f09012fc2a01
-  data.tar.gz: 5bb75988f4d979cb80f57c912d8448837848b3d4a5b34a3e524f8fdad3ff62de
+  metadata.gz: 3e6d2bb5ccf9f1caf0c56ba60c4791801dccc28a2be22bfbfc524db01dd553f5
+  data.tar.gz: 4d79491e900a308fcc3473ed6d7b96cdf6169e20c7c0c754c08c806cb52c6d34
 SHA512:
-  metadata.gz: 223c51744d7dde5e4a7130d3141696df1dc4a8cda0227e0f11324c3ac71e53226c95e8acd1ae27ed62ec46d8c1c8b81060e9135d923285e59e89572985dd146c
-  data.tar.gz: 39490d0ceeb2bfce5c413607d1ea5a1ca87e8942bdcbfd51ecf32f2baac1a1c6fec7bf8909eda8716cc6b397ef847d4c15de6eca9892f9d244f1724d4956a1fe
+  metadata.gz: c671f4e0473e435f7c5c9f760627464b8bf760367485877d43680225f399c6e7a83d2ac95be8ac4960ce8451d301abe7044e70570f1a7344a3a2bcd7ab529746
+  data.tar.gz: 5cbfd7fee603949c495e4af3b315ffb45af15e8810c9ed226305627e47472df6a29c92ce2fed2f824d07d5dbb4b28372fcb420d97b4ea673f8c9a8458dc4ad21

data/lib/ruby-macrodroid.rb

@@ -112,6 +112,7 @@ require 'rowx'
 require 'uuid'
 require 'glw'
 require 'geozone'
+require 'geocoder'
 require 'subunit'
 require 'rxfhelper'
 require 'chronic_cron'
@@ -199,6 +200,11 @@ class TriggersNlp
 
   alias find_trigger run_route
 
+  def to_s(colour: false)
+    'TriggersNlp ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 class ActionsNlp
@@ -318,6 +324,11 @@ class ActionsNlp
 
   alias find_action run_route
 
+  def to_s(colour: false)
+    'ActionsNlp ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 class ConstraintsNlp
@@ -400,12 +411,13 @@ class Macro
   using ColouredText
   using Params
 
-  attr_reader :local_variables, :triggers, :actions, :constraints, :guid
+  attr_reader :local_variables, :triggers, :actions, :constraints, 
+      :guid, :deviceid
   attr_accessor :title, :description
 
-  def initialize(name=nil, geofences: geofences, debug: false)
+  def initialize(name=nil, geofences: geofences, deviceid: nil, debug: false)
 
-    @title, @geofences, @debug = name, geofences, debug
+    @title, @geofences, @deviceid, @debug = name, geofences, deviceid, debug
     
     puts 'inside Macro#initialize' if @debug    
           
@@ -472,7 +484,8 @@ class Macro
     
     # fetch the triggers
     @triggers = h[:trigger_list].map do |trigger|
-      
+      puts 'trigger: ' + trigger.inspect
+      #exit      
       object(trigger.to_snake_case)
 
     end
@@ -663,16 +676,24 @@ end
 EOF
   end
     
-  def to_s()
+  def to_s(colour: false)
     
     indent = 0
     actions = @actions.map do |x|
 
-      s = x.to_s
+      s = x.to_s(colour: colour)
+      if s.lines.length > 1 then
+        lines = s.lines
+        s = lines[0] + lines[1..-1].map {|x| x.prepend ('  ' * indent) }.join
+      end
       
       r = if indent <= 0 then
       
-        "a: %s" % s
+        if colour then
+          "a".bg_blue.gray.bold + ": %s" % s
+        else
+          "a: %s" % s
+        end
         
       elsif indent > 0 
       
@@ -688,8 +709,15 @@ EOF
       end
       
       if s =~ /^If/i then
+        
         if indent < 1 then
-          r = "a:\n  %s" % s
+          
+          r = if colour then
+            "a".bg_blue.gray.bold + ":\n  %s" % s
+          else
+            "a:\n  %s" % s
+          end
+          
           indent += 1
         else
           r = ('  ' * indent) + "%s" % s
@@ -703,30 +731,59 @@ EOF
     end.join("\n")
     
     a = [
-      'm: ' + @title,
-      @triggers.map {|x| "t: %s" % x}.join("\n"),
+      (colour ? "m".bg_cyan.gray.bold : 'm') + ': ' + @title,
+      @triggers.map {|x| (colour ? "t".bg_red.gray.bold : 't') \
+                     + ": %s" % x}.join("\n"),
       actions
     ]
     
-    a << @constraints.map {|x| "c: %s" % x}.join("\n") if @constraints.any?
+    if @constraints.any? then
+      a << @constraints.map do |x|
+        (colour ? "c".bg_green.gray.bold : 'c') + ": %s" % x
+      end.join("\n") 
+    end
     
     if @description and @description.length >= 1 then
-      a.insert(1, 'd: ' + @description.gsub(/\n/,"\n  "))
+      a.insert(1, (colour ? "d".bg_gray.gray.bold : 'd') + ': ' \
+               + @description.gsub(/\n/,"\n  "))
     end
     
     a.join("\n") + "\n"
     
   end
   
-  def to_summary()
+  def to_summary(colour: false)
+    
+    if colour then
+      
+      a = [
+        'm'.bg_cyan.gray.bold + ': ' + @title,
+        't'.bg_red.gray.bold + ': ' + @triggers.map \
+      {|x| x.to_summary(colour: false)}.join(", "),
+        'a'.bg_blue.gray.bold + ': ' + @actions.map \
+      {|x| x.to_summary(colour: false)}.join(", ")
+      ]
+      
+      if @constraints.any? then
+        a <<  'c'.bg_green.gray.bold + ': ' + @constraints.map \
+            {|x| x.to_summary(colour: false)}.join(", ") 
+      end      
+      
+    else
+      
+      a = [
+        'm: ' + @title,
+        't: ' + @triggers.map {|x| x.to_summary(colour: false)}.join(", "),
+        'a: ' + @actions.map {|x| x.to_summary(colour: false)}.join(", ")
+      ]
+      
+      if @constraints.any? then
+        a <<  'c: ' + @constraints.map \
+            {|x| x.to_summary(colour: false)}.join(", ") 
+      end
+    end
     
-    a = [
-      'm: ' + @title,
-      't: ' + @triggers.map(&:to_summary).join(", "),
-      'a: ' + @actions.map(&:to_summary).join(", "),
-    ]
     
-    a <<  'c: ' + @constraints.map(&:to_summary).join(", ") if @constraints.any?
     
     a.join("\n") + "\n"
     
@@ -740,7 +797,7 @@ EOF
 
   def object(h={})
 
-    puts ('inside object h:'  + h.inspect).debug if @debug
+    puts ('inside object h:'  + h.inspect).debug if @debug  
     klass = Object.const_get h[:class_type]
     puts klass.inspect.highlight if $debug
     
@@ -748,7 +805,13 @@ EOF
       puts 'GeofenceTrigger found'.highlight if $debug
       GeofenceTrigger.new(h, geofences: @geofences)
     else
-      klass.new h
+      puts 'before klass'
+      h2 = h.merge( macro: self)
+      puts 'h2: ' + h2.inspect      
+      r = klass.new h2 
+
+      r
+      
     end
     
   end
@@ -764,10 +827,14 @@ class MacroDroid
   using Params  
 
   attr_reader :macros, :geofences, :yaml
+  attr_accessor :deviceid
+  
+  # note: The deviceid can only be found from an existing Webhook trigger, 
+  #       generated from MacroDroid itself.
 
-  def initialize(obj=nil, debug: false)
+  def initialize(obj=nil, deviceid: nil, debug: false)
 
-    @debug = debug    
+    @deviceid, @debug = deviceid, debug    
     
     @geofences = {}
     
@@ -892,21 +959,22 @@ class MacroDroid
     @macros.map(&:to_pc).join("\n\n")
   end
 
-  def to_s()
+  def to_s(colour: false)
     
     lines = []
     
     if @geofences.any? then
-      lines << @geofences.map {|_, value| 'g: ' + value.to_s}.join("\n\n") + "\n"
+      lines << @geofences.map {|_, value| (colour ? "g".green.bold : 'g') \
+                               + ': ' + value.to_s}.join("\n\n") + "\n"
     end
     
-    lines << @macros.map(&:to_s).join("\n")
+    lines << @macros.map {|x| x.to_s(colour: colour)}.join("\n")
     lines.join("\n")
     
   end
   
-  def to_summary()
-    @macros.map(&:to_summary).join("\n")
+  def to_summary(colour: false)
+    @macros.map {|x| x.to_summary(colour: colour)}.join("\n")
   end  
   
   private
@@ -918,13 +986,23 @@ class MacroDroid
       name = e.text.to_s.strip
       item = e.element('item')
       coordinates = item.text('coordinates')
-      latitude, longitude = coordinates.split(/, */,2)
-      radius = item.text('radius') 
+      location = item.text('location')
+      
+      if not coordinates and location then
+        results = Geocoder.search(location)
+        coordinates = results[0].coordinates.join(', ') if results.any?
+      end
+      
+      if coordinates then
+        latitude, longitude = coordinates.split(/, */,2)
+        radius = item.text('radius')
+      end
       
       id = UUID.new.generate
 
       h = {
         name: name, 
+        location: location,
         longitude: longitude, 
         latitude: latitude, 
         radius: radius, 
@@ -961,7 +1039,8 @@ class MacroDroid
       puts ('macro: ' + macro.inspect).debug if @debug
 #       puts '@geofences: ' + @geofences.inspect if @debug
       
-      m = Macro.new(geofences: @geofences.map(&:last), debug: @debug )
+      m = Macro.new(geofences: @geofences.map(&:last), deviceid: @deviceid, 
+                    debug: @debug )
       m.import_h(macro)
       m
 
@@ -982,7 +1061,8 @@ class MacroDroid
     
     @macros = doc.root.xpath('item').map do |node|
       puts ('geofences: ' + geofences.inspect).highlight if @debug
-      Macro.new(geofences: geofences.map(&:last), debug: @debug).import_xml(node)
+      Macro.new(geofences: geofences.map(&:last), deviceid: @deviceid, 
+                debug: @debug).import_xml(node)
       
     end
 
@@ -1005,7 +1085,8 @@ class MacroDroid
        
     @macros = doc.root.xpath('macro').map do |node|
           
-      Macro.new(geofences: @geofences.map(&:last), debug: @debug).import_xml(node)
+      Macro.new(geofences: @geofences.map(&:last), deviceid: @deviceid, 
+                debug: @debug).import_xml(node)
       
     end
   end
@@ -1038,10 +1119,11 @@ class GeofenceMap
   
   attr_accessor :name, :longitude, :latitude, :radius, :id
   
-  def initialize(id: '', longitude: '', latitude: '', name: '', radius: '')
+  def initialize(id: '', longitude: '', latitude: '', name: '', radius: '', 
+                 location: nil)
     
-    @id, @latitude, @longitude, @name, @radius = id, latitude, \
-        longitude, name, radius    
+    @id, @latitude, @longitude, @name, @radius, @location = id, latitude, \
+        longitude, name, radius, location    
     
   end
   
@@ -1057,10 +1139,15 @@ class GeofenceMap
       
   end
   
-  def to_s()
+  def to_s(colour: false)
     
-    coordinates = "%s, %s" % [@longitude, @latitude]
-    "%s\n  coordinates: %s\n  radius: %s" % [@name, coordinates, @radius]
+    lines = []
+    coordinates = "%s, %s" % [@latitude, @longitude]
+    lines << "%s" % @name
+    lines << "  location: %s" % @location if @location
+    lines << "  coordinates: %s" % coordinates
+    lines << "  radius: %s" % @radius
+    lines.join("\n")
     
   end
   
@@ -1069,15 +1156,16 @@ end
 class MacroObject
   using ColouredText
   
-  attr_reader :type
+  attr_reader :type, :siguid
   attr_accessor :options
 
   def initialize(h={})
     
     $env ||= {}
     
+    @attributes = %i(constraint_list is_or_condition is_disabled siguid)
     @h = {constraint_list: [], is_or_condition: false, 
-          is_disabled: false}.merge(h)
+          is_disabled: false, siguid: nil}.merge(h)
     @list = []
     
     # fetch the class name and convert from camelCase to snake_eyes
@@ -1085,6 +1173,7 @@ class MacroObject
         .gsub(/\B[A-Z][a-z]/){|x| '_' + x.downcase}\
         .gsub(/[a-z][A-Z]/){|x| x[0] + '_' + x[1].downcase}\
         .downcase.to_sym
+    @constraints = []
   end
 
   def to_h()
@@ -1105,8 +1194,21 @@ class MacroObject
 
   end
   
-  def to_s()
-    "#<%s %s>" % [self.class, @h.inspect]
+  def siguid()
+    @h[:siguid]
+  end
+  
+  def to_s(colour: false)
+
+    h = @h.clone    
+    h.delete :macro
+    @s ||= "#<%s %s>" % [self.class, h.inspect]
+    operator = @h[:is_or_condition] ? 'OR' : 'AND'
+    constraints = @constraints.map \
+        {|x| x.to_summary(colour: colour)}.join(" %s " % operator)
+    
+    @s + constraints
+    
   end
   
   alias to_summary to_s
@@ -1115,7 +1217,7 @@ class MacroObject
   
   def filter(options, h)
     
-    (h.keys - options.keys).each {|key| h.delete key }    
+    (h.keys - (options.keys + @attributes.to_a)).each {|key| h.delete key }    
     return h
     
   end
@@ -1162,21 +1264,7 @@ class Trigger < MacroObject
 end
 
 
-# Category: Applications
-#
-class WebHookTrigger < Trigger
-
-  def initialize(h={})
-
-    options = {
-      identifier: ''
-    }
-
-    super(options.merge h)
-
-  end
 
-end
 
 # Category: Applications
 #
@@ -1207,6 +1295,11 @@ class WifiConnectionTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'WifiConnectionTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Applications
@@ -1227,6 +1320,11 @@ class ApplicationInstalledRemovedTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'ApplicationInstalledRemovedTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Applications
@@ -1245,6 +1343,11 @@ class ApplicationLaunchedTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'ApplicationLaunchedTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Battery/Power
@@ -1263,7 +1366,7 @@ class BatteryLevelTrigger < Trigger
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     operator = @h[:decreases_to] ? '<=' : '>='    
     "Battery %s %s%%" % [operator, @h[:battery_level]]
   end
@@ -1286,6 +1389,11 @@ class BatteryTemperatureTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'BatteryTemperatureTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Battery/Power
@@ -1302,6 +1410,11 @@ class PowerButtonToggleTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'PowerButtonToggleTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 
@@ -1321,6 +1434,27 @@ class ExternalPowerTrigger < Trigger
     super(options.merge h)
 
   end
+  
+  def to_s(colour: false)
+    
+    return 'Power Disconnected' unless @h[:power_connected]
+    
+    status = 'Power Connectd'
+    options = if @h[:power_connected_options].all? then
+      'Any'
+    else
+      
+      a = ['Wired (Fast Charge)', 'Wireless', 'Wired (Slow Charge)']
+      @h[:power_connected_options].map.with_index {|x,i| x ? i : nil}\
+          .compact.map {|i| a[i] }.join(' + ')
+      
+    end
+    
+    "%s: %s" % [status, options]
+
+  end
+  
+  alias to_summary to_s
 
 end
 
@@ -1340,6 +1474,11 @@ class CallActiveTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'CallActiveTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Call/SMS
@@ -1360,6 +1499,12 @@ class IncomingCallTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    caller = @h[:incoming_call_from_list].map {|x| "%s" % x[:name]}.join(', ')
+    "Call Incoming [%s]" % caller
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Call/SMS
@@ -1380,6 +1525,11 @@ class OutgoingCallTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'OutgoingCallTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Call/SMS
@@ -1400,6 +1550,11 @@ class CallEndedTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'CallEndedTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Call/SMS
@@ -1416,6 +1571,11 @@ class CallMissedTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'CallMissedTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Call/SMS
@@ -1440,6 +1600,11 @@ class IncomingSMSTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'IncomingSMSTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -1456,6 +1621,16 @@ class WebHookTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    
+    url = "https://trigger.macrodroid.com/%s/%s" % \
+        [@h[:macro].deviceid, @h[:identifier]]
+    @s = 'WebHook (Url)' + "\n  " + url
+    super()
+
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -1473,6 +1648,12 @@ class WifiConnectionTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    access_point = @h[:ssid_list].first
+    'Connected to network ' + access_point
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -1491,6 +1672,11 @@ class BluetoothTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'BluetoothTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -1508,6 +1694,11 @@ class HeadphonesTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'HeadphonesTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -1524,6 +1715,11 @@ class SignalOnOffTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'SignalOnOffTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -1540,6 +1736,11 @@ class UsbDeviceConnectionTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'UsbDeviceConnectionTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -1577,6 +1778,11 @@ class WifiSSIDTrigger < Trigger
     
   end
 
+  def to_s(colour: false)
+    'WifiSSIDTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Date/Time
@@ -1603,6 +1809,11 @@ class CalendarTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'CalendarTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Date/Time
@@ -1640,7 +1851,7 @@ class TimerTrigger < Trigger
     
     #puts ('h: ' + h.inspect).debug
 
-    options = {
+    @options = {
       alarm_id: uuid(),
       days_of_week: [false, false, false, false, false, false, false],
       minute: 10,
@@ -1648,7 +1859,8 @@ class TimerTrigger < Trigger
       use_alarm: false
     }
             
-    super(options.merge filter(options, h))
+    #super(options.merge filter(options, h))
+    super(@options.merge h)
 
   end
   
@@ -1668,7 +1880,7 @@ class TimerTrigger < Trigger
     "time.is? '%s'" % self.to_s.gsub(',', ' or')
   end
   
-  def to_s()
+  def to_s(colour: false)
     
     dow = @h[:days_of_week]        
 
@@ -1693,11 +1905,13 @@ class TimerTrigger < Trigger
       a.zip(dow).select {|_,b| b}.map(&:first).join(', ')
     end
     
-    time = Time.parse("%s:%s" % [@h[:hour], @h[:minute]]).strftime("%-H:%M%P")    
+    time = Time.parse("%s:%s" % [@h[:hour], @h[:minute]]).strftime("%H:%M")    
     
     "%s %s" % [time, days]
   end
   
+  alias to_summary to_s
+  
   private
   
   def time()
@@ -1729,6 +1943,11 @@ class StopwatchTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'StopwatchTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Date/Time
@@ -1757,6 +1976,11 @@ class DayTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'DayTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Date/Time
@@ -1780,6 +2004,15 @@ class RegularIntervalTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    
+    interval = Subunit.new(units={minutes:60, hours:60}, \
+                           seconds: @h[:seconds]).strfunit("%c")
+    'Regular Interval ' + "\n  Interval: " + interval
+    
+  end
+
+  alias to_summary to_s
 end
 
 class DeviceEventsTrigger < Trigger
@@ -1814,6 +2047,11 @@ class AirplaneModeTrigger < DeviceEventsTrigger
 
   end
 
+  def to_s(colour: false)
+    'AirplaneModeTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Events
@@ -1830,6 +2068,11 @@ class AutoSyncChangeTrigger < DeviceEventsTrigger
 
   end
 
+  def to_s(colour: false)
+    'AutoSyncChangeTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Events
@@ -1846,6 +2089,11 @@ class DayDreamTrigger < DeviceEventsTrigger
 
   end
 
+  def to_s(colour: false)
+    'DayDreamTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Events
@@ -1862,6 +2110,11 @@ class DockTrigger < DeviceEventsTrigger
 
   end
 
+  def to_s(colour: false)
+    'DockTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Events
@@ -1882,7 +2135,7 @@ class FailedLoginTrigger < DeviceEventsTrigger
     'failed_login?'
   end
 
-  def to_s()
+  def to_s(colour: false)
     'Failed Login Attempt'
   end
 end
@@ -1901,6 +2154,11 @@ class GPSEnabledTrigger < DeviceEventsTrigger
 
   end
 
+  def to_s(colour: false)
+    'GPSEnabledTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Events
@@ -1917,6 +2175,11 @@ class MusicPlayingTrigger < DeviceEventsTrigger
 
   end
 
+  def to_s(colour: false)
+    'MusicPlayingTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 
@@ -1933,9 +2196,11 @@ class DeviceUnlockedTrigger < DeviceEventsTrigger
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     'Screen Unlocked'
   end
+  
+  alias to_summary to_s
 
 end
 
@@ -1953,6 +2218,11 @@ class AutoRotateChangeTrigger < DeviceEventsTrigger
 
   end
 
+  def to_s(colour: false)
+    'AutoRotateChangeTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Events
@@ -1970,6 +2240,11 @@ class ClipboardChangeTrigger < DeviceEventsTrigger
 
   end
 
+  def to_s(colour: false)
+    'ClipboardChangeTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Events
@@ -1985,6 +2260,11 @@ class BootTrigger < DeviceEventsTrigger
 
   end
 
+  def to_s(colour: false)
+    'BootTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Events
@@ -2005,6 +2285,11 @@ class IntentReceivedTrigger < DeviceEventsTrigger
 
   end
 
+  def to_s(colour: false)
+    'IntentReceivedTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Events
@@ -2031,6 +2316,12 @@ class NotificationTrigger < DeviceEventsTrigger
 
   end
 
+  def to_s(colour: false)
+    s = (@h[:package_name_list] + @h[:application_name_list]).uniq.join(', ')
+    'Notification Received ' + "\n    Any Content (%s)" % s
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Events
@@ -2046,6 +2337,12 @@ class ScreenOnOffTrigger < DeviceEventsTrigger
     super(options.merge h)
 
   end
+  
+  def to_s(colour: false)
+    'Screen ' + (@h[:screen_on] ? 'On' : 'Off')
+  end
+  
+  alias to_summary to_s
 
 end
 
@@ -2063,6 +2360,11 @@ class SilentModeTrigger < DeviceEventsTrigger
 
   end
 
+  def to_s(colour: false)
+    'SilentModeTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Location
@@ -2088,6 +2390,11 @@ class WeatherTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'WeatherTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Location
@@ -2097,7 +2404,7 @@ class GeofenceTrigger < Trigger
   def initialize( h={}, geofences: {})
 
     if h[:name] then
-      puts ('geofences2: ' + geofences.inspect)
+      puts ('geofences2: ' + geofences.inspect) if $debug
       found = geofences.find {|x| x.name.downcase == h[:name].downcase}
       h[:geofence_id] = found.id if found
       
@@ -2116,7 +2423,7 @@ class GeofenceTrigger < Trigger
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     
     if $debug then
       puts ' @geofences: ' + @geofences.inspect
@@ -2151,6 +2458,11 @@ class SunriseSunsetTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'SunriseSunsetTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 
@@ -2180,12 +2492,12 @@ class ActivityRecognitionTrigger < SensorsTrigger
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     activity = @activity[@h[:selected_index]]
     'Activity - ' + activity
   end
   
-  def to_summary
+  def to_summary(colour: false)
     
     activity = @activity[@h[:selected_index]]
     s = if activity.length > 10 then
@@ -2219,11 +2531,11 @@ class ProximityTrigger < SensorsTrigger
       selected_option: 0
     }
 
-    super(options.merge filter(options,h))
+    super(options.merge h)
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     
     distance = if @h[:near] then
       'Near'
@@ -2233,6 +2545,8 @@ class ProximityTrigger < SensorsTrigger
     
     "Proximity Sensor (%s)" % distance
   end
+  
+  alias to_summary to_s
 
 end
 
@@ -2253,7 +2567,7 @@ class ShakeDeviceTrigger < SensorsTrigger
     'shake_device?'
   end
   
-  def to_s()
+  def to_s(colour: false)
     'Shake Device'
   end
 
@@ -2284,7 +2598,7 @@ class FlipDeviceTrigger < SensorsTrigger
     @h[:face_down] ? 'flip_device_down?' : 'flip_device_up?'
   end
   
-  def to_s()
+  def to_s(colour: false)
     
     action = @h[:face_down] ? 'Face Up -> Face Down' : 'Face Down -> Face Up'
     'Flip Device ' + action
@@ -2307,6 +2621,11 @@ class OrientationTrigger < SensorsTrigger
 
   end
 
+  def to_s(colour: false)
+    'OrientationTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: User Input
@@ -2332,6 +2651,11 @@ class FloatingButtonTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'Floating Button'
+  end
+
+  alias to_summary to_s
 end
 
 # Category: User Input
@@ -2347,6 +2671,11 @@ class ShortcutTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'ShortcutTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: User Input
@@ -2365,6 +2694,33 @@ class VolumeButtonTrigger < Trigger
     super(options.merge h)
 
   end
+  
+  def to_s(colour: false)
+    
+    a = [
+      'Volume Up', 
+      'Volume Down',
+      'Volume Up - Long Press', 
+      'Volume Down - Long Press'
+    ]
+    
+    lines = [a[@h[:option]]]
+    lines << '  ' + (@h[:dont_change_volume] ? 'Retain Previous Volume' : 'Update Volume')
+    @s = lines.join("\n")
+  end
+  
+  def to_summary(colour: false)
+    a = [
+      'Volume Up', 
+      'Volume Down',
+      'Volume Up - Long Press', 
+      'Volume Down - Long Press'
+    ]
+    
+    lines = [a[@h[:option]]]
+    lines << (@h[:dont_change_volume] ? 'Retain Previous Volume' : 'Update Volume')
+    @s = lines.join(": ")    
+  end
 
 end
 
@@ -2383,6 +2739,11 @@ class MediaButtonPressedTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'MediaButtonPressedTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: User Input
@@ -2401,6 +2762,11 @@ class SwipeTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'SwipeTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 
@@ -2409,19 +2775,35 @@ class Action < MacroObject
   
   attr_reader :constraints  
 
-  def initialize(h={})    
+  def initialize(h={}) 
+    
+    macro = h[:macro]
+    h.delete :macro
     super(h)
     
     # fetch the constraints                               
     @constraints = @h[:constraint_list].map do |constraint|
-      object(constraint.to_snake_case)
+      object(constraint.to_snake_case.merge(macro: macro))
     end       
   end
   
   def invoke(s='')    
     "%s/%s: %s" % [@group, @type, s]
   end  
+  
+  def to_s(colour: false)
 
+    h = @h.clone    
+    h.delete :macro
+    @s ||= "#<%s %s>" % [self.class, h.inspect]
+    operator = @h[:is_or_condition] ? 'OR' : 'AND'
+    constraints = @constraints.map \
+        {|x| x.to_summary(colour: colour)}.join(" %s " % operator)
+    
+    @s + constraints
+    
+  end  
+  
 end
 
 
@@ -2456,6 +2838,11 @@ class ShareLocationAction < LocationAction
 
   end
 
+  def to_s(colour: false)
+    'ShareLocationAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 
@@ -2485,7 +2872,7 @@ class LaunchActivityAction < ApplicationAction
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     'Launch ' + @h[:application_name]
   end
 
@@ -2506,36 +2893,64 @@ class KillBackgroundAppAction < ApplicationAction
 
   end
 
+  def to_s(colour: false)
+    'KillBackgroundAppAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Applications
 #
-class OpenWebPageAction < ApplicationAction
+class LaunchShortcutAction < ApplicationAction
 
   def initialize(h={})
     
-    h[:url_to_open] = h[:url] if h[:url]
-
     options = {
-      variable_to_save_response: {:m_stringValue=>"", :m_name=>"", :m_decimalValue=>0.0, :isLocal=>true, :m_booleanValue=>false, :excludeFromLog=>false, :m_intValue=>0, :m_type=>2},
-      url_to_open: '',
-      http_get: true,
-      disable_url_encode: false,
-      block_next_action: false
+      :app_name=>"Amazon Alexa", :intent_encoded=>"", :name=>"Ask Alexa"
     }
 
-    super(options.merge filter(options,h))
+    super(options.merge h)
 
   end
   
-  def to_s()
-    "HTTP GET\n  url: " + @h[:url_to_open]
+  def to_s(colour: false)
+    @s = "Launch Shortcut: " + @h[:app_name] + "\n  " + @h[:name]
+    super()
   end
+  
+  alias to_summary to_s
 
 end
 
-
-class CameraAction < Action
+# Category: Applications
+#
+class OpenWebPageAction < ApplicationAction
+
+  def initialize(h={})
+    
+    h[:url_to_open] = h[:url] if h[:url]
+
+    options = {
+      variable_to_save_response: {:m_stringValue=>"", :m_name=>"", :m_decimalValue=>0.0, :isLocal=>true, :m_booleanValue=>false, :excludeFromLog=>false, :m_intValue=>0, :m_type=>2},
+      url_to_open: '',
+      http_get: true,
+      disable_url_encode: false,
+      block_next_action: false
+    }
+
+    super(options.merge filter(options,h))
+
+  end
+  
+  def to_s(colour: false)
+    "HTTP GET\n  url: " + @h[:url_to_open]
+  end
+
+end
+
+
+class CameraAction < Action
   
   def initialize(h={})
     super(h)
@@ -2559,6 +2974,11 @@ class UploadPhotoAction < CameraAction
 
   end
 
+  def to_s(colour: false)
+    'UploadPhotoAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Camera/Photo
@@ -2584,7 +3004,7 @@ class TakePictureAction < CameraAction
     'take_photo :' + camera.to_s
   end
 
-  def to_s()
+  def to_s(colour: false)
     'Take Picture'
   end  
 
@@ -2593,22 +3013,25 @@ end
 class IfConditionAction < Action
   
   def initialize(h={})
-
+    
     options = {
       a: true,
       constraint_list: ''
     }
+    
+    macro = h[:macro]
+    h2 = options.merge(filter(options,h).merge(macro: macro))
 
-    super(options.merge h)
+    super(h2)
+    
+    @label = 'If '
 
   end
 
-  def to_s()
+  def to_s(colour: false)
     
-    operator = @h[:is_or_condition] ? 'OR' : 'AND'
-    r = 'If ' + @constraints.map(&:to_s).join(" %s " % operator)
-    puts 'if ... @h ' + @h.inspect
-    r
+    @s = "If " #+ @constraints.map(&:to_s).join(" %s " % operator)
+    super(colour: colour)
     
   end
 end
@@ -2622,15 +3045,33 @@ class ElseAction < Action
     }
 
     super(options.merge h)
+    
 
   end  
   
-  def to_s()
+  def to_s(colour: false)
     'Else'
   end
   
 end
 
+class ElseIfConditionAction < IfConditionAction
+  
+  def initialize(h={})
+
+    options = {
+      constraint_list: ''
+    }
+
+    super(options.merge h)
+    @label = 'ElseIf '
+
+  end  
+    
+
+end
+
+
 class EndIfAction < Action
   
   def initialize(h={})
@@ -2643,7 +3084,7 @@ class EndIfAction < Action
 
   end  
   
-  def to_s()
+  def to_s(colour: false)
     'End If'
   end
   
@@ -2658,6 +3099,31 @@ class ConnectivityAction < Action
   
 end
 
+# Category: Connectivity
+#
+class SetAirplaneModeAction < ConnectivityAction
+
+  def initialize(h={})
+
+    options = {
+      device_name: '',
+      state: 1
+    }
+
+    super(options.merge h)
+
+  end
+  
+  def to_s(colour: false)
+    
+    state = ['On', 'Off', 'Toggle'][@h[:state]]
+    @s = 'Airplane Mode ' + state + "\n"
+    super(colour: colour)
+    
+  end
+
+end
+
 # Category: Connectivity
 #
 class SetWifiAction < ConnectivityAction
@@ -2674,7 +3140,7 @@ class SetWifiAction < ConnectivityAction
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     action = @h[:state] == 0 ? 'Enable' : 'Disable'
     action + ' Wifi'
   end
@@ -2696,6 +3162,11 @@ class SetBluetoothAction < ConnectivityAction
 
   end
 
+  def to_s(colour: false)
+    'SetBluetoothAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -2713,6 +3184,11 @@ class SetBluetoothAction < ConnectivityAction
 
   end
 
+  def to_s(colour: false)
+    'SetBluetoothAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 class SetHotspotAction < ConnectivityAction
@@ -2728,9 +3204,9 @@ class SetHotspotAction < ConnectivityAction
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     action = @h[:turn_wifi_on] ? 'Enable' : 'Disable'
-    action + ' Hotspot'
+    action + ' HotSpot'
   end
 end
 
@@ -2760,6 +3236,11 @@ class SendIntentAction < ConnectivityAction
 
   end
 
+  def to_s(colour: false)
+    'Send Intent ' + "\n  " + @h[:action]
+  end
+
+  alias to_summary to_s
 end
 
 
@@ -2795,6 +3276,11 @@ class SetAlarmClockAction < DateTimeAction
 
   end
 
+  def to_s(colour: false)
+    'SetAlarmClockAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Date/Time
@@ -2812,6 +3298,11 @@ class StopWatchAction < DateTimeAction
 
   end
 
+  def to_s(colour: false)
+    'StopWatchAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Date/Time
@@ -2838,7 +3329,7 @@ class SayTimeAction < DateTimeAction
     'say current_time()'
   end
   
-  def to_s()
+  def to_s(colour: false)
     'Say Current Time'
   end  
 
@@ -2868,6 +3359,11 @@ class AndroidShortcutsAction < DeviceAction
 
   end
 
+  def to_s(colour: false)
+    'AndroidShortcutsAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Actions
@@ -2884,6 +3380,11 @@ class ClipboardAction < DeviceAction
 
   end
 
+  def to_s(colour: false)
+    'ClipboardAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Actions
@@ -2899,6 +3400,11 @@ class PressBackAction < DeviceAction
 
   end
 
+  def to_s(colour: false)
+    'PressBackAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Actions
@@ -2922,7 +3428,7 @@ class SpeakTextAction < DeviceAction
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     "Speak Text (%s)" % @h[:text_to_say]
   end
 
@@ -2943,6 +3449,11 @@ class UIInteractionAction < DeviceAction
 
   end
 
+  def to_s(colour: false)
+    'UIInteractionAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Actions
@@ -2958,6 +3469,11 @@ class VoiceSearchAction < DeviceAction
 
   end
 
+  def to_s(colour: false)
+    'VoiceSearchAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 
@@ -2984,6 +3500,11 @@ class ExpandCollapseStatusBarAction < DeviceSettingsAction
 
   end
 
+  def to_s(colour: false)
+    'ExpandCollapseStatusBarAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Settings
@@ -2999,6 +3520,11 @@ class LaunchHomeScreenAction < DeviceSettingsAction
 
   end
 
+  def to_s(colour: false)
+    'LaunchHomeScreenAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Settings
@@ -3017,11 +3543,11 @@ class CameraFlashLightAction < DeviceSettingsAction
   end
 
   def to_pc()
-    'torch :on'
+    ['torch :on', 'torch :off', 'torch :toggle'][@h[:state]]
   end
   
-  def to_s()
-    'Torch On'
+  def to_s(colour: false)
+    ['Torch On', 'Torch Off', 'Torch Toggle'][@h[:state]]    
   end  
 
 end
@@ -3040,7 +3566,7 @@ class VibrateAction < DeviceSettingsAction
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     
     pattern = [
       'Blip', 'Short Buzz', 'Long Buzz', 'Rapid', 'Slow', 'Increasing', 
@@ -3067,6 +3593,11 @@ class SetAutoRotateAction < DeviceSettingsAction
 
   end
 
+  def to_s(colour: false)
+    'SetAutoRotateAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Settings
@@ -3082,6 +3613,11 @@ class DayDreamAction < DeviceSettingsAction
 
   end
 
+  def to_s(colour: false)
+    'DayDreamAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Settings
@@ -3097,6 +3633,11 @@ class SetKeyboardAction < DeviceSettingsAction
 
   end
 
+  def to_s(colour: false)
+    'SetKeyboardAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Settings
@@ -3113,6 +3654,11 @@ class SetKeyguardAction < DeviceSettingsAction
 
   end
 
+  def to_s(colour: false)
+    'SetKeyguardAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Settings
@@ -3129,6 +3675,11 @@ class CarModeAction < DeviceSettingsAction
 
   end
 
+  def to_s(colour: false)
+    'CarModeAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Settings
@@ -3146,6 +3697,11 @@ class ChangeKeyboardAction < DeviceSettingsAction
 
   end
 
+  def to_s(colour: false)
+    'ChangeKeyboardAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Settings
@@ -3167,6 +3723,11 @@ class SetWallpaperAction < DeviceSettingsAction
 
   end
 
+  def to_s(colour: false)
+    'SetWallpaperAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 class FileAction < Action
@@ -3195,6 +3756,11 @@ class OpenFileAction < FileAction
 
   end
 
+  def to_s(colour: false)
+    'OpenFileAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 
@@ -3220,6 +3786,11 @@ class ForceLocationUpdateAction < LocationAction
 
   end
 
+  def to_s(colour: false)
+    'ForceLocationUpdateAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Location
@@ -3240,6 +3811,11 @@ class ShareLocationAction < LocationAction
 
   end
 
+  def to_s(colour: false)
+    'ShareLocationAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Location
@@ -3257,6 +3833,11 @@ class SetLocationUpdateRateAction < LocationAction
 
   end
 
+  def to_s(colour: false)
+    'SetLocationUpdateRateAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 class LoggingAction < Action
@@ -3295,6 +3876,11 @@ class AddCalendarEntryAction < LoggingAction
 
   end
 
+  def to_s(colour: false)
+    'AddCalendarEntryAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Logging
@@ -3312,6 +3898,11 @@ class LogAction < LoggingAction
 
   end
 
+  def to_s(colour: false)
+    'LogAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Logging
@@ -3328,6 +3919,40 @@ class ClearLogAction < LoggingAction
 
   end
 
+  def to_s(colour: false)
+    'ClearLogAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
+end
+
+class PauseAction < Action
+  
+  def initialize(h={})
+    
+    options = {
+      delay_in_milli_seconds: 0, delay_in_seconds: 1, use_alarm: false
+    }
+    super(h)
+    
+  end  
+  
+  def to_s(colour: false)
+    
+    su = Subunit.new(units={minutes:60, hours:60}, 
+                     seconds: @h[:delay_in_seconds])
+
+    ms = @h[:delay_in_milli_seconds]
+    
+    duration = if su.to_h.has_key?(:minutes) or (ms < 1) then
+      su.strfunit("%X")
+    else
+      "%s %s ms" % [su.strfunit("%X"), ms]
+    end
+    
+    "Wait " + duration
+  end
+  
 end
 
 class MediaAction < Action
@@ -3356,6 +3981,11 @@ class RecordMicrophoneAction < MediaAction
 
   end
 
+  def to_s(colour: false)
+    'RecordMicrophoneAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Media
@@ -3373,7 +4003,7 @@ class PlaySoundAction < MediaAction
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     'Play: ' + @h[:file_path]
   end
 
@@ -3409,6 +4039,11 @@ class SendEmailAction < MessagingAction
 
   end
 
+  def to_s(colour: false)
+    'SendEmailAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Messaging
@@ -3430,6 +4065,11 @@ class SendSMSAction < MessagingAction
 
   end
 
+  def to_s(colour: false)
+    'SendSMSAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Messaging
@@ -3448,6 +4088,11 @@ class UDPCommandAction < MessagingAction
 
   end
 
+  def to_s(colour: false)
+    'UDPCommandAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 
@@ -3482,6 +4127,11 @@ class ClearNotificationsAction < NotificationsAction
 
   end
 
+  def to_s(colour: false)
+    'ClearNotificationsAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Notifications
@@ -3508,6 +4158,10 @@ class MessageDialogAction < NotificationsAction
     super(options.merge h)
 
   end
+  
+  def to_s(colour: false)
+    'Display Dialog' + "\n  Battery at: [battery]"
+  end
 
 end
 
@@ -3525,6 +4179,11 @@ class AllowLEDNotificationLightAction < NotificationsAction
 
   end
 
+  def to_s(colour: false)
+    'AllowLEDNotificationLightAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Notifications
@@ -3541,6 +4200,11 @@ class SetNotificationSoundAction < NotificationsAction
 
   end
 
+  def to_s(colour: false)
+    'SetNotificationSoundAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Notifications
@@ -3557,6 +4221,11 @@ class SetNotificationSoundAction < NotificationsAction
 
   end
 
+  def to_s(colour: false)
+    'SetNotificationSoundAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Notifications
@@ -3573,6 +4242,11 @@ class SetNotificationSoundAction < NotificationsAction
 
   end
 
+  def to_s(colour: false)
+    'SetNotificationSoundAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Notifications
@@ -3602,8 +4276,9 @@ class NotificationAction < NotificationsAction
 
   end
   
-  def to_s()
-    'Display Notification: ' + "%s: %s" % [@h[:notification_subject], @h[:notification_text]]
+  def to_s(colour: false)
+    "Display Notification\n  " + \
+        "%s: %s" % [@h[:notification_subject], @h[:notification_text]]
   end
 
 end
@@ -3642,8 +4317,8 @@ class ToastAction < NotificationsAction
     "popup_message '%s'" % @h[:message_text]
   end
   
-  def to_s()
-    "Popup Message '%s'" % @h[:message_text]
+  def to_s(colour: false)
+    "Popup Message\n  %s" % @h[:message_text]
   end
 
 end
@@ -3671,7 +4346,11 @@ class AnswerCallAction < PhoneAction
     super(options.merge h)
 
   end
-
+  
+  def to_s(colour: false)
+    @s = 'Answer Call' + "\n  "
+    super()
+  end
 end
 
 # Category: Phone
@@ -3690,6 +4369,11 @@ class ClearCallLogAction < PhoneAction
 
   end
 
+  def to_s(colour: false)
+    'ClearCallLogAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Phone
@@ -3705,6 +4389,11 @@ class OpenCallLogAction < PhoneAction
 
   end
 
+  def to_s(colour: false)
+    'OpenCallLogAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Phone
@@ -3719,6 +4408,11 @@ class RejectCallAction < PhoneAction
     super(options.merge h)
 
   end
+  
+  def to_s(colour: false)
+    @s = 'Call Reject' + "\n  "
+    super()
+  end
 
 end
 
@@ -3737,6 +4431,11 @@ class MakeCallAction < PhoneAction
 
   end
 
+  def to_s(colour: false)
+    'MakeCallAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 
@@ -3754,6 +4453,11 @@ class SetRingtoneAction < PhoneAction
 
   end
 
+  def to_s(colour: false)
+    'SetRingtoneAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 class ScreenAction < Action
@@ -3781,6 +4485,11 @@ class SetBrightnessAction < ScreenAction
 
   end
 
+  def to_s(colour: false)
+    'SetBrightnessAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Screen
@@ -3797,6 +4506,11 @@ class ForceScreenRotationAction < ScreenAction
 
   end
 
+  def to_s(colour: false)
+    'ForceScreenRotationAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Screen
@@ -3816,6 +4530,17 @@ class ScreenOnAction < ScreenAction
 
   end
 
+  def to_s(colour: false)
+    
+    state = @h[:screen_off] ? 'Off' : 'On'
+    state += ' ' + 'No Lock (root only)' if @h[:screen_off_no_lock]
+    #state += ' ' + '(Alternative)' if @h[:screen_on_alternative]
+    
+    'Screen ' + state
+    
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Screen
@@ -3833,6 +4558,11 @@ class DimScreenAction < ScreenAction
 
   end
 
+  def to_s(colour: false)
+    'DimScreenAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Screen
@@ -3856,7 +4586,7 @@ class KeepAwakeAction < ScreenAction
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     
     screen = @h[:screen_option] == 0 ? 'Screen On' : 'Screen Off'
     
@@ -3871,7 +4601,7 @@ class KeepAwakeAction < ScreenAction
         Subunit.new(units={minutes:60, hours:60}, seconds: scnds).strfunit("%x")
       end
       
-      'Keep Device Awake ' + screen + ' ' + whenx
+      "Keep Device Awake\n  " + screen + ' - ' + whenx
       
     else
       'Disable Keep Awake'
@@ -3897,6 +4627,11 @@ class SetScreenTimeoutAction < ScreenAction
 
   end
 
+  def to_s(colour: false)
+    'SetScreenTimeoutAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 
@@ -3923,6 +4658,11 @@ class SilentModeVibrateOffAction < VolumeAction
 
   end
 
+  def to_s(colour: false)
+    'SilentModeVibrateOffAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Volume
@@ -3940,6 +4680,27 @@ class SetVibrateAction < VolumeAction
 
   end
 
+  def to_s(colour: false)
+    
+    a = [
+      'Silent (Vibrate On)',
+      'Normal (Vibrate Off)',
+      'Vibrate when ringing On',
+      'Vibrate when ringing Off',
+      'Vibrate when ringing Toggle'
+    ]
+    
+    status = a[@h[:option_int]]
+    @s = 'Vibrate Enable/Disable ' + "\n    " + status + "\n  "
+    super()
+    
+  end
+
+  def to_summary(colour: false)
+    
+    @s = 'Vibrate Enable/Disable'
+    
+  end
 end
 
 # Category: Volume
@@ -3956,6 +4717,11 @@ class VolumeIncrementDecrementAction < VolumeAction
 
   end
 
+  def to_s(colour: false)
+    'VolumeIncrementDecrementAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Volume
@@ -3973,6 +4739,11 @@ class SpeakerPhoneAction < VolumeAction
 
   end
 
+  def to_s(colour: false)
+    'SpeakerPhoneAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Volume
@@ -3992,7 +4763,11 @@ class SetVolumeAction < VolumeAction
     super(options.merge h)
 
   end
-
+  
+  def to_s(colour: false)
+    volume = @h[:stream_index_array].zip(@h[:stream_volume_array]).to_h[true]
+    'Volume Change ' + "Notification = %s%%" % volume    
+  end
 end
 
 class Constraint < MacroObject
@@ -4005,7 +4780,7 @@ class Constraint < MacroObject
 
     detail.select {|k,v| @h.include? k }.all? {|key,value| @h[key] == value}
 
-  end
+  end  
   
   #def to_s()
   #  ''
@@ -4027,22 +4802,7 @@ class Constraint < MacroObject
 
 end
 
-class TimeOfDayConstraint < Constraint
-
-  def initialize(h={})
-
-    options = {
-      end_hour: 8,
-      end_minute: 0,
-      start_hour: 22,
-      start_minute: 0
-    }
-
-    super(options.merge h)
-
-  end
 
-end
 
 # Category: Battery/Power
 #
@@ -4060,7 +4820,7 @@ class BatteryLevelConstraint < Constraint
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     
     operator = if @h[:greater_than] then
       '>'
@@ -4074,6 +4834,8 @@ class BatteryLevelConstraint < Constraint
     
     "Battery %s %s%%" % [operator, level]
   end
+  
+  alias to_summary to_s
 
 end
 
@@ -4091,6 +4853,11 @@ class BatterySaverStateConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'BatterySaverStateConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Battery/Power
@@ -4109,6 +4876,11 @@ class BatteryTemperatureConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'BatteryTemperatureConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Battery/Power
@@ -4126,7 +4898,7 @@ class ExternalPowerConstraint < Constraint
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     connection = @h[:external_power] ? 'Connected' : 'Disconnected'
     'Power ' + connection
   end
@@ -4149,11 +4921,15 @@ class BluetoothConstraint < Constraint
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     device = @h[:device_name] #== 'Any Device' ? 'Any' : @h[:device_name]
-    "Device Connected (%s)" % device
+    "Device Connected\n  %s" % device
   end
   
+  def to_summary(colour: false)
+    device = @h[:device_name] #== 'Any Device' ? 'Any' : @h[:device_name]
+    "Device Connected (%s)" % device
+  end
 
 end
 
@@ -4171,6 +4947,11 @@ class GPSEnabledConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'GPSEnabledConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -4187,6 +4968,11 @@ class LocationModeConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'LocationModeConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -4203,6 +4989,11 @@ class SignalOnOffConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'SignalOnOffConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -4220,6 +5011,11 @@ class WifiConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'WifiConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -4238,6 +5034,11 @@ class CellTowerConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'CellTowerConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -4254,6 +5055,11 @@ class IsRoamingConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'IsRoamingConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -4270,6 +5076,11 @@ class DataOnOffConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'DataOnOffConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -4289,6 +5100,11 @@ class WifiHotSpotConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'WifiHotSpotConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Date/Time
@@ -4312,6 +5128,11 @@ class CalendarConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'CalendarConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Date/Time
@@ -4328,6 +5149,11 @@ class DayOfWeekConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'DayOfWeekConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Date/Time
@@ -4337,16 +5163,22 @@ class TimeOfDayConstraint < Constraint
   def initialize(h={})
 
     options = {
-      end_hour: 1,
-      end_minute: 1,
-      start_hour: 21,
-      start_minute: 58
+      end_hour: 8,
+      end_minute: 0,
+      start_hour: 22,
+      start_minute: 0
     }
 
     super(options.merge h)
 
   end
-
+  
+  def to_s(colour: false)
+    a = @h[:start_hour], @h[:start_minute], @h[:end_hour], @h[:start_minute]
+    'Time of Day ' + "%02d:%02d - %02d:%02d" % a    
+  end
+  
+  alias to_summary to_s
 end
 
 # Category: Date/Time
@@ -4364,6 +5196,11 @@ class DayOfMonthConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'DayOfMonthConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Date/Time
@@ -4380,6 +5217,11 @@ class MonthOfYearConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'MonthOfYearConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Date/Time
@@ -4396,6 +5238,11 @@ class SunsetSunriseConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'SunsetSunriseConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device State
@@ -4440,12 +5287,14 @@ class AirplaneModeConstraint < Constraint
     'airplane_mode.' + status
   end
   
-  def to_s()
+  def to_s(colour: false)
     
     status = @h[:enabled] ? 'Enabled' : 'Disabled'
     'Airplane Mode ' + status
     
   end
+  
+  alias to_summary to_s
 
 end
 
@@ -4463,6 +5312,11 @@ class AutoRotateConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'AutoRotateConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device State
@@ -4479,9 +5333,11 @@ class DeviceLockedConstraint < Constraint
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     'Device ' + (@h[:locked] ? 'Locked' : 'Unlocked')
   end
+  
+  alias to_summary to_s
 
 end
 
@@ -4499,6 +5355,11 @@ class RoamingOnOffConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'RoamingOnOffConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device State
@@ -4516,6 +5377,11 @@ class TimeSinceBootConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'TimeSinceBootConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device State
@@ -4532,6 +5398,11 @@ class AutoSyncConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'AutoSyncConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device State
@@ -4548,6 +5419,11 @@ class NFCStateConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'NFCStateConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device State
@@ -4564,6 +5440,11 @@ class IsRootedConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'IsRootedConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device State
@@ -4580,6 +5461,11 @@ class VpnConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'VpnConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: MacroDroid Specific
@@ -4598,6 +5484,11 @@ class MacroEnabledConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'MacroEnabledConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: MacroDroid Specific
@@ -4615,23 +5506,46 @@ class ModeConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'ModeConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: MacroDroid Specific
 #
 class TriggerThatInvokedConstraint < Constraint
-
+  using ColouredText
+  
   def initialize(h={})
 
+    puts ('h: ' + h.inspect).green
+    @trigger = h[:macro].triggers.find {|x| x.siguid == h[:si_guid_that_invoked] }
+    
     options = {
       not: false,
       si_guid_that_invoked: -4951291100076165433,
       trigger_name: 'Shake Device'
     }
 
+    #super(options.merge filter(options,h))
     super(options.merge h)
 
   end
+  
+  def to_s(colour: false)
+    'Trigger Fired: ' + @trigger.to_s(colour: colour)
+  end
+  
+  def to_summary(colour: false)
+    #puts '@trigger' + @trigger.inspect
+    if @trigger then
+      'Trigger Fired: ' + @trigger.to_summary(colour: colour)
+    else
+      'Trigger Fired: Trigger not found; guid: ' + @h[:si_guid_that_invoked].inspect
+    end
+  end  
 
 end
 
@@ -4653,6 +5567,11 @@ class LastRunTimeConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'LastRunTimeConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Media
@@ -4669,10 +5588,12 @@ class HeadphonesConnectionConstraint < Constraint
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     connection = @h[:connected] ? 'Connected' : 'Disconnected'
     'Headphones ' + connection
   end
+  
+  alias to_summary to_s
 
 end
 
@@ -4690,6 +5611,11 @@ class MusicActiveConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'MusicActiveConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Notification
@@ -4713,6 +5639,11 @@ class NotificationPresentConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'NotificationPresentConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Notification
@@ -4730,6 +5661,11 @@ class PriorityModeConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'PriorityModeConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Notification
@@ -4746,6 +5682,11 @@ class NotificationVolumeConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'NotificationVolumeConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Phone
@@ -4762,6 +5703,11 @@ class InCallConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'InCallConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Phone
@@ -4777,6 +5723,11 @@ class PhoneRingingConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s(colour: false)
+    @s = @h[:ringing] ? 'Phone Ringing' : 'Not Ringing'
+    super(colour: colour)
+  end
 
 end
 
@@ -4798,6 +5749,11 @@ class BrightnessConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'BrightnessConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Screen and Speaker
@@ -4810,9 +5766,15 @@ class VolumeConstraint < Constraint
       option: 0
     }
 
-    super(options.merge h)
+    super(options.merge filter(options, h))
 
   end
+  
+  def to_s(colour: false)
+    a = ['Volume On', 'Vibrate Only' 'Silent', 'Vibrate or Silent']
+    
+    "Ringer Volume\n  " + a[@h[:option]]
+  end
 
 end
 
@@ -4830,6 +5792,11 @@ class SpeakerPhoneConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'SpeakerPhoneConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Screen and Speaker
@@ -4846,6 +5813,11 @@ class DarkThemeConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'DarkThemeConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Screen and Speaker
@@ -4863,9 +5835,11 @@ class ScreenOnOffConstraint < Constraint
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     'Screen ' + (@h[:screen_on] ? 'On' : 'Off')
   end
+  
+  alias to_summary to_s
 
 end
 
@@ -4885,6 +5859,11 @@ class VolumeLevelConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'VolumeLevelConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Sensors
@@ -4902,6 +5881,11 @@ class FaceUpDownConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'FaceUpDownConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Sensors
@@ -4920,7 +5904,7 @@ class LightLevelConstraint < Constraint
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     
     operator = @h[:light_level] == -1 ? 'Less than' : 'Greater than'    
     condition = operator + ' ' + @h[:light_level_float].to_s + 'lx'
@@ -4944,6 +5928,11 @@ class DeviceOrientationConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'DeviceOrientationConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Sensors
@@ -4960,8 +5949,135 @@ class ProximitySensorConstraint < Constraint
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     'Proximity Sensor: ' + (@h[:near] ? 'Near' : 'Far')
   end
 
 end
+
+
+# ----------------------------------------------------------------------------
+
+
+class DroidSim
+
+  class Service
+    def initialize(callback)
+      @callback = callback
+    end
+  end
+
+  class Application < Service
+
+    def closed()
+    end
+    def launched()
+    end
+  end
+
+  class Battery < Service
+
+    def level()
+    end
+
+    def temperature()
+    end
+
+  end
+  class Bluetooth < Service
+
+    def enable()
+      @callback.on_bluetooth_enabled()
+    end
+
+    #def enabled
+    #  @callback.on_bluetooth_enabled()
+    #end
+
+    def enabled?
+    end
+
+    def disabled
+    end
+
+    def disabled?
+    end
+  end
+
+  class Calendar < Service
+    def event(starts, ends)
+    end
+  end
+
+  class DayTime < Service
+
+    def initialie(s)
+    end
+  end
+
+  class Headphones < Service
+    def inserted
+    end
+
+    def removed
+    end
+  end
+
+  class Webhook < Service
+
+    def url()
+      @url
+    end
+
+    def url=(s)
+      @url = s
+    end
+  end
+
+  class Wifi < Service
+    def enabled
+    end
+
+    def disabled
+    end
+
+    def ssid_in_range()
+    end
+
+    def ssid_out_of_range()
+    end
+  end
+
+  class Power < Service
+    def connected()
+    end
+
+    def disconnected()
+    end
+
+    def button_toggle()
+    end
+  end
+
+  class Popup < Service
+    def message(s)
+      puts s
+    end
+  end
+
+
+  attr_reader :bluetooth, :popup
+
+  def initialize()
+
+    @bluetooth = Bluetooth.new self
+    @popup = Popup.new self
+
+  end
+
+  def on_bluetooth_enabled()
+  
+  end
+
+
+end