Random dispositions

Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

2 files changed, 67 insertions, 2 deletions

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 3ab44b2..94efd96 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -141,4 +141,60 @@
         <item>0</item>
     </string-array>
 
+    <integer-array name="random_dispositions_intervals_values" translatable="false">
+        <item>0</item>
+        <item>3600000</item>
+        <item>7200000</item>
+        <item>14400000</item>
+        <item>28800000</item>
+        <item>43200000</item>
+        <item>86400000</item>
+    </integer-array>
+
+    <string-array name="portrait_disposition_templates" translatable="false">
+        <item>0x0:2x1|0x2:1x3|0x4:3x6|2x2:3x3|3x0:3x0|3x1:3x1</item>
+        <item>0x0:1x1|0x2:1x3|0x4:3x6|2x0:3x1|2x2:3x3</item>
+        <item>0x0:2x1|0x2:1x3|0x4:3x6|2x2:3x3|3x0:3x1</item>
+        <item>0x0:0x1|0x2:0x4|0x5:0x6|1x0:2x1|1x2:2x4|1x5:2x6|3x0:3x1|3x2:3x4|3x5:3x6</item>
+        <item>0x0:0x0|0x1:3x5|0x6:0x6|1x0:1x0|1x6:1x6|2x0:2x0|2x6:2x6|3x0:3x0|3x6:3x6</item>
+        <item>0x0:3x2|0x3:0x3|0x4:3x6|1x3:1x3|2x3:2x3|3x3:3x3</item>
+        <item>0x0:3x2|0x3:0x3|0x4:3x6|1x3:1x3|2x3:2x3|3x3:3x3</item>
+        <item>0x0:1x2|0x3:0x3|0x4:1x6|1x3:1x3|2x0:3x1|2x2:2x2|2x3:3x6|3x2:3x2</item>
+        <item>0x0:3x3|0x4:3x6</item>
+        <item>0x0:3x6</item>
+        <item>0x0:1x3|0x4:1x6|2x0:3x2|2x3:3x6</item>
+        <item>0x0:0x0|0x1:0x1|0x2:0x2|0x3:0x3|0x4:2x6|1x0:3x2|1x3:1x3|2x3:2x3|3x3:3x3|3x4:3x4|3x5:3x5|3x6:3x6</item>
+        <item>0x0:0x0|0x1:0x1|0x2:0x2|0x3:0x3|0x4:0x4|0x5:0x5|0x6:0x6|1x0:2x2|1x3:1x3|1x4:2x6|2x3:2x3|3x0:3x0|3x1:3x1|3x2:3x2|3x3:3x3|3x4:3x4|3x5:3x5|3x6:3x6</item>
+        <item>0x0:1x1|0x2:1x3|0x4:0x4|0x5:0x5|0x6:0x6|1x4:2x6|2x0:3x1|2x2:3x3|3x4:3x4|3x5:3x5|3x6:3x6</item>
+        <item>0x0:1x1|0x2:1x3|0x4:2x6|2x0:3x1|2x2:3x3|3x4:3x4|3x5:3x5|3x6:3x6</item>
+        <item>0x0:0x0|0x1:0x1|0x2:1x3|0x4:3x6|1x0:1x0|1x1:1x1|2x0:3x1|2x2:2x2|2x3:2x3|3x2:3x2|3x3:3x3</item>
+        <item>0x0:1x1|0x2:3x4|0x5:1x6|2x0:3x1|2x5:3x6</item>
+        <item>0x0:1x0|0x1:3x5|0x6:1x6|2x0:3x0|2x6:3x6</item>
+        <item>0x0:3x1|0x2:3x4|0x5:3x6</item>
+        <item>0x0:2x1|0x2:3x4|0x5:0x6|1x5:3x6|3x0:3x1</item>
+    </string-array>
+
+    <string-array name="landscape_disposition_templates" translatable="false">
+        <item>0x0:2x3|3x0:5x1|3x2:4x3|5x2:6x3|6x0:6x0|6x1:6x1</item>
+        <item>0x0:2x1|0x2:2x3|3x0:4x1|3x2:4x3|5x0:6x1|5x2:6x3</item>
+        <item>0x0:0x0|0x1:0x1|0x2:2x3|1x0:2x1|3x0:5x1|3x2:4x3|5x2:6x3|6x0:6x0|6x1:6x1</item>
+        <item>0x0:2x3|3x0:3x0|3x1:3x1|3x2:3x2|3x3:3x3|4x0:6x3</item>
+        <item>0x0:0x0|0x1:2x2|0x3:0x3|1x0:1x0|1x3:1x3|2x0:2x0|2x3:2x3|3x0:3x0|3x1:3x1|3x2:3x2|3x3:3x3|4x0:6x3</item>
+        <item>0x0:0x0|0x1:0x1|0x2:0x2|0x3:0x3|1x0:1x0|1x1:2x2|1x3:1x3|2x0:2x0|2x3:2x3|3x0:3x0|3x1:3x1|3x2:3x2|3x3:3x3|4x0:4x0|4x1:5x2|4x3:4x3|5x0:5x0|5x3:5x3|6x0:6x0|6x1:6x1|6x2:6x2|6x3:6x3</item>
+        <item>0x0:0x0|0x1:0x1|0x2:0x2|0x3:0x3|1x0:2x3|3x0:3x0|3x1:3x1|3x2:3x2|3x3:3x3|4x0:5x3|6x0:6x0|6x1:6x1|6x2:6x2|6x3:6x3</item>
+        <item>0x0:2x3|3x0:3x0|3x1:3x2|3x3:3x3|4x0:6x3</item>
+        <item>0x0:2x3|3x0:6x3</item>
+        <item>0x0:1x3|2x0:3x1|2x2:3x3|4x0:6x3</item>
+        <item>0x0:0x1|0x2:0x3|1x0:2x1|1x2:2x3|3x0:3x1|3x2:3x3|4x0:5x1|4x2:5x3|6x0:6x1|6x2:6x3</item>
+        <item>0x0:0x1|0x2:0x3|1x0:1x0|1x1:5x3|2x0:2x0|3x0:3x0|4x0:4x0|5x0:5x0|6x0:6x1|6x2:6x3</item>
+        <item>0x0:6x3</item>
+        <item>0x0:1x3|2x0:4x3|5x0:6x3</item>
+        <item>0x0:1x1|0x2:1x3|2x0:4x3|5x0:6x1|5x2:6x3</item>
+        <item>0x0:1x1|0x2:1x3|2x0:4x1|2x2:4x3|5x0:6x1|5x2:6x3</item>
+        <item>0x0:0x0|0x1:0x2|0x3:1x3|1x0:1x1|1x2:1x2|2x0:4x1|2x2:4x3|5x0:5x1|5x2:5x3|6x0:6x0|6x1:6x2|6x3:6x3</item>
+        <item>0x0:0x0|0x1:0x2|0x3:1x3|1x0:1x1|1x2:1x2|2x0:4x1|2x2:4x3|5x0:6x0|5x1:5x1|5x2:5x3|6x1:6x2|6x3:6x3</item>
+        <item>0x0:0x2|0x3:0x3|1x0:1x1|1x2:4x3|2x0:5x1|5x2:5x3|6x0:6x2|6x3:6x3</item>
+        <item>0x0:0x2|0x3:0x3|1x0:2x1|1x2:3x3|3x0:5x1|4x2:5x3|6x0:6x2|6x3:6x3</item>
+    </string-array>
+
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7ec74dc..e0359ae 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -37,12 +37,18 @@
     <string name="mnu_select_album">Select album</string>
     <string name="mnu_deselect_album">Deselect album</string>
 
