2.0.5 release

souliss · Mar 30, 2017 · 43765e7 · 43765e7
1 parent 5539a56
commit 43765e7
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 42 deletions.
diff --git a/SoulissApp/SoulissApp.iml b/SoulissApp/SoulissApp.iml
@@ -78,7 +78,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
@@ -107,23 +106,23 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="play-services-wearable-8.4.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-base-8.4.0" level="project" />
-    <orderEntry type="library" exported="" name="design-25.2.0" level="project" />
-    <orderEntry type="library" exported="" name="transition-25.2.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-25.2.0" level="project" />
-    <orderEntry type="library" exported="" name="cardview-v7-25.2.0" level="project" />
-    <orderEntry type="library" exported="" name="support-compat-25.2.0" level="project" />
+    <orderEntry type="library" exported="" name="transition-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="design-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="cardview-v7-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="tagView-1.3.0" level="project" />
-    <orderEntry type="library" exported="" name="support-media-compat-25.2.0" level="project" />
-    <orderEntry type="library" exported="" name="support-core-ui-25.2.0" level="project" />
     <orderEntry type="library" exported="" name="ColorSeekBar-1.2.2" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-25.2.0" level="project" />
-    <orderEntry type="library" exported="" name="recyclerview-v7-25.2.0" level="project" />
+    <orderEntry type="library" exported="" name="recyclerview-v7-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="play-services-basement-8.4.0" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-25.2.0" level="project" />
-    <orderEntry type="library" exported="" name="support-vector-drawable-25.2.0" level="project" />
-    <orderEntry type="library" exported="" name="support-core-utils-25.2.0" level="project" />
-    <orderEntry type="library" exported="" name="support-fragment-25.2.0" level="project" />
-    <orderEntry type="library" exported="" name="animated-vector-drawable-25.2.0" level="project" />
     <orderEntry type="module" module-name="taskerapi" exported="" />
     <orderEntry type="module" module-name="soulissLib" exported="" />
     <orderEntry type="module" module-name="ecoGallery" exported="" />

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,6 @@ buildscript {
         jcenter()
         maven {
             url "https://jitpack.io"
-
         }
 
     }

diff --git a/ecoGallery/ecoGallery.iml b/ecoGallery/ecoGallery.iml
@@ -83,10 +83,13 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>

diff --git a/soulissLib/src/main/res/values-de/strings.xml b/soulissLib/src/main/res/values-de/strings.xml
@@ -154,8 +154,6 @@
     <string name="opt_networkdesc">Heim- und Remote Netzwerk-Einstellungen</string>
     <string name="opt_dbexp">DB exportieren</string>
     <string name="opt_dbexp_desc">Ein .csv file auf Sdcard von der aktuellen DB erzeugen</string>
-    <string name="opt_setHtmlRoot">Zozzariello Homepage</string>
-    <string name="opt_setHtmlRoot_desc">Eine .html Datei auf der SD-Karte als Quelle auswählen</string>
     <string name="opt_dbimp">DB importieren</string>
     <string name="opt_dbimp_desc">Eine .csv Datei importieren. Warnung! Die Souliss Daten werden überschrieben: %1$s</string>
     <string name="opt_dbopt_desc">DB säubern und alle Logs älter als 1 Jahr entfernen</string>

diff --git a/soulissLib/src/main/res/values-es/strings.xml b/soulissLib/src/main/res/values-es/strings.xml
@@ -152,8 +152,6 @@
     <string name="opt_networkdesc">Ajuste de red local y remoto</string>
     <string name="opt_dbexp">Exportar Base de Datos</string>
     <string name="opt_dbexp_desc">Escribe un fichero .csv en la tarjeta SD conteniendo la actual Base de Datos</string>
-    <string name="opt_setHtmlRoot">Página Principal Zozzariello</string>
-    <string name="opt_setHtmlRoot_desc">Escoja un archivo .html en la tarjeta SD para usar como root</string>
     <string name="opt_dbimp">Importar Base de datos</string>
     <string name="opt_dbimp_desc">%1$s</string>
     <string name="opt_db">Base de Datos Souliss</string>

diff --git a/soulissLib/src/main/res/values-it/strings.xml b/soulissLib/src/main/res/values-it/strings.xml
@@ -153,8 +153,6 @@
     <string name="opt_networkdesc">Impostazioni rete locale e remota</string>
     <string name="opt_dbexp">Esporta DB</string>
     <string name="opt_dbexp_desc">Scrivi due .csv contenenti il modello attuale (nodi, dispositivi, ecc.) e le opzioni</string>
-    <string name="opt_setHtmlRoot">Zozzariello Homepage</string>
-    <string name="opt_setHtmlRoot_desc">Choose a .html file on sdcard to use as root</string>
     <string name="opt_dbimp">Importa DB</string>
     <string name="opt_dbimp_desc">Importa .csv. Attenzione! Le opzioni ed il modello verranno sovrascritti sulla configurazione attiva: %1$s</string>
     <string name="opt_db">Modello</string>

diff --git a/soulissLib/src/main/res/values-pl/array.xml b/soulissLib/src/main/res/values-pl/array.xml
@@ -1,15 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string-array name="func_array">
-        <item>Sceny</item>
-        <item>Programy</item>
-        <item>Ręczne</item>
-        <item>Ustawienia sieci</item>
-        <item>@string/unknown_typical</item>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-    </string-array>
     <string-array name="slot_array">
         <item>0</item>
         <item>1</item>

