diff --git a/.gitignore.rtf b/.gitignore.rtf
new file mode 100644
index 0000000..42e90ea
--- /dev/null
+++ b/.gitignore.rtf
@@ -0,0 +1,11 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf400
+{\fonttbl\f0\fmodern\fcharset0 Courier;}
+{\colortbl;\red255\green255\blue255;\red0\green0\blue0;}
+{\*\expandedcolortbl;;\cssrgb\c0\c0\c0;}
+\paperw11900\paperh16840\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+\deftab720
+\pard\pardeftab720\sl300\partightenfactor0
+
+\f0\fs26 \cf2 \expnd0\expndtw0\kerning0
+\outl0\strokewidth0 \strokec2 build\
+buildsystem}
\ No newline at end of file
diff --git a/.gradle/3.3/taskArtifacts/fileHashes.bin b/.gradle/3.3/taskArtifacts/fileHashes.bin
index acbb8b7..79aa285 100644
Binary files a/.gradle/3.3/taskArtifacts/fileHashes.bin and b/.gradle/3.3/taskArtifacts/fileHashes.bin differ
diff --git a/.gradle/3.3/taskArtifacts/fileSnapshots.bin b/.gradle/3.3/taskArtifacts/fileSnapshots.bin
index f9dfaea..3e4f2b4 100644
Binary files a/.gradle/3.3/taskArtifacts/fileSnapshots.bin and b/.gradle/3.3/taskArtifacts/fileSnapshots.bin differ
diff --git a/.gradle/3.3/taskArtifacts/taskArtifacts.bin b/.gradle/3.3/taskArtifacts/taskArtifacts.bin
index 7162bcc..83de9bb 100644
Binary files a/.gradle/3.3/taskArtifacts/taskArtifacts.bin and b/.gradle/3.3/taskArtifacts/taskArtifacts.bin differ
diff --git a/.gradle/3.3/taskArtifacts/taskArtifacts.lock b/.gradle/3.3/taskArtifacts/taskArtifacts.lock
index f19f5a8..95915cc 100644
Binary files a/.gradle/3.3/taskArtifacts/taskArtifacts.lock and b/.gradle/3.3/taskArtifacts/taskArtifacts.lock differ
diff --git a/.gradle/3.3/tasks/_data_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/.gradle/3.3/tasks/_data_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
index f9ba388..4373bd9 100644
Binary files a/.gradle/3.3/tasks/_data_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin and b/.gradle/3.3/tasks/_data_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin differ
diff --git a/.gradle/3.3/tasks/_data_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_data_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index 4094ac0..91c8fdc 100644
Binary files a/.gradle/3.3/tasks/_data_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_data_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/3.3/tasks/_data_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin b/.gradle/3.3/tasks/_data_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
index 17f3cc4..5ac1aef 100644
Binary files a/.gradle/3.3/tasks/_data_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin and b/.gradle/3.3/tasks/_data_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin differ
diff --git a/.gradle/3.3/tasks/_data_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_data_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index 66bc790..d2a324c 100644
Binary files a/.gradle/3.3/tasks/_data_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_data_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.gradle/3.3/tasks/_data_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/.gradle/3.3/tasks/_data_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
index 244f683..1c8fc86 100644
Binary files a/.gradle/3.3/tasks/_data_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin and b/.gradle/3.3/tasks/_data_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin differ
diff --git a/.gradle/3.3/tasks/_data_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_data_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index db31fd2..4772a5a 100644
Binary files a/.gradle/3.3/tasks/_data_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_data_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/3.3/tasks/_data_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin b/.gradle/3.3/tasks/_data_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
index 2a78e86..89e65f8 100644
Binary files a/.gradle/3.3/tasks/_data_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin and b/.gradle/3.3/tasks/_data_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin differ
diff --git a/.gradle/3.3/tasks/_data_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_data_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index 47e03c1..eb60b2e 100644
Binary files a/.gradle/3.3/tasks/_data_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_data_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.gradle/3.3/tasks/_presentation_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/.gradle/3.3/tasks/_presentation_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
index 1448b7e..32b0b42 100644
Binary files a/.gradle/3.3/tasks/_presentation_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin and b/.gradle/3.3/tasks/_presentation_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin differ
diff --git a/.gradle/3.3/tasks/_presentation_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_presentation_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index f53df5d..4406524 100644
Binary files a/.gradle/3.3/tasks/_presentation_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_presentation_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/3.3/tasks/_presentation_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin b/.gradle/3.3/tasks/_presentation_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
index d8e6747..6c6298e 100644
Binary files a/.gradle/3.3/tasks/_presentation_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin and b/.gradle/3.3/tasks/_presentation_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin differ
diff --git a/.gradle/3.3/tasks/_presentation_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_presentation_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index 5409953..d77ff2b 100644
Binary files a/.gradle/3.3/tasks/_presentation_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_presentation_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.gradle/3.3/tasks/_presentation_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/.gradle/3.3/tasks/_presentation_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
index 240115b..a586f10 100644
Binary files a/.gradle/3.3/tasks/_presentation_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin and b/.gradle/3.3/tasks/_presentation_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin differ
diff --git a/.gradle/3.3/tasks/_presentation_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_presentation_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index 6e5c429..1ea916a 100644
Binary files a/.gradle/3.3/tasks/_presentation_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_presentation_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/3.3/tasks/_presentation_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin b/.gradle/3.3/tasks/_presentation_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
index 9d3c9ca..31133c4 100644
Binary files a/.gradle/3.3/tasks/_presentation_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin and b/.gradle/3.3/tasks/_presentation_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin differ
diff --git a/.gradle/3.3/tasks/_presentation_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_presentation_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index a739b37..b9b692f 100644
Binary files a/.gradle/3.3/tasks/_presentation_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_presentation_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
new file mode 100644
index 0000000..2a9c5e0
--- /dev/null
+++ b/.idea/assetWizardSettings.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
new file mode 100644
index 0000000..d069858
Binary files /dev/null and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..30aa626
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 96cc43e..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 97626ba..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 1a5a4fd..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 3b31283..0000000
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..1d2cf4e
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/backport_util_concurrent_3_1.xml b/.idea/libraries/Gradle__backport_util_concurrent_backport_util_concurrent_3_1_jar.xml
similarity index 84%
rename from .idea/libraries/backport_util_concurrent_3_1.xml
rename to .idea/libraries/Gradle__backport_util_concurrent_backport_util_concurrent_3_1_jar.xml
index c5272ef..71be235 100644
--- a/.idea/libraries/backport_util_concurrent_3_1.xml
+++ b/.idea/libraries/Gradle__backport_util_concurrent_backport_util_concurrent_3_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/classworlds_1_1_alpha_2.xml b/.idea/libraries/Gradle__classworlds_classworlds_1_1_alpha_2_jar.xml
similarity index 78%
rename from .idea/libraries/classworlds_1_1_alpha_2.xml
rename to .idea/libraries/Gradle__classworlds_classworlds_1_1_alpha_2_jar.xml
index fffbe19..291eef3 100644
--- a/.idea/libraries/classworlds_1_1_alpha_2.xml
+++ b/.idea/libraries/Gradle__classworlds_classworlds_1_1_alpha_2_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/sqlite4java_0_282.xml b/.idea/libraries/Gradle__com_almworks_sqlite4java_sqlite4java_0_282_jar.xml
similarity index 85%
rename from .idea/libraries/sqlite4java_0_282.xml
rename to .idea/libraries/Gradle__com_almworks_sqlite4java_sqlite4java_0_282_jar.xml
index 8866bc2..ffbc9bf 100644
--- a/.idea/libraries/sqlite4java_0_282.xml
+++ b/.idea/libraries/Gradle__com_almworks_sqlite4java_sqlite4java_0_282_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_24_2_1.xml b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_24_2_1.xml
new file mode 100644
index 0000000..c4e24fd
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_24_2_1.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_appcompat_v7_24_2_1.xml b/.idea/libraries/Gradle__com_android_support_appcompat_v7_24_2_1.xml
new file mode 100644
index 0000000..5a4fc0d
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_appcompat_v7_24_2_1.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/cardview_v7_24_2_1.xml b/.idea/libraries/Gradle__com_android_support_cardview_v7_24_2_1.xml
similarity index 66%
rename from .idea/libraries/cardview_v7_24_2_1.xml
rename to .idea/libraries/Gradle__com_android_support_cardview_v7_24_2_1.xml
index 402ceb7..9f30ee7 100644
--- a/.idea/libraries/cardview_v7_24_2_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_cardview_v7_24_2_1.xml
@@ -1,10 +1,12 @@
-
+
-
+
-
+
+
+
diff --git a/.idea/libraries/design_24_2_1.xml b/.idea/libraries/Gradle__com_android_support_design_24_2_1.xml
similarity index 67%
rename from .idea/libraries/design_24_2_1.xml
rename to .idea/libraries/Gradle__com_android_support_design_24_2_1.xml
index e316827..835626d 100644
--- a/.idea/libraries/design_24_2_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_design_24_2_1.xml
@@ -1,10 +1,12 @@
-
+
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__com_android_support_multidex_1_0_1.xml b/.idea/libraries/Gradle__com_android_support_multidex_1_0_1.xml
new file mode 100644
index 0000000..378b0b9
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_multidex_1_0_1.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/support_v4_24_2_1.xml b/.idea/libraries/Gradle__com_android_support_multidex_1_0_3.xml
similarity index 52%
rename from .idea/libraries/support_v4_24_2_1.xml
rename to .idea/libraries/Gradle__com_android_support_multidex_1_0_3.xml
index fadecae..5e233bf 100644
--- a/.idea/libraries/support_v4_24_2_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_multidex_1_0_3.xml
@@ -1,8 +1,8 @@
-
+
-
-
+
+
diff --git a/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_1.xml b/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_1.xml
new file mode 100644
index 0000000..18614cd
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_1.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/recyclerview_v7_24_2_1.xml b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_24_2_1.xml
similarity index 66%
rename from .idea/libraries/recyclerview_v7_24_2_1.xml
rename to .idea/libraries/Gradle__com_android_support_recyclerview_v7_24_2_1.xml
index b428038..39ebb98 100644
--- a/.idea/libraries/recyclerview_v7_24_2_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_24_2_1.xml
@@ -1,10 +1,12 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/support_annotations_24_2_1.xml b/.idea/libraries/Gradle__com_android_support_support_annotations_24_2_1_jar.xml
similarity index 60%
rename from .idea/libraries/support_annotations_24_2_1.xml
rename to .idea/libraries/Gradle__com_android_support_support_annotations_24_2_1_jar.xml
index 6805fc1..dc7d877 100644
--- a/.idea/libraries/support_annotations_24_2_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_annotations_24_2_1_jar.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__com_android_support_support_compat_24_2_1.xml b/.idea/libraries/Gradle__com_android_support_support_compat_24_2_1.xml
new file mode 100644
index 0000000..b2848c3
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_support_compat_24_2_1.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_ui_24_2_1.xml b/.idea/libraries/Gradle__com_android_support_support_core_ui_24_2_1.xml
new file mode 100644
index 0000000..7773bb2
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_support_core_ui_24_2_1.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_utils_24_2_1.xml b/.idea/libraries/Gradle__com_android_support_support_core_utils_24_2_1.xml
new file mode 100644
index 0000000..959b8a2
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_support_core_utils_24_2_1.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_fragment_24_2_1.xml b/.idea/libraries/Gradle__com_android_support_support_fragment_24_2_1.xml
new file mode 100644
index 0000000..94e8136
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_support_fragment_24_2_1.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_media_compat_24_2_1.xml b/.idea/libraries/Gradle__com_android_support_support_media_compat_24_2_1.xml
new file mode 100644
index 0000000..f7c5619
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_support_media_compat_24_2_1.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_v4_24_2_1.xml b/.idea/libraries/Gradle__com_android_support_support_v4_24_2_1.xml
new file mode 100644
index 0000000..448e528
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_support_v4_24_2_1.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_24_2_1.xml b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_24_2_1.xml
new file mode 100644
index 0000000..882bf69
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_24_2_1.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/espresso_core_2_2_2.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2.xml
similarity index 66%
rename from .idea/libraries/espresso_core_2_2_2.xml
rename to .idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2.xml
index 89b0273..329bb05 100644
--- a/.idea/libraries/espresso_core_2_2_2.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2.xml
@@ -1,10 +1,12 @@
-
+
-
+
-
+
+
+
diff --git a/.idea/libraries/espresso_idling_resource_2_2_2.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2.xml
similarity index 65%
rename from .idea/libraries/espresso_idling_resource_2_2_2.xml
rename to .idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2.xml
index 2d50826..9d4ffa3 100644
--- a/.idea/libraries/espresso_idling_resource_2_2_2.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2.xml
@@ -1,10 +1,12 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/espresso_intents_2_2_2.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_intents_2_2_2.xml
similarity index 66%
rename from .idea/libraries/espresso_intents_2_2_2.xml
rename to .idea/libraries/Gradle__com_android_support_test_espresso_espresso_intents_2_2_2.xml
index d50b515..49d0912 100644
--- a/.idea/libraries/espresso_intents_2_2_2.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_intents_2_2_2.xml
@@ -1,10 +1,12 @@
-
+
-
+
-
+
+
+
diff --git a/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml b/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5.xml
similarity index 65%
rename from .idea/libraries/exposed_instrumentation_api_publish_0_5.xml
rename to .idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5.xml
index dfe7a44..9a56636 100644
--- a/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5.xml
@@ -1,10 +1,12 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/rules_0_5.xml b/.idea/libraries/Gradle__com_android_support_test_rules_0_5.xml
similarity index 67%
rename from .idea/libraries/rules_0_5.xml
rename to .idea/libraries/Gradle__com_android_support_test_rules_0_5.xml
index 60d8bd5..64e6c01 100644
--- a/.idea/libraries/rules_0_5.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_rules_0_5.xml
@@ -1,10 +1,12 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/runner_0_5.xml b/.idea/libraries/Gradle__com_android_support_test_runner_0_5.xml
similarity index 67%
rename from .idea/libraries/runner_0_5.xml
rename to .idea/libraries/Gradle__com_android_support_test_runner_0_5.xml
index 83ceda4..01fcea2 100644
--- a/.idea/libraries/runner_0_5.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_runner_0_5.xml
@@ -1,10 +1,12 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/accessibility_test_framework_2_1.xml b/.idea/libraries/Gradle__com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework_2_1_jar.xml
similarity index 81%
rename from .idea/libraries/accessibility_test_framework_2_1.xml
rename to .idea/libraries/Gradle__com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework_2_1_jar.xml
index b81cbce..d247d91 100644
--- a/.idea/libraries/accessibility_test_framework_2_1.xml
+++ b/.idea/libraries/Gradle__com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework_2_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/jsr305_2_0_1.xml b/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml
similarity index 77%
rename from .idea/libraries/jsr305_2_0_1.xml
rename to .idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml
index cdf9878..947e251 100644
--- a/.idea/libraries/jsr305_2_0_1.xml
+++ b/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/gson_2_7.xml b/.idea/libraries/Gradle__com_google_code_gson_gson_2_7_jar.xml
similarity index 85%
rename from .idea/libraries/gson_2_7.xml
rename to .idea/libraries/Gradle__com_google_code_gson_gson_2_7_jar.xml
index 2260755..2f5eebc 100644
--- a/.idea/libraries/gson_2_7.xml
+++ b/.idea/libraries/Gradle__com_google_code_gson_gson_2_7_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/dagger_2_5.xml b/.idea/libraries/Gradle__com_google_dagger_dagger_2_5_jar.xml
similarity index 86%
rename from .idea/libraries/dagger_2_5.xml
rename to .idea/libraries/Gradle__com_google_dagger_dagger_2_5_jar.xml
index 38b15d8..dae3e2f 100644
--- a/.idea/libraries/dagger_2_5.xml
+++ b/.idea/libraries/Gradle__com_google_dagger_dagger_2_5_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/dagger_compiler_2_5.xml b/.idea/libraries/Gradle__com_google_dagger_dagger_compiler_2_5_jar.xml
similarity index 85%
rename from .idea/libraries/dagger_compiler_2_5.xml
rename to .idea/libraries/Gradle__com_google_dagger_dagger_compiler_2_5_jar.xml
index 266b87c..a36e619 100644
--- a/.idea/libraries/dagger_compiler_2_5.xml
+++ b/.idea/libraries/Gradle__com_google_dagger_dagger_compiler_2_5_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/dagger_producers_2_5.xml b/.idea/libraries/Gradle__com_google_dagger_dagger_producers_2_5_jar.xml
similarity index 85%
rename from .idea/libraries/dagger_producers_2_5.xml
rename to .idea/libraries/Gradle__com_google_dagger_dagger_producers_2_5_jar.xml
index 7743dd6..a7be7b0 100644
--- a/.idea/libraries/dagger_producers_2_5.xml
+++ b/.idea/libraries/Gradle__com_google_dagger_dagger_producers_2_5_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/guava_19_0.xml b/.idea/libraries/Gradle__com_google_guava_guava_19_0_jar.xml
similarity index 86%
rename from .idea/libraries/guava_19_0.xml
rename to .idea/libraries/Gradle__com_google_guava_guava_19_0_jar.xml
index 3c0bbce..67850be 100644
--- a/.idea/libraries/guava_19_0.xml
+++ b/.idea/libraries/Gradle__com_google_guava_guava_19_0_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/guava_20_0.xml b/.idea/libraries/Gradle__com_google_guava_guava_20_0_jar.xml
similarity index 86%
rename from .idea/libraries/guava_20_0.xml
rename to .idea/libraries/Gradle__com_google_guava_guava_20_0_jar.xml
index 0290188..bbfeb85 100644
--- a/.idea/libraries/guava_20_0.xml
+++ b/.idea/libraries/Gradle__com_google_guava_guava_20_0_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/protobuf_java_2_6_1.xml b/.idea/libraries/Gradle__com_google_protobuf_protobuf_java_2_6_1_jar.xml
similarity index 85%
rename from .idea/libraries/protobuf_java_2_6_1.xml
rename to .idea/libraries/Gradle__com_google_protobuf_protobuf_java_2_6_1_jar.xml
index bef1f82..82830f5 100644
--- a/.idea/libraries/protobuf_java_2_6_1.xml
+++ b/.idea/libraries/Gradle__com_google_protobuf_protobuf_java_2_6_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/icu4j_53_1.xml b/.idea/libraries/Gradle__com_ibm_icu_icu4j_53_1_jar.xml
similarity index 86%
rename from .idea/libraries/icu4j_53_1.xml
rename to .idea/libraries/Gradle__com_ibm_icu_icu4j_53_1_jar.xml
index 1c73fa3..90fc81b 100644
--- a/.idea/libraries/icu4j_53_1.xml
+++ b/.idea/libraries/Gradle__com_ibm_icu_icu4j_53_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/Gradle__com_kohlschutter_junixsocket_junixsocket_common_2_0_4_jar.xml b/.idea/libraries/Gradle__com_kohlschutter_junixsocket_junixsocket_common_2_0_4_jar.xml
new file mode 100644
index 0000000..7172c51
--- /dev/null
+++ b/.idea/libraries/Gradle__com_kohlschutter_junixsocket_junixsocket_common_2_0_4_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_kohlschutter_junixsocket_junixsocket_native_common_2_0_4_jar.xml b/.idea/libraries/Gradle__com_kohlschutter_junixsocket_junixsocket_native_common_2_0_4_jar.xml
new file mode 100644
index 0000000..2310869
--- /dev/null
+++ b/.idea/libraries/Gradle__com_kohlschutter_junixsocket_junixsocket_native_common_2_0_4_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_nhaarman_mockito_kotlin_1_1_0_jar.xml b/.idea/libraries/Gradle__com_nhaarman_mockito_kotlin_1_1_0_jar.xml
new file mode 100644
index 0000000..4bb9fb7
--- /dev/null
+++ b/.idea/libraries/Gradle__com_nhaarman_mockito_kotlin_1_1_0_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/ink_0_2_1.xml b/.idea/libraries/Gradle__com_simplify_ink_0_2_1.xml
similarity index 89%
rename from .idea/libraries/ink_0_2_1.xml
rename to .idea/libraries/Gradle__com_simplify_ink_0_2_1.xml
index 7691dc4..208c2e6 100644
--- a/.idea/libraries/ink_0_2_1.xml
+++ b/.idea/libraries/Gradle__com_simplify_ink_0_2_1.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml b/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
new file mode 100644
index 0000000..5c4dd4e
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/okhttp_3_6_0.xml b/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_6_0_jar.xml
similarity index 85%
rename from .idea/libraries/okhttp_3_6_0.xml
rename to .idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_6_0_jar.xml
index 472aed6..6394035 100644
--- a/.idea/libraries/okhttp_3_6_0.xml
+++ b/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_6_0_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/Gradle__com_squareup_okio_okio_1_11_0_jar.xml b/.idea/libraries/Gradle__com_squareup_okio_okio_1_11_0_jar.xml
new file mode 100644
index 0000000..4af9d3f
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_okio_okio_1_11_0_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/adapter_rxjava2_2_2_0.xml b/.idea/libraries/Gradle__com_squareup_retrofit2_adapter_rxjava2_2_2_0_jar.xml
similarity index 85%
rename from .idea/libraries/adapter_rxjava2_2_2_0.xml
rename to .idea/libraries/Gradle__com_squareup_retrofit2_adapter_rxjava2_2_2_0_jar.xml
index c13a7f2..91bd02b 100644
--- a/.idea/libraries/adapter_rxjava2_2_2_0.xml
+++ b/.idea/libraries/Gradle__com_squareup_retrofit2_adapter_rxjava2_2_2_0_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/converter_gson_2_2_0.xml b/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_2_0_jar.xml
similarity index 85%
rename from .idea/libraries/converter_gson_2_2_0.xml
rename to .idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_2_0_jar.xml
index 4ec9ffd..a30f538 100644
--- a/.idea/libraries/converter_gson_2_2_0.xml
+++ b/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_2_0_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/retrofit_2_2_0.xml b/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_2_0_jar.xml
similarity index 85%
rename from .idea/libraries/retrofit_2_2_0.xml
rename to .idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_2_0_jar.xml
index d66c9cf..d0819d1 100644
--- a/.idea/libraries/retrofit_2_2_0.xml
+++ b/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_2_0_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/xstream_1_4_8.xml b/.idea/libraries/Gradle__com_thoughtworks_xstream_xstream_1_4_8_jar.xml
similarity index 85%
rename from .idea/libraries/xstream_1_4_8.xml
rename to .idea/libraries/Gradle__com_thoughtworks_xstream_xstream_1_4_8_jar.xml
index b5ff481..e9a16a0 100644
--- a/.idea/libraries/xstream_1_4_8.xml
+++ b/.idea/libraries/Gradle__com_thoughtworks_xstream_xstream_1_4_8_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/vtd_xml_2_11.xml b/.idea/libraries/Gradle__com_ximpleware_vtd_xml_2_11_jar.xml
similarity index 86%
rename from .idea/libraries/vtd_xml_2_11.xml
rename to .idea/libraries/Gradle__com_ximpleware_vtd_xml_2_11_jar.xml
index fe8507f..8dc3beb 100644
--- a/.idea/libraries/vtd_xml_2_11.xml
+++ b/.idea/libraries/Gradle__com_ximpleware_vtd_xml_2_11_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/rxandroid_2_0_1.xml b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_1.xml
similarity index 88%
rename from .idea/libraries/rxandroid_2_0_1.xml
rename to .idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_1.xml
index 0178d5f..b253207 100644
--- a/.idea/libraries/rxandroid_2_0_1.xml
+++ b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_1.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/rxjava_2_0_0.xml b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_0_0_jar.xml
similarity index 85%
rename from .idea/libraries/rxjava_2_0_0.xml
rename to .idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_0_0_jar.xml
index 0fecde8..1d49c58 100644
--- a/.idea/libraries/rxjava_2_0_0.xml
+++ b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_0_0_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_0_6_jar.xml b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_0_6_jar.xml
new file mode 100644
index 0000000..e6bc8ad
--- /dev/null
+++ b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_0_6_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_2_jar.xml b/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_2_jar.xml
new file mode 100644
index 0000000..568ea48
--- /dev/null
+++ b/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_2_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__javax_annotation_jsr250_api_1_0_jar.xml b/.idea/libraries/Gradle__javax_annotation_jsr250_api_1_0_jar.xml
new file mode 100644
index 0000000..1e68d64
--- /dev/null
+++ b/.idea/libraries/Gradle__javax_annotation_jsr250_api_1_0_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml b/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
new file mode 100644
index 0000000..f9c9a30
--- /dev/null
+++ b/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__junit_junit_4_12_jar.xml b/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
new file mode 100644
index 0000000..f4f25a8
--- /dev/null
+++ b/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__log4j_log4j_1_2_17_jar.xml b/.idea/libraries/Gradle__log4j_log4j_1_2_17_jar.xml
new file mode 100644
index 0000000..9fc8023
--- /dev/null
+++ b/.idea/libraries/Gradle__log4j_log4j_1_2_17_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/nekohtml_1_9_6_2.xml b/.idea/libraries/Gradle__nekohtml_nekohtml_1_9_6_2_jar.xml
similarity index 86%
rename from .idea/libraries/nekohtml_1_9_6_2.xml
rename to .idea/libraries/Gradle__nekohtml_nekohtml_1_9_6_2_jar.xml
index 3a7f412..c465abe 100644
--- a/.idea/libraries/nekohtml_1_9_6_2.xml
+++ b/.idea/libraries/Gradle__nekohtml_nekohtml_1_9_6_2_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/xercesMinimal_1_9_6_2.xml b/.idea/libraries/Gradle__nekohtml_xercesMinimal_1_9_6_2_jar.xml
similarity index 79%
rename from .idea/libraries/xercesMinimal_1_9_6_2.xml
rename to .idea/libraries/Gradle__nekohtml_xercesMinimal_1_9_6_2_jar.xml
index 28d003d..409964d 100644
--- a/.idea/libraries/xercesMinimal_1_9_6_2.xml
+++ b/.idea/libraries/Gradle__nekohtml_xercesMinimal_1_9_6_2_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_1_5_12_jar.xml b/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_1_5_12_jar.xml
new file mode 100644
index 0000000..2cf84da
--- /dev/null
+++ b/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_1_5_12_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_agent_1_5_12_jar.xml b/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_agent_1_5_12_jar.xml
new file mode 100644
index 0000000..38d3c27
--- /dev/null
+++ b/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_agent_1_5_12_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_amshove_kluent_kluent_1_14_jar.xml b/.idea/libraries/Gradle__org_amshove_kluent_kluent_1_14_jar.xml
new file mode 100644
index 0000000..9f00d1a
--- /dev/null
+++ b/.idea/libraries/Gradle__org_amshove_kluent_kluent_1_14_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/ant_1_8_0.xml b/.idea/libraries/Gradle__org_apache_ant_ant_1_8_0_jar.xml
similarity index 86%
rename from .idea/libraries/ant_1_8_0.xml
rename to .idea/libraries/Gradle__org_apache_ant_ant_1_8_0_jar.xml
index 07bc404..ded80a2 100644
--- a/.idea/libraries/ant_1_8_0.xml
+++ b/.idea/libraries/Gradle__org_apache_ant_ant_1_8_0_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/ant_launcher_1_8_0.xml b/.idea/libraries/Gradle__org_apache_ant_ant_launcher_1_8_0_jar.xml
similarity index 78%
rename from .idea/libraries/ant_launcher_1_8_0.xml
rename to .idea/libraries/Gradle__org_apache_ant_ant_launcher_1_8_0_jar.xml
index 2dce35f..80a988f 100644
--- a/.idea/libraries/ant_launcher_1_8_0.xml
+++ b/.idea/libraries/Gradle__org_apache_ant_ant_launcher_1_8_0_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/maven_ant_tasks_2_1_3.xml b/.idea/libraries/Gradle__org_apache_maven_maven_ant_tasks_2_1_3_jar.xml
similarity index 85%
rename from .idea/libraries/maven_ant_tasks_2_1_3.xml
rename to .idea/libraries/Gradle__org_apache_maven_maven_ant_tasks_2_1_3_jar.xml
index 22fe762..0335e71 100644
--- a/.idea/libraries/maven_ant_tasks_2_1_3.xml
+++ b/.idea/libraries/Gradle__org_apache_maven_maven_ant_tasks_2_1_3_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/maven_artifact_2_2_1.xml b/.idea/libraries/Gradle__org_apache_maven_maven_artifact_2_2_1_jar.xml
similarity index 85%
rename from .idea/libraries/maven_artifact_2_2_1.xml
rename to .idea/libraries/Gradle__org_apache_maven_maven_artifact_2_2_1_jar.xml
index 1928975..ef85690 100644
--- a/.idea/libraries/maven_artifact_2_2_1.xml
+++ b/.idea/libraries/Gradle__org_apache_maven_maven_artifact_2_2_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/maven_artifact_manager_2_2_1.xml b/.idea/libraries/Gradle__org_apache_maven_maven_artifact_manager_2_2_1_jar.xml
similarity index 85%
rename from .idea/libraries/maven_artifact_manager_2_2_1.xml
rename to .idea/libraries/Gradle__org_apache_maven_maven_artifact_manager_2_2_1_jar.xml
index 4b0d067..5309bc7 100644
--- a/.idea/libraries/maven_artifact_manager_2_2_1.xml
+++ b/.idea/libraries/Gradle__org_apache_maven_maven_artifact_manager_2_2_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/maven_error_diagnostics_2_2_1.xml b/.idea/libraries/Gradle__org_apache_maven_maven_error_diagnostics_2_2_1_jar.xml
similarity index 85%
rename from .idea/libraries/maven_error_diagnostics_2_2_1.xml
rename to .idea/libraries/Gradle__org_apache_maven_maven_error_diagnostics_2_2_1_jar.xml
index 7f52bad..71dbb4a 100644
--- a/.idea/libraries/maven_error_diagnostics_2_2_1.xml
+++ b/.idea/libraries/Gradle__org_apache_maven_maven_error_diagnostics_2_2_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/maven_model_2_2_1.xml b/.idea/libraries/Gradle__org_apache_maven_maven_model_2_2_1_jar.xml
similarity index 85%
rename from .idea/libraries/maven_model_2_2_1.xml
rename to .idea/libraries/Gradle__org_apache_maven_maven_model_2_2_1_jar.xml
index 4cc4e57..1d24ccf 100644
--- a/.idea/libraries/maven_model_2_2_1.xml
+++ b/.idea/libraries/Gradle__org_apache_maven_maven_model_2_2_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/maven_plugin_registry_2_2_1.xml b/.idea/libraries/Gradle__org_apache_maven_maven_plugin_registry_2_2_1_jar.xml
similarity index 85%
rename from .idea/libraries/maven_plugin_registry_2_2_1.xml
rename to .idea/libraries/Gradle__org_apache_maven_maven_plugin_registry_2_2_1_jar.xml
index 622d601..f171ef0 100644
--- a/.idea/libraries/maven_plugin_registry_2_2_1.xml
+++ b/.idea/libraries/Gradle__org_apache_maven_maven_plugin_registry_2_2_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/maven_profile_2_2_1.xml b/.idea/libraries/Gradle__org_apache_maven_maven_profile_2_2_1_jar.xml
similarity index 85%
rename from .idea/libraries/maven_profile_2_2_1.xml
rename to .idea/libraries/Gradle__org_apache_maven_maven_profile_2_2_1_jar.xml
index 1379b0d..aeadb8e 100644
--- a/.idea/libraries/maven_profile_2_2_1.xml
+++ b/.idea/libraries/Gradle__org_apache_maven_maven_profile_2_2_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/maven_project_2_2_1.xml b/.idea/libraries/Gradle__org_apache_maven_maven_project_2_2_1_jar.xml
similarity index 85%
rename from .idea/libraries/maven_project_2_2_1.xml
rename to .idea/libraries/Gradle__org_apache_maven_maven_project_2_2_1_jar.xml
index 65d60f2..2c3c183 100644
--- a/.idea/libraries/maven_project_2_2_1.xml
+++ b/.idea/libraries/Gradle__org_apache_maven_maven_project_2_2_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/maven_repository_metadata_2_2_1.xml b/.idea/libraries/Gradle__org_apache_maven_maven_repository_metadata_2_2_1_jar.xml
similarity index 85%
rename from .idea/libraries/maven_repository_metadata_2_2_1.xml
rename to .idea/libraries/Gradle__org_apache_maven_maven_repository_metadata_2_2_1_jar.xml
index c5c2259..7e4a9fa 100644
--- a/.idea/libraries/maven_repository_metadata_2_2_1.xml
+++ b/.idea/libraries/Gradle__org_apache_maven_maven_repository_metadata_2_2_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/maven_settings_2_2_1.xml b/.idea/libraries/Gradle__org_apache_maven_maven_settings_2_2_1_jar.xml
similarity index 85%
rename from .idea/libraries/maven_settings_2_2_1.xml
rename to .idea/libraries/Gradle__org_apache_maven_maven_settings_2_2_1_jar.xml
index 337ce90..ab60ab7 100644
--- a/.idea/libraries/maven_settings_2_2_1.xml
+++ b/.idea/libraries/Gradle__org_apache_maven_maven_settings_2_2_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/wagon_file_1_0_beta_6.xml b/.idea/libraries/Gradle__org_apache_maven_wagon_wagon_file_1_0_beta_6_jar.xml
similarity index 85%
rename from .idea/libraries/wagon_file_1_0_beta_6.xml
rename to .idea/libraries/Gradle__org_apache_maven_wagon_wagon_file_1_0_beta_6_jar.xml
index a3caeb7..5baf42c 100644
--- a/.idea/libraries/wagon_file_1_0_beta_6.xml
+++ b/.idea/libraries/Gradle__org_apache_maven_wagon_wagon_file_1_0_beta_6_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/wagon_http_lightweight_1_0_beta_6.xml b/.idea/libraries/Gradle__org_apache_maven_wagon_wagon_http_lightweight_1_0_beta_6_jar.xml
similarity index 84%
rename from .idea/libraries/wagon_http_lightweight_1_0_beta_6.xml
rename to .idea/libraries/Gradle__org_apache_maven_wagon_wagon_http_lightweight_1_0_beta_6_jar.xml
index 032bfbc..e81f9ac 100644
--- a/.idea/libraries/wagon_http_lightweight_1_0_beta_6.xml
+++ b/.idea/libraries/Gradle__org_apache_maven_wagon_wagon_http_lightweight_1_0_beta_6_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/wagon_http_shared_1_0_beta_6.xml b/.idea/libraries/Gradle__org_apache_maven_wagon_wagon_http_shared_1_0_beta_6_jar.xml
similarity index 84%
rename from .idea/libraries/wagon_http_shared_1_0_beta_6.xml
rename to .idea/libraries/Gradle__org_apache_maven_wagon_wagon_http_shared_1_0_beta_6_jar.xml
index ec56128..5a8822c 100644
--- a/.idea/libraries/wagon_http_shared_1_0_beta_6.xml
+++ b/.idea/libraries/Gradle__org_apache_maven_wagon_wagon_http_shared_1_0_beta_6_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/wagon_provider_api_1_0_beta_6.xml b/.idea/libraries/Gradle__org_apache_maven_wagon_wagon_provider_api_1_0_beta_6_jar.xml
similarity index 84%
rename from .idea/libraries/wagon_provider_api_1_0_beta_6.xml
rename to .idea/libraries/Gradle__org_apache_maven_wagon_wagon_provider_api_1_0_beta_6_jar.xml
index a3474ce..e55de7f 100644
--- a/.idea/libraries/wagon_provider_api_1_0_beta_6.xml
+++ b/.idea/libraries/Gradle__org_apache_maven_wagon_wagon_provider_api_1_0_beta_6_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/bcprov_jdk16_1_46.xml b/.idea/libraries/Gradle__org_bouncycastle_bcprov_jdk16_1_46_jar.xml
similarity index 85%
rename from .idea/libraries/bcprov_jdk16_1_46.xml
rename to .idea/libraries/Gradle__org_bouncycastle_bcprov_jdk16_1_46_jar.xml
index 2b9e094..470c269 100644
--- a/.idea/libraries/bcprov_jdk16_1_46.xml
+++ b/.idea/libraries/Gradle__org_bouncycastle_bcprov_jdk16_1_46_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/plexus_container_default_1_0_alpha_9_stable_1.xml b/.idea/libraries/Gradle__org_codehaus_plexus_plexus_container_default_1_0_alpha_9_stable_1_jar.xml
similarity index 84%
rename from .idea/libraries/plexus_container_default_1_0_alpha_9_stable_1.xml
rename to .idea/libraries/Gradle__org_codehaus_plexus_plexus_container_default_1_0_alpha_9_stable_1_jar.xml
index 693ce9b..2596ac8 100644
--- a/.idea/libraries/plexus_container_default_1_0_alpha_9_stable_1.xml
+++ b/.idea/libraries/Gradle__org_codehaus_plexus_plexus_container_default_1_0_alpha_9_stable_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/plexus_interpolation_1_11.xml b/.idea/libraries/Gradle__org_codehaus_plexus_plexus_interpolation_1_11_jar.xml
similarity index 85%
rename from .idea/libraries/plexus_interpolation_1_11.xml
rename to .idea/libraries/Gradle__org_codehaus_plexus_plexus_interpolation_1_11_jar.xml
index 5a86299..c6bfb8e 100644
--- a/.idea/libraries/plexus_interpolation_1_11.xml
+++ b/.idea/libraries/Gradle__org_codehaus_plexus_plexus_interpolation_1_11_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/plexus_utils_1_5_15.xml b/.idea/libraries/Gradle__org_codehaus_plexus_plexus_utils_1_5_15_jar.xml
similarity index 85%
rename from .idea/libraries/plexus_utils_1_5_15.xml
rename to .idea/libraries/Gradle__org_codehaus_plexus_plexus_utils_1_5_15_jar.xml
index 7863fdf..81d9f0b 100644
--- a/.idea/libraries/plexus_utils_1_5_15.xml
+++ b/.idea/libraries/Gradle__org_codehaus_plexus_plexus_utils_1_5_15_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
new file mode 100644
index 0000000..50cf2b9
--- /dev/null
+++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
new file mode 100644
index 0000000..a5eaca5
--- /dev/null
+++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/hamcrest_library_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
similarity index 86%
rename from .idea/libraries/hamcrest_library_1_3.xml
rename to .idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
index 923d5fc..b4dabdc 100644
--- a/.idea/libraries/hamcrest_library_1_3.xml
+++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/anko_common_0_9.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_common_0_9_jar.xml
similarity index 85%
rename from .idea/libraries/anko_common_0_9.xml
rename to .idea/libraries/Gradle__org_jetbrains_anko_anko_common_0_9_jar.xml
index 3c95c00..c54834d 100644
--- a/.idea/libraries/anko_common_0_9.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_common_0_9_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/anko_sqlite_0_9.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_sqlite_0_9_jar.xml
similarity index 85%
rename from .idea/libraries/anko_sqlite_0_9.xml
rename to .idea/libraries/Gradle__org_jetbrains_anko_anko_sqlite_0_9_jar.xml
index c8ecf5f..625091f 100644
--- a/.idea/libraries/anko_sqlite_0_9.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_sqlite_0_9_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml b/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml
new file mode 100644
index 0000000..93524e8
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_0_6_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_0_6_jar.xml
new file mode 100644
index 0000000..150efa7
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_0_6_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_1_0_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_1_0_jar.xml
new file mode 100644
index 0000000..8547cc8
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_1_0_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_test_1_1_0_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_test_1_1_0_jar.xml
new file mode 100644
index 0000000..b339b11
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_test_1_1_0_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_test_junit_1_1_0_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_test_junit_1_1_0_jar.xml
new file mode 100644
index 0000000..19f58ee
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_test_junit_1_1_0_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_mockito_mockito_core_2_4_5_jar.xml b/.idea/libraries/Gradle__org_mockito_mockito_core_2_4_5_jar.xml
new file mode 100644
index 0000000..ee5fd39
--- /dev/null
+++ b/.idea/libraries/Gradle__org_mockito_mockito_core_2_4_5_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_objenesis_objenesis_2_4_jar.xml b/.idea/libraries/Gradle__org_objenesis_objenesis_2_4_jar.xml
new file mode 100644
index 0000000..3d26606
--- /dev/null
+++ b/.idea/libraries/Gradle__org_objenesis_objenesis_2_4_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/asm_5_0_1.xml b/.idea/libraries/Gradle__org_ow2_asm_asm_5_0_1_jar.xml
similarity index 86%
rename from .idea/libraries/asm_5_0_1.xml
rename to .idea/libraries/Gradle__org_ow2_asm_asm_5_0_1_jar.xml
index 283ec5c..4503685 100644
--- a/.idea/libraries/asm_5_0_1.xml
+++ b/.idea/libraries/Gradle__org_ow2_asm_asm_5_0_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/asm_analysis_5_0_1.xml b/.idea/libraries/Gradle__org_ow2_asm_asm_analysis_5_0_1_jar.xml
similarity index 86%
rename from .idea/libraries/asm_analysis_5_0_1.xml
rename to .idea/libraries/Gradle__org_ow2_asm_asm_analysis_5_0_1_jar.xml
index 6d8c202..defd667 100644
--- a/.idea/libraries/asm_analysis_5_0_1.xml
+++ b/.idea/libraries/Gradle__org_ow2_asm_asm_analysis_5_0_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/asm_commons_5_0_1.xml b/.idea/libraries/Gradle__org_ow2_asm_asm_commons_5_0_1_jar.xml
similarity index 86%
rename from .idea/libraries/asm_commons_5_0_1.xml
rename to .idea/libraries/Gradle__org_ow2_asm_asm_commons_5_0_1_jar.xml
index dc61cb1..fed8173 100644
--- a/.idea/libraries/asm_commons_5_0_1.xml
+++ b/.idea/libraries/Gradle__org_ow2_asm_asm_commons_5_0_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/asm_tree_5_0_1.xml b/.idea/libraries/Gradle__org_ow2_asm_asm_tree_5_0_1_jar.xml
similarity index 86%
rename from .idea/libraries/asm_tree_5_0_1.xml
rename to .idea/libraries/Gradle__org_ow2_asm_asm_tree_5_0_1_jar.xml
index cb7a1e8..e4fa990 100644
--- a/.idea/libraries/asm_tree_5_0_1.xml
+++ b/.idea/libraries/Gradle__org_ow2_asm_asm_tree_5_0_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/asm_util_5_0_1.xml b/.idea/libraries/Gradle__org_ow2_asm_asm_util_5_0_1_jar.xml
similarity index 86%
rename from .idea/libraries/asm_util_5_0_1.xml
rename to .idea/libraries/Gradle__org_ow2_asm_asm_util_5_0_1_jar.xml
index e07f4ed..a0db9f3 100644
--- a/.idea/libraries/asm_util_5_0_1.xml
+++ b/.idea/libraries/Gradle__org_ow2_asm_asm_util_5_0_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_0_jar.xml b/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_0_jar.xml
new file mode 100644
index 0000000..f4fcefc
--- /dev/null
+++ b/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_0_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/robolectric_3_2_1.xml b/.idea/libraries/Gradle__org_robolectric_robolectric_3_2_1_jar.xml
similarity index 86%
rename from .idea/libraries/robolectric_3_2_1.xml
rename to .idea/libraries/Gradle__org_robolectric_robolectric_3_2_1_jar.xml
index 2abb0dc..6644b0e 100644
--- a/.idea/libraries/robolectric_3_2_1.xml
+++ b/.idea/libraries/Gradle__org_robolectric_robolectric_3_2_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/robolectric_annotations_3_2_1.xml b/.idea/libraries/Gradle__org_robolectric_robolectric_annotations_3_2_1_jar.xml
similarity index 85%
rename from .idea/libraries/robolectric_annotations_3_2_1.xml
rename to .idea/libraries/Gradle__org_robolectric_robolectric_annotations_3_2_1_jar.xml
index a6f4f1c..6e91d3f 100644
--- a/.idea/libraries/robolectric_annotations_3_2_1.xml
+++ b/.idea/libraries/Gradle__org_robolectric_robolectric_annotations_3_2_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/robolectric_resources_3_2_1.xml b/.idea/libraries/Gradle__org_robolectric_robolectric_resources_3_2_1_jar.xml
similarity index 85%
rename from .idea/libraries/robolectric_resources_3_2_1.xml
rename to .idea/libraries/Gradle__org_robolectric_robolectric_resources_3_2_1_jar.xml
index 34365b7..baebe0f 100644
--- a/.idea/libraries/robolectric_resources_3_2_1.xml
+++ b/.idea/libraries/Gradle__org_robolectric_robolectric_resources_3_2_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/robolectric_utils_3_2_1.xml b/.idea/libraries/Gradle__org_robolectric_robolectric_utils_3_2_1_jar.xml
similarity index 85%
rename from .idea/libraries/robolectric_utils_3_2_1.xml
rename to .idea/libraries/Gradle__org_robolectric_robolectric_utils_3_2_1_jar.xml
index 84b62d5..e52b2e9 100644
--- a/.idea/libraries/robolectric_utils_3_2_1.xml
+++ b/.idea/libraries/Gradle__org_robolectric_robolectric_utils_3_2_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/shadows_core_3_2_1.xml b/.idea/libraries/Gradle__org_robolectric_shadows_core_3_2_1_jar.xml
similarity index 85%
rename from .idea/libraries/shadows_core_3_2_1.xml
rename to .idea/libraries/Gradle__org_robolectric_shadows_core_3_2_1_jar.xml
index 78a56cf..95a0749 100644
--- a/.idea/libraries/shadows_core_3_2_1.xml
+++ b/.idea/libraries/Gradle__org_robolectric_shadows_core_3_2_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/Gradle__org_scijava_native_lib_loader_2_0_2_jar.xml b/.idea/libraries/Gradle__org_scijava_native_lib_loader_2_0_2_jar.xml
new file mode 100644
index 0000000..694c260
--- /dev/null
+++ b/.idea/libraries/Gradle__org_scijava_native_lib_loader_2_0_2_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/xmlpull_1_1_3_1.xml b/.idea/libraries/Gradle__xmlpull_xmlpull_1_1_3_1_jar.xml
similarity index 79%
rename from .idea/libraries/xmlpull_1_1_3_1.xml
rename to .idea/libraries/Gradle__xmlpull_xmlpull_1_1_3_1_jar.xml
index 28caf95..7c7c47e 100644
--- a/.idea/libraries/xmlpull_1_1_3_1.xml
+++ b/.idea/libraries/Gradle__xmlpull_xmlpull_1_1_3_1_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/xpp3_min_1_1_4c.xml b/.idea/libraries/Gradle__xpp3_xpp3_min_1_1_4c_jar.xml
similarity index 87%
rename from .idea/libraries/xpp3_min_1_1_4c.xml
rename to .idea/libraries/Gradle__xpp3_xpp3_min_1_1_4c_jar.xml
index c933d22..af0ae03 100644
--- a/.idea/libraries/xpp3_min_1_1_4c.xml
+++ b/.idea/libraries/Gradle__xpp3_xpp3_min_1_1_4c_jar.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/animated_vector_drawable_24_2_1.xml b/.idea/libraries/animated_vector_drawable_24_2_1.xml
deleted file mode 100644
index cb94c19..0000000
--- a/.idea/libraries/animated_vector_drawable_24_2_1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/appcompat_v7_24_2_1.xml b/.idea/libraries/appcompat_v7_24_2_1.xml
deleted file mode 100644
index 45e6492..0000000
--- a/.idea/libraries/appcompat_v7_24_2_1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/hamcrest_integration_1_3.xml b/.idea/libraries/hamcrest_integration_1_3.xml
deleted file mode 100644
index 58b2c4b..0000000
--- a/.idea/libraries/hamcrest_integration_1_3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/javawriter_2_1_1.xml b/.idea/libraries/javawriter_2_1_1.xml
deleted file mode 100644
index a66fefb..0000000
--- a/.idea/libraries/javawriter_2_1_1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/javax_annotation_api_1_2.xml b/.idea/libraries/javax_annotation_api_1_2.xml
deleted file mode 100644
index 811e73f..0000000
--- a/.idea/libraries/javax_annotation_api_1_2.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/jsr250_api_1_0.xml b/.idea/libraries/jsr250_api_1_0.xml
deleted file mode 100644
index ee94d46..0000000
--- a/.idea/libraries/jsr250_api_1_0.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/multidex_1_0_1.xml b/.idea/libraries/multidex_1_0_1.xml
index 9351bda..cda2814 100644
--- a/.idea/libraries/multidex_1_0_1.xml
+++ b/.idea/libraries/multidex_1_0_1.xml
@@ -1,8 +1,7 @@
-
-
+
diff --git a/.idea/libraries/multidex_instrumentation_1_0_1.xml b/.idea/libraries/multidex_instrumentation_1_0_1.xml
deleted file mode 100644
index 901ff28..0000000
--- a/.idea/libraries/multidex_instrumentation_1_0_1.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/support_compat_24_2_1.xml b/.idea/libraries/support_compat_24_2_1.xml
deleted file mode 100644
index c4ce543..0000000
--- a/.idea/libraries/support_compat_24_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/support_core_ui_24_2_1.xml b/.idea/libraries/support_core_ui_24_2_1.xml
deleted file mode 100644
index 2e25ead..0000000
--- a/.idea/libraries/support_core_ui_24_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/support_core_utils_24_2_1.xml b/.idea/libraries/support_core_utils_24_2_1.xml
deleted file mode 100644
index cea8fb6..0000000
--- a/.idea/libraries/support_core_utils_24_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/support_fragment_24_2_1.xml b/.idea/libraries/support_fragment_24_2_1.xml
deleted file mode 100644
index 130b965..0000000
--- a/.idea/libraries/support_fragment_24_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/support_media_compat_24_2_1.xml b/.idea/libraries/support_media_compat_24_2_1.xml
deleted file mode 100644
index d05f9d7..0000000
--- a/.idea/libraries/support_media_compat_24_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/support_vector_drawable_24_2_1.xml b/.idea/libraries/support_vector_drawable_24_2_1.xml
deleted file mode 100644
index 1b6ff69..0000000
--- a/.idea/libraries/support_vector_drawable_24_2_1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 93f5422..c0f68ed 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,18 +1,16 @@
-
-
-
@@ -27,15 +25,10 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2f1f5ac..171341c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,8 +1,5 @@
-
-
-
@@ -12,11 +9,257 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -24,10 +267,6 @@
-
-
-
-
@@ -40,36 +279,23 @@
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -81,17 +307,58 @@
+
+
+ item_ticket
+ app.ver
+ signed
+ FilterTicketsUseCase
+ filter
+ getTickets
+ Signed
+ TicketRepository
+ get_tickets
+ TicketApi
+ SignDataAdapter
+ upload
+ save_
+ deleteTickets
+ TicketOps
+ if(data.Tickets.size > 0){
+ save_sign
+ UPLOADED
+ saveSign
+ selectTickets
+ increaseUploadIntent
+ Retrofit
+ deleteTicketsBySign
+ "${TableTicket.ID} IN
+ getDataSignedTickets
+ filterTickets
+ deleteA
+ https:
+ uploadSign
+ app.
+
+
+ $PROJECT_DIR$/data/src/main/kotlin/es/verdnatura/data
+ $PROJECT_DIR$/domain
+ $PROJECT_DIR$/presentation
+ $PROJECT_DIR$/data
+
+
-
-
+
+
+
+
+
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
-
-
-
-
-
-
-
+
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
+
+
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4315,82 +4785,58 @@
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
+
+
-
-
-
-
-
-
-
-
+
-
+
@@ -4405,81 +4851,50 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4489,9 +4904,9 @@
-
+
-
+
@@ -4500,256 +4915,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
@@ -4783,60 +4958,58 @@
-
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4847,6 +5020,12 @@
+
+
+
+
+
+
@@ -4859,11 +5038,11 @@
-
- 1499770919328
+
+ 1528972179708
- 1499770919328
+ 1528972179708
@@ -4877,434 +5056,431 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
+
-
-
-
+
+
-
+
-
-
-
+
+
-
+
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+ 1.8
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index e7623c0..854bebe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,6 +7,10 @@ buildscript {
ext.kotlin_version = '1.1.0'
repositories {
jcenter()
+ maven {
+ url 'https://maven.google.com/'
+ name 'Google'
+ }
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
@@ -20,10 +24,15 @@ allprojects {
ext {
androidApplicationId = 'es.verdnatura.vndelivery.presentation'
androidVersionCode = 3
- androidVersionName = "1.0.2"
+ androidVersionName = "1.0.3"
testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"
testApplicationId = 'es.verdnatura.vndelivery.presentation.test'
}
+ repositories {
+ maven {
+ url 'https://maven.google.com'
+ }
+ }
}
task customClean(type: Delete) {
@@ -33,6 +42,10 @@ clean.dependsOn customClean
repositories {
mavenCentral()
+ maven {
+ url 'https://maven.google.com/'
+ name 'Google'
+ }
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
diff --git a/build/generated/mockable-android-24.jar b/build/generated/mockable-android-24.jar
index ca7aac9..a6deabf 100644
Binary files a/build/generated/mockable-android-24.jar and b/build/generated/mockable-android-24.jar differ
diff --git a/data/src/main/AndroidManifest.xml b/data/src/main/AndroidManifest.xml
index 6f1cc2b..07e415f 100644
--- a/data/src/main/AndroidManifest.xml
+++ b/data/src/main/AndroidManifest.xml
@@ -6,4 +6,5 @@
+
diff --git a/data/src/main/kotlin/es/verdnatura/data/database/TicketDb.kt b/data/src/main/kotlin/es/verdnatura/data/database/TicketDb.kt
index 99b06c7..ad81648 100644
--- a/data/src/main/kotlin/es/verdnatura/data/database/TicketDb.kt
+++ b/data/src/main/kotlin/es/verdnatura/data/database/TicketDb.kt
@@ -80,6 +80,11 @@ class TicketDb {
return signOps.getUploadedTickets(route)
}
+ fun getUploadedTicketsForList(route: Int): List {
+ return signOps.getUploadedTicketsForList(route)
+ }
+
+
fun selectTickets(route: Int): List {
return ticketOps.selectTickets(route)
}
diff --git a/data/src/main/kotlin/es/verdnatura/data/database/ticket/SignOps.kt b/data/src/main/kotlin/es/verdnatura/data/database/ticket/SignOps.kt
index 416bbbd..6d6ead7 100644
--- a/data/src/main/kotlin/es/verdnatura/data/database/ticket/SignOps.kt
+++ b/data/src/main/kotlin/es/verdnatura/data/database/ticket/SignOps.kt
@@ -58,6 +58,18 @@ class SignOps(val db: VnOpenHelper) {
fun getUploadedTickets(route: Int): List{
var tickets = listOf()
+ db.use {
+ select(TableTicket.TABLE_TICKET, TableTicket.ID)
+ .whereSimple("${TableTicket.ROUTE_ID} = ? and ${TableTicket.UPDATE_INTENT} > 0", route.toString())
+ .exec { tickets = parseList(IntParser) }
+ }
+
+ return tickets
+ }
+
+ fun getUploadedTicketsForList(route: Int): List{
+ var tickets = listOf()
+
db.use {
select(TableTicket.TABLE_TICKET, TableTicket.ID)
.whereSimple("${TableTicket.ROUTE_ID} = ? and ${TableTicket.UPLOADED} = 1", route.toString())
@@ -74,7 +86,7 @@ class SignOps(val db: VnOpenHelper) {
db.use {
select(TableTicket.TABLE_TICKET,
TableTicket.ROUTE_ID, TableTicket.CLIENT, TableTicket.ADDRESS, TableTicket.ID, TableTicket.SIGN, TableTicket.UPLOADED)
- .where("${TableTicket.SIGNED} = 1")
+ .where("${TableTicket.UPLOADED} = 0")
.exec { dbData = parseList(SignDataParser()) }
}
diff --git a/data/src/main/kotlin/es/verdnatura/data/database/ticket/TicketOps.kt b/data/src/main/kotlin/es/verdnatura/data/database/ticket/TicketOps.kt
index f3d2e05..9c8828e 100644
--- a/data/src/main/kotlin/es/verdnatura/data/database/ticket/TicketOps.kt
+++ b/data/src/main/kotlin/es/verdnatura/data/database/ticket/TicketOps.kt
@@ -1,10 +1,15 @@
package es.verdnatura.data.database.ticket
+import android.app.AlertDialog
import es.verdnatura.core.database.VnOpenHelper
import es.verdnatura.data.database.tables.TablePhone
import es.verdnatura.data.database.tables.TableTicket
import es.verdnatura.domain.entity.Ticket
import org.jetbrains.anko.db.*
+import android.content.DialogInterface
+import android.os.Build
+import com.google.common.collect.Table
+
/**
* Created by nelo on 12/7/17.
@@ -38,7 +43,8 @@ class TicketOps(val db: VnOpenHelper) {
val idsString = transformIdsToString(tickets)
db.use {
update(TableTicket.TABLE_TICKET,
- TableTicket.UPLOADED to 1)
+ TableTicket.UPLOADED to 1,
+ TableTicket.UPDATE_INTENT to 0)
.where("${TableTicket.ID} in (${idsString})")
.exec()
}
@@ -48,19 +54,17 @@ class TicketOps(val db: VnOpenHelper) {
val idsString = transformIdsToString(tickets)
var updateIntent = 0
- db.use {
- select(TableTicket.TABLE_TICKET,
- TableTicket.UPDATE_INTENT)
- .whereSimple("${TableTicket.ID} in (${idsString}) limit 1")
- .exec { updateIntent = parseSingle(IntParser) }
- }
-
db.use {
update(TableTicket.TABLE_TICKET,
- TableTicket.UPDATE_INTENT to updateIntent + 1)
+ TableTicket.UPLOADED to 0,
+ TableTicket.UPDATE_INTENT to 1,
+ TableTicket.SIGNED to 1)
.where("${TableTicket.ID} in (${idsString})")
.exec()
}
+
+
+
}
fun deleteTicketsBysign(sign: String){
@@ -74,10 +78,14 @@ class TicketOps(val db: VnOpenHelper) {
if(tickets.isNotEmpty())
{
- db.use {
- delete(TableTicket.TABLE_TICKET, "${TableTicket.ID} IN (${transformIdsToString(tickets)})", arrayOf())
- delete(TablePhone.TABLE_PHONE, "${TablePhone.TICKET_ID} IN (${transformIdsToString(tickets)})", arrayOf())
+ db.use{
+ update(TableTicket.TABLE_TICKET,
+ TableTicket.SIGNED to 0,
+ TableTicket.UPLOADED to 1)
+ .where("${TableTicket.ID} IN (${transformIdsToString(tickets)})")
+ .exec()
}
+
}
}
@@ -99,8 +107,8 @@ class TicketOps(val db: VnOpenHelper) {
TableTicket.SALE_PERSON_PHONE to ticket.SalePersonPhone,
TableTicket.ROUTE_ID to route,
TableTicket.UPDATE_INTENT to 0,
- TableTicket.SIGNED to 0,
- TableTicket.UPLOADED to 0)
+ TableTicket.UPLOADED to 1,
+ TableTicket.SIGNED to ticket.Signed)
}
ticket.Phones.forEach { phone -> insertPhones(ticket.Id, phone) }
@@ -109,9 +117,23 @@ class TicketOps(val db: VnOpenHelper) {
private fun uploadTickets(ticket: Ticket){
db.use {
update(TableTicket.TABLE_TICKET,
- TableTicket.PACKAGES to ticket.Packages)
- .whereSimple("${TableTicket.ID} = ?", ticket.Id.toString())
+ TableTicket.CLIENT to ticket.Client,
+ TableTicket.CLIENT_NAME to ticket.ClientName,
+ TableTicket.ADDRESS to ticket.Address,
+ TableTicket.ADDRESS_NAME to ticket.AddressName,
+ TableTicket.PACKAGES to ticket.Packages,
+ TableTicket.POSTAL_CODE to ticket.PostalCode,
+ TableTicket.CITY to ticket.City,
+ TableTicket.WAREHOUSE to ticket.Warehouse,
+ TableTicket.LONGITUDE to ticket.Loc.Longitude,
+ TableTicket.LATITUDE to ticket.Loc.Latitude,
+ TableTicket.NOTE to ticket.Note,
+ TableTicket.SALE_PERSON_PHONE to ticket.SalePersonPhone,
+ TableTicket.UPDATE_INTENT to ticket.UpdateIntent)
+ .whereSimple("ID=?",ticket.Id.toString()).exec()
}
+
+ ticket.Phones.forEach { phone -> updatePhones(ticket.Id, phone) }
}
private fun insertPhones(ticket: Int, phones: String){
@@ -122,6 +144,15 @@ class TicketOps(val db: VnOpenHelper) {
}
}
+ private fun updatePhones(ticket: Int, phones: String){
+ db.use {
+ update(TablePhone.TABLE_PHONE,
+ TablePhone.PHONE to phones)
+ .whereSimple("TICKET_ID=?",ticket.toString()).exec()
+
+ }
+ }
+
private fun filterTickets(route: Int, tickets: List, contains: Boolean): List{
val list = selectTickets(route)
val ids = list.map { t -> t.Id }
@@ -144,22 +175,32 @@ class TicketOps(val db: VnOpenHelper) {
class TicketParser: MapRowParser {
override fun parseRow(columns: Map): Ticket {
- return Ticket(
- (columns[TableTicket.ID] as Long).toInt(),
- (columns[TableTicket.CLIENT] as Long).toInt(),
- (columns[TableTicket.CLIENT_NAME] as String),
- (columns[TableTicket.ADDRESS] as Long).toInt(),
- (columns[TableTicket.ADDRESS_NAME] as String),
- (columns[TableTicket.PACKAGES] as Long).toInt(),
- (columns[TableTicket.POSTAL_CODE] as String),
- (columns[TableTicket.CITY] as String),
- (columns[TableTicket.WAREHOUSE] as String),
- (columns[TableTicket.SALE_PERSON_PHONE] as String),
- (columns[TableTicket.NOTE] as String),
- columns[TableTicket.LONGITUDE].toString(),
- columns[TableTicket.LATITUDE].toString(),
- columns[TableTicket.SIGNED].toString().toInt(),
- columns[TableTicket.UPLOADED].toString().toInt())
+
+ if (columns.size >= 18){
+ var uploaded = 1;
+ if (columns[TableTicket.UPLOADED] != null){
+ uploaded = columns[TableTicket.UPLOADED].toString().toInt()
+ }
+ return Ticket(
+ (columns[TableTicket.ID] as Long).toInt(),
+ (columns[TableTicket.CLIENT] as Long).toInt(),
+ (columns[TableTicket.CLIENT_NAME] as String),
+ (columns[TableTicket.ADDRESS] as Long).toInt(),
+ (columns[TableTicket.ADDRESS_NAME] as String),
+ (columns[TableTicket.PACKAGES] as Long).toInt(),
+ (columns[TableTicket.POSTAL_CODE] as String),
+ (columns[TableTicket.CITY] as String),
+ (columns[TableTicket.WAREHOUSE] as String),
+ (columns[TableTicket.SALE_PERSON_PHONE] as String),
+ (columns[TableTicket.NOTE] as String),
+ columns[TableTicket.LONGITUDE].toString(),
+ columns[TableTicket.LATITUDE].toString(),
+ columns[TableTicket.SIGNED].toString().toInt(),
+ columns[TableTicket.UPDATE_INTENT].toString().toInt(),
+ uploaded)
+ }else{
+ return Ticket()
+ }
}
}
@@ -174,4 +215,12 @@ class TicketOps(val db: VnOpenHelper) {
delete(TableTicket.TABLE_TICKET, "${TableTicket.ID} NOT IN (${ticketByComa}) AND ${TableTicket.ROUTE_ID} = ${route}")
}
}
+
+ private fun deleteAllTicketsOfRoute(route: Int){
+ db.use {
+ delete(TableTicket.TABLE_TICKET, "${TableTicket.ROUTE_ID} = ${route}")
+ }
+ }
+
+
}
\ No newline at end of file
diff --git a/data/src/main/kotlin/es/verdnatura/data/entity/TicketDto.kt b/data/src/main/kotlin/es/verdnatura/data/entity/TicketDto.kt
index 0e4f7e2..4a35bac 100644
--- a/data/src/main/kotlin/es/verdnatura/data/entity/TicketDto.kt
+++ b/data/src/main/kotlin/es/verdnatura/data/entity/TicketDto.kt
@@ -18,5 +18,6 @@ class TicketDto {
var Note = ""
var Phones = listOf()
var Location = LocationDto()
+ var Signed = 0
}
\ No newline at end of file
diff --git a/data/src/main/kotlin/es/verdnatura/data/rest/Host.kt b/data/src/main/kotlin/es/verdnatura/data/rest/Host.kt
index 671bea6..a3e8db4 100644
--- a/data/src/main/kotlin/es/verdnatura/data/rest/Host.kt
+++ b/data/src/main/kotlin/es/verdnatura/data/rest/Host.kt
@@ -9,12 +9,14 @@ class Host {
companion object{
- private val TESTHOST = "http://10.0.3.2:8000/silex/"
+ private val TESTHOST = "http://172.16.119.95:8080/"
private val RELEASEHOST = "https://app.verdnatura.es/"
+
+
fun getHost(): String{
if(Build.FINGERPRINT.startsWith("generic"))
- return TESTHOST
+ return RELEASEHOST
return RELEASEHOST
}
}
diff --git a/data/src/main/kotlin/es/verdnatura/data/rest/NsConnector.kt b/data/src/main/kotlin/es/verdnatura/data/rest/NsConnector.kt
index b3d1296..2219947 100644
--- a/data/src/main/kotlin/es/verdnatura/data/rest/NsConnector.kt
+++ b/data/src/main/kotlin/es/verdnatura/data/rest/NsConnector.kt
@@ -1,6 +1,7 @@
package es.verdnatura.vndelivery.data.rest
import android.app.Application
+import com.google.gson.Gson
import es.verdnatura.vndelivery.data.parser.Serializer
import okhttp3.OkHttpClient
import retrofit2.Retrofit
@@ -8,6 +9,9 @@ import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
import retrofit2.converter.gson.GsonConverterFactory
import java.util.concurrent.TimeUnit
import javax.inject.Singleton
+import com.google.gson.GsonBuilder
+
+
/**
@@ -41,12 +45,17 @@ class NsConnector {
.addInterceptor(interceptor)
.build()
+
+ val gson = GsonBuilder()
+ .setLenient()
+ .create()
vnAdapter = Retrofit
.Builder()
.baseUrl(ENDPOINT)
- .addConverterFactory(GsonConverterFactory.create())
+ .addConverterFactory(GsonConverterFactory.create(gson))
.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
.client(client)
+
.build()
}
diff --git a/data/src/main/kotlin/es/verdnatura/data/rest/TicketApiImpl.kt b/data/src/main/kotlin/es/verdnatura/data/rest/TicketApiImpl.kt
index 908d8d3..5663fd2 100644
--- a/data/src/main/kotlin/es/verdnatura/data/rest/TicketApiImpl.kt
+++ b/data/src/main/kotlin/es/verdnatura/data/rest/TicketApiImpl.kt
@@ -14,6 +14,7 @@ import es.verdnatura.vndelivery.data.exceptions.ServerException
import es.verdnatura.vndelivery.data.parser.Serializer
import es.verdnatura.vndelivery.data.rest.NsConnector
import io.reactivex.Observable
+import java.net.URLEncoder
import java.util.*
import javax.inject.Inject
import javax.inject.Singleton
@@ -60,7 +61,7 @@ class TicketApiImpl: TicketRepository {
.map { _ -> ticketDb.createTickets(route, tickets) }
.map { _ -> ticketDb.getSignedTicketsIds(route) }
.map { tt -> markSigndedTicket(tickets, tt)}
- .map { _ -> ticketDb.getUploadedTickets(route) }
+ .map { _ -> ticketDb.getUploadedTicketsForList(route) }
.map { tt -> markUploadedTicket(tickets, tt)}
.map { tt -> tt }
.doOnError { t -> generateError(t, R.string.error_tickets) }
@@ -95,7 +96,7 @@ class TicketApiImpl: TicketRepository {
if(data.Tickets.size > 0){
data.Sign = imageConverter.loadImageFromStorage(data.Sign!!)
return ticketApi.saveSign(data)
- .map { s -> if(s == "OK") ticketDb.markTicketsAsUploaded(data.Tickets) else ticketDb.increaseUploadIntent(data.Tickets) }
+ .map { s -> if(s == "ERROR") ticketDb.increaseUploadIntent(data.Tickets) else ticketDb.markTicketsAsUploaded(data.Tickets) }
.map { _ -> ""}
.doOnError { t ->
ticketDb.increaseUploadIntent(data.Tickets)
diff --git a/domain/build/classes/main/es/verdnatura/domain/entity/Ticket.class b/domain/build/classes/main/es/verdnatura/domain/entity/Ticket.class
index 5783ce1..a5355b3 100644
Binary files a/domain/build/classes/main/es/verdnatura/domain/entity/Ticket.class and b/domain/build/classes/main/es/verdnatura/domain/entity/Ticket.class differ
diff --git a/domain/build/kotlin-classes/main/es/verdnatura/domain/entity/Ticket.class b/domain/build/kotlin-classes/main/es/verdnatura/domain/entity/Ticket.class
index 5783ce1..a5355b3 100644
Binary files a/domain/build/kotlin-classes/main/es/verdnatura/domain/entity/Ticket.class and b/domain/build/kotlin-classes/main/es/verdnatura/domain/entity/Ticket.class differ
diff --git a/domain/build/kotlin/compileKotlin/sync/kotlin-files-in-java-timestamps.bin b/domain/build/kotlin/compileKotlin/sync/kotlin-files-in-java-timestamps.bin
index 3eb43cc..b835397 100644
Binary files a/domain/build/kotlin/compileKotlin/sync/kotlin-files-in-java-timestamps.bin and b/domain/build/kotlin/compileKotlin/sync/kotlin-files-in-java-timestamps.bin differ
diff --git a/domain/build/libs/domain.jar b/domain/build/libs/domain.jar
index 5b182c0..6743348 100644
Binary files a/domain/build/libs/domain.jar and b/domain/build/libs/domain.jar differ
diff --git a/domain/domain.iml b/domain/domain.iml
index 7a234ee..317da5d 100644
--- a/domain/domain.iml
+++ b/domain/domain.iml
@@ -12,8 +12,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -21,8 +45,8 @@
-
+
diff --git a/domain/src/main/kotlin/es/verdnatura/domain/entity/Ticket.kt b/domain/src/main/kotlin/es/verdnatura/domain/entity/Ticket.kt
index 8e13ae3..fe0b6e4 100644
--- a/domain/src/main/kotlin/es/verdnatura/domain/entity/Ticket.kt
+++ b/domain/src/main/kotlin/es/verdnatura/domain/entity/Ticket.kt
@@ -10,7 +10,7 @@ class Ticket() {
constructor(id: Int, client: Int, clientName: String, address: Int, addressName: String, packages: Int,
postalCode: String, city: String, warehouse: String, salePersonPhone: String, note: String,
- longitude: String, latitude: String, signed: Int, uploaded: Int) : this() {
+ longitude: String, latitude: String, signed: Int, update_intent: Int, uploaded: Int) : this() {
this.Id = id
this.Client = client
@@ -25,6 +25,7 @@ class Ticket() {
this.PostalCode = postalCode
this.Signed = signed
this.Uploaded = uploaded
+ this.UpdateIntent = update_intent
if(latitude != "null" && longitude != "null") {
val loc = Location()
loc.Longitude = longitude.toDouble()
@@ -77,4 +78,7 @@ class Ticket() {
@Named("Uploaded")
var Uploaded = 0
+
+ @Named("UpdateIntent")
+ var UpdateIntent = 0
}
\ No newline at end of file
diff --git a/local.properties b/local.properties
index 8ee1950..d0b43a3 100644
--- a/local.properties
+++ b/local.properties
@@ -1,10 +1,8 @@
-## This file is automatically generated by Android Studio.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file should *NOT* be checked into Version Control Systems,
+## This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
-sdk.dir=/Users/nelo/Library/Android/sdk
\ No newline at end of file
+#Thu Jun 14 12:29:38 CEST 2018
+sdk.dir=/Users/enriqueblascoblanquer/Library/Android/sdk
diff --git a/presentation/build.gradle b/presentation/build.gradle
index 9c64a94..47ba22c 100644
--- a/presentation/build.gradle
+++ b/presentation/build.gradle
@@ -69,6 +69,7 @@ afterEvaluate {
}
dependencies {
+ compile 'com.android.support:multidex:1.0.3'
def presentationDependencies = rootProject.ext.presentationDependencies
def presentationTestDependencies = rootProject.ext.presentationTestDependencies
def presentationAndroidTestDependencies = rootProject.ext.presentationAndroidTestDependencies
diff --git a/presentation/src/main/kotlin/es/verdnatura/presentation/AndroidApplication.kt b/presentation/src/main/kotlin/es/verdnatura/presentation/AndroidApplication.kt
index f574332..68a95ce 100644
--- a/presentation/src/main/kotlin/es/verdnatura/presentation/AndroidApplication.kt
+++ b/presentation/src/main/kotlin/es/verdnatura/presentation/AndroidApplication.kt
@@ -1,8 +1,8 @@
package es.verdnatura.vndelivery.presentation
-import android.app.Application
+import android.content.Context
+import android.support.multidex.MultiDexApplication
import es.verdnatura.vndelivery.data.preferences.Preferences
-import es.verdnatura.vndelivery.data.rest.NsConnector
import es.verdnatura.vndelivery.presentation.di.components.ApplicationComponent
import es.verdnatura.vndelivery.presentation.di.components.DaggerApplicationComponent
import es.verdnatura.vndelivery.presentation.di.modules.ApplicationModule
@@ -13,10 +13,11 @@ import javax.inject.Inject
* Created by nelo on 20/2/17.
*/
-class AndroidApplication: Application() {
+class AndroidApplication: MultiDexApplication() {
@Inject lateinit var navigator: Navigator
@Inject lateinit var preferences: Preferences
+ private var context: Context? = null
val component: ApplicationComponent by lazy {
DaggerApplicationComponent.builder().applicationModule(ApplicationModule(this)).build()
@@ -25,10 +26,15 @@ class AndroidApplication: Application() {
override fun onCreate() {
super.onCreate()
component.inject(this)
+ this.context = applicationContext
//initializeLeakDetection()
}
+ fun getAppContext(): Context? {
+ return this.context!!
+ }
+
/*private fun initializeLeakDetection() {
if (BuildConfig.DEBUG) {
LeakCanary.install(this)
diff --git a/presentation/src/main/kotlin/es/verdnatura/presentation/presenter/SignDataPresenter.kt b/presentation/src/main/kotlin/es/verdnatura/presentation/presenter/SignDataPresenter.kt
index fc08cc9..e3dcc76 100644
--- a/presentation/src/main/kotlin/es/verdnatura/presentation/presenter/SignDataPresenter.kt
+++ b/presentation/src/main/kotlin/es/verdnatura/presentation/presenter/SignDataPresenter.kt
@@ -53,7 +53,10 @@ class SignDataPresenter: BasePresenter {
fun uploadSign(sign: String){
view.showProgress()
- uploadSignsUseCase.execute(UploadObserver({ hideProgress() }, { e, s -> onErrorUpload(e, s) }, sign), UploadSignsUseCase.Params.forUploadSign(sign))
+ uploadSignsUseCase.execute(UploadObserver({
+ hideProgress()
+ loadSignData()
+ }, { e, s -> onErrorUpload(e, s) }, sign), UploadSignsUseCase.Params.forUploadSign(sign))
}
fun onErrorUpload(error: String, sign: String){
@@ -101,6 +104,20 @@ class SignDataPresenter: BasePresenter {
presenter.updateList(t!!)
}
+ override fun onComplete() {
+ presenter.hideProgress()
+ }
+ }
+ class UpdateBySignObserver(val presenter: SignDataPresenter): DisposableObserver>(){
+ override fun onError(e: Throwable?) {
+ Log.e("Error", e?.message.toString())
+ presenter.hideProgress()
+ }
+
+ override fun onNext(t: List?) {
+ presenter.updateList(t!!)
+ }
+
override fun onComplete() {
presenter.hideProgress()
}
diff --git a/presentation/src/main/kotlin/es/verdnatura/presentation/presenter/SignPresenter.kt b/presentation/src/main/kotlin/es/verdnatura/presentation/presenter/SignPresenter.kt
index f499fe5..a3e59e8 100644
--- a/presentation/src/main/kotlin/es/verdnatura/presentation/presenter/SignPresenter.kt
+++ b/presentation/src/main/kotlin/es/verdnatura/presentation/presenter/SignPresenter.kt
@@ -40,7 +40,7 @@ class SignPresenter: BasePresenter {
}
fun uploadSign(fileName: String){
- uploadSignUseCase.execute(UploadObserver(), UploadSignsUseCase.Params.forUploadSign(fileName))
+ uploadSignUseCase.execute(SignObserverFinish(this), UploadSignsUseCase.Params.forUploadSign(fileName))
}
class SignObserver(val presenter: SignPresenter): DisposableObserver(){
@@ -53,6 +53,20 @@ class SignPresenter: BasePresenter {
Log.e("ERROR", e?.message.toString())
}
+ override fun onComplete() {
+ //presenter.closeFragment()
+ }
+
+ }
+
+ class SignObserverFinish(val presenter: SignPresenter): DisposableObserver(){
+
+ override fun onNext(t: String?) {}
+
+ override fun onError(e: Throwable?) {
+ presenter.closeFragment()
+ }
+
override fun onComplete() {
presenter.closeFragment()
}
@@ -60,4 +74,6 @@ class SignPresenter: BasePresenter {
}
+
+
}
\ No newline at end of file
diff --git a/presentation/src/main/kotlin/es/verdnatura/presentation/presenter/TicketPresenter.kt b/presentation/src/main/kotlin/es/verdnatura/presentation/presenter/TicketPresenter.kt
index 1a2c098..419236d 100644
--- a/presentation/src/main/kotlin/es/verdnatura/presentation/presenter/TicketPresenter.kt
+++ b/presentation/src/main/kotlin/es/verdnatura/presentation/presenter/TicketPresenter.kt
@@ -21,6 +21,7 @@ class TicketPresenter: BasePresenter {
private val getTicketsUseCase: GetTicketsUseCase
private val selectTicketUseCase: SelectTicketUseCase
private val filterTicketUSeCase: FilterTicketsUseCase
+ private var filter:Boolean = false
@Inject
@@ -51,7 +52,7 @@ class TicketPresenter: BasePresenter {
fun onDownloadTickets(tickets: List>){
this.tickets = tickets
- filterTickets(false)
+ filterTickets(filter)
}
fun onFilterTickets(tickets: List>){
@@ -72,7 +73,10 @@ class TicketPresenter: BasePresenter {
}
fun filterTickets(signed: Boolean){
- filterTicketUSeCase.execute(TicketFilterObserver(this), FilterTicketsUseCase.Params.forFilter(tickets, signed))
+ if (signed != filter) {
+ filter = signed
+ }
+ filterTicketUSeCase.execute(TicketFilterObserver(this), FilterTicketsUseCase.Params.forFilter(tickets, filter))
}
class TicketObserver(val presenter: TicketPresenter, val route: Int): DisposableObserver>>(){
diff --git a/presentation/src/main/kotlin/es/verdnatura/presentation/view/adapter/TicketAdapter.kt b/presentation/src/main/kotlin/es/verdnatura/presentation/view/adapter/TicketAdapter.kt
index 7508ccb..6d4839e 100644
--- a/presentation/src/main/kotlin/es/verdnatura/presentation/view/adapter/TicketAdapter.kt
+++ b/presentation/src/main/kotlin/es/verdnatura/presentation/view/adapter/TicketAdapter.kt
@@ -39,7 +39,7 @@ class TicketAdapter(var items: MutableList>, val signAction: (List<
textCity.text = ticket.City
if(ticket.Signed == 1) okSigned.visibility = View.VISIBLE else okSigned.visibility = View.GONE
- if(ticket.Uploaded == 1) okUploaded.visibility = View.VISIBLE else okUploaded.visibility = View.GONE
+ if(ticket.Uploaded == 1 && ticket.Signed == 1) okUploaded.visibility = View.VISIBLE else okUploaded.visibility = View.GONE
val ns = getNotes(item)
if(ns.length > 0) notes.visibility = View.VISIBLE else notes.visibility = View.INVISIBLE
diff --git a/presentation/src/main/res/drawable/list_background_white.xml b/presentation/src/main/res/drawable/list_background_white.xml
new file mode 100644
index 0000000..3a755c3
--- /dev/null
+++ b/presentation/src/main/res/drawable/list_background_white.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/presentation/src/main/res/layouts/fragment/layout/fragment_list.xml b/presentation/src/main/res/layouts/fragment/layout/fragment_list.xml
index ae0b2ae..58c9007 100644
--- a/presentation/src/main/res/layouts/fragment/layout/fragment_list.xml
+++ b/presentation/src/main/res/layouts/fragment/layout/fragment_list.xml
@@ -1,7 +1,9 @@
+ style="@style/WidhtMatchHeightMatch"
+ android:background="@color/background_grey"
+ android:padding="@dimen/padding_large">
+ android:background="@color/colorPrimary">
-
+
+ android:layout_toRightOf="@+id/textRoute"/>
-
+
+ android:layout_toRightOf="@+id/textAgency"/>
+ android:orientation="horizontal" android:layout_marginBottom="@dimen/margin_small">
+ android:layout_toRightOf="@+id/textDate"/>
@@ -50,13 +50,13 @@
+ android:layout_toRightOf="@+id/textHour"/>
+ android:orientation="horizontal" android:layout_marginBottom="@dimen/margin_small">
+ android:layout_toRightOf="@+id/textPlate"/>
@@ -75,16 +75,17 @@
+ android:layout_toRightOf="@+id/textM3"/>
+ android:orientation="horizontal" android:layout_marginBottom="@dimen/margin_small">
+ style="@style/WidhtWrapHeightWrap"
+ android:textSize="17dp"/>
diff --git a/presentation/src/main/res/layouts/item/layout/item_ticket.xml b/presentation/src/main/res/layouts/item/layout/item_ticket.xml
index 733059c..af2e78b 100644
--- a/presentation/src/main/res/layouts/item/layout/item_ticket.xml
+++ b/presentation/src/main/res/layouts/item/layout/item_ticket.xml
@@ -3,7 +3,7 @@
android:orientation="vertical"
style="@style/WidhtMatchHeightWrap"
android:padding="@dimen/padding_medium"
- android:background="@android:color/white"
+ android:background="@drawable/list_background_white"
android:layout_marginBottom="@dimen/margin_medium">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
+