From e234a15b428267997c903a4ed42536c5d9f14a1f Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 10 十一月 2025 13:10:42 +0800
Subject: [PATCH] 2025.11.10 1. 新增巡查场景历史详情相关数据逻辑; 2. 新增工地施工阶段修改界面；
---
.idea/libraries/Gradle__com_github_gzu_liyujiang_AndroidPicker_Common_1_5_6_20181018_aar.xml | 8
app/src/main/java/cn/flightfeather/thirdappmodule/repository/SceneRepository.kt | 11
.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml | 6
.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml | 6
.idea/misc.xml | 7
.idea/libraries/Gradle__com_orhanobut_dialogplus_1_11_aar.xml | 6
.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml | 8
appsupervision/build.gradle | 7
.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml | 8
.idea/gradle.xml | 2
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionFragment.kt | 1
.idea/libraries/Gradle__com_github_razerdp_BasePopup_2_1_8_aar.xml | 6
.idea/libraries/Gradle__com_liulishuo_okdownload_okhttp_1_0_7_aar.xml | 6
.idea/libraries/Gradle__cn_carbswang_android_NumberPickerView_1_1_1_aar.xml | 6
app/src/main/res/layout/item_simple_radio.xml | 12
.idea/libraries/Gradle__com_github_bumptech_glide_glide_4_9_0_aar.xml | 6
.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml | 6
.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml | 6
app/src/main/java/cn/flightfeather/thirdappmodule/repository/CommonRepository.kt | 7
.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_coroutines_0_10_8_aar.xml | 6
.idea/libraries/Gradle__org_jetbrains_anko_appcompatV7_base_0_10_8_aar.xml | 6
.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml | 6
.idea/libraries/Gradle__com_android_support_exifinterface_27_1_0_aar.xml | 6
.idea/libraries/Gradle__com_liulishuo_okdownload_filedownloader_1_0_7_aar.xml | 6
.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_commons_0_10_8_aar.xml | 6
.idea/compiler.xml | 2
.idea/libraries/Gradle__com_mikhaellopez_circularprogressbar_3_0_3_aar.xml | 6
app/src/main/java/cn/flightfeather/thirdappmodule/module/task/SceneDetailViewModel.kt | 9
.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml | 6
.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml | 8
.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml | 8
app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/ScenseService.java | 4
.idea/libraries/Gradle__com_github_cazaea_sweet_alert_dialog_1_0_0_aar.xml | 6
.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_commons_0_10_8_aar.xml | 6
.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml | 6
.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml | 8
.idea/libraries/Gradle__com_android_support_test_rules_0_5_aar.xml | 8
.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_coroutines_0_10_8_aar.xml | 6
.idea/libraries/Gradle__com_android_support_support_v4_27_1_1_aar.xml | 6
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneInfoActivity.kt | 17
.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_0_10_8_aar.xml | 6
.idea/libraries/Gradle__org_jetbrains_anko_anko_commons_0_10_8_aar.xml | 6
.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml | 6
.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml | 6
.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_2_aar.xml | 6
.idea/libraries/Gradle__org_jetbrains_anko_anko_0_10_8_aar.xml | 6
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryActivity.kt | 76 ++
app/src/main/java/cn/flightfeather/thirdappmodule/adapter/AllRecyclerViewAdapter.java | 5
.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5_aar.xml | 6
app/src/main/res/layout/item_task_list_2.xml | 19
.idea/libraries/Gradle__com_jakewharton_butterknife_9_0_0_aar.xml | 6
.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml | 6
.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml | 8
.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_9_0_0_aar.xml | 6
.idea/libraries/Gradle__com_lcw_library_imagepicker_2_2_7_aar.xml | 6
.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml | 6
.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml | 8
.idea/libraries/Gradle__com_android_databinding_viewbinding_4_2_0_aar.xml | 6
app/src/main/res/layout/fragment_inspection_content.xml | 63 +
.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml | 6
.idea/libraries/Gradle__com_android_support_support_media_compat_27_1_1_aar.xml | 6
.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml | 8
.idea/libraries/Gradle__org_jetbrains_anko_anko_coroutines_0_10_8_aar.xml | 6
.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_1_1_aar.xml | 6
app/src/main/res/layout/dialog_scene_history_2.xml | 2
.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml | 6
.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml | 6
app/src/main/java/cn/flightfeather/thirdappmodule/module/base/BaseActivity.kt | 6
.idea/libraries/Gradle__com_github_chrisbanes_PhotoView_2_1_4_aar.xml | 6
app/src/main/java/cn/flightfeather/thirdappmodule/databinding/SceneHistoryViewModel.kt | 73 +
.idea/libraries/Gradle__org_jetbrains_anko_platform_base_0_10_8_aar.xml | 6
.idea/libraries/Gradle__com_github_CymChad_BaseRecyclerViewAdapterHelper_2_9_46_aar.xml | 8
.idea/libraries/Gradle__com_otaliastudios_cameraview_1_6_1_aar.xml | 8
app/src/main/java/cn/flightfeather/thirdappmodule/util/DateUtil.kt | 12
.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml | 6
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionDetailActivity.kt | 5
.idea/libraries/Gradle__org_jetbrains_anko_anko_sqlite_0_10_8_aar.xml | 6
.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml | 6
.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml | 8
.idea/libraries/Gradle__am_widget_circleprogressbar_1_0_3_aar.xml | 6
.idea/libraries/Gradle__android_arch_lifecycle_extensions_1_1_1_aar.xml | 6
app/build.gradle | 6
.idea/libraries/Gradle__org_jetbrains_anko_supportV4_base_0_10_8_aar.xml | 6
.idea/libraries/Gradle__com_android_support_test_runner_0_5_aar.xml | 8
.idea/libraries/Gradle__org_jetbrains_anko_commons_base_0_10_8_aar.xml | 6
.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml | 6
.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml | 6
.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml | 8
.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2_aar.xml | 6
.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_0_10_8_aar.xml | 6
.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml | 6
.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml | 6
.idea/libraries/Gradle__com_haibin_calendarview_3_5_8_aar.xml | 6
.idea/libraries/Gradle__com_github_gzu_liyujiang_AndroidPicker_WheelPicker_1_5_6_20181018_aar.xml | 8
.idea/libraries/Gradle__org_jetbrains_anko_sqlite_base_0_10_8_aar.xml | 6
.idea/libraries/Gradle__com_android_databinding_adapters_4_2_0_aar.xml | 6
.idea/libraries/Gradle__com_liulishuo_okdownload_okdownload_1_0_7_aar.xml | 6
.idea/libraries/Gradle__com_liulishuo_okdownload_ktx_1_0_7_aar.xml | 6
.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml | 6
.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_0_10_8_aar.xml | 6
app/src/main/res/layout/dialog_scene_history.xml | 736 +++++------------------
build.gradle | 3
.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml | 6
.idea/libraries/Gradle__com_android_databinding_library_4_2_0_aar.xml | 6
.idea/libraries/Gradle__com_liulishuo_okdownload_sqlite_1_0_7_aar.xml | 6
.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_2_0_1_aar.xml | 6
.idea/libraries/Gradle__com_android_support_multidex_1_0_2_aar.xml | 6
.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml | 6
.idea/libraries/Gradle__de_hdodenhof_circleimageview_2_2_0_aar.xml | 6
.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml | 6
.idea/libraries/Gradle__com_github_bumptech_glide_gifdecoder_4_9_0_aar.xml | 8
app/src/main/java/cn/flightfeather/thirdappmodule/adapter/TaskListAdapter.java | 5
.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml | 6
/dev/null | 136 ----
app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/DomainItemService.kt | 3
.idea/libraries/Gradle__com_bm_photoview_library_1_4_1_aar.xml | 6
.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml | 6
117 files changed, 778 insertions(+), 1,031 deletions(-)
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
- <bytecodeTargetLevel target="1.8" />
+ <bytecodeTargetLevel target="11" />
</component>
</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 9814d5d..82f1900 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,10 +4,10 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
- <option name="delegatedBuild" value="false" />
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
+ <option name="gradleJvm" value="11" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
diff --git a/.idea/libraries/Gradle__am_widget_circleprogressbar_1_0_3_aar.xml b/.idea/libraries/Gradle__am_widget_circleprogressbar_1_0_3_aar.xml
index cdcad70..9d32a5a 100644
--- a/.idea/libraries/Gradle__am_widget_circleprogressbar_1_0_3_aar.xml
+++ b/.idea/libraries/Gradle__am_widget_circleprogressbar_1_0_3_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: am.widget:circleprogressbar:1.0.3@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/bd7100736e887667593333e1c9db10fd/transformed/circleprogressbar-1.0.3/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/bd7100736e887667593333e1c9db10fd/transformed/circleprogressbar-1.0.3/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/bd7100736e887667593333e1c9db10fd/transformed/circleprogressbar-1.0.3/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/56444086981467702c948cdc96bceeee/transformed/circleprogressbar-1.0.3/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/56444086981467702c948cdc96bceeee/transformed/circleprogressbar-1.0.3/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/56444086981467702c948cdc96bceeee/transformed/circleprogressbar-1.0.3/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/am.widget/circleprogressbar/1.0.3/950fc6fb417ed78bc42aa231b79f59f2836ba64a/circleprogressbar-1.0.3-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml
index e0dcb85..d7d0cf3 100644
--- a/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml
@@ -4,8 +4,10 @@
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/214bdc9cac88e976195e46d761ee1538/runtime-1.1.1/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/498bbf373388df26213731ad42aa4963/transformed/runtime-1.1.1/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/1bc989b9a041d5059b8c8431150441e1/transformed/runtime-1.1.1/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/1bc989b9a041d5059b8c8431150441e1/transformed/runtime-1.1.1/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/1bc989b9a041d5059b8c8431150441e1/transformed/runtime-1.1.1/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/cc73a3db7fa8f6f3ca2550432782ca5e/transformed/runtime-1.1.1/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c5f517037cf226e4c0fcd9e60b512a48/transformed/runtime-1.1.1/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/c5f517037cf226e4c0fcd9e60b512a48/transformed/runtime-1.1.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c5f517037cf226e4c0fcd9e60b512a48/transformed/runtime-1.1.1/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_extensions_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_extensions_1_1_1_aar.xml
index 902d752..513e574 100644
--- a/.idea/libraries/Gradle__android_arch_lifecycle_extensions_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_extensions_1_1_1_aar.xml
@@ -4,8 +4,10 @@
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/365f657fde1f3785888e75af4aa4ee10/extensions-1.1.1/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/86245674e276514b3ad3fba9660594ee/transformed/extensions-1.1.1/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/609c54361791a3c8ed1e8de15e1e6206/transformed/extensions-1.1.1/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/609c54361791a3c8ed1e8de15e1e6206/transformed/extensions-1.1.1/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/609c54361791a3c8ed1e8de15e1e6206/transformed/extensions-1.1.1/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/41b8680fabe711ccf9cc914bf3c55700/transformed/extensions-1.1.1/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/47d215159db4aca60d9e12f76b3ae415/transformed/extensions-1.1.1/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/47d215159db4aca60d9e12f76b3ae415/transformed/extensions-1.1.1/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/47d215159db4aca60d9e12f76b3ae415/transformed/extensions-1.1.1/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
index c53a29b..49223b2 100644
--- a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
@@ -4,8 +4,10 @@
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3150690e8713e02e5e032dcb88719575/livedata-1.1.1/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/e5eb335208cb35b31d1c7e66715f435d/transformed/livedata-1.1.1/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/74393a8ccc7a98a53a226928871e7918/transformed/livedata-1.1.1/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/74393a8ccc7a98a53a226928871e7918/transformed/livedata-1.1.1/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/74393a8ccc7a98a53a226928871e7918/transformed/livedata-1.1.1/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d8d4eb29ee0753a66b856abf83ed8643/transformed/livedata-1.1.1/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d403d3b6a04913d6fb666e9efe2062ad/transformed/livedata-1.1.1/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/d403d3b6a04913d6fb666e9efe2062ad/transformed/livedata-1.1.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d403d3b6a04913d6fb666e9efe2062ad/transformed/livedata-1.1.1/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml
index fdd9dbf..4513594 100644
--- a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6d2442638d1d59660bcc6af7e7e0088f/livedata-core-1.1.1/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/c87a5180f9fddccc2e9b6d3f136f2b9a/transformed/livedata-core-1.1.1/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/9e7984d6cf38f8c95f14a44e66223e52/transformed/livedata-core-1.1.1/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/9e7984d6cf38f8c95f14a44e66223e52/transformed/livedata-core-1.1.1/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/9e7984d6cf38f8c95f14a44e66223e52/transformed/livedata-core-1.1.1/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5898e72b2be2c21de5fb6e516f759501/transformed/livedata-core-1.1.1/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/587556e97cb25be74a7f038fc8ebb79a/transformed/livedata-core-1.1.1/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/587556e97cb25be74a7f038fc8ebb79a/transformed/livedata-core-1.1.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/587556e97cb25be74a7f038fc8ebb79a/transformed/livedata-core-1.1.1/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
index b371a95..987df1e 100644
--- a/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
@@ -4,8 +4,10 @@
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bd9a24a47ad2242a8fea2d4cb485f7f4/runtime-1.1.1/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/0141c50c861245fe11e6dcaa98a9117e/transformed/runtime-1.1.1/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/0238a0f25fb680b25d84c24613447f2f/transformed/runtime-1.1.1/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/0238a0f25fb680b25d84c24613447f2f/transformed/runtime-1.1.1/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/0238a0f25fb680b25d84c24613447f2f/transformed/runtime-1.1.1/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5c84336d7434b1a6a5982ee9aa8618d7/transformed/runtime-1.1.1/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/6ff386afe68b5e1fd7766d4a8572c638/transformed/runtime-1.1.1/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/6ff386afe68b5e1fd7766d4a8572c638/transformed/runtime-1.1.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/6ff386afe68b5e1fd7766d4a8572c638/transformed/runtime-1.1.1/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
index 1b96cba..b78af91 100644
--- a/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9a574c2236445212ad229f69a1894781/viewmodel-1.1.1/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/a46dd2c6a315d0bf67b853ecbbf41a14/transformed/viewmodel-1.1.1/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/495d1d00226704a2128b2f02ca801527/transformed/viewmodel-1.1.1/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/495d1d00226704a2128b2f02ca801527/transformed/viewmodel-1.1.1/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/495d1d00226704a2128b2f02ca801527/transformed/viewmodel-1.1.1/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/dd9542f90543130fd436930cc435e99f/transformed/viewmodel-1.1.1/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/748e1769050ac6b99383b2830df48a32/transformed/viewmodel-1.1.1/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/748e1769050ac6b99383b2830df48a32/transformed/viewmodel-1.1.1/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/748e1769050ac6b99383b2830df48a32/transformed/viewmodel-1.1.1/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__cn_carbswang_android_NumberPickerView_1_1_1_aar.xml b/.idea/libraries/Gradle__cn_carbswang_android_NumberPickerView_1_1_1_aar.xml
index 2c28c8a..01ec003 100644
--- a/.idea/libraries/Gradle__cn_carbswang_android_NumberPickerView_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__cn_carbswang_android_NumberPickerView_1_1_1_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: cn.carbswang.android:NumberPickerView:1.1.1@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/304b39f67142bcb855b10342eaa79578/transformed/NumberPickerView-1.1.1/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/304b39f67142bcb855b10342eaa79578/transformed/NumberPickerView-1.1.1/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/304b39f67142bcb855b10342eaa79578/transformed/NumberPickerView-1.1.1/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/bbaac88e2e4076a599daf0d9cc35d80d/transformed/NumberPickerView-1.1.1/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/bbaac88e2e4076a599daf0d9cc35d80d/transformed/NumberPickerView-1.1.1/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/bbaac88e2e4076a599daf0d9cc35d80d/transformed/NumberPickerView-1.1.1/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/cn.carbswang.android/NumberPickerView/1.1.1/5580870c5c11b0b43b79a58e8c7b0f3f6f0eb262/NumberPickerView-1.1.1-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_android_databinding_adapters_4_2_0_aar.xml b/.idea/libraries/Gradle__com_android_databinding_adapters_4_2_0_aar.xml
index 6fad20c..3c74f34 100644
--- a/.idea/libraries/Gradle__com_android_databinding_adapters_4_2_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_databinding_adapters_4_2_0_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: com.android.databinding:adapters:4.2.0@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/77362f090f3736827f6496ac41c054b9/transformed/adapters-4.2.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/77362f090f3736827f6496ac41c054b9/transformed/adapters-4.2.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/77362f090f3736827f6496ac41c054b9/transformed/adapters-4.2.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/63c5676d8f375479f08b684dca6789e9/transformed/adapters-4.2.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/63c5676d8f375479f08b684dca6789e9/transformed/adapters-4.2.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/63c5676d8f375479f08b684dca6789e9/transformed/adapters-4.2.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_databinding_library_4_2_0_aar.xml b/.idea/libraries/Gradle__com_android_databinding_library_4_2_0_aar.xml
index 435420f..b6c6681 100644
--- a/.idea/libraries/Gradle__com_android_databinding_library_4_2_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_databinding_library_4_2_0_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: com.android.databinding:library:4.2.0@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/515aec787bd894183db38a3d7db71513/transformed/library-4.2.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/515aec787bd894183db38a3d7db71513/transformed/library-4.2.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/515aec787bd894183db38a3d7db71513/transformed/library-4.2.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/a648e218ca952f127d1324977e9a72f8/transformed/library-4.2.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/a648e218ca952f127d1324977e9a72f8/transformed/library-4.2.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/a648e218ca952f127d1324977e9a72f8/transformed/library-4.2.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_databinding_viewbinding_4_2_0_aar.xml b/.idea/libraries/Gradle__com_android_databinding_viewbinding_4_2_0_aar.xml
index 3b59794..5796572 100644
--- a/.idea/libraries/Gradle__com_android_databinding_viewbinding_4_2_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_databinding_viewbinding_4_2_0_aar.xml
@@ -1,9 +1,11 @@
<component name="libraryTable">
<library name="Gradle: com.android.databinding:viewbinding:4.2.0@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ff08e615976def9f0c8d9eb7219771c6/transformed/viewbinding-4.2.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/ff08e615976def9f0c8d9eb7219771c6/transformed/viewbinding-4.2.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ff08e615976def9f0c8d9eb7219771c6/transformed/viewbinding-4.2.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/a82ef20d42dd4c2d3197e18767f042b1/transformed/viewbinding-4.2.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/8352b8d69e698417eb6a163afaee75e8/transformed/viewbinding-4.2.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/8352b8d69e698417eb6a163afaee75e8/transformed/viewbinding-4.2.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/8352b8d69e698417eb6a163afaee75e8/transformed/viewbinding-4.2.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml
index de2a4e2..3f662be 100644
--- a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7a6d52ee5d429d4b8844b4e139bec139/animated-vector-drawable-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/554ff06c493a298991412a1a180c9621/transformed/animated-vector-drawable-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b3c246c4ca3b474316a944d0e79ca67f/transformed/animated-vector-drawable-28.0.0/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/b3c246c4ca3b474316a944d0e79ca67f/transformed/animated-vector-drawable-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b3c246c4ca3b474316a944d0e79ca67f/transformed/animated-vector-drawable-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/3561e72c53b07c82b46b9d9a28317f98/transformed/animated-vector-drawable-28.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/fed32e2e69b13e284ba0bf5eef39faf9/transformed/animated-vector-drawable-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/fed32e2e69b13e284ba0bf5eef39faf9/transformed/animated-vector-drawable-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/fed32e2e69b13e284ba0bf5eef39faf9/transformed/animated-vector-drawable-28.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml
index e29ffdc..a4eeac5 100644
--- a/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:appcompat-v7:28.0.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b27b73ab2f28d9f4b37d016824f8c4bc/transformed/appcompat-v7-28.0.0/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/13a7542fcb7042a83fdde0e210d750c3/transformed/appcompat-v7-28.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b27b73ab2f28d9f4b37d016824f8c4bc/transformed/appcompat-v7-28.0.0/AndroidManifest.xml" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b27b73ab2f28d9f4b37d016824f8c4bc/transformed/appcompat-v7-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b27b73ab2f28d9f4b37d016824f8c4bc/transformed/appcompat-v7-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/13a7542fcb7042a83fdde0e210d750c3/transformed/appcompat-v7-28.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/13a7542fcb7042a83fdde0e210d750c3/transformed/appcompat-v7-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/13a7542fcb7042a83fdde0e210d750c3/transformed/appcompat-v7-28.0.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
index 952ff97..19dcb5d 100644
--- a/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/24157e7ed0db220c3ca463df4d44e01f/asynclayoutinflater-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/caac66f9697c632af85e1a065896eef1/transformed/asynclayoutinflater-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/f2e01e227281e0b1a892456c30af8d82/transformed/asynclayoutinflater-28.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/f2e01e227281e0b1a892456c30af8d82/transformed/asynclayoutinflater-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/f2e01e227281e0b1a892456c30af8d82/transformed/asynclayoutinflater-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/7054fa61fbc35d53ee518574a4c1921e/transformed/asynclayoutinflater-28.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/e2c0148373f73cd6b6db5b98f5c60c57/transformed/asynclayoutinflater-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e2c0148373f73cd6b6db5b98f5c60c57/transformed/asynclayoutinflater-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e2c0148373f73cd6b6db5b98f5c60c57/transformed/asynclayoutinflater-28.0.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml
index 9448e36..60ece99 100644
--- a/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:cardview-v7:28.0.0@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c8b00b81dac0168f2a7ede1aa44a44ff/transformed/cardview-v7-28.0.0/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/c8b00b81dac0168f2a7ede1aa44a44ff/transformed/cardview-v7-28.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c8b00b81dac0168f2a7ede1aa44a44ff/transformed/cardview-v7-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/18ebd29b4aefcb5c149908c83f34f831/transformed/cardview-v7-28.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/18ebd29b4aefcb5c149908c83f34f831/transformed/cardview-v7-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/18ebd29b4aefcb5c149908c83f34f831/transformed/cardview-v7-28.0.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_2_0_1_aar.xml b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_2_0_1_aar.xml
index 548a273..36d7374 100644
--- a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_2_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_2_0_1_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: com.android.support.constraint:constraint-layout:2.0.1@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/743f52f1f35b77d129d02815488e7c75/transformed/constraint-layout-2.0.1/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/743f52f1f35b77d129d02815488e7c75/transformed/constraint-layout-2.0.1/AndroidManifest.xml" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/743f52f1f35b77d129d02815488e7c75/transformed/constraint-layout-2.0.1/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/eb4de77df256326ff0aca55dfebed467/transformed/constraint-layout-2.0.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/eb4de77df256326ff0aca55dfebed467/transformed/constraint-layout-2.0.1/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/eb4de77df256326ff0aca55dfebed467/transformed/constraint-layout-2.0.1/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
index 7abc47d..454054e 100644
--- a/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:coordinatorlayout:28.0.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/6edbdbed12df33f714620ceb7ca6ae17/transformed/coordinatorlayout-28.0.0/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/cf291143843d6b053a6da062993d6583/transformed/coordinatorlayout-28.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/6edbdbed12df33f714620ceb7ca6ae17/transformed/coordinatorlayout-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/6edbdbed12df33f714620ceb7ca6ae17/transformed/coordinatorlayout-28.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/6edbdbed12df33f714620ceb7ca6ae17/transformed/coordinatorlayout-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/cf291143843d6b053a6da062993d6583/transformed/coordinatorlayout-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/cf291143843d6b053a6da062993d6583/transformed/coordinatorlayout-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/cf291143843d6b053a6da062993d6583/transformed/coordinatorlayout-28.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml
index f3e91be..77abc7d 100644
--- a/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f6cc43be649d8dd54e1d15f575f0cd14/cursoradapter-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/788b34836e0f164ad96486a33b499c60/transformed/cursoradapter-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/e49c7ebb05a901273e89122d61c495a7/transformed/cursoradapter-28.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e49c7ebb05a901273e89122d61c495a7/transformed/cursoradapter-28.0.0/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/e49c7ebb05a901273e89122d61c495a7/transformed/cursoradapter-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/4970cb8e7d2381baff953e0ef364bbeb/transformed/cursoradapter-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ff58ae4c59e567c479b0b4cf24728d85/transformed/cursoradapter-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ff58ae4c59e567c479b0b4cf24728d85/transformed/cursoradapter-28.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ff58ae4c59e567c479b0b4cf24728d85/transformed/cursoradapter-28.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml
index b90084f..73b7349 100644
--- a/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml
@@ -4,8 +4,10 @@
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ddd7d7c45259fdb153c0cfa2948bc245/customview-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/c45304e2fcc51011033118debaf998af/transformed/customview-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/e800cc5b069eb4b38923eb970653192f/transformed/customview-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e800cc5b069eb4b38923eb970653192f/transformed/customview-28.0.0/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/e800cc5b069eb4b38923eb970653192f/transformed/customview-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/a8ebb4d69fd4bddc4ad9f47ddfa74502/transformed/customview-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ce6e5cebb09cd3dcb1c3f885db5c9d59/transformed/customview-28.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ce6e5cebb09cd3dcb1c3f885db5c9d59/transformed/customview-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ce6e5cebb09cd3dcb1c3f885db5c9d59/transformed/customview-28.0.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml
index 34e5272..4cd5d7f 100644
--- a/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:design:28.0.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/04ce8d5bc87b32952d199ba29bea31d0/transformed/design-28.0.0/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/eb942a32b92815a5c8115ffc658404bf/transformed/design-28.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/04ce8d5bc87b32952d199ba29bea31d0/transformed/design-28.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/04ce8d5bc87b32952d199ba29bea31d0/transformed/design-28.0.0/AndroidManifest.xml" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/04ce8d5bc87b32952d199ba29bea31d0/transformed/design-28.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/eb942a32b92815a5c8115ffc658404bf/transformed/design-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/eb942a32b92815a5c8115ffc658404bf/transformed/design-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/eb942a32b92815a5c8115ffc658404bf/transformed/design-28.0.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml
index 4e34075..ea0fb5b 100644
--- a/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8204f1ad54e41652bd4dbd721d396274/documentfile-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/dbef811cb3aa2691936a21f657daa34c/transformed/documentfile-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/8a679302623e9adc970e103a30b86f17/transformed/documentfile-28.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/8a679302623e9adc970e103a30b86f17/transformed/documentfile-28.0.0/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/8a679302623e9adc970e103a30b86f17/transformed/documentfile-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/9e5fefedba3f97f08eaf806ea1f5fc61/transformed/documentfile-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2b81983c5b279cdcc095a6973a2a69a7/transformed/documentfile-28.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/2b81983c5b279cdcc095a6973a2a69a7/transformed/documentfile-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2b81983c5b279cdcc095a6973a2a69a7/transformed/documentfile-28.0.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml
index 5e068f2..2424a00 100644
--- a/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml
@@ -1,14 +1,16 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:drawerlayout:28.0.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b6d60de56376f5e893579c1d4afd19bb/transformed/drawerlayout-28.0.0/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/fd0b9109e84986ccd454b269a8233157/transformed/drawerlayout-28.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ef6e3aadf804389ce0c62ed72f3bf0d4/drawerlayout-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/698f4336a751ba68a07e750167beb85c/transformed/drawerlayout-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b6d60de56376f5e893579c1d4afd19bb/transformed/drawerlayout-28.0.0/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b6d60de56376f5e893579c1d4afd19bb/transformed/drawerlayout-28.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/b6d60de56376f5e893579c1d4afd19bb/transformed/drawerlayout-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/280a424e4fad1ca1c97579627c19fc48/transformed/drawerlayout-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/fd0b9109e84986ccd454b269a8233157/transformed/drawerlayout-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/fd0b9109e84986ccd454b269a8233157/transformed/drawerlayout-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/fd0b9109e84986ccd454b269a8233157/transformed/drawerlayout-28.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_exifinterface_27_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_exifinterface_27_1_0_aar.xml
index c7ce6a6..5ffb7a2 100644
--- a/.idea/libraries/Gradle__com_android_support_exifinterface_27_1_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_exifinterface_27_1_0_aar.xml
@@ -4,8 +4,10 @@
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/869616d23c633d46b6693acce001d972/exifinterface-27.1.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/a2ace5e749873c6f1ebaa8ecb40f2420/transformed/exifinterface-27.1.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/cfb5321af2f54c8e7c93dfe2be765b4e/transformed/exifinterface-27.1.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/cfb5321af2f54c8e7c93dfe2be765b4e/transformed/exifinterface-27.1.0/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/cfb5321af2f54c8e7c93dfe2be765b4e/transformed/exifinterface-27.1.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/1479fbe0709cc1e09fd2d0f132348c8b/transformed/exifinterface-27.1.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/60e69a74ed139d72a3d296c244103cc6/transformed/exifinterface-27.1.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/60e69a74ed139d72a3d296c244103cc6/transformed/exifinterface-27.1.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/60e69a74ed139d72a3d296c244103cc6/transformed/exifinterface-27.1.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml
index 00fbf5a..3005d62 100644
--- a/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/67d601c9415c6ae4d6b122735ccaf4ce/interpolator-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/7d069aa86c075a5d149cab0f53f5e681/transformed/interpolator-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/dec77fafdbdbedf8f5b765781aeb7d8c/transformed/interpolator-28.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/dec77fafdbdbedf8f5b765781aeb7d8c/transformed/interpolator-28.0.0/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/dec77fafdbdbedf8f5b765781aeb7d8c/transformed/interpolator-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/63ca1fbdb54ca1e25fff4288948cbcc2/transformed/interpolator-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2396488a2630acafeb1e978a26d5c53d/transformed/interpolator-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/2396488a2630acafeb1e978a26d5c53d/transformed/interpolator-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2396488a2630acafeb1e978a26d5c53d/transformed/interpolator-28.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml
index 939837b..aba7fce 100644
--- a/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3452d014ce283284210b51f6887641f2/loader-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/4be0d0cedb829b31bf59e46645d88156/transformed/loader-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/c67cd2ce23f0bec9f5902558b4fbb7c2/transformed/loader-28.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/c67cd2ce23f0bec9f5902558b4fbb7c2/transformed/loader-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c67cd2ce23f0bec9f5902558b4fbb7c2/transformed/loader-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c7089f482fc549fb08f7d074dd35a196/transformed/loader-28.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/dcb3a732879114fdd4ebb791a60f3f55/transformed/loader-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/dcb3a732879114fdd4ebb791a60f3f55/transformed/loader-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/dcb3a732879114fdd4ebb791a60f3f55/transformed/loader-28.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml
index fe44b68..ec84b09 100644
--- a/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a125e3af23bb8cf90053ec749ee694cb/localbroadcastmanager-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/8f97de2948d3d8ed5d37712b1dea2464/transformed/localbroadcastmanager-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5705b56c0e97222216d1160008ce77b2/transformed/localbroadcastmanager-28.0.0/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/5705b56c0e97222216d1160008ce77b2/transformed/localbroadcastmanager-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/5705b56c0e97222216d1160008ce77b2/transformed/localbroadcastmanager-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/289313e7f41d342c46cb7cd8cd41095b/transformed/localbroadcastmanager-28.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ddc6e8fe2197e07a6084075cf7756142/transformed/localbroadcastmanager-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ddc6e8fe2197e07a6084075cf7756142/transformed/localbroadcastmanager-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ddc6e8fe2197e07a6084075cf7756142/transformed/localbroadcastmanager-28.0.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_multidex_1_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_multidex_1_0_2_aar.xml
index be4ef3f..8d9f266 100644
--- a/.idea/libraries/Gradle__com_android_support_multidex_1_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_multidex_1_0_2_aar.xml
@@ -4,8 +4,10 @@
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/58de6b06336b3dfb9158c724464024c3/multidex-1.0.2/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/d43bcf9c59c74b32b40012d26b833801/transformed/multidex-1.0.2/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/c89c4a25c24afadb85f0bfae29045a9c/transformed/multidex-1.0.2/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c89c4a25c24afadb85f0bfae29045a9c/transformed/multidex-1.0.2/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/c89c4a25c24afadb85f0bfae29045a9c/transformed/multidex-1.0.2/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/29e38b24d9c86359837184b3b743ae90/transformed/multidex-1.0.2/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/5ae28faf7ce873b94a00461504b18301/transformed/multidex-1.0.2/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5ae28faf7ce873b94a00461504b18301/transformed/multidex-1.0.2/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5ae28faf7ce873b94a00461504b18301/transformed/multidex-1.0.2/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_2_aar.xml
index 4cb40b7..0d9277a 100644
--- a/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_2_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a6a560bf17bcf59b8695329809abb663/multidex-instrumentation-1.0.2/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/08f644ac23a7411872e4dfb27792578b/transformed/multidex-instrumentation-1.0.2/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/02a21e377512f2a0f2f6a44ab6d04b06/transformed/multidex-instrumentation-1.0.2/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/02a21e377512f2a0f2f6a44ab6d04b06/transformed/multidex-instrumentation-1.0.2/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/02a21e377512f2a0f2f6a44ab6d04b06/transformed/multidex-instrumentation-1.0.2/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/86997dfbd9a5a0bbff2df55f58358000/transformed/multidex-instrumentation-1.0.2/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/185d0740d1c58399dddeec408202c7bc/transformed/multidex-instrumentation-1.0.2/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/185d0740d1c58399dddeec408202c7bc/transformed/multidex-instrumentation-1.0.2/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/185d0740d1c58399dddeec408202c7bc/transformed/multidex-instrumentation-1.0.2/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml
index cf92bea..0d05995 100644
--- a/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml
@@ -1,14 +1,16 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:print:28.0.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/77b0f42df0ecb47ba965663d65919fe1/transformed/print-28.0.0/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/4fa0cb057845054d5065f6341db1b0f0/transformed/print-28.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8eca30a5cb410362bcd219fcc9cd683c/print-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/d424c3280964773c21aef0ac325384b6/transformed/print-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/77b0f42df0ecb47ba965663d65919fe1/transformed/print-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/77b0f42df0ecb47ba965663d65919fe1/transformed/print-28.0.0/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/77b0f42df0ecb47ba965663d65919fe1/transformed/print-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/1d660b4f74067fa893dca754446bdff3/transformed/print-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/4fa0cb057845054d5065f6341db1b0f0/transformed/print-28.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/4fa0cb057845054d5065f6341db1b0f0/transformed/print-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/4fa0cb057845054d5065f6341db1b0f0/transformed/print-28.0.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml
index ce715f0..a0db29f 100644
--- a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:recyclerview-v7:28.0.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/405a1a56a710d05c5813e6bcf697e407/transformed/recyclerview-v7-28.0.0/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/83110efa9366109f618d0292a1be392e/transformed/recyclerview-v7-28.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/405a1a56a710d05c5813e6bcf697e407/transformed/recyclerview-v7-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/405a1a56a710d05c5813e6bcf697e407/transformed/recyclerview-v7-28.0.0/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/405a1a56a710d05c5813e6bcf697e407/transformed/recyclerview-v7-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/83110efa9366109f618d0292a1be392e/transformed/recyclerview-v7-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/83110efa9366109f618d0292a1be392e/transformed/recyclerview-v7-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/83110efa9366109f618d0292a1be392e/transformed/recyclerview-v7-28.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml
index f1d59b7..bd67da7 100644
--- a/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml
@@ -4,8 +4,10 @@
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1a5a137e6ce3152575f648e5cea55d09/slidingpanelayout-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/048f06e17906c5afdcee20fe20237983/transformed/slidingpanelayout-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/e28e65bef49e43ec9b500206094c4b64/transformed/slidingpanelayout-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e28e65bef49e43ec9b500206094c4b64/transformed/slidingpanelayout-28.0.0/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/e28e65bef49e43ec9b500206094c4b64/transformed/slidingpanelayout-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d11f1e8dd3465de3079b0e444d016f14/transformed/slidingpanelayout-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/bfa0fa9f8795ab67e4ce5a3072b6f590/transformed/slidingpanelayout-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/bfa0fa9f8795ab67e4ce5a3072b6f590/transformed/slidingpanelayout-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/bfa0fa9f8795ab67e4ce5a3072b6f590/transformed/slidingpanelayout-28.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
index 7d4b3fd..9fdc165 100644
--- a/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:support-compat:28.0.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/d8203b7584783a078a01f62a683c77ce/transformed/support-compat-28.0.0/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/e49b89461910a225ae8e1406c7965cb1/transformed/support-compat-28.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d8203b7584783a078a01f62a683c77ce/transformed/support-compat-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d8203b7584783a078a01f62a683c77ce/transformed/support-compat-28.0.0/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/d8203b7584783a078a01f62a683c77ce/transformed/support-compat-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e49b89461910a225ae8e1406c7965cb1/transformed/support-compat-28.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/e49b89461910a225ae8e1406c7965cb1/transformed/support-compat-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e49b89461910a225ae8e1406c7965cb1/transformed/support-compat-28.0.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml
index e97fcdd..23db855 100644
--- a/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bc07ec053600effd49d7785fd8d03f15/support-core-ui-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/38f529275f5d537e09d7f0bd4ce3a648/transformed/support-core-ui-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/7b5458f4844bdb6604d2e5f48279a783/transformed/support-core-ui-28.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/7b5458f4844bdb6604d2e5f48279a783/transformed/support-core-ui-28.0.0/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/7b5458f4844bdb6604d2e5f48279a783/transformed/support-core-ui-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/1a3b82abc841723d32f28580c763dfdd/transformed/support-core-ui-28.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ae332a7bb8747d019fd9170c824c50b0/transformed/support-core-ui-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ae332a7bb8747d019fd9170c824c50b0/transformed/support-core-ui-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ae332a7bb8747d019fd9170c824c50b0/transformed/support-core-ui-28.0.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml
index 485b8c1..c920732 100644
--- a/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2133d2345213f984f4d8b75590468157/support-core-utils-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/a5b20bd76144aa159f66c26c03ab2f32/transformed/support-core-utils-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/eb6f01f1a1dee4764d39fabacd10ad98/transformed/support-core-utils-28.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/eb6f01f1a1dee4764d39fabacd10ad98/transformed/support-core-utils-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/eb6f01f1a1dee4764d39fabacd10ad98/transformed/support-core-utils-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/cd2acc4d361dbac3f6728861a6c8cb55/transformed/support-core-utils-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/7e57202967c2219085a1bc4eca332fdf/transformed/support-core-utils-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/7e57202967c2219085a1bc4eca332fdf/transformed/support-core-utils-28.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/7e57202967c2219085a1bc4eca332fdf/transformed/support-core-utils-28.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml
index 7f445e9..9be0deb 100644
--- a/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml
@@ -1,14 +1,16 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:support-fragment:28.0.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/edd366c3e6ed5b11e01b10c7f981c883/transformed/support-fragment-28.0.0/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/631d1730257a879fb08ab0f63e402a7b/transformed/support-fragment-28.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7c53a57167873d78d8a6b9240f5676e0/support-fragment-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/83779b6767ac1403b92e395c5d7b2a0b/transformed/support-fragment-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/edd366c3e6ed5b11e01b10c7f981c883/transformed/support-fragment-28.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/edd366c3e6ed5b11e01b10c7f981c883/transformed/support-fragment-28.0.0/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/edd366c3e6ed5b11e01b10c7f981c883/transformed/support-fragment-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/446a769b7674facc4fafb48aa0124c56/transformed/support-fragment-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/631d1730257a879fb08ab0f63e402a7b/transformed/support-fragment-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/631d1730257a879fb08ab0f63e402a7b/transformed/support-fragment-28.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/631d1730257a879fb08ab0f63e402a7b/transformed/support-fragment-28.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_media_compat_27_1_1_aar.xml b/.idea/libraries/Gradle__com_android_support_support_media_compat_27_1_1_aar.xml
index 803735b..333a597 100644
--- a/.idea/libraries/Gradle__com_android_support_support_media_compat_27_1_1_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_media_compat_27_1_1_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:support-media-compat:27.1.1@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/4026b074905ddb397cfb59c424c90b25/transformed/support-media-compat-27.1.1/AndroidManifest.xml" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/4026b074905ddb397cfb59c424c90b25/transformed/support-media-compat-27.1.1/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/4026b074905ddb397cfb59c424c90b25/transformed/support-media-compat-27.1.1/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/6fd3b0c83d183a0d3e414a14d2259e6c/transformed/support-media-compat-27.1.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/6fd3b0c83d183a0d3e414a14d2259e6c/transformed/support-media-compat-27.1.1/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/6fd3b0c83d183a0d3e414a14d2259e6c/transformed/support-media-compat-27.1.1/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_support_v4_27_1_1_aar.xml b/.idea/libraries/Gradle__com_android_support_support_v4_27_1_1_aar.xml
index 178a905..ae36042 100644
--- a/.idea/libraries/Gradle__com_android_support_support_v4_27_1_1_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_v4_27_1_1_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e744014cbe53e02fac8bb3352a93881/support-v4-27.1.1/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/7849fbad2497efb537a227ed5de0cc0d/transformed/support-v4-27.1.1/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/c016565183f682b24af480ffcf7f6056/transformed/support-v4-27.1.1/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c016565183f682b24af480ffcf7f6056/transformed/support-v4-27.1.1/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/c016565183f682b24af480ffcf7f6056/transformed/support-v4-27.1.1/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/a0bb50bb4734f4b1e63fa67e9542ee28/transformed/support-v4-27.1.1/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/38fc6ddc4a80981bb424ddcd2b7ca731/transformed/support-v4-27.1.1/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/38fc6ddc4a80981bb424ddcd2b7ca731/transformed/support-v4-27.1.1/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/38fc6ddc4a80981bb424ddcd2b7ca731/transformed/support-v4-27.1.1/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
index ed79651..8d537d6 100644
--- a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
@@ -4,8 +4,10 @@
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b5c9150aea796b21a4ce35a83210d456/support-vector-drawable-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/e42d2d1301d513ea74d47ed2b24750cb/transformed/support-vector-drawable-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/451b4ebdce79bd5672cf26ced5c3332c/transformed/support-vector-drawable-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/451b4ebdce79bd5672cf26ced5c3332c/transformed/support-vector-drawable-28.0.0/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/451b4ebdce79bd5672cf26ced5c3332c/transformed/support-vector-drawable-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e733eecc4bcbe3ffe5b00cdaf8d538a7/transformed/support-vector-drawable-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/f8954d5df730ca2ccaa85383b1b95a56/transformed/support-vector-drawable-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/f8954d5df730ca2ccaa85383b1b95a56/transformed/support-vector-drawable-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/f8954d5df730ca2ccaa85383b1b95a56/transformed/support-vector-drawable-28.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml
index 2327aec..4873b01 100644
--- a/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml
@@ -1,14 +1,16 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:swiperefreshlayout:28.0.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ef0770a7491d6e0a26d918948a73e4ae/transformed/swiperefreshlayout-28.0.0/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/083e041e9adfd8b0c12d4cc71f61b687/transformed/swiperefreshlayout-28.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d8db5e47744bf18c3e813a1a5f7b2d3a/swiperefreshlayout-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/385c0ec07b1fdd272a5950d2e2309cd9/transformed/swiperefreshlayout-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/ef0770a7491d6e0a26d918948a73e4ae/transformed/swiperefreshlayout-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ef0770a7491d6e0a26d918948a73e4ae/transformed/swiperefreshlayout-28.0.0/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ef0770a7491d6e0a26d918948a73e4ae/transformed/swiperefreshlayout-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/1647fe475c24fa28a5b57ffba4673f1c/transformed/swiperefreshlayout-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/083e041e9adfd8b0c12d4cc71f61b687/transformed/swiperefreshlayout-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/083e041e9adfd8b0c12d4cc71f61b687/transformed/swiperefreshlayout-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/083e041e9adfd8b0c12d4cc71f61b687/transformed/swiperefreshlayout-28.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml
index 8b8d3bf..3b3d732 100644
--- a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml
@@ -4,8 +4,10 @@
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/882f32cb5c0fe42cb3a95594204714ac/espresso-core-2.2.2/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/3467a2a09f9920fa607f14c49202020e/transformed/espresso-core-2.2.2/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/9e75d5efc7d7ccd23998421cbf9d783b/transformed/espresso-core-2.2.2/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/9e75d5efc7d7ccd23998421cbf9d783b/transformed/espresso-core-2.2.2/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/9e75d5efc7d7ccd23998421cbf9d783b/transformed/espresso-core-2.2.2/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/7926960eb55461345b591c647b64817b/transformed/espresso-core-2.2.2/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/263cddb7b7714138c610b57072f87101/transformed/espresso-core-2.2.2/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/263cddb7b7714138c610b57072f87101/transformed/espresso-core-2.2.2/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/263cddb7b7714138c610b57072f87101/transformed/espresso-core-2.2.2/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml
index 69bdce6..5a183f9 100644
--- a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7212a59c1274725c320b564d60bbf332/espresso-core-3.0.2/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/fb685ab65f80134572dd290a822fca87/transformed/espresso-core-3.0.2/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b8b6ab4bf4a8a9a1a4d1c60178f4c82e/transformed/espresso-core-3.0.2/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b8b6ab4bf4a8a9a1a4d1c60178f4c82e/transformed/espresso-core-3.0.2/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/b8b6ab4bf4a8a9a1a4d1c60178f4c82e/transformed/espresso-core-3.0.2/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/280b9675db9220da9b46a00862875bef/transformed/espresso-core-3.0.2/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c55a43cb4f2be9315fa62013e51e2a01/transformed/espresso-core-3.0.2/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c55a43cb4f2be9315fa62013e51e2a01/transformed/espresso-core-3.0.2/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/c55a43cb4f2be9315fa62013e51e2a01/transformed/espresso-core-3.0.2/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2_aar.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2_aar.xml
index f89a62e..bd8bf9c 100644
--- a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0b61b82c1194157efa6579f8072a3799/espresso-idling-resource-2.2.2/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/4d5a4f4fda609ef68184286f9a7ef2d4/transformed/espresso-idling-resource-2.2.2/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/70685e1d88682503b58ee9cd43162998/transformed/espresso-idling-resource-2.2.2/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/70685e1d88682503b58ee9cd43162998/transformed/espresso-idling-resource-2.2.2/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/70685e1d88682503b58ee9cd43162998/transformed/espresso-idling-resource-2.2.2/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/61c44bab84a4a10e8bcf6762dd7de0ad/transformed/espresso-idling-resource-2.2.2/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/0aa7a8fa00447d2bf3fd3eda69faab2c/transformed/espresso-idling-resource-2.2.2/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/0aa7a8fa00447d2bf3fd3eda69faab2c/transformed/espresso-idling-resource-2.2.2/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/0aa7a8fa00447d2bf3fd3eda69faab2c/transformed/espresso-idling-resource-2.2.2/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml
index 4500134..62dd44c 100644
--- a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml
@@ -4,8 +4,10 @@
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cc0ee972a26cbb196b210a41cbb4cdb2/espresso-idling-resource-3.0.2/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/255727b43f2fdbab4d4c503374990227/transformed/espresso-idling-resource-3.0.2/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/f257f8bfbfa9981bc1d1c1f800ca2512/transformed/espresso-idling-resource-3.0.2/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/f257f8bfbfa9981bc1d1c1f800ca2512/transformed/espresso-idling-resource-3.0.2/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/f257f8bfbfa9981bc1d1c1f800ca2512/transformed/espresso-idling-resource-3.0.2/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e72c3084e5e5abc06a1f3f2f1974592d/transformed/espresso-idling-resource-3.0.2/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ab1874093eb637bf31493c80dd523e3d/transformed/espresso-idling-resource-3.0.2/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ab1874093eb637bf31493c80dd523e3d/transformed/espresso-idling-resource-3.0.2/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ab1874093eb637bf31493c80dd523e3d/transformed/espresso-idling-resource-3.0.2/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5_aar.xml b/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5_aar.xml
index 94b1908..92cfe7c 100644
--- a/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5_aar.xml
@@ -4,8 +4,10 @@
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/35cd66ca96906e8a383954b558e602b7/exposed-instrumentation-api-publish-0.5/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/7424f89b0673e5a7514bad2110965866/transformed/exposed-instrumentation-api-publish-0.5/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/ec78aeb367dd752f933bbae375463a36/transformed/exposed-instrumentation-api-publish-0.5/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ec78aeb367dd752f933bbae375463a36/transformed/exposed-instrumentation-api-publish-0.5/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ec78aeb367dd752f933bbae375463a36/transformed/exposed-instrumentation-api-publish-0.5/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/90e96ff09f78fb457156ded2de0c7b21/transformed/exposed-instrumentation-api-publish-0.5/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d2e55f54c59053bf0ccb87b5429c27ee/transformed/exposed-instrumentation-api-publish-0.5/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/d2e55f54c59053bf0ccb87b5429c27ee/transformed/exposed-instrumentation-api-publish-0.5/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d2e55f54c59053bf0ccb87b5429c27ee/transformed/exposed-instrumentation-api-publish-0.5/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml
index 8b725d7..3c06977 100644
--- a/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b906a897bc011a888300e60662c89f53/monitor-1.0.2/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/5ada80b3e7aa4c564b178bd2729f8a0c/transformed/monitor-1.0.2/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/2df5be13ad0ed01116353c74c6a0444f/transformed/monitor-1.0.2/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/2df5be13ad0ed01116353c74c6a0444f/transformed/monitor-1.0.2/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2df5be13ad0ed01116353c74c6a0444f/transformed/monitor-1.0.2/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/63bea56ee6f02502e69675d4da8dea04/transformed/monitor-1.0.2/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/da22ca32b60a4a7a6fd752b83d7aff21/transformed/monitor-1.0.2/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/da22ca32b60a4a7a6fd752b83d7aff21/transformed/monitor-1.0.2/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/da22ca32b60a4a7a6fd752b83d7aff21/transformed/monitor-1.0.2/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_test_rules_0_5_aar.xml b/.idea/libraries/Gradle__com_android_support_test_rules_0_5_aar.xml
index d84297c..b3357f0 100644
--- a/.idea/libraries/Gradle__com_android_support_test_rules_0_5_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_rules_0_5_aar.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="Gradle: com.android.support.test:rules:0.5@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/6620adb875e6104d7685a74c2de76627/transformed/rules-0.5/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/04450f5a4c179c76796a9dc35587b378/transformed/rules-0.5/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/6620adb875e6104d7685a74c2de76627/transformed/rules-0.5/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/6620adb875e6104d7685a74c2de76627/transformed/rules-0.5/AndroidManifest.xml" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/6620adb875e6104d7685a74c2de76627/transformed/rules-0.5/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/04450f5a4c179c76796a9dc35587b378/transformed/rules-0.5/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/04450f5a4c179c76796a9dc35587b378/transformed/rules-0.5/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/04450f5a4c179c76796a9dc35587b378/transformed/rules-0.5/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_test_runner_0_5_aar.xml b/.idea/libraries/Gradle__com_android_support_test_runner_0_5_aar.xml
index 2052db9..12f2313 100644
--- a/.idea/libraries/Gradle__com_android_support_test_runner_0_5_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_runner_0_5_aar.xml
@@ -1,14 +1,16 @@
<component name="libraryTable">
<library name="Gradle: com.android.support.test:runner:0.5@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/55284df9a96d7bb1d143f54a31cbe743/transformed/runner-0.5/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/737adf2c45162f707130e9f2eaa4d193/transformed/runner-0.5/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/549ede95b915811ff42181c4f3c808b9/runner-0.5/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/1421e6b55605b8d346f4d43adfb07dad/transformed/runner-0.5/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/55284df9a96d7bb1d143f54a31cbe743/transformed/runner-0.5/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/55284df9a96d7bb1d143f54a31cbe743/transformed/runner-0.5/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/55284df9a96d7bb1d143f54a31cbe743/transformed/runner-0.5/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/23d40e6601b8995da49104f17d092b47/transformed/runner-0.5/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/737adf2c45162f707130e9f2eaa4d193/transformed/runner-0.5/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/737adf2c45162f707130e9f2eaa4d193/transformed/runner-0.5/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/737adf2c45162f707130e9f2eaa4d193/transformed/runner-0.5/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml
index 5f2e3d8..f4c280b 100644
--- a/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8ed375459ac2d938fa4746c6fdaad28f/runner-1.0.2/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/0f3169bbf23bb5910ee5412402a39b6a/transformed/runner-1.0.2/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b51552d38dce496ca21124a63ab08a2f/transformed/runner-1.0.2/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/b51552d38dce496ca21124a63ab08a2f/transformed/runner-1.0.2/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b51552d38dce496ca21124a63ab08a2f/transformed/runner-1.0.2/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5e674e697710703f0fbbc2adcfeb0f10/transformed/runner-1.0.2/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b18127e7b3f8101f1449de287a91863b/transformed/runner-1.0.2/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b18127e7b3f8101f1449de287a91863b/transformed/runner-1.0.2/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b18127e7b3f8101f1449de287a91863b/transformed/runner-1.0.2/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml
index edd05ec..1c0c449 100644
--- a/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:transition:28.0.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/5dd2f923772c4f2463030b571ca3bf45/transformed/transition-28.0.0/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/088144ec2ea85f81abd876d0335f5329/transformed/transition-28.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5dd2f923772c4f2463030b571ca3bf45/transformed/transition-28.0.0/AndroidManifest.xml" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5dd2f923772c4f2463030b571ca3bf45/transformed/transition-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/5dd2f923772c4f2463030b571ca3bf45/transformed/transition-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/088144ec2ea85f81abd876d0335f5329/transformed/transition-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/088144ec2ea85f81abd876d0335f5329/transformed/transition-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/088144ec2ea85f81abd876d0335f5329/transformed/transition-28.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
index 1bb2b7f..b236b18 100644
--- a/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5055a8610d8c18d271af376ee6e30056/versionedparcelable-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/f72f2bc0016c83fe4b587b852d45d0c0/transformed/versionedparcelable-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5ebf141afb00d09fcbcacab20ef5e161/transformed/versionedparcelable-28.0.0/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/5ebf141afb00d09fcbcacab20ef5e161/transformed/versionedparcelable-28.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/5ebf141afb00d09fcbcacab20ef5e161/transformed/versionedparcelable-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/4468812ea75af3ee3c7046127e4c18e0/transformed/versionedparcelable-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/7f39690f60cd1aaaff5c484aef354903/transformed/versionedparcelable-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/7f39690f60cd1aaaff5c484aef354903/transformed/versionedparcelable-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/7f39690f60cd1aaaff5c484aef354903/transformed/versionedparcelable-28.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml
index 64a9f64..194cbf5 100644
--- a/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c3238a73b099cc2f23a65aa60617d746/viewpager-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/470b838fb3f5d61b43153ec13fe544a4/transformed/viewpager-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/abdb601812d99ba7a4aafc5c95569652/transformed/viewpager-28.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/abdb601812d99ba7a4aafc5c95569652/transformed/viewpager-28.0.0/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/abdb601812d99ba7a4aafc5c95569652/transformed/viewpager-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2131215f3009ed9b54cb65dab0ef67c1/transformed/viewpager-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b69878dc55ba09b02e0debf7b864e816/transformed/viewpager-28.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b69878dc55ba09b02e0debf7b864e816/transformed/viewpager-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b69878dc55ba09b02e0debf7b864e816/transformed/viewpager-28.0.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_bm_photoview_library_1_4_1_aar.xml b/.idea/libraries/Gradle__com_bm_photoview_library_1_4_1_aar.xml
index ab95d30..e002cf9 100644
--- a/.idea/libraries/Gradle__com_bm_photoview_library_1_4_1_aar.xml
+++ b/.idea/libraries/Gradle__com_bm_photoview_library_1_4_1_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/344918dc3dd99eb4677517c11390c932/library-1.4.1/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/0c5cfd47bfa42b79bbb72a6d75e1a741/transformed/library-1.4.1/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/31650650350cab988091fd20d8c0ba21/transformed/library-1.4.1/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/31650650350cab988091fd20d8c0ba21/transformed/library-1.4.1/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/31650650350cab988091fd20d8c0ba21/transformed/library-1.4.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/934f5c4c4c7eb0c009ac301946f602da/transformed/library-1.4.1/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/dadacb3ab083f926a4ee8845493d1986/transformed/library-1.4.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/dadacb3ab083f926a4ee8845493d1986/transformed/library-1.4.1/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/dadacb3ab083f926a4ee8845493d1986/transformed/library-1.4.1/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.bm.photoview/library/1.4.1/1443677c523f07ad6024e247cd54bdd2ad3b8235/library-1.4.1-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_github_CymChad_BaseRecyclerViewAdapterHelper_2_9_46_aar.xml b/.idea/libraries/Gradle__com_github_CymChad_BaseRecyclerViewAdapterHelper_2_9_46_aar.xml
index e7ae536..f604413 100644
--- a/.idea/libraries/Gradle__com_github_CymChad_BaseRecyclerViewAdapterHelper_2_9_46_aar.xml
+++ b/.idea/libraries/Gradle__com_github_CymChad_BaseRecyclerViewAdapterHelper_2_9_46_aar.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="Gradle: com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.46@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/9e9d3092d52e9fcf4d7170787c5a3aac/transformed/BaseRecyclerViewAdapterHelper-2.9.46/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/4359af1781cf8a43099b4634d244b8ca/transformed/BaseRecyclerViewAdapterHelper-2.9.46/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/9e9d3092d52e9fcf4d7170787c5a3aac/transformed/BaseRecyclerViewAdapterHelper-2.9.46/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/9e9d3092d52e9fcf4d7170787c5a3aac/transformed/BaseRecyclerViewAdapterHelper-2.9.46/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/9e9d3092d52e9fcf4d7170787c5a3aac/transformed/BaseRecyclerViewAdapterHelper-2.9.46/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/4359af1781cf8a43099b4634d244b8ca/transformed/BaseRecyclerViewAdapterHelper-2.9.46/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/4359af1781cf8a43099b4634d244b8ca/transformed/BaseRecyclerViewAdapterHelper-2.9.46/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/4359af1781cf8a43099b4634d244b8ca/transformed/BaseRecyclerViewAdapterHelper-2.9.46/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.CymChad/BaseRecyclerViewAdapterHelper/2.9.46/39d920bc306c1a2b22a9eaf0ab0e1ae0d78932f7/BaseRecyclerViewAdapterHelper-2.9.46-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_github_bumptech_glide_gifdecoder_4_9_0_aar.xml b/.idea/libraries/Gradle__com_github_bumptech_glide_gifdecoder_4_9_0_aar.xml
index c25e4ac..3d2b8bc 100644
--- a/.idea/libraries/Gradle__com_github_bumptech_glide_gifdecoder_4_9_0_aar.xml
+++ b/.idea/libraries/Gradle__com_github_bumptech_glide_gifdecoder_4_9_0_aar.xml
@@ -1,14 +1,16 @@
<component name="libraryTable">
<library name="Gradle: com.github.bumptech.glide:gifdecoder:4.9.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/21d60ef8e66e46ac0d1502eee830bcfa/transformed/gifdecoder-4.9.0/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/da9f11f146a9019416f449a7bfd59cad/transformed/gifdecoder-4.9.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a42e7fa664adb156e50b65885c2bc189/gifdecoder-4.9.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/15bc637a134c18a5d0cc9959c6843ecd/transformed/gifdecoder-4.9.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/21d60ef8e66e46ac0d1502eee830bcfa/transformed/gifdecoder-4.9.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/21d60ef8e66e46ac0d1502eee830bcfa/transformed/gifdecoder-4.9.0/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/21d60ef8e66e46ac0d1502eee830bcfa/transformed/gifdecoder-4.9.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/a6c3810b876df13e62e8bab97b4414ab/transformed/gifdecoder-4.9.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/da9f11f146a9019416f449a7bfd59cad/transformed/gifdecoder-4.9.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/da9f11f146a9019416f449a7bfd59cad/transformed/gifdecoder-4.9.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/da9f11f146a9019416f449a7bfd59cad/transformed/gifdecoder-4.9.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/gifdecoder/4.9.0/5a535e1ca9189de869e65c35ebf5f76b565e6c07/gifdecoder-4.9.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_github_bumptech_glide_glide_4_9_0_aar.xml b/.idea/libraries/Gradle__com_github_bumptech_glide_glide_4_9_0_aar.xml
index ab03ec0..3c8ca72 100644
--- a/.idea/libraries/Gradle__com_github_bumptech_glide_glide_4_9_0_aar.xml
+++ b/.idea/libraries/Gradle__com_github_bumptech_glide_glide_4_9_0_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: com.github.bumptech.glide:glide:4.9.0@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/628c441e9c3d1fea5e72a137e52e75d3/transformed/glide-4.9.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/628c441e9c3d1fea5e72a137e52e75d3/transformed/glide-4.9.0/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/628c441e9c3d1fea5e72a137e52e75d3/transformed/glide-4.9.0/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/246423fe5f75a8c662bfd40279bfd836/transformed/glide-4.9.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/246423fe5f75a8c662bfd40279bfd836/transformed/glide-4.9.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/246423fe5f75a8c662bfd40279bfd836/transformed/glide-4.9.0/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/glide/4.9.0/b53be1dd9e86c008d96d319510846282f95c49f/glide-4.9.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_github_cazaea_sweet_alert_dialog_1_0_0_aar.xml b/.idea/libraries/Gradle__com_github_cazaea_sweet_alert_dialog_1_0_0_aar.xml
index 74609fc..d7251c1 100644
--- a/.idea/libraries/Gradle__com_github_cazaea_sweet_alert_dialog_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_github_cazaea_sweet_alert_dialog_1_0_0_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: com.github.cazaea:sweet-alert-dialog:1.0.0@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/3b87fe3d4d7c4143cc05fcb0b463ab29/transformed/sweet-alert-dialog-1.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/3b87fe3d4d7c4143cc05fcb0b463ab29/transformed/sweet-alert-dialog-1.0.0/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/3b87fe3d4d7c4143cc05fcb0b463ab29/transformed/sweet-alert-dialog-1.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d6dc79cedaea51fc41879c70631c2a88/transformed/sweet-alert-dialog-1.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d6dc79cedaea51fc41879c70631c2a88/transformed/sweet-alert-dialog-1.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/d6dc79cedaea51fc41879c70631c2a88/transformed/sweet-alert-dialog-1.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.cazaea/sweet-alert-dialog/1.0.0/72c400c2dc8d649addb18112514b40148bbf0fa/sweet-alert-dialog-1.0.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_github_chrisbanes_PhotoView_2_1_4_aar.xml b/.idea/libraries/Gradle__com_github_chrisbanes_PhotoView_2_1_4_aar.xml
index 9389973..11ff530 100644
--- a/.idea/libraries/Gradle__com_github_chrisbanes_PhotoView_2_1_4_aar.xml
+++ b/.idea/libraries/Gradle__com_github_chrisbanes_PhotoView_2_1_4_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/39e2acb3c99bf2e370d4797ba7b22289/PhotoView-2.1.4/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/634faa410421b8b7c3c5dcaaaf34fada/transformed/PhotoView-2.1.4/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b2845b60570c514053d43a16c64915f3/transformed/PhotoView-2.1.4/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/b2845b60570c514053d43a16c64915f3/transformed/PhotoView-2.1.4/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b2845b60570c514053d43a16c64915f3/transformed/PhotoView-2.1.4/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/1006e390209a5c7d4ae3bf52ff1fdb26/transformed/PhotoView-2.1.4/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/9a8f5a3d59792f52eb4072b5e29ab7bb/transformed/PhotoView-2.1.4/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/9a8f5a3d59792f52eb4072b5e29ab7bb/transformed/PhotoView-2.1.4/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/9a8f5a3d59792f52eb4072b5e29ab7bb/transformed/PhotoView-2.1.4/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.chrisbanes/PhotoView/2.1.4/79245178a16570a2cf316758247e3d0f62a78a99/PhotoView-2.1.4-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_github_gzu_liyujiang_AndroidPicker_Common_1_5_6_20181018_aar.xml b/.idea/libraries/Gradle__com_github_gzu_liyujiang_AndroidPicker_Common_1_5_6_20181018_aar.xml
index 3dfde11..c7c46eb 100644
--- a/.idea/libraries/Gradle__com_github_gzu_liyujiang_AndroidPicker_Common_1_5_6_20181018_aar.xml
+++ b/.idea/libraries/Gradle__com_github_gzu_liyujiang_AndroidPicker_Common_1_5_6_20181018_aar.xml
@@ -1,14 +1,16 @@
<component name="libraryTable">
<library name="Gradle: com.github.gzu-liyujiang.AndroidPicker:Common:1.5.6.20181018@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/0379d93be49831df00ffa073831ca188/transformed/Common-1.5.6.20181018/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/4451f1af7f209a1bfbea64f5342c5238/transformed/Common-1.5.6.20181018/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7d3bb394491bf68112e1dd6189f00e08/Common-1.5.6.20181018/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/a4b06fdbe15be4c3d180b455880a2f19/transformed/Common-1.5.6.20181018/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/0379d93be49831df00ffa073831ca188/transformed/Common-1.5.6.20181018/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/0379d93be49831df00ffa073831ca188/transformed/Common-1.5.6.20181018/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/0379d93be49831df00ffa073831ca188/transformed/Common-1.5.6.20181018/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/9c8081478eb9c16778fcc090b3fd17db/transformed/Common-1.5.6.20181018/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/4451f1af7f209a1bfbea64f5342c5238/transformed/Common-1.5.6.20181018/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/4451f1af7f209a1bfbea64f5342c5238/transformed/Common-1.5.6.20181018/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/4451f1af7f209a1bfbea64f5342c5238/transformed/Common-1.5.6.20181018/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.gzu-liyujiang.AndroidPicker/Common/1.5.6.20181018/991715da4703a5165cf0a2d1de6c3ac5ae49e0aa/Common-1.5.6.20181018-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_github_gzu_liyujiang_AndroidPicker_WheelPicker_1_5_6_20181018_aar.xml b/.idea/libraries/Gradle__com_github_gzu_liyujiang_AndroidPicker_WheelPicker_1_5_6_20181018_aar.xml
index c4ffa00..3aa5210 100644
--- a/.idea/libraries/Gradle__com_github_gzu_liyujiang_AndroidPicker_WheelPicker_1_5_6_20181018_aar.xml
+++ b/.idea/libraries/Gradle__com_github_gzu_liyujiang_AndroidPicker_WheelPicker_1_5_6_20181018_aar.xml
@@ -1,14 +1,16 @@
<component name="libraryTable">
<library name="Gradle: com.github.gzu-liyujiang.AndroidPicker:WheelPicker:1.5.6.20181018@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/090bf49f305081f5eeb8686164f4660b/transformed/WheelPicker-1.5.6.20181018/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/c8c2aff5fb863267f2c902a49448ed81/transformed/WheelPicker-1.5.6.20181018/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b703219a2644e98bc1dc32b72e7dd04d/WheelPicker-1.5.6.20181018/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/ef5cf0eadb88cf5967945626fcd085a3/transformed/WheelPicker-1.5.6.20181018/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/090bf49f305081f5eeb8686164f4660b/transformed/WheelPicker-1.5.6.20181018/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/090bf49f305081f5eeb8686164f4660b/transformed/WheelPicker-1.5.6.20181018/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/090bf49f305081f5eeb8686164f4660b/transformed/WheelPicker-1.5.6.20181018/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/faa1c438826df4e239e6db27a1115002/transformed/WheelPicker-1.5.6.20181018/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c8c2aff5fb863267f2c902a49448ed81/transformed/WheelPicker-1.5.6.20181018/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c8c2aff5fb863267f2c902a49448ed81/transformed/WheelPicker-1.5.6.20181018/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/c8c2aff5fb863267f2c902a49448ed81/transformed/WheelPicker-1.5.6.20181018/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.gzu-liyujiang.AndroidPicker/WheelPicker/1.5.6.20181018/2d7aefc2207f4e1bab14b7fc5c5e8545c5db1796/WheelPicker-1.5.6.20181018-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_github_razerdp_BasePopup_2_1_8_aar.xml b/.idea/libraries/Gradle__com_github_razerdp_BasePopup_2_1_8_aar.xml
index b100651..2c2d9fa 100644
--- a/.idea/libraries/Gradle__com_github_razerdp_BasePopup_2_1_8_aar.xml
+++ b/.idea/libraries/Gradle__com_github_razerdp_BasePopup_2_1_8_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: com.github.razerdp:BasePopup:2.1.8@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/3c7e27656d9467513caf8392755f7095/transformed/BasePopup-2.1.8/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/3c7e27656d9467513caf8392755f7095/transformed/BasePopup-2.1.8/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/3c7e27656d9467513caf8392755f7095/transformed/BasePopup-2.1.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e0f1b5a9d643beee766cb241dd26ad80/transformed/BasePopup-2.1.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e0f1b5a9d643beee766cb241dd26ad80/transformed/BasePopup-2.1.8/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/e0f1b5a9d643beee766cb241dd26ad80/transformed/BasePopup-2.1.8/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.razerdp/BasePopup/2.1.8/f541ddeb201a633108b8280a3d33daca0114267c/BasePopup-2.1.8-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_haibin_calendarview_3_5_8_aar.xml b/.idea/libraries/Gradle__com_haibin_calendarview_3_5_8_aar.xml
index b172c78..4fd68f7 100644
--- a/.idea/libraries/Gradle__com_haibin_calendarview_3_5_8_aar.xml
+++ b/.idea/libraries/Gradle__com_haibin_calendarview_3_5_8_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: com.haibin:calendarview:3.5.8@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5cd3d54f17dbbe3a21e50235331ee6d0/transformed/calendarview-3.5.8/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/5cd3d54f17dbbe3a21e50235331ee6d0/transformed/calendarview-3.5.8/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5cd3d54f17dbbe3a21e50235331ee6d0/transformed/calendarview-3.5.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b546dd73eb7916f4dbe4d76c917b6f63/transformed/calendarview-3.5.8/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b546dd73eb7916f4dbe4d76c917b6f63/transformed/calendarview-3.5.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b546dd73eb7916f4dbe4d76c917b6f63/transformed/calendarview-3.5.8/AndroidManifest.xml" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.haibin/calendarview/3.5.8/807aff0291aafde92fa664e02f9a2183371d77a7/calendarview-3.5.8-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_jakewharton_butterknife_9_0_0_aar.xml b/.idea/libraries/Gradle__com_jakewharton_butterknife_9_0_0_aar.xml
index 87a07be..d68bb3d 100644
--- a/.idea/libraries/Gradle__com_jakewharton_butterknife_9_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_jakewharton_butterknife_9_0_0_aar.xml
@@ -4,8 +4,10 @@
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/99dfa8cc60e86385f2c6c1b6ee2347ca/butterknife-9.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/2a92a237be5667bc447a426e4e83784a/transformed/butterknife-9.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/f840029a5424444e58e2a3450ff7c5d0/transformed/butterknife-9.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/f840029a5424444e58e2a3450ff7c5d0/transformed/butterknife-9.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/f840029a5424444e58e2a3450ff7c5d0/transformed/butterknife-9.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/dc324516f2d4583a840b391c4cbe3008/transformed/butterknife-9.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/6298a85af639368df2c3ada872eaed78/transformed/butterknife-9.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/6298a85af639368df2c3ada872eaed78/transformed/butterknife-9.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/6298a85af639368df2c3ada872eaed78/transformed/butterknife-9.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife/9.0.0/905cc58569caf8a949f943d1ecd022ff8a401faa/butterknife-9.0.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_9_0_0_aar.xml b/.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_9_0_0_aar.xml
index 14825bb..f3678a6 100644
--- a/.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_9_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_9_0_0_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/76cf613c76451ed596a65892c4242a83/butterknife-runtime-9.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/c500a2c33a4a7714635be1ffd83ef865/transformed/butterknife-runtime-9.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/3c933b488a54e002914919e6bc88fc6d/transformed/butterknife-runtime-9.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/3c933b488a54e002914919e6bc88fc6d/transformed/butterknife-runtime-9.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/3c933b488a54e002914919e6bc88fc6d/transformed/butterknife-runtime-9.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/01ead41bcc85c6f79dccfefef8db552e/transformed/butterknife-runtime-9.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/212e93178af12543c9ccaac8d731bada/transformed/butterknife-runtime-9.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/212e93178af12543c9ccaac8d731bada/transformed/butterknife-runtime-9.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/212e93178af12543c9ccaac8d731bada/transformed/butterknife-runtime-9.0.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife-runtime/9.0.0/39ea68f6fcd783603c7d5dc36263aa191d5a84e5/butterknife-runtime-9.0.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_lcw_library_imagepicker_2_2_7_aar.xml b/.idea/libraries/Gradle__com_lcw_library_imagepicker_2_2_7_aar.xml
index 1b1c5fa..20093d0 100644
--- a/.idea/libraries/Gradle__com_lcw_library_imagepicker_2_2_7_aar.xml
+++ b/.idea/libraries/Gradle__com_lcw_library_imagepicker_2_2_7_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: com.lcw.library:imagepicker:2.2.7@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/22ac5632427f126061a1915eacd63f39/transformed/imagepicker-2.2.7/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/22ac5632427f126061a1915eacd63f39/transformed/imagepicker-2.2.7/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/22ac5632427f126061a1915eacd63f39/transformed/imagepicker-2.2.7/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2213af7a726d026107fd301002ab4024/transformed/imagepicker-2.2.7/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2213af7a726d026107fd301002ab4024/transformed/imagepicker-2.2.7/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/2213af7a726d026107fd301002ab4024/transformed/imagepicker-2.2.7/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.lcw.library/imagepicker/2.2.7/a45290c39e2abbb24d4e6b2572ee901d08f685d/imagepicker-2.2.7-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_liulishuo_okdownload_filedownloader_1_0_7_aar.xml b/.idea/libraries/Gradle__com_liulishuo_okdownload_filedownloader_1_0_7_aar.xml
index 1686ec8..4eeaef4 100644
--- a/.idea/libraries/Gradle__com_liulishuo_okdownload_filedownloader_1_0_7_aar.xml
+++ b/.idea/libraries/Gradle__com_liulishuo_okdownload_filedownloader_1_0_7_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc698ffa27cfff306bc4fa9593205d99/filedownloader-1.0.7/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/87fd533ea2b009aac48f6746a72be8bb/transformed/filedownloader-1.0.7/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ff6d3747b02e47940af298aff37824ff/transformed/filedownloader-1.0.7/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ff6d3747b02e47940af298aff37824ff/transformed/filedownloader-1.0.7/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/ff6d3747b02e47940af298aff37824ff/transformed/filedownloader-1.0.7/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ba6d295a2fa37806a695489b38beaf4b/transformed/filedownloader-1.0.7/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5b45b8486a264e32f0a9c7211938809d/transformed/filedownloader-1.0.7/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/5b45b8486a264e32f0a9c7211938809d/transformed/filedownloader-1.0.7/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5b45b8486a264e32f0a9c7211938809d/transformed/filedownloader-1.0.7/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.liulishuo.okdownload/filedownloader/1.0.7/e8bdbcd1676cb3c183cb14a899027e0111e2e2b0/filedownloader-1.0.7-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_liulishuo_okdownload_ktx_1_0_7_aar.xml b/.idea/libraries/Gradle__com_liulishuo_okdownload_ktx_1_0_7_aar.xml
index 375a54e..c015b28 100644
--- a/.idea/libraries/Gradle__com_liulishuo_okdownload_ktx_1_0_7_aar.xml
+++ b/.idea/libraries/Gradle__com_liulishuo_okdownload_ktx_1_0_7_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b18a8c91e0e59e24fef3e0a2086651f7/ktx-1.0.7/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/576d291e9ca56efd21c2ec711644a90d/transformed/ktx-1.0.7/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/761f7ff292629d2c97c276e782e2c02e/transformed/ktx-1.0.7/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/761f7ff292629d2c97c276e782e2c02e/transformed/ktx-1.0.7/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/761f7ff292629d2c97c276e782e2c02e/transformed/ktx-1.0.7/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/46db5f21d4256e1630baa8cea3e4d3cc/transformed/ktx-1.0.7/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/9559709f21bbcc7c5f16716ec85947f3/transformed/ktx-1.0.7/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/9559709f21bbcc7c5f16716ec85947f3/transformed/ktx-1.0.7/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/9559709f21bbcc7c5f16716ec85947f3/transformed/ktx-1.0.7/AndroidManifest.xml" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.liulishuo.okdownload/ktx/1.0.7/b851247f10eb4a9adfbc062d7c62f6448b196629/ktx-1.0.7-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_liulishuo_okdownload_okdownload_1_0_7_aar.xml b/.idea/libraries/Gradle__com_liulishuo_okdownload_okdownload_1_0_7_aar.xml
index 10ec76e..db56d15 100644
--- a/.idea/libraries/Gradle__com_liulishuo_okdownload_okdownload_1_0_7_aar.xml
+++ b/.idea/libraries/Gradle__com_liulishuo_okdownload_okdownload_1_0_7_aar.xml
@@ -4,8 +4,10 @@
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7fed2534cc6b6b9f2e91f6fcbec67c7c/okdownload-1.0.7/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/577292347259320f558d159ecaccff40/transformed/okdownload-1.0.7/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/f4fba7476e041db31790e0039423f6f4/transformed/okdownload-1.0.7/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/f4fba7476e041db31790e0039423f6f4/transformed/okdownload-1.0.7/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/f4fba7476e041db31790e0039423f6f4/transformed/okdownload-1.0.7/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/f165449f691dfd004c99296a88ad73b5/transformed/okdownload-1.0.7/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c6a1e88516a7b95d9b6ee50376ce7cf7/transformed/okdownload-1.0.7/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/c6a1e88516a7b95d9b6ee50376ce7cf7/transformed/okdownload-1.0.7/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c6a1e88516a7b95d9b6ee50376ce7cf7/transformed/okdownload-1.0.7/AndroidManifest.xml" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.liulishuo.okdownload/okdownload/1.0.7/95b2ee357b77cfb046b5f0727aa673c625b2eff7/okdownload-1.0.7-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_liulishuo_okdownload_okhttp_1_0_7_aar.xml b/.idea/libraries/Gradle__com_liulishuo_okdownload_okhttp_1_0_7_aar.xml
index 690b116..16d8d58 100644
--- a/.idea/libraries/Gradle__com_liulishuo_okdownload_okhttp_1_0_7_aar.xml
+++ b/.idea/libraries/Gradle__com_liulishuo_okdownload_okhttp_1_0_7_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0f536f4e5c0ae54a7d52598849fccd88/okhttp-1.0.7/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/af046c0a33f42fa34b5790aa7118457e/transformed/okhttp-1.0.7/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/3ce34f67ce3f5e9c963503ec068b0b55/transformed/okhttp-1.0.7/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/3ce34f67ce3f5e9c963503ec068b0b55/transformed/okhttp-1.0.7/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/3ce34f67ce3f5e9c963503ec068b0b55/transformed/okhttp-1.0.7/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/27069bca3fb1f5b3e5dc06319a343e35/transformed/okhttp-1.0.7/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/04d691e29471db4628f31c21dfa11f7f/transformed/okhttp-1.0.7/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/04d691e29471db4628f31c21dfa11f7f/transformed/okhttp-1.0.7/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/04d691e29471db4628f31c21dfa11f7f/transformed/okhttp-1.0.7/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.liulishuo.okdownload/okhttp/1.0.7/1159a0b702fd02294eeecfb81d71557448402684/okhttp-1.0.7-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_liulishuo_okdownload_sqlite_1_0_7_aar.xml b/.idea/libraries/Gradle__com_liulishuo_okdownload_sqlite_1_0_7_aar.xml
index 6fc8b6a..5c81629 100644
--- a/.idea/libraries/Gradle__com_liulishuo_okdownload_sqlite_1_0_7_aar.xml
+++ b/.idea/libraries/Gradle__com_liulishuo_okdownload_sqlite_1_0_7_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ab674b8bcaea1137b5f5a6409730ef21/sqlite-1.0.7/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/b2b62e10ddadeef47280cf4c57e3356e/transformed/sqlite-1.0.7/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/939ba57e6a1bf6c6ad7eadcc6b4b1359/transformed/sqlite-1.0.7/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/939ba57e6a1bf6c6ad7eadcc6b4b1359/transformed/sqlite-1.0.7/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/939ba57e6a1bf6c6ad7eadcc6b4b1359/transformed/sqlite-1.0.7/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/1eebbf22b883614fd36684c9be1c3416/transformed/sqlite-1.0.7/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/8bcbe4c5f20827c77f9efbc367eb3cf2/transformed/sqlite-1.0.7/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/8bcbe4c5f20827c77f9efbc367eb3cf2/transformed/sqlite-1.0.7/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/8bcbe4c5f20827c77f9efbc367eb3cf2/transformed/sqlite-1.0.7/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.liulishuo.okdownload/sqlite/1.0.7/8d34be4d58c1a13c41237b0a5ed8895ca4585da0/sqlite-1.0.7-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_mikhaellopez_circularprogressbar_3_0_3_aar.xml b/.idea/libraries/Gradle__com_mikhaellopez_circularprogressbar_3_0_3_aar.xml
index dbcd1dd..0f0142d 100644
--- a/.idea/libraries/Gradle__com_mikhaellopez_circularprogressbar_3_0_3_aar.xml
+++ b/.idea/libraries/Gradle__com_mikhaellopez_circularprogressbar_3_0_3_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: com.mikhaellopez:circularprogressbar:3.0.3@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/50b26e201bb95b157802fe6e51b69df8/transformed/circularprogressbar-3.0.3/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/50b26e201bb95b157802fe6e51b69df8/transformed/circularprogressbar-3.0.3/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/50b26e201bb95b157802fe6e51b69df8/transformed/circularprogressbar-3.0.3/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/bd5266ddeed41116ccbaa56209443cc3/transformed/circularprogressbar-3.0.3/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/bd5266ddeed41116ccbaa56209443cc3/transformed/circularprogressbar-3.0.3/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/bd5266ddeed41116ccbaa56209443cc3/transformed/circularprogressbar-3.0.3/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_orhanobut_dialogplus_1_11_aar.xml b/.idea/libraries/Gradle__com_orhanobut_dialogplus_1_11_aar.xml
index e7c18b9..d3dd1f2 100644
--- a/.idea/libraries/Gradle__com_orhanobut_dialogplus_1_11_aar.xml
+++ b/.idea/libraries/Gradle__com_orhanobut_dialogplus_1_11_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: com.orhanobut:dialogplus:1.11@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/11d751c10183a969aed3c73f686402bd/transformed/dialogplus-1.11/AndroidManifest.xml" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/11d751c10183a969aed3c73f686402bd/transformed/dialogplus-1.11/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/11d751c10183a969aed3c73f686402bd/transformed/dialogplus-1.11/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/574f8c018828ec50def97f802cb1c832/transformed/dialogplus-1.11/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/574f8c018828ec50def97f802cb1c832/transformed/dialogplus-1.11/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/574f8c018828ec50def97f802cb1c832/transformed/dialogplus-1.11/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.orhanobut/dialogplus/1.11/56e6feff7f932fdd9308821b59da17d3987bec3/dialogplus-1.11-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_otaliastudios_cameraview_1_6_1_aar.xml b/.idea/libraries/Gradle__com_otaliastudios_cameraview_1_6_1_aar.xml
index aead77d..8ad2a1e 100644
--- a/.idea/libraries/Gradle__com_otaliastudios_cameraview_1_6_1_aar.xml
+++ b/.idea/libraries/Gradle__com_otaliastudios_cameraview_1_6_1_aar.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="Gradle: com.otaliastudios:cameraview:1.6.1@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/82df51e642828049cbd9f8f7f53bcbf8/transformed/cameraview-1.6.1/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/9ce3fb2b321bb05b036a1552666e3214/transformed/cameraview-1.6.1/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/82df51e642828049cbd9f8f7f53bcbf8/transformed/cameraview-1.6.1/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/82df51e642828049cbd9f8f7f53bcbf8/transformed/cameraview-1.6.1/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/82df51e642828049cbd9f8f7f53bcbf8/transformed/cameraview-1.6.1/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/9ce3fb2b321bb05b036a1552666e3214/transformed/cameraview-1.6.1/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/9ce3fb2b321bb05b036a1552666e3214/transformed/cameraview-1.6.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/9ce3fb2b321bb05b036a1552666e3214/transformed/cameraview-1.6.1/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.otaliastudios/cameraview/1.6.1/efad8342aae95ea8c4da59cd8ab05801ec631cfd/cameraview-1.6.1-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml b/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml
index 439c741..7365068 100644
--- a/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml
+++ b/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d82657aef97067ce375c2bf61a048685/picasso-2.71828/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/38b2538fd1ffe882218216167a6217fb/transformed/picasso-2.71828/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/8f1c0069b310d5ac9432cec55514a0c3/transformed/picasso-2.71828/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/8f1c0069b310d5ac9432cec55514a0c3/transformed/picasso-2.71828/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/8f1c0069b310d5ac9432cec55514a0c3/transformed/picasso-2.71828/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/327e3b2974594e1eedff348dc45d14bf/transformed/picasso-2.71828/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/83527acbb9b963df81e4647a82ca165b/transformed/picasso-2.71828/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/83527acbb9b963df81e4647a82ca165b/transformed/picasso-2.71828/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/83527acbb9b963df81e4647a82ca165b/transformed/picasso-2.71828/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.picasso/picasso/2.71828/2843564e6bac90b1e125104d7c842c87a96a8ee9/picasso-2.71828-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__de_hdodenhof_circleimageview_2_2_0_aar.xml b/.idea/libraries/Gradle__de_hdodenhof_circleimageview_2_2_0_aar.xml
index a8ba808..423f134 100644
--- a/.idea/libraries/Gradle__de_hdodenhof_circleimageview_2_2_0_aar.xml
+++ b/.idea/libraries/Gradle__de_hdodenhof_circleimageview_2_2_0_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: de.hdodenhof:circleimageview:2.2.0@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2e5a2eb4ce8d3641da9d1ce8add12e3a/transformed/circleimageview-2.2.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2e5a2eb4ce8d3641da9d1ce8add12e3a/transformed/circleimageview-2.2.0/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/2e5a2eb4ce8d3641da9d1ce8add12e3a/transformed/circleimageview-2.2.0/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/bbcf421d042e1e487f7208440bbcbc6c/transformed/circleimageview-2.2.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/bbcf421d042e1e487f7208440bbcbc6c/transformed/circleimageview-2.2.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/bbcf421d042e1e487f7208440bbcbc6c/transformed/circleimageview-2.2.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/de.hdodenhof/circleimageview/2.2.0/5c68ac4974e0c1cf827ec184dda9ea2523f74347/circleimageview-2.2.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_1_1_aar.xml b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_1_1_aar.xml
index c50de1a..eaddaae 100644
--- a/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_1_1_aar.xml
+++ b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_1_1_aar.xml
@@ -4,8 +4,10 @@
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/71f415848bc775ea1dd2468a7a88130c/rxandroid-2.1.1/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/6af95461822020b052a845ddd21667b3/transformed/rxandroid-2.1.1/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/363d0b1958be66d858d3cb97a84bedbf/transformed/rxandroid-2.1.1/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/363d0b1958be66d858d3cb97a84bedbf/transformed/rxandroid-2.1.1/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/363d0b1958be66d858d3cb97a84bedbf/transformed/rxandroid-2.1.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e890935f49bbc80a99569bd416934624/transformed/rxandroid-2.1.1/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/d3144e8f1630f97dac24ce0c635164e5/transformed/rxandroid-2.1.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d3144e8f1630f97dac24ce0c635164e5/transformed/rxandroid-2.1.1/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d3144e8f1630f97dac24ce0c635164e5/transformed/rxandroid-2.1.1/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex.rxjava2/rxandroid/2.1.1/634c77382eff415441853908e7e1429c786f6320/rxandroid-2.1.1-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_0_10_8_aar.xml
index 48aa7e8..d853677 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_0_10_8_aar.xml
@@ -4,8 +4,10 @@
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d1b998faff9a565b73514325b2f711e3/anko-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/2877f687fe9e0cb3617e7b2702d02131/transformed/anko-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/8b6626463cc4b052c1fdaf87cc4e9bae/transformed/anko-0.10.8/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/8b6626463cc4b052c1fdaf87cc4e9bae/transformed/anko-0.10.8/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/8b6626463cc4b052c1fdaf87cc4e9bae/transformed/anko-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/a0e0466bbf192e6cd6eaf5cc981a9e98/transformed/anko-0.10.8/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/9d732e93f0c21a4551a82a7bb6c4bf3b/transformed/anko-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/9d732e93f0c21a4551a82a7bb6c4bf3b/transformed/anko-0.10.8/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/9d732e93f0c21a4551a82a7bb6c4bf3b/transformed/anko-0.10.8/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_0_10_8_aar.xml
index d327a39..3ddc79f 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_0_10_8_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6d59222d2c00d6351318cbf13135aab4/anko-appcompat-v7-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/acc3a7bd9b754c4077d54cadb9db1913/transformed/anko-appcompat-v7-0.10.8/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/db58113964f8aae071af4e4ba10b3e05/transformed/anko-appcompat-v7-0.10.8/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/db58113964f8aae071af4e4ba10b3e05/transformed/anko-appcompat-v7-0.10.8/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/db58113964f8aae071af4e4ba10b3e05/transformed/anko-appcompat-v7-0.10.8/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e87b56cdcc688835d8f6d97d3f47b5ad/transformed/anko-appcompat-v7-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2b0da7645713fe5ba598a33208d3c0ac/transformed/anko-appcompat-v7-0.10.8/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/2b0da7645713fe5ba598a33208d3c0ac/transformed/anko-appcompat-v7-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2b0da7645713fe5ba598a33208d3c0ac/transformed/anko-appcompat-v7-0.10.8/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_commons_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_commons_0_10_8_aar.xml
index 98dc262..d6627df 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_commons_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_commons_0_10_8_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/611301734d9108b6972b1c6cab05f2e5/anko-appcompat-v7-commons-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/458d3f0fbba7f46ce869eb56c76d78f5/transformed/anko-appcompat-v7-commons-0.10.8/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/a4c59e3f97e37e24ebb0ff01ab3ac69d/transformed/anko-appcompat-v7-commons-0.10.8/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/a4c59e3f97e37e24ebb0ff01ab3ac69d/transformed/anko-appcompat-v7-commons-0.10.8/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/a4c59e3f97e37e24ebb0ff01ab3ac69d/transformed/anko-appcompat-v7-commons-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e79978080834a498aafc384f2699b470/transformed/anko-appcompat-v7-commons-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/595bffc051e299ebca36f05c4d70d1e9/transformed/anko-appcompat-v7-commons-0.10.8/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/595bffc051e299ebca36f05c4d70d1e9/transformed/anko-appcompat-v7-commons-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/595bffc051e299ebca36f05c4d70d1e9/transformed/anko-appcompat-v7-commons-0.10.8/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_coroutines_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_coroutines_0_10_8_aar.xml
index e4e9444..d7351e9 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_coroutines_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_coroutines_0_10_8_aar.xml
@@ -4,8 +4,10 @@
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/483c9d3d9c865b5e94db32b69d20986f/anko-appcompat-v7-coroutines-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/d10c288b6202ada1aa4057dd850cc010/transformed/anko-appcompat-v7-coroutines-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/df252b77fab8302f6683dbd52f545234/transformed/anko-appcompat-v7-coroutines-0.10.8/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/df252b77fab8302f6683dbd52f545234/transformed/anko-appcompat-v7-coroutines-0.10.8/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/df252b77fab8302f6683dbd52f545234/transformed/anko-appcompat-v7-coroutines-0.10.8/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/3b994afeb2d6b378a3605714f6e9c61c/transformed/anko-appcompat-v7-coroutines-0.10.8/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/91fc04a906ab94c4e1d2649454dbe18a/transformed/anko-appcompat-v7-coroutines-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/91fc04a906ab94c4e1d2649454dbe18a/transformed/anko-appcompat-v7-coroutines-0.10.8/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/91fc04a906ab94c4e1d2649454dbe18a/transformed/anko-appcompat-v7-coroutines-0.10.8/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_commons_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_commons_0_10_8_aar.xml
index a0d7c9d..4654b01 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_commons_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_commons_0_10_8_aar.xml
@@ -4,8 +4,10 @@
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a9fee3b4a9eb4ab8e4662fdc3b9c9b87/anko-commons-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/ae677cd708c0c8c8ae339d506b036d37/transformed/anko-commons-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/8b4dc4a44e125281f5225458fbd9a014/transformed/anko-commons-0.10.8/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/8b4dc4a44e125281f5225458fbd9a014/transformed/anko-commons-0.10.8/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/8b4dc4a44e125281f5225458fbd9a014/transformed/anko-commons-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/a37bbc72861259bcd87073b4f775ff37/transformed/anko-commons-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/623bdf8339a98a8843498a9ba8bb3fb5/transformed/anko-commons-0.10.8/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/623bdf8339a98a8843498a9ba8bb3fb5/transformed/anko-commons-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/623bdf8339a98a8843498a9ba8bb3fb5/transformed/anko-commons-0.10.8/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_coroutines_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_coroutines_0_10_8_aar.xml
index 8a92e27..a2b96d2 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_coroutines_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_coroutines_0_10_8_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/37592c687aa237f8f9fe22da0a0d80dc/anko-coroutines-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/bcd8739fba412370af6a80ca33b79ec3/transformed/anko-coroutines-0.10.8/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/2f70e400098068ecc840cc70780bc525/transformed/anko-coroutines-0.10.8/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2f70e400098068ecc840cc70780bc525/transformed/anko-coroutines-0.10.8/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/2f70e400098068ecc840cc70780bc525/transformed/anko-coroutines-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/dca90f1e68e86321d8c0bc793aff65fa/transformed/anko-coroutines-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/cf59edb98d4e2136f82250f6fb9c4dfe/transformed/anko-coroutines-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/cf59edb98d4e2136f82250f6fb9c4dfe/transformed/anko-coroutines-0.10.8/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/cf59edb98d4e2136f82250f6fb9c4dfe/transformed/anko-coroutines-0.10.8/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_0_10_8_aar.xml
index 1f2dbfc..459690c 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_0_10_8_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/10c59ec38127e89f14e98bedf4b111d1/anko-sdk27-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/a7deacfb81be9e633d405695d0cab9ab/transformed/anko-sdk27-0.10.8/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b45f1bd20f286b9f30df79b0cb1a0a08/transformed/anko-sdk27-0.10.8/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b45f1bd20f286b9f30df79b0cb1a0a08/transformed/anko-sdk27-0.10.8/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/b45f1bd20f286b9f30df79b0cb1a0a08/transformed/anko-sdk27-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/89a9996c01fbef235584782967d41e36/transformed/anko-sdk27-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/db1b32f7fd674bd989f582bc66a22c68/transformed/anko-sdk27-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/db1b32f7fd674bd989f582bc66a22c68/transformed/anko-sdk27-0.10.8/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/db1b32f7fd674bd989f582bc66a22c68/transformed/anko-sdk27-0.10.8/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_coroutines_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_coroutines_0_10_8_aar.xml
index ce9182c..2316236 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_coroutines_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_coroutines_0_10_8_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ca0a5c7cdd7cd1b0787ab9986293cad0/anko-sdk27-coroutines-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/37f8b03d9576bfc5a3622c43f991b5b1/transformed/anko-sdk27-coroutines-0.10.8/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/6ac8dc2fd5a075012a25b8f02450280b/transformed/anko-sdk27-coroutines-0.10.8/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/6ac8dc2fd5a075012a25b8f02450280b/transformed/anko-sdk27-coroutines-0.10.8/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/6ac8dc2fd5a075012a25b8f02450280b/transformed/anko-sdk27-coroutines-0.10.8/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/9086682b728042cc064c3d43a83ababd/transformed/anko-sdk27-coroutines-0.10.8/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/39e64058391aa24a40c8627bb9d9c259/transformed/anko-sdk27-coroutines-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/39e64058391aa24a40c8627bb9d9c259/transformed/anko-sdk27-coroutines-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/39e64058391aa24a40c8627bb9d9c259/transformed/anko-sdk27-coroutines-0.10.8/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_sqlite_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_sqlite_0_10_8_aar.xml
index 7c325f6..89aed84 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_sqlite_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_sqlite_0_10_8_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/277be98df7376e47830b3c63f1309727/anko-sqlite-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/e32bfd9c3be93d27121b189d229ac281/transformed/anko-sqlite-0.10.8/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/3d8255ba581822d779c89f48ce29bcf5/transformed/anko-sqlite-0.10.8/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/3d8255ba581822d779c89f48ce29bcf5/transformed/anko-sqlite-0.10.8/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/3d8255ba581822d779c89f48ce29bcf5/transformed/anko-sqlite-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c05876f4c0cd6b0d27f5af4e18ced36c/transformed/anko-sqlite-0.10.8/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/fe956e956f1adb4f2a83c7cf9cb5e3f8/transformed/anko-sqlite-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/fe956e956f1adb4f2a83c7cf9cb5e3f8/transformed/anko-sqlite-0.10.8/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/fe956e956f1adb4f2a83c7cf9cb5e3f8/transformed/anko-sqlite-0.10.8/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_0_10_8_aar.xml
index 718cc25..893f156 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_0_10_8_aar.xml
@@ -4,8 +4,10 @@
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e638b8911f58df453497a665afdb16c3/anko-support-v4-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/cc8ffdf4f6130ce12f952b1ac9b3552e/transformed/anko-support-v4-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/e896d7275b78bb2464cb3ee843bd2783/transformed/anko-support-v4-0.10.8/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/e896d7275b78bb2464cb3ee843bd2783/transformed/anko-support-v4-0.10.8/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e896d7275b78bb2464cb3ee843bd2783/transformed/anko-support-v4-0.10.8/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/9c51703abdb13a5ae9ebb61f948facf0/transformed/anko-support-v4-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/94f463fe5aeed6ec74a6d2eea9e7149c/transformed/anko-support-v4-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/94f463fe5aeed6ec74a6d2eea9e7149c/transformed/anko-support-v4-0.10.8/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/94f463fe5aeed6ec74a6d2eea9e7149c/transformed/anko-support-v4-0.10.8/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_commons_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_commons_0_10_8_aar.xml
index 062f9c9..49cdc58 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_commons_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_commons_0_10_8_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1ee51b0e2b7849768d5bef54763d1769/anko-support-v4-commons-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/98a5a26bb13ef7a4c3f19b5719d7bf42/transformed/anko-support-v4-commons-0.10.8/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/dddf6ecfae36c3d72727b06a910880f5/transformed/anko-support-v4-commons-0.10.8/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/dddf6ecfae36c3d72727b06a910880f5/transformed/anko-support-v4-commons-0.10.8/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/dddf6ecfae36c3d72727b06a910880f5/transformed/anko-support-v4-commons-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/060cfe688a2707243a6d90abdc54ca88/transformed/anko-support-v4-commons-0.10.8/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ea649935100fbf8071f8381df84c09bf/transformed/anko-support-v4-commons-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ea649935100fbf8071f8381df84c09bf/transformed/anko-support-v4-commons-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ea649935100fbf8071f8381df84c09bf/transformed/anko-support-v4-commons-0.10.8/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_appcompatV7_base_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_appcompatV7_base_0_10_8_aar.xml
index 557aa5f..58f51e9 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_appcompatV7_base_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_appcompatV7_base_0_10_8_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cfd59b2b993035c5588bd8d1bc371382/appcompatV7-base-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/14fbdec2cf602f8b6ea4bceee6357c1e/transformed/appcompatV7-base-0.10.8/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ade1b4c385117725a999e0ca571c2f59/transformed/appcompatV7-base-0.10.8/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ade1b4c385117725a999e0ca571c2f59/transformed/appcompatV7-base-0.10.8/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/ade1b4c385117725a999e0ca571c2f59/transformed/appcompatV7-base-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/6c124b866c7d1ea5cc7dce2eca0d3948/transformed/appcompatV7-base-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5c76bf81be1bb06d28d7354cb9d50819/transformed/appcompatV7-base-0.10.8/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5c76bf81be1bb06d28d7354cb9d50819/transformed/appcompatV7-base-0.10.8/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/5c76bf81be1bb06d28d7354cb9d50819/transformed/appcompatV7-base-0.10.8/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_commons_base_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_commons_base_0_10_8_aar.xml
index 8b5b174..29c3f93 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_commons_base_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_commons_base_0_10_8_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a7f95eebb8fa36bd9da40a39a4e09560/commons-base-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/fd7cdd1fd38e386d670a9c49bcea3a7c/transformed/commons-base-0.10.8/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/e663b03c10e219bd4a3e20b6d0e90241/transformed/commons-base-0.10.8/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e663b03c10e219bd4a3e20b6d0e90241/transformed/commons-base-0.10.8/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/e663b03c10e219bd4a3e20b6d0e90241/transformed/commons-base-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2630a54e83eefa84ba22387b54fda197/transformed/commons-base-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/541861057d47d8b4a3b76e94be2d59dd/transformed/commons-base-0.10.8/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/541861057d47d8b4a3b76e94be2d59dd/transformed/commons-base-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/541861057d47d8b4a3b76e94be2d59dd/transformed/commons-base-0.10.8/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_platform_base_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_platform_base_0_10_8_aar.xml
index 550c3b8..60e9c88 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_platform_base_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_platform_base_0_10_8_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/75c7188d7e599d9bbd40874405e1304e/platform-base-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/508bb90d5ca2a494b83213bf6b6a59a1/transformed/platform-base-0.10.8/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c519796eb46b6177d517d865ccc9e11f/transformed/platform-base-0.10.8/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/c519796eb46b6177d517d865ccc9e11f/transformed/platform-base-0.10.8/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/c519796eb46b6177d517d865ccc9e11f/transformed/platform-base-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b8e8531eb9cd1bebafe45e0c4bbf88cc/transformed/platform-base-0.10.8/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/43f838245e7f399e213707f74838c2fb/transformed/platform-base-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/43f838245e7f399e213707f74838c2fb/transformed/platform-base-0.10.8/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/43f838245e7f399e213707f74838c2fb/transformed/platform-base-0.10.8/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_sqlite_base_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_sqlite_base_0_10_8_aar.xml
index 3425539..9a51844 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_sqlite_base_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_sqlite_base_0_10_8_aar.xml
@@ -3,9 +3,11 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/368cfb9ed90e14e74a3d9407d59f49e9/sqlite-base-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/6551a2ab2b4f39fc1ab2363861199773/transformed/sqlite-base-0.10.8/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/cd9d062b5da914892876c43c1bca4a70/transformed/sqlite-base-0.10.8/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/cd9d062b5da914892876c43c1bca4a70/transformed/sqlite-base-0.10.8/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/cd9d062b5da914892876c43c1bca4a70/transformed/sqlite-base-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/dc893febaa4b8adec2a67dec3ae1d397/transformed/sqlite-base-0.10.8/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/30b593a70959890f1a8b0db7d60385dc/transformed/sqlite-base-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/30b593a70959890f1a8b0db7d60385dc/transformed/sqlite-base-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/30b593a70959890f1a8b0db7d60385dc/transformed/sqlite-base-0.10.8/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_supportV4_base_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_supportV4_base_0_10_8_aar.xml
index 7ac37ec..0596ea6 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_supportV4_base_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_supportV4_base_0_10_8_aar.xml
@@ -4,8 +4,10 @@
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/22bad94d5c91dcad379d703cfc88354f/supportV4-base-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/5b7bb738ea789e260a50ff1071897701/transformed/supportV4-base-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/8c4e0079c1c1ef986314e5c6fc203384/transformed/supportV4-base-0.10.8/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/8c4e0079c1c1ef986314e5c6fc203384/transformed/supportV4-base-0.10.8/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/8c4e0079c1c1ef986314e5c6fc203384/transformed/supportV4-base-0.10.8/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/1e90105fd2605f2be22199685e557eb2/transformed/supportV4-base-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/23ef6d20ac7d282ddb692c55d32a0e09/transformed/supportV4-base-0.10.8/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/23ef6d20ac7d282ddb692c55d32a0e09/transformed/supportV4-base-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/23ef6d20ac7d282ddb692c55d32a0e09/transformed/supportV4-base-0.10.8/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_72.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_72.xml
deleted file mode 100644
index 7929d63..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_72.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.3.72">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-android-extensions-runtime/1.3.72/83423235971335be77d2ea025008bc9959738ffc/kotlin-android-extensions-runtime-1.3.72.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-android-extensions-runtime/1.3.72/f3399b71a83521b6a2d366daaf5dc11184518ff6/kotlin-android-extensions-runtime-1.3.72-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-android-extensions-runtime/1.3.72/46492b02491d9b3fbe80dd89f4921a7e4aacd2ec/kotlin-android-extensions-runtime-1.3.72-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_72.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_72.xml
deleted file mode 100644
index cd57d89..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_72.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.72">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/b1d2ee58cf8c842c5143315cff20019a6173378d/kotlin-stdlib-1.3.72-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/28f81264fad20dd20cc692003f4a27d355632073/kotlin-stdlib-1.3.72-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_72.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_72.xml
deleted file mode 100644
index c769fec..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_72.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72" type="kotlin.common">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/b1d2ee58cf8c842c5143315cff20019a6173378d/kotlin-stdlib-common-1.3.72-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/8c35588215bc56f828c189e9edc37ee51672cf5c/kotlin-stdlib-common-1.3.72-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5a0a38f..578d4e4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -101,6 +101,7 @@
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_day_task_progress.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_evalution_grade.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_gradelist_2.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_image_chose.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_image_display.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_movlist.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_night_work.xml" value="0.3338541666666667" />
@@ -120,20 +121,24 @@
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_scene_task.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_scense_detail_list.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_selector_head.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_simple_radio.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_single_text.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_spinner_area.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_spinner_area_custom.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_spinner_drop_down.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_spinner_drop_down_custom.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_spinner_simple_text.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_square_photo.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_take_photo.xml" value="0.33" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_task_list_2.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_task_list_head.xml" value="0.27239583333333334" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_task_progress.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_task_progress_2.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_today_task.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_topclass_task.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_town_rank.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/layout_actionbar.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/layout_button_back.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/layout_empty_load_more.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/layout_empty_view.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/layout_loading.xml" value="0.3338541666666667" />
@@ -214,7 +219,7 @@
</value>
</option>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
<component name="SvnBranchConfigurationManager">
<option name="myConfigurationMap">
<map>
diff --git a/app/build.gradle b/app/build.gradle
index 8aee6b3..9d2515d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -63,6 +63,12 @@
doNotStrip "*/mips64/*.so"
//...
}
+
+ lintOptions {
+ checkReleaseBuilds false
+ abortOnError false
+ disable 'TypographyFractions','TypographyQuotes'
+ }
}
greendao {
diff --git a/app/release/output.json b/app/release/output.json
deleted file mode 100644
index aa8582a..0000000
--- a/app/release/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":13,"versionName":"1.1.10","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/release/release/output.json b/app/release/release/output.json
deleted file mode 100644
index cf3a20e..0000000
--- a/app/release/release/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":34,"versionName":"1.1.14.18","enabled":true,"outputFile":"appsupervision-release.apk","fullName":"release","baseName":"release"},"path":"appsupervision-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/release/release/supervision_1.1.14.18-release.apk b/app/release/release/supervision_1.1.14.18-release.apk
deleted file mode 100644
index d36c4ce..0000000
--- a/app/release/release/supervision_1.1.14.18-release.apk
+++ /dev/null
Binary files differ
diff --git a/app/release/supervision_1.1.10-release.apk b/app/release/supervision_1.1.10-release.apk
deleted file mode 100644
index 4e89b88..0000000
--- a/app/release/supervision_1.1.10-release.apk
+++ /dev/null
Binary files differ
diff --git a/app/release/supervision_1.1.13.03.apk b/app/release/supervision_1.1.13.03.apk
deleted file mode 100644
index d1c432a..0000000
--- a/app/release/supervision_1.1.13.03.apk
+++ /dev/null
Binary files differ
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/adapter/AllRecyclerViewAdapter.java b/app/src/main/java/cn/flightfeather/thirdappmodule/adapter/AllRecyclerViewAdapter.java
index 73e1957..67372f7 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/adapter/AllRecyclerViewAdapter.java
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/adapter/AllRecyclerViewAdapter.java
@@ -15,6 +15,7 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.CheckBox;
+import android.widget.Checkable;
import android.widget.ImageView;
import android.widget.TextView;
@@ -331,8 +332,8 @@
public MyViewHolder setChecked(int id, boolean checked) {
View view = getView(id);
- if (view instanceof CheckBox) {
- ((CheckBox) view).setChecked(checked);
+ if (view instanceof Checkable) {
+ ((Checkable) view).setChecked(checked);
}
return this;
}
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/adapter/TaskListAdapter.java b/app/src/main/java/cn/flightfeather/thirdappmodule/adapter/TaskListAdapter.java
index c104abd..b3253ad 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/adapter/TaskListAdapter.java
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/adapter/TaskListAdapter.java
@@ -161,6 +161,11 @@
} else {
holder.slideLayout.setOnLongClickListener(null);
}
+
+ // 椋庨櫓鎻愮ず銆佸贰鏌ヨ鐐广�佸簲鎬ュ贰鏌ョ殑鎻愮ず鍥炬爣
+ holder.group_risk_warn.setVisibility(View.GONE);
+ holder.group_inspection_key_point.setVisibility(View.GONE);
+ holder.group_emergency_inspection.setVisibility(View.GONE);
break;
}
}
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/databinding/SceneHistoryViewModel.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/databinding/SceneHistoryViewModel.kt
index 165d72c..2b79233 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/databinding/SceneHistoryViewModel.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/databinding/SceneHistoryViewModel.kt
@@ -1,7 +1,6 @@
package cn.flightfeather.thirdappmodule.databinding
import android.arch.lifecycle.MutableLiveData
-import android.view.View
import cn.flightfeather.thirdappmodule.bean.vo.DPChangeInfo
import cn.flightfeather.thirdappmodule.bean.vo.DPProblemRecurrence
import cn.flightfeather.thirdappmodule.bean.vo.QueryOptSingle
@@ -21,22 +20,37 @@
class SceneHistoryViewModel : BaseViewModel() {
companion object {
+ // 鏁存敼鐜囬槇鍊�
const val CHANGE_PER = 0.8
+
+ // 鏁存敼鏁堢巼闃堝��
+ const val CHANGE_EFFICIENCY_PER = 0.5
}
private val dataProdSingleSceneRepository = DataProdSingleSceneRepository.instance
- // 涓婁釜鏈堟暣鏀圭巼鏈�宸殑鎯呭喌
- var worstChangeInfo = MutableLiveData<DPChangeInfo>()
+ // 鏁存敼鎯呭喌
+ val changeInfoTxt = MutableLiveData<String>()
- var changeInfoTxt = MutableLiveData<String>()
- var changeEfficiencyTxt = MutableLiveData<String>()
+ // 鏁存敼鏁堢巼
+ val changeEfficiencyTxt = MutableLiveData<String>()
// 闂澶嶅彂鎯呭喌
-// var problemRecurrenceList = MutableLiveData<List<DPProblemRecurrence>>()
- var worstProblemRecurrence = MutableLiveData<DPProblemRecurrence>()
+ val problemRecurrenceTxt = MutableLiveData<String>()
- //
+ // 宸℃煡瑕佺偣
+ val inspectionKeyPointTxt = MutableLiveData<String>()
+
+ // 搴旀�ュ贰鏌�
+ val tempInspectionTxt = MutableLiveData<String>()
+
+
+ // 涓婁釜鏈堟暣鏀圭巼鏈�宸殑鎯呭喌
+ val changeInfoList = MutableLiveData<List<DPChangeInfo>>()
+
+ // 闂澶嶅彂鎯呭喌
+ val problemRecurrenceList = MutableLiveData<List<DPProblemRecurrence>>()
+
fun fetchChangeInfoList(sceneId: String) {
val queryOpts = getQueryOptSingleList(sceneId)
dataProdSingleSceneRepository.getChangeInfoList(queryOpts, object : ResultCallBack<List<DPChangeInfo>> {
@@ -44,16 +58,31 @@
if (!result.isNullOrEmpty()) {
changeInfoTxt.value = result.mapIndexed { i, info ->
// 绛涢�夊瓨鍦ㄩ棶棰橈紝骞朵笖鏁存敼鐜囧皬浜�80%鐨勬湀浠�
- if (info.subTasks.isNullOrEmpty() && info.changePer >= CHANGE_PER) {
+ if (info.subTasks.isNullOrEmpty() || info.proCount == 0 || info.changePer >= CHANGE_PER) {
""
} else {
val time = DateUtil.parseYearMonth(queryOpts[i].startTime) ?: return@mapIndexed ""
val cal = Calendar.getInstance().apply { setTime(time) }
"${cal.get(Calendar.MONTH) + 1}鏈堟暣鏀圭巼涓�${round(info.changePer * 100)}%"
}
- }.filter { it.isNotBlank() }.joinToString("锛�") + "锛屾暣鏀圭巼杈冧綆锛岄渶鍔犲己鐩戠銆�"
+ }.filter { it.isNotBlank() }.run {
+ if (this.isEmpty()) {
+// "杩戞湡鏁存敼鐜囬兘楂樹簬${round(CHANGE_PER * 100)}%锛岃宸ュ湴琛ㄧ幇鑹ソ銆�"
+ null
+ } else {
+ joinToString("锛�") + "锛屾暣鏀圭巼杈冧綆銆�"
+ }
+ }
+ changeEfficiencyTxt.value = result.maxByOrNull { it.changeTime }
+ ?.takeIf { it.proCount > 0 && it.changeEfficiency < CHANGE_EFFICIENCY_PER }
+ .run {
+ this?.subTasks?.takeIf { s -> s.isNotEmpty() }?.get(0)?.let { s ->
+ val time = DateUtil.getMonthStr(s.planstarttime)
+ "鍓嶄笁涓湀涓�, ${time}鏈堜唤鏁存敼鏁堢巼浠呬负${round(this.changeEfficiency * 100)}%锛堝疄闄呮暣鏀硅�楁椂${this.changeTime}澶╋級銆�"
+ }
+ }
- worstChangeInfo.value = result[0]
+ changeInfoList.value = result
}
}
@@ -63,7 +92,7 @@
})
}
- fun fetchProblemRecurrence(sceneId:String) {
+ fun fetchProblemRecurrence(sceneId: String) {
// 鑾峰彇鍓嶄笁涓湀鐨勫唴鐨勮褰�
val queryOpt = QueryOptSingle().apply {
this.sceneId = sceneId
@@ -83,13 +112,26 @@
set(Calendar.MINUTE, 0)
set(Calendar.SECOND, 0)
}
- now.add(Calendar.MONTH, 2)
+ now.add(Calendar.MONTH, -2)
startTime = DateUtil.getDateStr(now.time)
}
dataProdSingleSceneRepository.getProblemRecurrence(queryOpt, object : ResultCallBack<List<DPProblemRecurrence>> {
override fun onSuccess(result: List<DPProblemRecurrence>?) {
if (!result.isNullOrEmpty()) {
- worstProblemRecurrence.value = result[0]
+ problemRecurrenceTxt.value = result
+// .filter { it.changePer < CHANGE_PER }
+ .filter { it.count > 1 }
+ .mapIndexed { i, p ->
+ "${i + 1}. ${p.problemTag}锛堝嚭鐜�${p.count}娆★級"
+ }.joinToString("锛沑r\n").run {
+ if (this.isBlank()) {
+ null
+ } else {
+ "鍓嶄笁涓湀瀛樺湪濡備笅澶嶅彂闂锛歕r\n$this"
+ }
+ }
+
+ problemRecurrenceList.value = result
}
}
@@ -99,6 +141,9 @@
})
}
+ fun fetchInspectionKeyPoint(sceneId: String) {
+ inspectionKeyPointTxt.value = "鍑哄叆鍙ｅ唴銆佸璺潰锛涜溅杈嗗啿娲楋紱\r\n鍥村鍠锋穻锛涙壃灏樺湪绾跨洃娴嬭澶囷紱鎶�闃茶鏂斤紱\r\n骞茬矇鐮傛祮鏈猴紱娓ｅ湡鍨冨溇鍫嗘斁鍖猴紱绾歌川鍙拌处"
+ }
private fun getQueryOptSingleList(sceneId: String): List<QueryOptSingle> {
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/DomainItemService.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/DomainItemService.kt
index 90bf59c..3120a6c 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/DomainItemService.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/DomainItemService.kt
@@ -1,6 +1,7 @@
package cn.flightfeather.thirdappmodule.httpservice
import cn.flightfeather.thirdappmodule.bean.entity.Domainitem
+import cn.flightfeather.thirdappmodule.model.bean.BaseResponse
import io.reactivex.Observable
import retrofit2.Response
import retrofit2.http.GET
@@ -25,5 +26,5 @@
fun getMediaFileType(@Query("sceneType") sceneType: Int): Observable<Response<Map<String?, String?>>>
@GET("domainitem/name")
- fun getItemByName(@Query("name") name: String): Observable<Response<ArrayList<Domainitem>>>
+ fun getItemByName(@Query("name") name: String): Observable<Response<BaseResponse<ArrayList<Domainitem>>>>
}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/ScenseService.java b/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/ScenseService.java
index d38e56a..256855a 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/ScenseService.java
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/ScenseService.java
@@ -4,7 +4,7 @@
import cn.flightfeather.thirdappmodule.bean.entity.Scense;
import cn.flightfeather.thirdappmodule.bean.entity.Task;
-import cn.flightfeather.thirdappmodule.bean.vo.BaseSubScene;
+import cn.flightfeather.thirdappmodule.bean.vo.SceneConstructionSite;
import cn.flightfeather.thirdappmodule.bean.vo.SceneDetailStrVo;
import cn.flightfeather.thirdappmodule.bean.vo.SceneDetailVo;
import cn.flightfeather.thirdappmodule.model.bean.BaseResponse;
@@ -46,7 +46,7 @@
Observable<Response<ArrayList<Scense>>> getByTaskId(@Body Task task, @Query("mode") int mode);
@GET("scense/detail")
- <T extends BaseSubScene> Observable<Response<BaseResponse<SceneDetailVo<T>>>> getSceneDetail(@Query("sceneId") String sceneId);
+ Observable<Response<BaseResponse<SceneDetailVo<SceneConstructionSite>>>> getSceneDetail(@Query("sceneId") String sceneId);
@POST("scense/detail/update")
Observable<Response<BaseResponse<String>>> updateSceneDetail(@Query("sceneTypeId") int typeId, @Body SceneDetailStrVo vo);
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/base/BaseActivity.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/base/BaseActivity.kt
index 7f54b48..f9ca5da 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/base/BaseActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/base/BaseActivity.kt
@@ -40,8 +40,10 @@
} catch (e: Exception) {
e.printStackTrace()
}
- getLayoutId()?.let { setContentView(it) }
- rootView = findViewById<ViewGroup>(android.R.id.content).getChildAt(0) as ViewGroup
+ getLayoutId()?.let {
+ setContentView(it)
+ rootView = findViewById<ViewGroup>(android.R.id.content).getChildAt(0) as ViewGroup
+ }
}
override fun onDestroy() {
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionDetailActivity.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionDetailActivity.kt
index 5522c5d..e677bd0 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionDetailActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionDetailActivity.kt
@@ -213,6 +213,7 @@
}
}
+
override fun onResume() {
startTracking()
super.onResume()
@@ -465,10 +466,14 @@
// 2025.10.22 褰撳満鏅槸宸ュ湴绫诲瀷鏃讹紝鏄剧ず淇敼鏂藉伐闃舵鎸夐挳
if (s.typeid.toString() == Constant.SCENE_TYPE_SITE) {
scene_status.visibility = View.VISIBLE
+ scene_status.setOnClickListener(this)
} else {
scene_status.visibility = View.GONE
}
+
scene_detail.setOnClickListener(this)
+ scene_detail.callOnClick()
+
}
/**
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionFragment.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionFragment.kt
index 05e4fe2..844847d 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionFragment.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionFragment.kt
@@ -243,6 +243,7 @@
}
setOnItemClickListener {
val intent = Intent(activity, InspectionDetailActivity::class.java)
+ // 浼犲叆宸℃煡浠诲姟淇℃伅
intent.putExtra("subTask", curSubTaskList[it])
startActivity(intent)
}
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryActivity.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryActivity.kt
index f95c5b4..931d99e 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryActivity.kt
@@ -1,15 +1,15 @@
package cn.flightfeather.thirdappmodule.module.inspection
+import android.arch.lifecycle.Observer
import android.arch.lifecycle.ViewModelProviders
-import android.databinding.DataBindingUtil
import android.os.Bundle
import android.view.View
import android.widget.TextView
import cn.flightfeather.thirdappmodule.R
import cn.flightfeather.thirdappmodule.bean.entity.Scense
-import cn.flightfeather.thirdappmodule.databinding.DialogSceneHistory2Binding
import cn.flightfeather.thirdappmodule.databinding.SceneHistoryViewModel
import cn.flightfeather.thirdappmodule.module.base.BaseActivity
+import kotlinx.android.synthetic.main.dialog_scene_history.*
/**
* 鍦烘櫙鍘嗗彶鎯呭喌鎻愮ず鐣岄潰
@@ -21,8 +21,7 @@
// 浼犲叆鐨勫満鏅璞�
private var scene: Scense? = null
-// override fun getLayoutId(): Int = R.layout.dialog_scene_history_2
- override fun getLayoutId(): Int? = null
+ override fun getLayoutId(): Int = R.layout.dialog_scene_history
lateinit var viewModel: SceneHistoryViewModel
@@ -33,14 +32,69 @@
scene = intent.getSerializableExtra("scene") as Scense?
- // 2025.10.31 鍦烘櫙椋庨櫓鎻愮ず
- val dialogSceneHistory2Binding = DataBindingUtil.setContentView<DialogSceneHistory2Binding>(this, R.layout.dialog_scene_history_2)
- dialogSceneHistory2Binding.viewModel = viewModel
- dialogSceneHistory2Binding.fabClose.setOnClickListener { this.finish() }
+ initUI()
+ initObserver()
+ initListener()
+ scene?.let {
+ viewModel.fetchChangeInfoList(it.guid)
+ viewModel.fetchProblemRecurrence(it.guid)
+ viewModel.fetchInspectionKeyPoint(it.guid)
+ }
+ }
-// viewModel.getSceneStatus {
-// scene?.let { viewModel.getSceneDetail(it) }
-// }
+ private fun initUI() {
+ // 榛樿鍏堝皢涓夊潡鍐呭闅愯棌
+ cl_risk_warn.visibility = View.GONE
+ cl_inspection_key_point.visibility = View.GONE
+ cl_temp_inspection.visibility = View.GONE
+ tv_change_rate.visibility = View.GONE
+ tv_change_efficiency.visibility = View.GONE
+ tv_problem_recurrence.visibility = View.GONE
+ }
+
+ private fun initObserver() {
+ // 椋庨櫓鎻愮ず
+ viewModel.changeInfoTxt.observe(this, Observer {
+ it?.let {
+ tv_change_rate.text = it
+ tv_change_rate.visibility = View.VISIBLE
+ cl_risk_warn.visibility = View.VISIBLE
+ }
+ })
+ viewModel.changeEfficiencyTxt.observe(this, Observer {
+ it?.let {
+ tv_change_efficiency.text = it
+ tv_change_efficiency.visibility = View.VISIBLE
+ cl_risk_warn.visibility = View.VISIBLE
+ }
+ })
+ viewModel.problemRecurrenceTxt.observe(this, Observer {
+ it?.let {
+ tv_problem_recurrence.text = it
+ tv_problem_recurrence.visibility = View.VISIBLE
+ cl_risk_warn.visibility = View.VISIBLE
+ }
+ })
+ // 宸℃煡瑕佺偣
+ viewModel.inspectionKeyPointTxt.observe(this, Observer {
+ it?.let {
+ tv_key_point.text = it
+ cl_inspection_key_point.visibility = View.VISIBLE
+ }
+ })
+ // 搴旀�ュ贰鏌�
+ viewModel.tempInspectionTxt.observe(this, Observer {
+ it?.let {
+ tv_temp_inspection.text = it
+ cl_temp_inspection.visibility = View.VISIBLE
+ }
+ })
+ }
+
+ private fun initListener() {
+ fab_close.setOnClickListener {
+ this.finish()
+ }
}
}
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryActivity_backup.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryActivity_backup.kt
deleted file mode 100644
index 00dbd6c..0000000
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryActivity_backup.kt
+++ /dev/null
@@ -1,136 +0,0 @@
-package cn.flightfeather.thirdappmodule.module.inspection
-
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
-import android.os.Bundle
-import android.support.v4.content.ContextCompat
-import android.view.View
-import android.widget.TextView
-import cn.flightfeather.thirdappmodule.R
-import cn.flightfeather.thirdappmodule.bean.entity.Scense
-import cn.flightfeather.thirdappmodule.module.base.BaseActivity
-import kotlinx.android.synthetic.main.dialog_scene_history.*
-import kotlinx.android.synthetic.main.fragment_analysis_over_view.*
-
-/**
- * 鍦烘櫙鍘嗗彶鎯呭喌鎻愮ず鐣岄潰
- * Date: 2025/10/27
- */
-class MenuSceneHistoryActivity_backup : BaseActivity() {
- inner class HistoryItemView(val title: String, val show: Boolean, val parentView: View, val titleView: TextView)
-
- // 浼犲叆鐨勫満鏅璞�
- private var scene: Scense? = null
-
- override fun getLayoutId(): Int = R.layout.dialog_scene_history
-
- lateinit var viewModel: MenuSceneHistoryViewModel
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
-
- viewModel = ViewModelProviders.of(this).get(MenuSceneHistoryViewModel::class.java)
-
- scene = intent.getSerializableExtra("scene") as Scense?
-
- initUI()
- initObserver()
- initListener()
-
-// viewModel.getSceneStatus {
-// scene?.let { viewModel.getSceneDetail(it) }
-// }
- }
-
- private fun initUI() {
- // 缁熻椤圭洰
- val itemList = listOf(
- HistoryItemView("鐜板満璇勫垎", true, cl_1, tv_title_1),
- HistoryItemView("鍏稿瀷宸ュ湴", true, cl_2, tv_title_2),
- HistoryItemView("閲嶇偣鍖哄煙", true, cl_3, tv_title_3),
- HistoryItemView("鑱斿悎鎵ф硶", true, cl_4, tv_title_4),
- HistoryItemView("鏁存敼鏁堢巼", true, cl_5, tv_title_5),
- HistoryItemView("闂澶嶅彂", true, cl_6, tv_title_6),
- HistoryItemView("鏂藉伐闃舵", true, cl_7, tv_title_7),
- HistoryItemView("鐩戞祴鏁版嵁", true, cl_8, tv_title_8),
- HistoryItemView("搴旀�ュ贰鏌�", false, cl_9, tv_title_9)
- )
-
- // 鏄剧ず 鍔犺浇鍥炬爣
- view_waiting.visibility = View.GONE
-
- // 鏍规嵁閰嶇疆鏄剧ず瀵瑰簲鐨勯」鐩紝骞惰嚜鍔ㄥ尮閰嶅簭鍙�
- var index = 1
- itemList.forEach { item ->
- if (item.show) {
- val title = "${index}. ${item.title}"
- item.parentView.visibility = View.VISIBLE
- item.titleView.text = title
- index++
- } else {
- item.parentView.visibility = View.GONE
- }
- }
-
- // 鏄剧ず 鍦烘櫙鍚嶇О
- scene?.let {
- tv_title.text = it.name
- }
- }
-
- private fun initObserver() {
- // 鍘嗗彶璇勪及鎯呭喌
- viewModel.evaluationList.observe(this, Observer {
-
- })
-
- // 鍏稿瀷鍦烘櫙鎯呭喌
- viewModel.typicalScene.observe(this, Observer {
-
- })
- tv_title_2.setTextColor(ContextCompat.getColor(this, R.color.red_btn_bg_color))
- // 閲嶇偣鍖哄煙锛堝湪鍥芥帶鐐广�佸競鎺х偣鍛ㄨ竟锛�
- viewModel.keyArea.observe(this, Observer {
-
- })
- tv_title_3.setTextColor(ContextCompat.getColor(this, R.color.red_btn_bg_color))
- // 鑱斿悎鎵ф硶
- viewModel.jointLawEnforcement.observe(this, Observer {
-
- })
- tv_title_4.setTextColor(ContextCompat.getColor(this, R.color.main_color_3))
- tv_summary_4.setTextColor(ContextCompat.getColor(this, R.color.main_color_3))
- // 鏁存敼鏁堢巼
- viewModel.changeRate.observe(this, Observer {
-
- })
- tv_title_5.setTextColor(ContextCompat.getColor(this, R.color.red_btn_bg_color))
- // 闂澶嶅彂
- viewModel.problemRecurrence.observe(this, Observer {
-
- })
- tv_title_6.setTextColor(ContextCompat.getColor(this, R.color.red_btn_bg_color))
- // 鏂藉伐闃舵
- viewModel.constructionPhase.observe(this, Observer {
-
- })
- tv_title_7.setTextColor(ContextCompat.getColor(this, R.color.main_color_2))
- // 鍦ㄧ嚎鐩戞祴鏁版嵁
- viewModel.monitorData.observe(this, Observer {
-
- })
- tv_title_8.setTextColor(ContextCompat.getColor(this, R.color.main_color_3))
- tv_summary_8.setTextColor(ContextCompat.getColor(this, R.color.main_color_3))
- // 搴旀�ュ贰鏌�
- viewModel.emergencyInspection.observe(this, Observer {
-
- })
- tv_title_9.setTextColor(ContextCompat.getColor(this, R.color.main_color_3))
- }
-
- private fun initListener() {
- fab_close.setOnClickListener {
- this.finish()
- }
- }
-}
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneInfoActivity.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneInfoActivity.kt
index eb5a8d0..8f60378 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneInfoActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneInfoActivity.kt
@@ -5,20 +5,15 @@
import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager
-import android.view.LayoutInflater
import android.view.View
import cn.flightfeather.thirdappmodule.R
import cn.flightfeather.thirdappmodule.adapter.AllRecyclerViewAdapter
import cn.flightfeather.thirdappmodule.bean.entity.Scense
-import cn.flightfeather.thirdappmodule.bean.vo.RankVo
import cn.flightfeather.thirdappmodule.bean.vo.SceneConstructionSite
-import cn.flightfeather.thirdappmodule.bean.vo.TaskFrequencyVo
import cn.flightfeather.thirdappmodule.module.base.BaseActivity
import cn.flightfeather.thirdappmodule.module.task.SceneDetailViewModel
-import cn.flightfeather.thirdappmodule.util.CommonUtils
import cn.flightfeather.thirdappmodule.util.Constant
import kotlinx.android.synthetic.main.dialog_scene_subinfo.*
-import kotlinx.android.synthetic.main.fragment_analysis_over_view.*
/**
* 鍦烘櫙鏂藉伐闃舵绠＄悊鐣岄潰
@@ -45,6 +40,7 @@
initListener()
viewModel.getSceneStatus {
+ statusAdapter?.notifyDataSetChanged()
scene?.let { viewModel.getSceneDetail(it) }
}
}
@@ -76,11 +72,12 @@
}
private fun initListener() {
- statusAdapter = object : AllRecyclerViewAdapter<String>(viewModel.sceneStatus, android.R.layout.simple_list_item_single_choice, this) {
+ statusAdapter = object : AllRecyclerViewAdapter<String>(viewModel.sceneStatus, R.layout.item_simple_radio, this) {
@SuppressLint("NotifyDataSetChanged")
override fun bindView(holder: MyViewHolder?, obj: String?, isSelected: Boolean, position: Int) {
- holder?.setText(R.id.text1, obj)
- ?.setOnItemClickListener {
+ holder?.setText(R.id.check_text, obj)
+ ?.setChecked(R.id.check_text, isSelected)
+ ?.setOnClickListener(R.id.check_text) {
setAllFalse()
setSelected(true, position)
notifyDataSetChanged()
@@ -98,7 +95,9 @@
this.finish()
}
fab_submit.setOnClickListener {
- viewModel
+ viewModel.updateSceneDetail(scene) {
+ this.finish()
+ }
}
}
}
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/task/SceneDetailViewModel.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/task/SceneDetailViewModel.kt
index 1e68d90..bd89fb5 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/task/SceneDetailViewModel.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/task/SceneDetailViewModel.kt
@@ -128,7 +128,9 @@
scene?.let {
sceneRepository.getSceneDetail(it, object : ResultCallBack<SceneDetailVo<SceneConstructionSite>> {
override fun onSuccess(result: SceneDetailVo<SceneConstructionSite>?) {
- result?.let { r -> subScene.value = r.subScene }
+ result?.let { r ->
+ subScene.value = r.subScene
+ }
}
override fun onFailure() {
@@ -138,15 +140,16 @@
}
}
- fun updateSceneDetail(scene: Scense?, subScene: BaseSubScene) {
+ fun updateSceneDetail(scene: Scense?, success: () -> Unit) {
scene?.let {
val vo = SceneDetailStrVo().apply {
this.scene = it
- this.subScene = Gson().toJson(subScene)
+ this.subScene = Gson().toJson(this@SceneDetailViewModel.subScene.value)
}
sceneRepository.updateSceneDetail(vo, object : ResultCallBack<String> {
override fun onSuccess(result: String?) {
application.toast("鏂藉伐闃舵淇敼鎴愬姛")
+ success()
}
override fun onFailure() {
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/repository/CommonRepository.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/repository/CommonRepository.kt
index 258837c..a21dd27 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/repository/CommonRepository.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/repository/CommonRepository.kt
@@ -6,6 +6,7 @@
import cn.flightfeather.thirdappmodule.common.net.RetrofitFactory
import cn.flightfeather.thirdappmodule.httpservice.CommonService
import cn.flightfeather.thirdappmodule.httpservice.DomainItemService
+import cn.flightfeather.thirdappmodule.model.bean.BaseResponse
import cn.flightfeather.thirdappmodule.model.enumreation.MediaFileType
import cn.flightfeather.thirdappmodule.repository.dao.MediaTypeAliasDao
import io.reactivex.schedulers.Schedulers
@@ -120,9 +121,9 @@
fun getDomainItem(name: String, resultCallBack: ResultCallBack<ArrayList<Domainitem>>) {
val service = retrofit.create(DomainItemService::class.java).getItemByName(name)
- RetrofitFactory.executeResult(service, object : ResultObserver<ArrayList<Domainitem>>() {
- override fun onSuccess(result: ArrayList<Domainitem>?) {
- resultCallBack.onSuccess(result)
+ RetrofitFactory.executeResult(service, object : ResultObserver<BaseResponse<ArrayList<Domainitem>>>() {
+ override fun onSuccess(result: BaseResponse<ArrayList<Domainitem>>?) {
+ resultCallBack.onSuccess(result?.data)
}
override fun onFailure(e: Throwable, isNetWorkError: Boolean) {
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/repository/SceneRepository.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/repository/SceneRepository.kt
index e0c1c35..335e07b 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/repository/SceneRepository.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/repository/SceneRepository.kt
@@ -2,6 +2,7 @@
import cn.flightfeather.thirdappmodule.bean.entity.*
import cn.flightfeather.thirdappmodule.bean.vo.BaseSubScene
+import cn.flightfeather.thirdappmodule.bean.vo.SceneConstructionSite
import cn.flightfeather.thirdappmodule.bean.vo.SceneDetailStrVo
import cn.flightfeather.thirdappmodule.bean.vo.SceneDetailVo
import cn.flightfeather.thirdappmodule.common.net.ResponseBodyCallBack
@@ -136,14 +137,14 @@
/**
* 鑾峰彇鍦烘櫙璇︽儏锛屽寘鍚熀纭�淇℃伅鍜屽満鏅壒鏈変俊鎭�
*/
- fun <T : BaseSubScene> getSceneDetail(scene: Scense, resultCallBack: ResultCallBack<SceneDetailVo<T>>) {
+ fun getSceneDetail(scene: Scense, resultCallBack: ResultCallBack<SceneDetailVo<SceneConstructionSite>>) {
val sceneService = when (scene.typeid.toString()) {
- Constant.SCENE_TYPE_SITE -> retrofit.create(ScenseService::class.java).getSceneDetail<T>(scene.guid)
- else -> retrofit.create(ScenseService::class.java).getSceneDetail<T>(scene.guid)
+ Constant.SCENE_TYPE_SITE -> retrofit.create(ScenseService::class.java).getSceneDetail(scene.guid)
+ else -> return
}
- RetrofitFactory.executeResult(sceneService, object : ResultObserver<BaseResponse<SceneDetailVo<T>>>() {
- override fun onSuccess(result: BaseResponse<SceneDetailVo<T>>?) {
+ RetrofitFactory.executeResult(sceneService, object : ResultObserver<BaseResponse<SceneDetailVo<SceneConstructionSite>>>() {
+ override fun onSuccess(result: BaseResponse<SceneDetailVo<SceneConstructionSite>>?) {
resultCallBack.onSuccess(result?.data)
}
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/util/DateUtil.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/util/DateUtil.kt
index f1ba566..359b613 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/util/DateUtil.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/util/DateUtil.kt
@@ -82,6 +82,18 @@
}
/**
+ * MM
+ */
+ fun getMonthStr(date: Date?): String {
+ try {
+ return getDateStr(date).substring(5, 7)
+ } catch (e: Exception) {
+ e.printStackTrace()
+ }
+ return ""
+ }
+
+ /**
* dd
*/
fun getDayStr(date: Date?): String {
diff --git a/app/src/main/res/layout/dialog_scene_history.xml b/app/src/main/res/layout/dialog_scene_history.xml
index 7716d49..4fd465f 100644
--- a/app/src/main/res/layout/dialog_scene_history.xml
+++ b/app/src/main/res/layout/dialog_scene_history.xml
@@ -22,587 +22,169 @@
android:layout_height="match_parent"
android:layout_marginBottom="30dp">
- <android.support.constraint.ConstraintLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:padding="@dimen/dimen16">
-
- <TextView
- android:id="@+id/tv_title"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:textColor="@color/primary_text"
- android:textSize="@dimen/textSize_18"
- app:layout_constraintEnd_toStartOf="@id/view_waiting"
- app:layout_constraintHorizontal_bias="0"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:text="鍦烘櫙鐨勫悕绉板満鏅殑鍚嶇О鍦烘櫙鐨勫悕绉板満鏅殑鍚嶇О鍦烘櫙鐨勫悕绉板満鏅殑鍚嶇О鍦烘櫙鐨勫悕绉板満鏅殑鍚嶇О" />
-
- <ProgressBar
- android:id="@+id/view_waiting"
- android:layout_width="@dimen/fab_margin"
- android:layout_height="@dimen/fab_margin"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-
- <android.support.constraint.ConstraintLayout
- android:id="@+id/cl_1"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:layout_marginTop="@dimen/dimen16"
- app:layout_constraintTop_toBottomOf="@id/tv_title">
-
- <TextView
- android:id="@+id/tv_title_1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="1. 鐜板満璇勫垎"
- android:textStyle="bold"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:ignore="UnusedAttribute" />
-
- <TextView
- android:id="@+id/tv1_title_1"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:background="@drawable/bg_border_black_no_right"
- android:textAlignment="center"
- android:textColor="@color/main_color_1"
- app:layout_constraintEnd_toStartOf="@id/tv1_title_2"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/tv_title_1"
- android:text="7鏈�" />
- <TextView
- android:id="@+id/tv1_content_1"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:background="@drawable/bg_border_black_no_top_right"
- android:textAlignment="center"
- android:textColor="@color/main_color_1"
- app:layout_constraintEnd_toStartOf="@id/tv1_content_2"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/tv1_title_1"
- android:text="76鍒�" />
-
- <TextView
- android:id="@+id/tv1_title_2"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:background="@drawable/bg_border_black_no_right"
- android:textAlignment="center"
- android:textColor="@color/main_color_1"
- app:layout_constraintEnd_toStartOf="@id/tv1_title_3"
- app:layout_constraintStart_toEndOf="@id/tv1_title_1"
- app:layout_constraintTop_toBottomOf="@id/tv_title_1"
- android:text="8鏈�" />
- <TextView
- android:id="@+id/tv1_content_2"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:background="@drawable/bg_border_black_no_top_right"
- android:textAlignment="center"
- android:textColor="@color/main_color_1"
- app:layout_constraintEnd_toStartOf="@id/tv1_content_3"
- app:layout_constraintStart_toEndOf="@id/tv1_content_1"
- app:layout_constraintBaseline_toBaselineOf="@id/tv1_content_1"
- android:text="82鍒�" />
-
- <TextView
- android:id="@+id/tv1_title_3"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:background="@drawable/bg_border_black"
- android:textAlignment="center"
- android:textColor="@color/main_color_1"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@id/tv1_title_2"
- app:layout_constraintTop_toBottomOf="@id/tv_title_1"
- android:text="9鏈�" />
- <TextView
- android:id="@+id/tv1_content_3"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:background="@drawable/bg_border_black_no_top"
- android:textAlignment="center"
- android:textColor="@color/main_color_1"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@id/tv1_content_2"
- app:layout_constraintBaseline_toBaselineOf="@id/tv1_content_1"
- android:text="79鍒�" />
- </android.support.constraint.ConstraintLayout>
-
- <android.support.constraint.ConstraintLayout
- android:id="@+id/cl_2"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:layout_marginTop="@dimen/dimen8"
- app:layout_constraintTop_toBottomOf="@id/cl_1">
-
- <TextView
- android:id="@+id/tv_title_2"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="2. 鍏稿瀷宸ュ湴"
- android:textStyle="bold"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:ignore="UnusedAttribute" />
-
- <TextView
- android:id="@+id/tv2_content_1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="璇ュ伐鍦颁笂鏈堟暣鏀圭巼浠呬负57.1%锛岃鍒椾负鍏稿瀷宸ュ湴锛屾敞鎰忓姞寮虹幇鍦虹洃绠°��"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- android:paddingStart="@dimen/dimen16"
- android:paddingEnd="0dp"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/tv_title_2"
- tools:ignore="UnusedAttribute" />
- </android.support.constraint.ConstraintLayout>
-
- <android.support.constraint.ConstraintLayout
- android:id="@+id/cl_3"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:layout_marginTop="@dimen/dimen8"
- app:layout_constraintTop_toBottomOf="@id/cl_2">
-
- <TextView
- android:id="@+id/tv_title_3"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="3. 閲嶇偣鍖哄煙"
- android:textStyle="bold"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:ignore="UnusedAttribute" />
-
- <TextView
- android:id="@+id/tv3_content_1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="璇ュ伐鍦颁綅浜庡浗鎺х偣闈欏畨鐩戞祴绔欏懆杈�2鍏噷鑼冨洿鍐咃紝灞炰簬閲嶇偣绠℃帶鍖哄煙锛屾敞鎰忓姞寮虹幇鍦虹洃绠°��"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- android:paddingStart="@dimen/dimen16"
- android:paddingEnd="0dp"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/tv_title_3"
- tools:ignore="UnusedAttribute" />
- </android.support.constraint.ConstraintLayout>
-
- <android.support.constraint.ConstraintLayout
- android:id="@+id/cl_4"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:layout_marginTop="@dimen/dimen8"
- app:layout_constraintTop_toBottomOf="@id/cl_3">
-
- <TextView
- android:id="@+id/tv_title_4"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="4. 鑱斿悎鎵ф硶"
- android:textStyle="bold"
- android:textColor="@color/main_color_3"
- android:textSize="@dimen/textSize_16"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:ignore="UnusedAttribute" />
- <TextView
- android:id="@+id/tv_summary_4"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="璇ュ伐鍦拌繎涓変釜鏈堟湭娑夊強鑱斿悎鎵ф硶銆�"
- android:textColor="@color/main_color_3"
- android:textSize="@dimen/textSize_16"
- android:paddingStart="@dimen/dimen16"
- android:paddingEnd="0dp"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/tv_title_4"
- tools:ignore="UnusedAttribute" />
- </android.support.constraint.ConstraintLayout>
-
- <android.support.constraint.ConstraintLayout
- android:id="@+id/cl_5"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:layout_marginTop="@dimen/dimen8"
- app:layout_constraintTop_toBottomOf="@id/cl_4">
-
- <TextView
- android:id="@+id/tv_title_5"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="5. 鏁存敼鏁堢巼"
- android:textStyle="bold"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:ignore="UnusedAttribute" />
-
- <TextView
- android:id="@+id/tv_summary_5"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="璇ュ伐鍦板墠涓変釜鏈堟暣鏀规儏鍐靛涓嬭〃锛岀患鍚堟暣鏀圭巼浠呬负79%锛屾暣鏀规儏鍐佃緝宸��"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- android:paddingStart="@dimen/dimen16"
- android:paddingEnd="0dp"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/tv_title_5"
- tools:ignore="UnusedAttribute" />
-
-<!-- column 1 -->
- <TextView
- android:id="@+id/tv5_title_1"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:textAlignment="center"
- android:textColor="@color/main_color_1"
- android:background="@drawable/bg_border_black_no_right"
- app:layout_constraintEnd_toStartOf="@id/tv5_title_2"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/tv_summary_5"
- />
- <TextView
- android:id="@+id/tv5_content_1"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:background="@drawable/bg_border_black_no_top_right"
- android:textAlignment="center"
- android:textColor="@color/main_color_1"
- app:layout_constraintEnd_toStartOf="@id/tv5_content_2"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/tv5_title_1"
- android:text="鏁存敼鐜�" />
- <TextView
- android:id="@+id/tv5_content1_1"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:background="@drawable/bg_border_black_no_top_right"
- android:textAlignment="center"
- android:textColor="@color/main_color_1"
- app:layout_constraintEnd_toStartOf="@id/tv5_content1_2"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/tv5_content_1"
- android:text="鏁存敼鏁堢巼" />
- <TextView
- android:id="@+id/tv5_content2_1"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:background="@drawable/bg_border_black_no_top_right"
- android:textAlignment="center"
- android:textColor="@color/main_color_1"
- app:layout_constraintEnd_toStartOf="@id/tv5_content1_2"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/tv5_content1_1"
- android:text="缁煎悎鏁存敼鐜�" />
-
- <!-- column 2 -->
- <TextView
- android:id="@+id/tv5_title_2"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:background="@drawable/bg_border_black_no_right"
- android:textAlignment="center"
- android:textColor="@color/main_color_1"
- app:layout_constraintEnd_toStartOf="@id/tv5_title_3"
- app:layout_constraintStart_toEndOf="@id/tv5_title_1"
- app:layout_constraintTop_toTopOf="@id/tv5_title_1"
- android:text="7鏈�" />
- <TextView
- android:id="@+id/tv5_content_2"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:background="@drawable/bg_border_black_no_top_right"
- android:textAlignment="center"
- android:textColor="@color/main_color_1"
- app:layout_constraintEnd_toStartOf="@id/tv5_content_3"
- app:layout_constraintStart_toEndOf="@id/tv5_content_1"
- app:layout_constraintTop_toBottomOf="@id/tv5_title_2"
- android:text="100%" />
- <TextView
- android:id="@+id/tv5_content1_2"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:background="@drawable/bg_border_black_no_top_right"
- android:textAlignment="center"
- android:textColor="@color/main_color_1"
- app:layout_constraintEnd_toStartOf="@id/tv5_content1_3"
- app:layout_constraintStart_toEndOf="@id/tv5_content1_1"
- app:layout_constraintTop_toBottomOf="@id/tv5_content_2"
- android:text="1澶╁唴" />
- <TextView
- android:id="@+id/tv5_content2_2"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:background="@drawable/bg_border_black_no_top"
- android:textAlignment="center"
- android:textColor="@color/main_color_1"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@id/tv5_content2_1"
- app:layout_constraintTop_toBottomOf="@id/tv5_content1_2"
- android:text="79%" />
-
- <!-- column 3 -->
- <TextView
- android:id="@+id/tv5_title_3"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:background="@drawable/bg_border_black_no_right"
- android:textAlignment="center"
- android:textColor="@color/main_color_1"
- app:layout_constraintEnd_toStartOf="@id/tv5_title_4"
- app:layout_constraintStart_toEndOf="@id/tv5_title_2"
- app:layout_constraintTop_toTopOf="@id/tv5_title_1"
- android:text="8鏈�" />
- <TextView
- android:id="@+id/tv5_content_3"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:background="@drawable/bg_border_black_no_top_right"
- android:textAlignment="center"
- android:textColor="@color/main_color_1"
- app:layout_constraintEnd_toStartOf="@id/tv5_content_4"
- app:layout_constraintStart_toEndOf="@id/tv5_content_2"
- app:layout_constraintTop_toBottomOf="@id/tv5_title_3"
- android:text="80%" />
- <TextView
- android:id="@+id/tv5_content1_3"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:background="@drawable/bg_border_black_no_top_right"
- android:textAlignment="center"
- android:textColor="@color/main_color_1"
- app:layout_constraintEnd_toStartOf="@id/tv5_content1_4"
- app:layout_constraintStart_toEndOf="@id/tv5_content1_2"
- app:layout_constraintTop_toBottomOf="@id/tv5_content_3"
- android:text="鏈暣鏀�" />
-
- <!-- column 4 -->
- <TextView
- android:id="@+id/tv5_title_4"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:background="@drawable/bg_border_black"
- android:textAlignment="center"
- android:textColor="@color/main_color_1"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@id/tv5_title_3"
- app:layout_constraintTop_toTopOf="@id/tv5_title_1"
- android:text="9鏈�" />
- <TextView
- android:id="@+id/tv5_content_4"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:background="@drawable/bg_border_black_no_top"
- android:textAlignment="center"
- android:textColor="@color/main_color_1"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@id/tv5_content_3"
- app:layout_constraintTop_toBottomOf="@id/tv5_title_4"
- android:text="57.1%" />
- <TextView
- android:id="@+id/tv5_content1_4"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:background="@drawable/bg_border_black_no_top"
- android:textAlignment="center"
- android:textColor="@color/main_color_1"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@id/tv5_content1_3"
- app:layout_constraintTop_toBottomOf="@id/tv5_content_4"
- android:text="鏈暣鏀�" />
- </android.support.constraint.ConstraintLayout>
-
- <android.support.constraint.ConstraintLayout
- android:id="@+id/cl_6"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:layout_marginTop="@dimen/dimen8"
- app:layout_constraintTop_toBottomOf="@id/cl_5">
-
- <TextView
- android:id="@+id/tv_title_6"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="6. 闂澶嶅彂"
- android:textStyle="bold"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:ignore="UnusedAttribute" />
-
- <TextView
- android:id="@+id/tv_summary_6"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="璇ュ伐鍦板墠涓変釜鏈堟湁1涓棶棰樺娆″鍙戯紝涓衡�濆伐鍦板唴澶氭潯閬撹矾鏄庢樉娉ョ棔/娉ユ碁/绉皹/閬楁拻鈥溿��"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- android:paddingStart="@dimen/dimen16"
- android:paddingEnd="0dp"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/tv_title_6"
- tools:ignore="UnusedAttribute" />
- </android.support.constraint.ConstraintLayout>
-
- <android.support.constraint.ConstraintLayout
- android:id="@+id/cl_7"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:layout_marginTop="@dimen/dimen8"
- app:layout_constraintTop_toBottomOf="@id/cl_6">
-
- <TextView
- android:id="@+id/tv_title_7"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="7. 鏂藉伐闃舵"
- android:textStyle="bold"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:ignore="UnusedAttribute" />
- <TextView
- android:id="@+id/tv_summary_7"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="璇ュ伐鍦颁笂涓�娆℃洿鏂版柦宸ラ樁娈典负2025骞�9鏈�10鏃ャ��"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- android:paddingStart="@dimen/dimen16"
- android:paddingEnd="0dp"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/tv_title_7"
- tools:ignore="UnusedAttribute" />
- </android.support.constraint.ConstraintLayout>
-
- <android.support.constraint.ConstraintLayout
- android:id="@+id/cl_8"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:layout_marginTop="@dimen/dimen8"
- app:layout_constraintTop_toBottomOf="@id/cl_7">
-
- <TextView
- android:id="@+id/tv_title_8"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="8. 鐩戞祴鏁版嵁"
- android:textStyle="bold"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:ignore="UnusedAttribute" />
- <TextView
- android:id="@+id/tv_summary_8"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="璇ュ伐鍦拌繎涓変釜鏈堟壃灏樺湪绾跨洃娴嬫暟鎹帓鍚嶆湭杈惧叏鍖哄墠鍗侊紝涓婃湀骞冲潎娴撳害浣庝簬鍖哄潎鍊硷紝鏁版嵁鎯呭喌杈冨ソ銆�"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- android:paddingStart="@dimen/dimen16"
- android:paddingEnd="0dp"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/tv_title_8"
- tools:ignore="UnusedAttribute" />
- </android.support.constraint.ConstraintLayout>
-
- <android.support.constraint.ConstraintLayout
- android:id="@+id/cl_9"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:layout_marginTop="@dimen/dimen8"
- app:layout_constraintTop_toBottomOf="@id/cl_8">
-
- <TextView
- android:id="@+id/tv_title_9"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="9. 搴旀�ュ贰鏌�"
- android:textStyle="bold"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:ignore="UnusedAttribute" />
- <TextView
- android:id="@+id/tv_summary_9"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="璇ュ伐鍦拌繎涓変釜鏈堟湭娑夊強閬撹矾宸℃煡銆�"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- android:paddingStart="@dimen/dimen16"
- android:paddingEnd="0dp"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/tv_title_9"
- tools:ignore="UnusedAttribute" />
- </android.support.constraint.ConstraintLayout>
+ android:orientation="vertical">
- </android.support.constraint.ConstraintLayout>
+ <android.support.constraint.ConstraintLayout
+ android:id="@+id/cl_risk_warn"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:padding="@dimen/dimen16">
+
+ <ImageView
+ android:id="@+id/img_risk_warn"
+ android:layout_width="20dp"
+ android:layout_height="20dp"
+ android:layout_marginBottom="@dimen/dimen4"
+ android:contentDescription="椋庨櫓鎻愮ず"
+ android:src="@drawable/icon_task_alert"
+ app:layout_constraintBottom_toBottomOf="@id/tv_risk_warn"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="@id/tv_risk_warn" />
+
+ <TextView
+ android:id="@+id/tv_risk_warn"
+ android:layout_width="0dp"
+ android:layout_height="30dp"
+ android:text="椋庨櫓鎻愮ず"
+ android:textColor="@color/red_btn_bg_color"
+ android:textSize="@dimen/textSize_18"
+ android:textStyle="bold"
+ app:layout_constraintStart_toEndOf="@id/img_risk_warn"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/tv_change_rate"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="20dp"
+ android:paddingEnd="0dp"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ style="@style/TextButtonStyle.DialogNeutral"
+ android:gravity="start"
+ app:layout_constraintTop_toBottomOf="@id/tv_risk_warn"
+ tools:text="鏁存敼鐜囨儏鍐碉紝濡傛灉鏁存敼鐜囪緝浣庯紝鍒欎綔涓洪闄╂彁绀哄睍绀�" />
+
+ <TextView
+ android:id="@+id/tv_change_efficiency"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="20dp"
+ android:paddingEnd="0dp"
+ android:layout_marginTop="@dimen/dimen16"
+ app:layout_goneMarginTop="0dp"
+ style="@style/TextButtonStyle.DialogNeutral"
+ android:gravity="start"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ app:layout_constraintTop_toBottomOf="@id/tv_change_rate"
+ tools:text="鏁存敼鏁堢巼鎯呭喌锛屾暣鏀规晥鐜囦负瑕佹眰鏁存敼鐨勬湡闄愶紙澶╂暟锛夐櫎浠ュ疄闄呮暣鏀圭殑鐢ㄦ椂锛堝ぉ鏁帮級锛屽鏋滄晥鐜囦綆浜�50%锛屽垯浣滀负椋庨櫓鎻愮ず灞曠ず" />
+
+ <TextView
+ android:id="@+id/tv_problem_recurrence"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="20dp"
+ android:paddingEnd="0dp"
+ android:layout_marginTop="@dimen/dimen16"
+ app:layout_goneMarginTop="0dp"
+ style="@style/TextButtonStyle.DialogNeutral"
+ android:gravity="start"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ app:layout_constraintTop_toBottomOf="@id/tv_change_efficiency"
+ tools:text="闂澶嶅彂鎯呭喌锛岃嫢鍓嶄笁涓湀鍐呮湁鐩稿悓绫诲瀷鐨勯棶棰樺嚭鐜颁袱娆″強浠ヤ笂鏃讹紝鎻愰啋灞曠ず锛屽苟缁欏嚭瀵瑰簲鐨勬暣鏀圭巼" />
+
+ </android.support.constraint.ConstraintLayout>
+
+ <android.support.constraint.ConstraintLayout
+ android:id="@+id/cl_inspection_key_point"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:padding="@dimen/dimen16">
+
+ <ImageView
+ android:id="@+id/img_inspection_key_point"
+ android:layout_width="20dp"
+ android:layout_height="20dp"
+ android:layout_marginBottom="@dimen/dimen4"
+ android:contentDescription="宸℃煡瑕佺偣"
+ android:src="@drawable/icon_consult"
+ app:layout_constraintBottom_toBottomOf="@id/tv_inspection_key_point"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="@id/tv_risk_warn" />
+
+ <TextView
+ android:id="@+id/title_inspection_key_point"
+ android:layout_width="0dp"
+ android:layout_height="30dp"
+ android:text="宸℃煡瑕佺偣"
+ android:textColor="@color/primary_text"
+ android:textSize="@dimen/textSize_18"
+ app:layout_constraintStart_toEndOf="@id/img_inspection_key_point"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/tv_key_point"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="20dp"
+ android:paddingEnd="0dp"
+ style="@style/TextButtonStyle.DialogNeutral"
+ android:gravity="start"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ app:layout_constraintTop_toBottomOf="@id/title_inspection_key_point"
+ tools:text="宸℃煡瑕佺偣锛屾敞鎰忛渶瑕佹鏌ョ殑浣嶇疆銆佽澶囧拰闂绛�" />
+
+ </android.support.constraint.ConstraintLayout>
+
+ <android.support.constraint.ConstraintLayout
+ android:id="@+id/cl_temp_inspection"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:padding="@dimen/dimen16">
+
+ <ImageView
+ android:id="@+id/img_temp_inspection"
+ android:layout_width="20dp"
+ android:layout_height="20dp"
+ android:layout_marginBottom="@dimen/dimen4"
+ android:contentDescription="搴旀�ュ贰鏌�"
+ android:src="@drawable/ic_emergency"
+ app:layout_constraintBottom_toBottomOf="@id/tv_risk_warn"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="@id/tv_risk_warn" />
+
+ <TextView
+ android:id="@+id/title_temp_inspection"
+ android:layout_width="0dp"
+ android:layout_height="30dp"
+ android:text="搴旀�ュ贰鏌�"
+ android:textColor="@color/primary_text"
+ android:textSize="@dimen/textSize_18"
+ app:layout_constraintStart_toEndOf="@id/img_temp_inspection"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/tv_temp_inspection"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="20dp"
+ android:paddingEnd="0dp"
+ style="@style/TextButtonStyle.DialogNeutral"
+ android:gravity="start"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ app:layout_constraintTop_toBottomOf="@id/title_temp_inspection"
+ tools:text="搴旀�ュ贰鏌ワ紝涓�鑸负鐜繚灞�鍙戝竷鐨勭揣鎬ヨ姹傜瓑" />
+
+ </android.support.constraint.ConstraintLayout>
+ </LinearLayout>
</ScrollView>
</android.support.v7.widget.CardView>
diff --git a/app/src/main/res/layout/dialog_scene_history_2.xml b/app/src/main/res/layout/dialog_scene_history_2.xml
index e4ec0d4..94edddf 100644
--- a/app/src/main/res/layout/dialog_scene_history_2.xml
+++ b/app/src/main/res/layout/dialog_scene_history_2.xml
@@ -40,7 +40,7 @@
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:visibility="@{viewModel.worstChangeInfo == null ? View.GONE : View.VISIBLE}"
+ android:visibility="@{viewModel.changeInfoList == null ? View.GONE : View.VISIBLE}"
android:padding="@dimen/dimen16">
<ImageView
diff --git a/app/src/main/res/layout/fragment_inspection_content.xml b/app/src/main/res/layout/fragment_inspection_content.xml
index b795437..ed77ea9 100644
--- a/app/src/main/res/layout/fragment_inspection_content.xml
+++ b/app/src/main/res/layout/fragment_inspection_content.xml
@@ -28,49 +28,52 @@
android:id="@+id/ll_show_hide_detail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:background="?android:attr/selectableItemBackground"
+ android:clickable="true"
+ android:gravity="center"
android:orientation="vertical"
android:paddingTop="8dp"
- android:paddingBottom="7dp"
- android:clickable="true"
- android:background="?android:attr/selectableItemBackground"
- android:gravity="center">
+ android:paddingBottom="7dp">
+
<TextView
- android:layout_marginLeft="50dp"
- android:layout_marginRight="50dp"
android:id="@+id/tv_subtask_name_bar"
android:layout_width="wrap_content"
- android:textColor="@color/white"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="50dp"
+ android:layout_marginRight="50dp"
android:gravity="center"
android:singleLine="true"
- android:layout_height="wrap_content"
- android:textSize="16sp"
- android:text="浠诲姟鍚嶇О"/>
+ android:text="浠诲姟鍚嶇О"
+ android:textColor="@color/white"
+ android:textSize="16sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_marginTop="-1dp"
android:layout_marginLeft="50dp"
+ android:layout_marginTop="-1dp"
+ android:layout_marginRight="50dp"
android:gravity="center_vertical"
- android:layout_marginRight="50dp">
+ android:orientation="horizontal">
+
<TextView
android:id="@+id/tv_subtask_status_bar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textSize="13dp"
android:text="浠诲姟鐘舵��"
- android:textColor="@color/white"/>
+ android:textColor="@color/white"
+ android:textSize="13dp" />
+
<ImageView
- android:alpha="0.9"
- android:layout_marginLeft="2dp"
- android:layout_marginTop="1dp"
android:id="@+id/iv_patrol_show_site_detail"
- android:src="@drawable/selector_show_hide_white"
android:layout_width="14dp"
android:layout_height="13dp"
- android:scaleType="fitXY" />
+ android:layout_marginLeft="2dp"
+ android:layout_marginTop="1dp"
+ android:alpha="0.9"
+ android:scaleType="fitXY"
+ android:src="@drawable/selector_show_hide_white" />
</LinearLayout>
@@ -323,14 +326,14 @@
<TextView
android:id="@+id/scene_status"
- android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
- android:layout_marginBottom="230dp"
+ android:layout_marginBottom="246dp"
android:background="@drawable/shape_yellow"
- android:drawableStart="@drawable/ic_group_black_24dp"
+ android:backgroundTint="@color/main_color_3"
+ android:drawableStart="@drawable/ic_info_black_24dp"
android:drawableTint="@color/white"
android:elevation="@dimen/dimen4"
android:foreground="?android:attr/selectableItemBackground"
@@ -338,23 +341,24 @@
android:padding="@dimen/dimen4"
android:text="@string/scene_status"
android:textColor="@color/white"
+ android:visibility="visible"
tools:ignore="UnusedAttribute" />
<TextView
android:id="@+id/scene_detail"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
+ android:layout_width="32dp"
+ android:layout_height="36dp"
+ android:layout_alignParentStart="true"
android:layout_alignParentBottom="true"
- android:layout_marginBottom="230dp"
+ android:layout_marginBottom="188dp"
android:background="@drawable/shape_yellow"
- android:drawableStart="@drawable/ic_info_black_24dp"
android:drawableTint="@color/white"
android:elevation="@dimen/dimen4"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:padding="@dimen/dimen4"
- android:text="鐐逛綅鎯呭喌"
+ android:text="!"
+ android:textStyle="bold"
android:textColor="@color/white"
tools:ignore="UnusedAttribute" />
@@ -366,6 +370,7 @@
android:layout_alignParentBottom="true"
android:layout_marginBottom="188dp"
android:background="@drawable/shape_green"
+ android:backgroundTint="@color/lightGreen"
android:drawableStart="@drawable/ic_group_black_24dp"
android:drawableTint="@color/white"
android:elevation="@dimen/dimen4"
diff --git a/app/src/main/res/layout/item_simple_radio.xml b/app/src/main/res/layout/item_simple_radio.xml
new file mode 100644
index 0000000..aa97085
--- /dev/null
+++ b/app/src/main/res/layout/item_simple_radio.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/check_text"
+ android:layout_width="match_parent"
+ android:layout_height="?android:attr/listPreferredItemHeightSmall"
+ android:text="@string/scene_status"
+ android:textAppearance="?android:attr/textAppearanceListItemSmall"
+ android:gravity="center_vertical"
+ android:checkMark="?android:attr/listChoiceIndicatorSingle"
+ android:checked="true"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_task_list_2.xml b/app/src/main/res/layout/item_task_list_2.xml
index a9ea202..5d3611c 100644
--- a/app/src/main/res/layout/item_task_list_2.xml
+++ b/app/src/main/res/layout/item_task_list_2.xml
@@ -105,20 +105,23 @@
android:tint="@color/white"
android:layout_marginTop="@dimen/dimen4"
app:layout_constraintTop_toBottomOf="@id/tv_item_task_list_time"
- app:layout_constraintStart_toStartOf="@id/tv_item_task_list_name" />
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="@id/tv_item_task_list_name"
+ app:layout_constraintVertical_bias="0"/>
<TextView
android:id="@+id/tv_task_staff"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:visibility="visible"
style="@style/TextStyle.Abstract"
- tools:text="鍙備笌浜哄憳"
+ tools:text="鍙備笌浜哄憳鍙備笌浜哄憳鍙備笌浜哄憳鍙備笌浜哄憳鍙備笌浜哄憳鍙備笌浜哄憳鍙備笌浜哄憳鍙備笌浜哄憳鍙備笌浜哄憳鍙備笌浜哄憳"
android:layout_marginStart="@dimen/dimen8"
android:layout_marginBottom="@dimen/dimen8"
app:layout_constraintTop_toTopOf="@id/img_task_staff"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/img_task_time"
- app:layout_constraintEnd_toStartOf="@id/guide_line_2"/>
+ app:layout_constraintEnd_toStartOf="@id/guide_line_2"
+ app:layout_constraintVertical_bias="0"/>
<ImageView
@@ -148,8 +151,7 @@
app:layout_constraintHorizontal_bias="1"
app:layout_constraintStart_toStartOf="@id/guide_line_2"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="@id/tv_item_task_list_name"
- app:layout_constraintBottom_toTopOf="@id/img_risk_warn"/>
+ app:layout_constraintTop_toTopOf="@id/tv_item_task_list_name" />
<android.support.constraint.Group
android:id="@+id/group_risk_warn"
@@ -165,7 +167,8 @@
android:layout_marginBottom="@dimen/dimen4"
app:layout_constraintTop_toBottomOf="@id/img_task_status"
app:layout_constraintBottom_toTopOf="@id/img_inspection_key_point"
- app:layout_constraintEnd_toStartOf="@id/tv_risk_warn"/>
+ app:layout_constraintEnd_toStartOf="@id/tv_risk_warn"
+ app:layout_constraintVertical_bias="1"/>
<TextView
android:id="@+id/tv_risk_warn"
@@ -182,7 +185,7 @@
android:id="@+id/group_inspection_key_point"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:constraint_referenced_ids="img_risk_warn, tv_risk_warn"/>
+ app:constraint_referenced_ids="img_inspection_key_point, tv_inspection_key_point"/>
<ImageView
android:id="@+id/img_inspection_key_point"
android:layout_width="20dp"
@@ -209,7 +212,7 @@
android:id="@+id/group_emergency_inspection"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:constraint_referenced_ids="img_risk_warn, tv_risk_warn"/>
+ app:constraint_referenced_ids="img_emergency_inspection, tv_emergency_inspection"/>
<ImageView
android:id="@+id/img_emergency_inspection"
android:layout_width="20dp"
diff --git a/appsupervision/build.gradle b/appsupervision/build.gradle
index b4daf8f..d1b5f10 100644
--- a/appsupervision/build.gradle
+++ b/appsupervision/build.gradle
@@ -12,7 +12,7 @@
minSdkVersion 19
targetSdkVersion 28
versionCode 34
- versionName "1.1.14.18"
+ versionName "1.1.14.19"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
renderscriptTargetApi 25
@@ -43,6 +43,11 @@
doNotStrip "*/mips64/*.so"
//...
}
+ lintOptions {
+ checkReleaseBuilds false
+ abortOnError false
+ disable 'TypographyFractions','TypographyQuotes'
+ }
}
dependencies {
diff --git a/build.gradle b/build.gradle
index e65dff6..bbfb47a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,8 @@
buildscript {
ext {
- kotlin_version = '1.3.72'
+// kotlin_version = '1.3.72'
+ kotlin_version = '1.4.0'
lifecycle_version = '1.1.1'
anko_version = '0.10.8'
event_bus = '3.1.1'
--
Gitblit v1.9.3