ruby-macrodroid 0.8.4 → 0.8.10

data/lib/ruby-macrodroid/actions.rb

@@ -53,59 +53,10 @@ class Action < MacroObject
     "%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
 
 
-class LocationAction < Action
-  
-  def initialize(h={})
-    super(h)
-    @group = 'location'
-  end
-  
-end
-
-# Category: Location
-#
-class ShareLocationAction < LocationAction
-
-  def initialize(h={})
-    
-    super()
-
-    options = {
-      email: '',
-      variable: {:m_stringValue=>"", :m_name=>"", 
-                 :m_decimalValue=>0.0, :isLocal=>true, :m_booleanValue=>false, 
-                 :excludeFromLog=>false, :m_intValue=>0, :m_type=>2},
-      sim_id: 0,
-      output_channel: 5,
-      old_variable_format: true
-    }
-
-    super(options.merge h)
-
-  end
-
-  def to_s(colour: false)
-    'ShareLocationAction ' + @h.inspect
-  end
-
-  alias to_summary to_s
-end
 
 
 class ApplicationAction < Action
@@ -134,7 +85,7 @@ class LaunchActivityAction < ApplicationAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'Launch ' + @h[:application_name]
   end
 
@@ -155,7 +106,7 @@ class KillBackgroundAppAction < ApplicationAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'KillBackgroundAppAction ' + @h.inspect
   end
 
@@ -176,8 +127,8 @@ class LaunchShortcutAction < ApplicationAction
 
   end
   
-  def to_s(colour: false)
-    @s = "Launch Shortcut: " + @h[:app_name] + "\n  " + @h[:name]
+  def to_s(colour: false, indent: 0)
+    @s = "Launch Shortcut: " + @h[:app_name] + "\n" + @h[:name]
     super()
   end
   
@@ -205,8 +156,9 @@ class OpenWebPageAction < ApplicationAction
 
   end
   
-  def to_s(colour: false)
-    "HTTP GET\n  url: " + @h[:url_to_open]
+  def to_s(colour: false, indent: 0)
+    @s = "HTTP GET\nurl: " + @h[:url_to_open]
+    super()
   end
 
 end
@@ -236,7 +188,7 @@ class UploadPhotoAction < CameraAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'UploadPhotoAction ' + @h.inspect
   end
 
@@ -266,7 +218,7 @@ class TakePictureAction < CameraAction
     'take_photo :' + camera.to_s
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'Take Picture'
   end  
 
@@ -293,7 +245,7 @@ class IfConfirmedThenAction < Action
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     
     @s = "If Confirmed Then " #+ @constraints.map(&:to_s).join(" %s " % operator)
     super(colour: colour)
@@ -315,16 +267,26 @@ class LoopAction < Action
 
     super(h2)
     
-    @label = 'WHILE / DO '
+    @label = 'DO / WHILE '
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     
-    @s = 'WHILE / DO '
-    super()
+    h = @h.clone    
+    h.delete :macro
+    @s = 'DO / WHILE '
+    operator = @h[:is_or_condition] ? 'OR' : 'AND'
+    constraints = @constraints.map \
+        {|x| '  ' * indent + x.to_summary(colour: colour)}.join(" %s " % operator)    
     
-  end
+    out = []
+    out << "; %s" % @h[:comment] if @h[:comment]
+    s = @s.lines.map {|x| ('  ' * indent) + x}.join
+    out << s + constraints
+    out.join("\n")
+    
+  end    
 end
 
 # Conditions/Loops
@@ -345,7 +307,7 @@ class EndLoopAction < Action
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     
     'End Loop '
     
@@ -356,7 +318,14 @@ end
 #
 class IfConditionAction < Action
   