+    <!-- Formats -->
+    <string name="format_seconds">%s sec.</string>
+    <string name="format_minutes">%s min.</string>
+    <string name="format_hours">%s h.</string>
+    <string name="format_days">%s d.</string>
+    <string name="format_dim">%s%%</string>
+
     <!-- Preferences -->
     <string name="pref_general">General</string>
     <string name="pref_general_summary">Access to general settings, effects and transitions</string>
     <string name="pref_general_settings">Settings</string>
     <string name="pref_general_settings_wallpaper_dim">Wallpaper dim</string>
-    <string name="pref_general_settings_wallpaper_dim_format">%s%%</string>
     <string name="pref_general_settings_wallpaper_dim_summary">Set the brightness of the wallpaper for a better visualization and battery performance</string>
     <string name="pref_general_settings_background_color">Background color</string>
     <string name="pref_general_settings_background_color_summary">Set the background color of the wallpaper</string>
@@ -56,7 +62,6 @@
     <string name="pref_general_transitions_types_summary">Select the types of transition effects to be applied</string>
     <string name="pref_general_transitions_interval">Interval</string>
     <string name="pref_general_transitions_interval_summary">Set how often are triggered the picture transitions</string>
-    <string name="pref_general_transitions_interval_format">%s sec.</string>
     <string name="pref_general_effects">Effects</string>
     <string name="pref_general_effects_types">Types</string>
     <string name="pref_general_effects_types_summary">Select the types of image effects to be applied to the pictures</string>
@@ -78,6 +83,10 @@
     <string name="pref_layout">Layout</string>
     <string name="pref_layout_summary">Select how pictures are disposed on the screen</string>
     <string name="pref_layout_disposition">Disposition</string>
+    <string name="pref_random_dispositions">Random dispositions</string>
+    <string name="pref_random_dispositions_summary">Generating random dispositions occasionally</string>
+    <string name="pref_random_dispositions_interval">Interval</string>
+    <string name="pref_random_dispositions_interval_summary">Select how often the layout disposition will be changed. Set to 0 to change the disposition only when the app is loaded or rotated</string>
     <string name="pref_disposition_portrait">Portrait disposition</string>
     <string name="pref_disposition_portrait_summary">Select how pictures are disposed on a portrait screen</string>
     <string name="pref_disposition_landscape">Landscape disposition</string>