diff --git a/soulissLib/src/main/res/values-pl/strings.xml b/soulissLib/src/main/res/values-pl/strings.xml
@@ -154,8 +154,6 @@
     <string name="opt_networkdesc">Ustawienia sieci domowej i zdalnej</string>
     <string name="opt_dbexp">Eksportuj bazę</string>
     <string name="opt_dbexp_desc">Zapisz plik .csv na sdcard z bieżącą zawartością bazy danych</string>
-    <string name="opt_setHtmlRoot">Strona domowa Zozzariello</string>
-    <string name="opt_setHtmlRoot_desc">Wybierz plik .html na sdcard do użycia jako root</string>
     <string name="opt_dbimp">Importuj bazę</string>
     <string name="opt_dbimp_desc">%1$s</string>
     <string name="opt_dbopt_desc">Odkurz bazę danych i usuń logi starsze niż rok</string>
@@ -404,4 +402,5 @@
     <string name="importing_be_patient">Importing %1$s, please be patient</string>
     <string name="opt_vacuum_complete">Vacuum Complete. DB size:</string>
     <string name="tile_removed">Tile removed</string>
+    <string name="all">all</string>
 </resources>
diff --git a/soulissLib/src/main/res/values-pt/strings.xml b/soulissLib/src/main/res/values-pt/strings.xml
@@ -152,8 +152,6 @@
     <string name="opt_networkdesc">Configurações das redes interna e remota</string>
     <string name="opt_dbexp">Exportar Bando de Dados</string>
     <string name="opt_dbexp_desc">Escrever um arquivo .csv no sdcard contendo o atual banco de dados</string>
-    <string name="opt_setHtmlRoot">Zozzariello Homepage</string>
-    <string name="opt_setHtmlRoot_desc">Choose a .html file on sdcard to use as root</string>
     <string name="opt_dbimp">Importar Banco de Dados</string>
     <string name="opt_dbimp_desc">%1$s</string>
     <string name="opt_db">Souliss Banco de Dados</string>
@@ -403,5 +401,6 @@
     <string name="importing_be_patient">Importing %1$s, please be patient</string>
     <string name="opt_vacuum_complete">Vacuum Complete. DB size:</string>
     <string name="tile_removed">Tile removed</string>
+    <string name="all">all</string>
 
 </resources>
diff --git a/soulissLib/src/main/res/values-ru/strings.xml b/soulissLib/src/main/res/values-ru/strings.xml
@@ -154,8 +154,6 @@
     <string name="opt_networkdesc">Настройки домашней и удаленной сети</string>
     <string name="opt_dbexp">Выгрузить БД</string>
     <string name="opt_dbexp_desc">Записать .csv файл содержащий текущую БД на СД карту</string>
-    <string name="opt_setHtmlRoot">Домашняя страница Zozzariello </string>
-    <string name="opt_setHtmlRoot_desc">Выберите .html файл на СД карте для использования как корневой</string>
     <string name="opt_dbimp">Загрузить БД</string>
     <string name="opt_dbimp_desc">%1$s</string>
     <string name="opt_dbopt_desc">Очистить БД и удалить логи старше года</string>

diff --git a/soulissLib/src/main/res/values-sl/strings.xml b/soulissLib/src/main/res/values-sl/strings.xml
@@ -157,8 +157,6 @@
     <string name="opt_networkdesc">Domače in oddaljene omrežne nastavitve</string>
     <string name="opt_dbexp">Izvozi</string>
     <string name="opt_dbexp_desc">Zapiši .csv datoteko na sd-kartico, vsebovala bo trenutni model in nastavitve</string>
-    <string name="opt_setHtmlRoot">Zozzariello domača stran</string>
-    <string name="opt_setHtmlRoot_desc">Izberi .html datoteko na sd-kartici za uporabo kot root</string>
     <string name="opt_dbimp">Uvozi</string>
     <string name="opt_dbimp_desc">%1$s</string>
     <string name="opt_dbopt_desc">Počisti pod.bazo in odstrani zgodovino starejšo od enega leta</string>
@@ -400,5 +398,6 @@
     <string name="importing_be_patient">Importing %1$s, please be patient</string>
     <string name="opt_vacuum_complete">Vacuum Complete. DB size:</string>
     <string name="tile_removed">Tile removed</string>
+    <string name="cancel">Cancel</string>
     >
 </resources>
diff --git a/soulissLib/src/main/res/values/strings.xml b/soulissLib/src/main/res/values/strings.xml
@@ -157,8 +157,6 @@
     <string name="opt_networkdesc">Home and remote network settings</string>
     <string name="opt_dbexp">Export</string>
     <string name="opt_dbexp_desc">Write a .csv file on sdcard containing current model and settings</string>
-    <string name="opt_setHtmlRoot">Zozzariello Homepage</string>
-    <string name="opt_setHtmlRoot_desc">Choose a .html file on sdcard to use as root</string>
     <string name="opt_dbimp">Import</string>
     <string name="opt_dbimp_desc">Import a .csv file. Warning! Both Model (nodes, devices, scenes, etc.) and preferences will be overwritten on current configuration:%1$s</string>
     <string name="opt_dbopt_desc">Vacuum DB and remove logs older than a year</string>
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ buildscript { @@
             jcenter()
             maven {
                 url "https://jitpack.io"
             }
         }
@@ Expand Down @@