-  def initialize(h={})
+  def initialize(obj=nil)
+    
+    h = if obj.is_a? Hash then
+      obj
+    else
+      # get the constraints
+
+    end
     
     options = {
       a: true,
@@ -372,12 +341,22 @@ class IfConditionAction < Action
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     
-    @s = "If " #+ @constraints.map(&:to_s).join(" %s " % operator)
-    super(colour: colour)
+    h = @h.clone    
+    h.delete :macro
+    @s = 'If '
+    operator = @h[:is_or_condition] ? 'OR' : 'AND'
+    constraints = @constraints.map \
+        {|x| '  ' * indent + x.to_summary(colour: colour)}.join(" %s " % operator)    
     
-  end
+    out = []
+    out << "; %s" % @h[:comment] if @h[:comment]
+    s = @s.lines.map {|x| ('  ' * indent) + x}.join
+    out << s + constraints
+    out.join("\n")
+    
+  end  
 end
 
 class ElseAction < Action
@@ -393,7 +372,7 @@ class ElseAction < Action
 
   end  
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'Else'
   end
   
@@ -412,9 +391,25 @@ class ElseIfConditionAction < Action
 
   end  
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
+    
+    h = @h.clone    
+    h.delete :macro
     @s = 'Else If '
-    super()
+    operator = @h[:is_or_condition] ? 'OR' : 'AND'
+    constraints = @constraints.map \
+        {|x| '  ' * indent + x.to_summary(colour: colour)}.join(" %s " % operator)    
+    
+    out = []
+    out << "; %s" % @h[:comment] if @h[:comment]
+    s = @s.lines.map {|x| ('  ' * indent) + x}.join
+    out << s + constraints
+    out.join("\n")
+    
+  end    
+  
+  def to_summary(colour: false)
+    'foo'
   end
     
 
@@ -433,7 +428,7 @@ class EndIfAction < Action
 
   end  
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'End If'
   end
   
@@ -463,10 +458,10 @@ class SetAirplaneModeAction < ConnectivityAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     
     state = ['On', 'Off', 'Toggle'][@h[:state]]
-    @s = 'Airplane Mode ' + state + "\n"
+    @s = 'Airplane Mode ' + state
     super(colour: colour)
     
   end
@@ -489,7 +484,7 @@ class SetWifiAction < ConnectivityAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     action = @h[:state] == 0 ? 'Enable' : 'Disable'
     action + ' Wifi'
   end
@@ -511,7 +506,7 @@ class SetBluetoothAction < ConnectivityAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetBluetoothAction ' + @h.inspect
   end
 
@@ -533,7 +528,7 @@ class SetBluetoothAction < ConnectivityAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetBluetoothAction ' + @h.inspect
   end
 
@@ -553,7 +548,7 @@ class SetHotspotAction < ConnectivityAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     action = @h[:turn_wifi_on] ? 'Enable' : 'Disable'
     action + ' HotSpot'
   end
@@ -585,7 +580,7 @@ class SendIntentAction < ConnectivityAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'Send Intent ' + "\n  " + @h[:action]
   end
 
@@ -625,7 +620,7 @@ class SetAlarmClockAction < DateTimeAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetAlarmClockAction ' + @h.inspect
   end
 
@@ -647,8 +642,11 @@ class StopWatchAction < DateTimeAction
 
   end
 
-  def to_s(colour: false)
-    'StopWatchAction ' + @h.inspect
+  def to_s(colour: false, indent: 0)
+    option = ['Start', 'Pause','Reset','Reset and Restart'][@h[:option]]
+    name = @h[:stopwatch_name]
+    @s = "StopWatch (%s)" % option + "\n" + name #+ ' ' + @h.inspect
+    super()
   end
 
   alias to_summary to_s
@@ -678,7 +676,7 @@ class SayTimeAction < DateTimeAction
     'say current_time()'
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'Say Current Time'
   end  
 
@@ -708,7 +706,7 @@ class AndroidShortcutsAction < DeviceAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'AndroidShortcutsAction ' + @h.inspect
   end
 
@@ -729,7 +727,7 @@ class ClipboardAction < DeviceAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'Fill Clipboard' + "\n  " + @h[:clipboard_text] #+ @h.inspect
   end
 
@@ -749,7 +747,7 @@ class PressBackAction < DeviceAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'PressBackAction ' + @h.inspect
   end
 
@@ -777,7 +775,7 @@ class SpeakTextAction < DeviceAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     "Speak Text (%s)" % @h[:text_to_say]
   end
 
@@ -798,8 +796,43 @@ class UIInteractionAction < DeviceAction
 
   end
 
-  def to_s(colour: false)
-    'UIInteractionAction ' + @h.inspect
+  def to_s(colour: false, indent: 0)
+
+    ui = @h[:ui_interaction_configuration]
+    
+    option = -> do
+      detail = case ui[:click_option]
+      when 0 # 'Current focus'
+        'Current focus'
+      when 1 # 'Text content'
+        ui[:text_content]
+      when 2 # 'X, Y location'
+        "%s" % ui[:xy_point].values.join(',')
+      when 3 # 'Identify in app'
+        "id:%s" % ui[:view_id]
+      end      
+    end
+    
+    s = case @h[:action]
+    when 0 # 'Click'      
+      'Click' + " [%s]" % option.call
+    when 1 # 'Long Click'
+      'Long Click' + " [%s]" % option.call
+    when 2 # 'Copy'
+      'Copy'
+    when 3 # 'Cut'
+      'Cut'
+    when 4 # 'Paste'
+      "Paste [%s]" % (ui[:use_clipboard] ? 'Clipboard text' : ui[:text])
+    when 5 # 'Clear selection'
+      'Clear selection'
+    when 6 # 'Gesture'
+      detail = "%d ms: %d,%d -> %d,%d" % [ui[:duration_ms], ui[:start_x], 
+          ui[:start_y], ui[:end_x], ui[:end_y]]
+      "Gesture [%s]" % detail
+    end
+    
+    'UI Interaction' + "\n  " + s #+ ' ' + @h.inspect
   end
 
   alias to_summary to_s
@@ -818,7 +851,7 @@ class VoiceSearchAction < DeviceAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'VoiceSearchAction ' + @h.inspect
   end
 
@@ -849,7 +882,7 @@ class ExpandCollapseStatusBarAction < DeviceSettingsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'ExpandCollapseStatusBarAction ' + @h.inspect
   end
 
@@ -869,7 +902,7 @@ class LaunchHomeScreenAction < DeviceSettingsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'LaunchHomeScreenAction ' + @h.inspect
   end
 
@@ -900,7 +933,7 @@ class CameraFlashLightAction < DeviceSettingsAction
     ['torch :on', 'torch :off', 'torch :toggle'][@h[:state]]
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     ['Torch On', 'Torch Off', 'Torch Toggle'][@h[:state]]    
   end  
 
@@ -920,7 +953,7 @@ class VibrateAction < DeviceSettingsAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     
     pattern = [
       'Blip', 'Short Buzz', 'Long Buzz', 'Rapid', 'Slow', 'Increasing', 
@@ -947,7 +980,7 @@ class SetAutoRotateAction < DeviceSettingsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetAutoRotateAction ' + @h.inspect
   end
 
@@ -967,7 +1000,7 @@ class DayDreamAction < DeviceSettingsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'DayDreamAction ' + @h.inspect
   end
 
@@ -987,7 +1020,7 @@ class SetKeyboardAction < DeviceSettingsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetKeyboardAction ' + @h.inspect
   end
 
@@ -1008,7 +1041,7 @@ class SetKeyguardAction < DeviceSettingsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetKeyguardAction ' + @h.inspect
   end
 
@@ -1029,7 +1062,7 @@ class CarModeAction < DeviceSettingsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'CarModeAction ' + @h.inspect
   end
 
@@ -1051,7 +1084,7 @@ class ChangeKeyboardAction < DeviceSettingsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'ChangeKeyboardAction ' + @h.inspect
   end
 
@@ -1077,7 +1110,7 @@ class SetWallpaperAction < DeviceSettingsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetWallpaperAction ' + @h.inspect
   end
 
@@ -1093,6 +1126,40 @@ class FileAction < Action
   
 end
 
+
+
+# Category: Files
+#
+class FileOperationV21Action < FileAction
+
+  def initialize(h={})
+
+    options = {
+      :app_name=>"", :class_name=>"", :package_name=>"", :file_path=>"", 
+      :file_extensions=>["jpg", "jpeg", "png", "raw", "bmp", "tif", "tiff", 
+                         "gif"], :file_option=>2, :from_name=>"Sent", 
+      :from_uri_string=>"", :option=>2
+    }
+
+    super(options.merge h)
+
+  end
+
+  def to_s(colour: false, indent: 0)
+    
+    operation = ['Copy', 'Move', 'Delete', 'Create Folder']
+    file = ['All Files', 'All Media Files', 'Images', 'Audio', 'Videos', 'Specify File Pattern', 'Folder']
+    
+    detail = @h[:from_name]
+    detail += ' to: ' + @h[:to_name] if @h[:option] == 1
+    @s = "%s %s" % [operation[@h[:option]], file[@h[:file_option]]]  \
+        + "\n" + detail #+ @h.inspect        
+    super()
+  end
+
+  alias to_summary to_s
+end
+
 # Category: Files
 #
 class OpenFileAction < FileAction
@@ -1110,7 +1177,7 @@ class OpenFileAction < FileAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'OpenFileAction ' + @h.inspect
   end
 
@@ -1135,7 +1202,7 @@ class WriteToFileAction < FileAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'Write To File' + "\n  " + @h[:filename] #+ @h.inspect
   end
 
@@ -1164,22 +1231,37 @@ class ForceLocationUpdateAction < LocationAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'ForceLocationUpdateAction ' + @h.inspect
   end
 
   alias to_summary to_s
 end
 
+# Category: Location
+#
+class LocationAction < Action
+  
+  def initialize(h={})
+    super(h)
+    @group = 'location'
+  end
+  
+end
+
 # Category: Location
 #
 class ShareLocationAction < LocationAction
 
   def initialize(h={})
+    
+    super()
 
     options = {
       email: '',
-      variable: {:m_stringValue=>"", :m_name=>"", :m_decimalValue=>0.0, :isLocal=>true, :m_booleanValue=>false, :excludeFromLog=>false, :m_intValue=>0, :m_type=>2},
+      variable: {:m_stringValue=>"", :m_name=>"", 
+                 :m_decimalValue=>0.0, :isLocal=>true, :m_booleanValue=>false, 
+                 :excludeFromLog=>false, :m_intValue=>0, :m_type=>2},
       sim_id: 0,
       output_channel: 5,
       old_variable_format: true
@@ -1189,13 +1271,15 @@ class ShareLocationAction < LocationAction
 
   end
 
-  def to_s(colour: false)
-    'ShareLocationAction ' + @h.inspect
+  def to_s(colour: false, indent: 0)
+    @s = 'Share Location' + "\nGPS" # + @h.inspect
+    super()
   end
 
   alias to_summary to_s
 end
 
+
 # Category: Location
 #
 class SetLocationUpdateRateAction < LocationAction
@@ -1211,7 +1295,7 @@ class SetLocationUpdateRateAction < LocationAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetLocationUpdateRateAction ' + @h.inspect
   end
 
@@ -1254,7 +1338,7 @@ class AddCalendarEntryAction < LoggingAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'AddCalendarEntryAction ' + @h.inspect
   end
 
@@ -1276,7 +1360,7 @@ class LogAction < LoggingAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'LogAction ' + @h.inspect
   end
 
@@ -1297,13 +1381,64 @@ class ClearLogAction < LoggingAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'ClearLogAction ' + @h.inspect
   end
 
   alias to_summary to_s
 end
 
+
+# MacroDroid Specific
+#
+class CancelActiveMacroAction < Action
+  
+  def initialize(h={})
+    
+    options = {
+
+    }
+
+    super(h)
+    
+  end  
+  
+  def to_s(colour: false, indent: 0)
+    @s = 'Cancel Macro Actions' + "\n  " + @h[:macro_name] #+ ' ' + @h.inspect
+    super()
+    
+  end
+  
+  alias to_summary to_s
+  
+end
+
+# MacroDroid Specific
+#
+class ConfirmNextAction < Action
+  
+  def initialize(h={})
+    
+    options = {
+      :message=>"Do you want to fill the clipboard? ", :title=>"Fill clipboard? ", :negative_text=>"NO", :positive_text=>"YES", :class_type=>"ConfirmNextAction"
+
+    }
+
+    super(h)
+    
+  end  
+  
+  def to_s(colour: false, indent: 0)
+    
+    @s = 'Confirm Next'  + "\n%s: %s" % [@h[:title], @h[:message]]
+    super()
+    
+  end
+  
+  alias to_summary to_s
+  
+end
+
 # MacroDroid Specific
 #
 class ExportMacrosAction < Action
@@ -1317,7 +1452,7 @@ class ExportMacrosAction < Action
     
   end  
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     
     'Export macros'
     
@@ -1346,7 +1481,7 @@ class SetVariableAction < Action
     
   end  
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     
     input = if @h[:user_prompt] then
       '[User Prompt]'
@@ -1379,7 +1514,7 @@ class SetVariableAction < Action
 
     end
     
-    @s = 'Set Variable' + ("\n  %s: " % @h[:variable][:name]) + input #+ @h.inspect
+    @s = 'Set Variable' + ("\n%s: " % @h[:variable][:name]) + input #+ @h.inspect
     super()
     
   end
@@ -1403,18 +1538,28 @@ class TextManipulationAction < Action
     
   end  
   
-  def to_s(colour: false)
-    
-    tm = @h[:text_manipulation]
+  def to_s(colour: false, indent: 0)
     
-    s = case tm[:type].to_sym
-    when :SubstringManipulation
+    #tm = @h[:text_manipulation][:type]
+
+    #s = case tm[:type].to_sym
+    s = case 3 # @h[:text_manipulation][:option].to_i
+    when 0 # :SubstringManipulation
       "Substring(%s, %s)" % [@h[:text], tm[:params].join(', ')]
+    when 1 # :ReplaceAllManipulation
+      "Replace all(%s, %s, %s)" % [@h[:text], *tm[:params]]      
+    when 2 # :ExtractTextManipulation
+      "Extract text(%s, %s)" % [@h[:text], tm[:params].join(', ')]      
+    when 3 # :UpperCaseManipulation
+      "Upper case(%s)" % [@h[:text]]
+      #'foo'
+    when 4 # :LowerCaseManipulation
+      "Lower case(%s)" % [@h[:text]]      
+    when 5 # :TrimWhitespaceManipulation
+      "Trim whitespace(%s)" % [@h[:text]]      
     end
 
-    
-    'Text Manipulation' + "\n  " + s #+ ' ' + @h.inspect
-    
+    'Text Manipulation' + "\n  " + s.inspect #+ ' ' + @h.inspect        
     
   end
   
@@ -1422,6 +1567,9 @@ class TextManipulationAction < Action
   
 end
 
+
+
+
 class PauseAction < Action
   
   def initialize(h={})
@@ -1433,7 +1581,7 @@ class PauseAction < Action
     
   end  
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     
     su = Subunit.new(units={minutes:60, hours:60}, 
                      seconds: @h[:delay_in_seconds])
@@ -1477,7 +1625,7 @@ class RecordMicrophoneAction < MediaAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'RecordMicrophoneAction ' + @h.inspect
   end
 
@@ -1499,7 +1647,7 @@ class PlaySoundAction < MediaAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'Play: ' + @h[:file_path]
   end
 
@@ -1535,8 +1683,10 @@ class SendEmailAction < MessagingAction
 
   end
 
-  def to_s(colour: false)
-    'SendEmailAction ' + @h.inspect
+  def to_s(colour: false, indent: 0)
+    recipient = @h[:email_address]
+    @s = 'Send EmailAction' + "\nTo: " + recipient #+ ' ' + @h.inspect
+    super()
   end
 
   alias to_summary to_s
@@ -1561,7 +1711,7 @@ class SendSMSAction < MessagingAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SendSMSAction ' + @h.inspect
   end
 
@@ -1584,7 +1734,7 @@ class UDPCommandAction < MessagingAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'UDPCommandAction ' + @h.inspect
   end
 
@@ -1610,7 +1760,7 @@ class ClearNotificationsAction < NotificationsAction
     options = {
       package_name_list: [],
       match_text: '',
-      application_name_list: [],
+      application_name_list: [],                  
       clear_persistent: false,
       excludes: false,
       match_option: 0,
@@ -1623,7 +1773,7 @@ class ClearNotificationsAction < NotificationsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'ClearNotificationsAction ' + @h.inspect
   end
 
@@ -1655,7 +1805,7 @@ class MessageDialogAction < NotificationsAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'Display Dialog' + "\n  Battery at: [battery]"
   end
 
@@ -1675,7 +1825,7 @@ class AllowLEDNotificationLightAction < NotificationsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'AllowLEDNotificationLightAction ' + @h.inspect
   end
 
@@ -1696,7 +1846,7 @@ class SetNotificationSoundAction < NotificationsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetNotificationSoundAction ' + @h.inspect
   end
 
@@ -1717,7 +1867,7 @@ class SetNotificationSoundAction < NotificationsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetNotificationSoundAction ' + @h.inspect
   end
 
@@ -1738,7 +1888,7 @@ class SetNotificationSoundAction < NotificationsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetNotificationSoundAction ' + @h.inspect
   end
 
@@ -1772,9 +1922,10 @@ class NotificationAction < NotificationsAction
 
   end
   
-  def to_s(colour: false)
-    "Display Notification\n  " + \
+  def to_s(colour: false, indent: 0)
+    @s = "Display Notification\n" + \
         "%s: %s" % [@h[:notification_subject], @h[:notification_text]]
+    super()
   end
 
 end
@@ -1787,6 +1938,9 @@ class ToastAction < NotificationsAction
     
     h = if obj.is_a? Hash then
       obj
+    elsif obj.is_a? Rexle::Element
+      txt = obj.text('item/description')
+      {msg: (txt || obj.text)}
     else
       {msg: obj}
     end
@@ -1819,8 +1973,9 @@ class ToastAction < NotificationsAction
     "popup_message '%s'" % @h[:message_text]
   end
   
-  def to_s(colour: false)
-    @s = "Popup Message\n  %s" % @h[:message_text]
+  def to_s(colour: false, indent: 0)
+    @s = "Popup Message\n%s" % @h[:message_text]
+    super()
   end
 
 end
@@ -1849,8 +2004,8 @@ class AnswerCallAction < PhoneAction
 
   end
   
-  def to_s(colour: false)
-    @s = 'Answer Call' + "\n  "
+  def to_s(colour: false, indent: 0)
+    @s = 'Answer Call'
     super()
   end
 end
@@ -1871,7 +2026,7 @@ class ClearCallLogAction < PhoneAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'ClearCallLogAction ' + @h.inspect
   end
 
@@ -1891,7 +2046,7 @@ class OpenCallLogAction < PhoneAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'OpenCallLogAction ' + @h.inspect
   end
 
@@ -1911,8 +2066,8 @@ class RejectCallAction < PhoneAction
 
   end
   
-  def to_s(colour: false)
-    @s = 'Call Reject' + "\n  "
+  def to_s(colour: false, indent: 0)
+    @s = 'Call Reject'
     super()
   end
 
@@ -1933,7 +2088,7 @@ class MakeCallAction < PhoneAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'MakeCallAction ' + @h.inspect
   end
 
@@ -1955,7 +2110,7 @@ class SetRingtoneAction < PhoneAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetRingtoneAction ' + @h.inspect
   end
 
@@ -1987,8 +2142,10 @@ class SetBrightnessAction < ScreenAction
 
   end
 
-  def to_s(colour: false)
-    'SetBrightnessAction ' + @h.inspect
+  def to_s(colour: false, indent: 0)
+    val = @h[:brightness_percent] > 100 ? 'Auto' : @h[:brightness_percent].to_s + '%'
+    @s = 'Brightness' + "\n  " + val #@h.inspect
+    super()
   end
 
   alias to_summary to_s
@@ -2008,7 +2165,7 @@ class ForceScreenRotationAction < ScreenAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'ForceScreenRotationAction ' + @h.inspect
   end
 
@@ -2032,13 +2189,14 @@ class ScreenOnAction < ScreenAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     
     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
+    @s = 'Screen ' + state
+    super()
     
   end
 
@@ -2060,7 +2218,7 @@ class DimScreenAction < ScreenAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'DimScreenAction ' + @h.inspect
   end
 
@@ -2088,7 +2246,7 @@ class KeepAwakeAction < ScreenAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     
     screen = @h[:screen_option] == 0 ? 'Screen On' : 'Screen Off'
     
@@ -2129,7 +2287,7 @@ class SetScreenTimeoutAction < ScreenAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetScreenTimeoutAction ' + @h.inspect
   end
 
@@ -2160,7 +2318,7 @@ class SilentModeVibrateOffAction < VolumeAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SilentModeVibrateOffAction ' + @h.inspect
   end
 
@@ -2182,7 +2340,7 @@ class SetVibrateAction < VolumeAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     
     a = [
       'Silent (Vibrate On)',
@@ -2193,7 +2351,7 @@ class SetVibrateAction < VolumeAction
     ]
     
     status = a[@h[:option_int]]
-    @s = 'Vibrate Enable/Disable ' + "\n    " + status + "\n  "
+    @s = 'Vibrate Enable/Disable ' + "\n" + status
     super()
     
   end
@@ -2219,7 +2377,7 @@ class VolumeIncrementDecrementAction < VolumeAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'VolumeIncrementDecrementAction ' + @h.inspect
   end
 
@@ -2241,7 +2399,7 @@ class SpeakerPhoneAction < VolumeAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SpeakerPhoneAction ' + @h.inspect
   end
 
@@ -2266,7 +2424,7 @@ class SetVolumeAction < VolumeAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     volume = @h[:stream_index_array].zip(@h[:stream_volume_array]).to_h[true]
     'Volume Change ' + "Notification = %s%%" % volume    
   end