From 33ac4c6fcff822a7c94d0817559e129e226097f7 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Sat, 5 Oct 2019 17:30:37 -0400 Subject: [PATCH] JNI is wanky. Finally about to return an object from C++ to Java/Kotlin --- .idea/caches/build_file_checksums.ser | Bin 957 -> 957 bytes .idea/caches/gradle_models.ser | Bin 1838 -> 0 bytes .idea/codeStyles/Project.xml | 12 + ...e__android_arch_core_runtime_1_1_1_aar.xml | 4 +- ...roid_arch_lifecycle_livedata_1_1_1_aar.xml | 4 +- ...arch_lifecycle_livedata_core_1_1_1_aar.xml | 4 +- ...droid_arch_lifecycle_runtime_1_1_1_aar.xml | 4 +- ...oid_arch_lifecycle_viewmodel_1_1_1_aar.xml | 4 +- ...rt_animated_vector_drawable_28_0_0_aar.xml | 4 +- ...ndroid_support_appcompat_v7_28_0_0_aar.xml | 6 +- ...support_asynclayoutinflater_28_0_0_aar.xml | 4 +- ...android_support_cardview_v7_28_0_0_aar.xml | 4 +- ...constraint_constraint_layout_1_1_3_aar.xml | 4 +- ...d_support_coordinatorlayout_28_0_0_aar.xml | 6 +- ...droid_support_cursoradapter_28_0_0_aar.xml | 4 +- ..._android_support_customview_28_0_0_aar.xml | 4 +- ..._com_android_support_design_28_0_0_aar.xml | 6 +- ...ndroid_support_documentfile_28_0_0_aar.xml | 4 +- ...ndroid_support_drawerlayout_28_0_0_aar.xml | 6 +- ...droid_support_exifinterface_27_1_0_aar.xml | 4 +- ...ndroid_support_interpolator_28_0_0_aar.xml | 4 +- ..._com_android_support_loader_28_0_0_aar.xml | 4 +- ...pport_localbroadcastmanager_28_0_0_aar.xml | 4 +- ...__com_android_support_print_28_0_0_aar.xml | 6 +- ...oid_support_recyclerview_v7_28_0_0_aar.xml | 6 +- ...d_support_slidingpanelayout_28_0_0_aar.xml | 4 +- ...roid_support_support_compat_28_0_0_aar.xml | 6 +- ...oid_support_support_core_ui_28_0_0_aar.xml | 4 +- ..._support_support_core_utils_28_0_0_aar.xml | 4 +- ...id_support_support_fragment_28_0_0_aar.xml | 6 +- ...upport_support_media_compat_28_0_0_aar.xml | 6 +- ..._android_support_support_v4_28_0_0_aar.xml | 4 +- ...ort_support_vector_drawable_28_0_0_aar.xml | 4 +- ..._support_swiperefreshlayout_28_0_0_aar.xml | 6 +- ..._test_espresso_espresso_core_3_0_2_aar.xml | 4 +- ...sso_espresso_idling_resource_3_0_2_aar.xml | 4 +- ...android_support_test_monitor_1_0_2_aar.xml | 4 +- ..._android_support_test_runner_1_0_2_aar.xml | 4 +- ..._android_support_transition_28_0_0_aar.xml | 6 +- ...support_versionedparcelable_28_0_0_aar.xml | 4 +- ...m_android_support_viewpager_28_0_0_aar.xml | 4 +- ...__com_ealva_ealvalog_android_0_5_0_aar.xml | 4 +- ...hub_XuDeveloper_XPopupWindow_1_0_1_aar.xml | 4 +- ...dle__com_squareup_javawriter_2_1_1_jar.xml | 4 +- ...com_squareup_okhttp3_okhttp_3_10_0_jar.xml | 4 +- ...m_squareup_picasso_picasso_2_71828_aar.xml | 4 +- ...radle__javax_inject_javax_inject_1_jar.xml | 4 +- .../Gradle__junit_junit_4_12_jar.xml | 4 +- .../Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml | 4 +- ...le__org_hamcrest_hamcrest_core_1_3_jar.xml | 4 +- ..._hamcrest_hamcrest_integration_1_3_jar.xml | 4 +- ..._org_hamcrest_hamcrest_library_1_3_jar.xml | 4 +- ...le__org_jetbrains_anko_anko_0_10_8_aar.xml | 4 +- ...ains_anko_anko_appcompat_v7_0_10_8_aar.xml | 4 +- ...o_anko_appcompat_v7_commons_0_10_8_aar.xml | 4 +- ...nko_appcompat_v7_coroutines_0_10_8_aar.xml | 4 +- ...jetbrains_anko_anko_commons_0_10_8_aar.xml | 4 +- ...brains_anko_anko_coroutines_0_10_8_aar.xml | 4 +- ...g_jetbrains_anko_anko_sdk27_0_10_8_aar.xml | 4 +- ..._anko_anko_sdk27_coroutines_0_10_8_aar.xml | 4 +- ..._jetbrains_anko_anko_sqlite_0_10_8_aar.xml | 4 +- ...brains_anko_anko_support_v4_0_10_8_aar.xml | 4 +- ...nko_anko_support_v4_commons_0_10_8_aar.xml | 4 +- ...rains_anko_appcompatV7_base_0_10_8_aar.xml | 4 +- ...jetbrains_anko_commons_base_0_10_8_aar.xml | 4 +- ...etbrains_anko_platform_base_0_10_8_aar.xml | 4 +- ..._jetbrains_anko_sqlite_base_0_10_8_aar.xml | 4 +- ...tbrains_anko_supportV4_base_0_10_8_aar.xml | 4 +- ...__org_jetbrains_annotations_16_0_2_jar.xml | 4 +- ...x_kotlinx_coroutines_android_1_0_0_jar.xml | 4 +- ...linx_kotlinx_coroutines_core_1_0_0_jar.xml | 4 +- ...tlinx_coroutines_core_common_1_0_0_jar.xml | 4 +- .idea/vcs.xml | 1 + .idea/workspace.xml | 491 +++++++++++++++--- Mear.iml | 19 - app/app.iml | 8 +- app/build.gradle | 3 +- app/src/main/cpp/CMakeLists.txt | 2 + app/src/main/cpp/Demo.cpp | 67 +++ app/src/main/cpp/SongRepository.cpp | 58 +++ app/src/main/cpp/SongRepository.h | 3 + app/src/main/cpp/Tok.cpp | 7 +- app/src/main/cpp/Tok.h | 1 + .../mear/activities/DemoStreamActivity.kt | 11 +- .../main/java/com/example/mear/models/Song.kt | 4 + build.gradle | 2 +- 86 files changed, 761 insertions(+), 226 deletions(-) delete mode 100644 .idea/caches/gradle_models.ser delete mode 100644 Mear.iml create mode 100644 app/src/main/java/com/example/mear/models/Song.kt diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 210367c6c10b219bac5945be9a6fbb4e28bcb29a..5ad0101a3856324718508cd6f39b0f9a5ceaece4 100644 GIT binary patch delta 80 zcmV-W0I&bO2fYW7m;{}cCt|UjmjMveT?ert1#5V~9w|fx_$IWoLjn!~5cZIjbx--k mD&4b1BTMk}@{^7OE|Xyc9TDOswv)7v;pS86n}+A+ae{bFa3s|L delta 81 zcmV-X0IvVN2fYW7m;{^a5N@%YmjMuA)?VM4IBbU#kg0po7<&k_Ljn!~5OaQ?MK4xg nE0n&DyM1|l<&%#C9T1Hpn>Muhv27qNl>iA9Bt&cX&{I=ElQd~Ja+@eyfz%?z#GdX>I^!`j zXH)HSG4J#C>me$_&%= zdJ2P%^S}#XUKGn2vq)F!gmw)Y&ZPSjS{i5{T0 z$)msj_|w8izfOR+2FJK0@fwMYR9$$%3>4J^$>ThI_lorZ(|c2R@8G9ppe-m-==1vX zs8*iy8PVEKG}PjnlYOYjtsu{5S7i1&fDE zSlCMX>nL+0Nvi^06CO<8hF3+gRMJxJc%PYp%*=a4FHZOa07ReU^O>gr1@Ffp}$5hPPtYHvo=m*Xkxacw8SnnI9!pOV=rLp z=;5>|)`uuV3W745Tz0SQ>SD)>n8%~W(deofTT6*}_{?|X?F+w;>ITctP1I-55*tRpOoDuK* zKj0UR0xRXY98?{rdOFGb68xQZr5nilbMPRE};!B-J;qYusJD; zEvm?IA18=jt$^O=b2h)H#+s%(FFbN@#XJ-`Si#W6!;Fb zh=KV#jo~uVHd8QHF8CE4i(h{C;mdztn8b+>Zs>Y8_XQ`?O9sv#j*#k~#xa8Yy;djM xBw|&h#?AZt-=6yB@)w`~;bPi&Z@Sws=o^O$>VnnA2fiWQZqB>cu34t?e*vLwRSf_D diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index c33b7e4..45b5654 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,5 +1,8 @@ + + @@ -14,6 +17,7 @@ xmlns:android + ^$ @@ -24,6 +28,7 @@ xmlns:.* + ^$ @@ -35,6 +40,7 @@ .*:id + http://schemas.android.com/apk/res/android @@ -45,6 +51,7 @@ .*:name + http://schemas.android.com/apk/res/android @@ -55,6 +62,7 @@ name + ^$ @@ -65,6 +73,7 @@ style + ^$ @@ -75,6 +84,7 @@ .* + ^$ @@ -86,6 +96,7 @@ .* + http://schemas.android.com/apk/res/android @@ -97,6 +108,7 @@ .* + .* 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 c4582bc..0e73b8c 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 @@ -1,8 +1,8 @@ - - + + 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 b5a8650..ad0a3f6 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 @@ -1,8 +1,8 @@ - - + + 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 298f801..48b12ce 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 @@ -1,8 +1,8 @@ - - + + 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 b63e628..8d567ef 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 @@ -1,8 +1,8 @@ - - + + 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 d4c37bd..5736e02 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 @@ -1,8 +1,8 @@ - - + + 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 bb8c385..9113c99 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 @@ -1,8 +1,8 @@ - - + + 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 f5aca94..35b0c35 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,11 +1,11 @@ - + - - + + 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 2e831f1..345c17f 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 @@ -1,8 +1,8 @@ - - + + 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 469886b..ff5d667 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,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml index 561823b..b4c5001 100644 --- a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml +++ b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml @@ -1,8 +1,8 @@ - - + + 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 1c628f3..c874ff9 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,11 +1,11 @@ - + - - + + 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 8083603..c6482e4 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 @@ -1,8 +1,8 @@ - - + + 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 d1a6955..b4e7f5c 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 @@ -1,8 +1,8 @@ - - + + 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 c13ea23..e060806 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,11 +1,11 @@ - + - - + + 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 329f5d2..b78a985 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 @@ -1,8 +1,8 @@ - - + + 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 a25f142..8939efc 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,11 +1,11 @@ - + - - + + 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 99214c0..96990f1 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 @@ -1,8 +1,8 @@ - - + + 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 6cac6af..4abc4b3 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 @@ -1,8 +1,8 @@ - - + + 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 7b4448d..35a4bc3 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 @@ -1,8 +1,8 @@ - - + + 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 da115cd..cb55f59 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 @@ -1,8 +1,8 @@ - - + + 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 06194b6..a2e0d61 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,11 +1,11 @@ - + - - + + 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 d5e014c..e72178e 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,11 +1,11 @@ - + - - + + 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 71268a9..7816982 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 @@ -1,8 +1,8 @@ - - + + 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 34815e7..3aff30b 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,11 +1,11 @@ - + - - + + 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 20f6f26..e770e4b 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 @@ -1,8 +1,8 @@ - - + + 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 797a792..e58b2b7 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 @@ -1,8 +1,8 @@ - - + + 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 b7db675..a6ce645 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,11 +1,11 @@ - + - - + + diff --git a/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml index 919f5de..cd58189 100644 --- a/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml +++ b/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml index 6276e00..904aa00 100644 --- a/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml +++ b/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + 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 1ffccdc..5e6278a 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 @@ -1,8 +1,8 @@ - - + + 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 4acfb13..b3524b1 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,11 +1,11 @@ - + - - + + 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 2e21d09..5c70e80 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 @@ -1,8 +1,8 @@ - - + + 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 a752391..7ce5213 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 @@ -1,8 +1,8 @@ - - + + 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 10d9638..a791ef6 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 @@ -1,8 +1,8 @@ - - + + 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 09e8ac1..b32d04a 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 @@ -1,8 +1,8 @@ - - + + 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 1c70f79..bef5094 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,11 +1,11 @@ - + - - + + 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 90a85a6..01d27ea 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 @@ -1,8 +1,8 @@ - - + + 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 514f8cb..42a9b45 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 @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_ealva_ealvalog_android_0_5_0_aar.xml b/.idea/libraries/Gradle__com_ealva_ealvalog_android_0_5_0_aar.xml index 88f14d2..3d73041 100644 --- a/.idea/libraries/Gradle__com_ealva_ealvalog_android_0_5_0_aar.xml +++ b/.idea/libraries/Gradle__com_ealva_ealvalog_android_0_5_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_github_XuDeveloper_XPopupWindow_1_0_1_aar.xml b/.idea/libraries/Gradle__com_github_XuDeveloper_XPopupWindow_1_0_1_aar.xml index 5841883..a8e2c6d 100644 --- a/.idea/libraries/Gradle__com_github_XuDeveloper_XPopupWindow_1_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_github_XuDeveloper_XPopupWindow_1_0_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml b/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml index 5c4dd4e..f97c138 100644 --- a/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml +++ b/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml @@ -3,7 +3,9 @@ - + + + diff --git a/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_10_0_jar.xml b/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_10_0_jar.xml index 3bb1ed9..ffed7c4 100644 --- a/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_10_0_jar.xml +++ b/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_10_0_jar.xml @@ -3,7 +3,9 @@ - + + + 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 bbfeb24..0b6eeb4 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 @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml b/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml index f9c9a30..5ac7d7b 100644 --- a/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml +++ b/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml @@ -3,7 +3,9 @@ - + + + diff --git a/.idea/libraries/Gradle__junit_junit_4_12_jar.xml b/.idea/libraries/Gradle__junit_junit_4_12_jar.xml index f4f25a8..24e5b72 100644 --- a/.idea/libraries/Gradle__junit_junit_4_12_jar.xml +++ b/.idea/libraries/Gradle__junit_junit_4_12_jar.xml @@ -3,7 +3,9 @@ - + + + diff --git a/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml b/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml index 5855a29..ddd2635 100644 --- a/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml +++ b/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml @@ -3,7 +3,9 @@ - + + + diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml index 50cf2b9..6b1e2e7 100644 --- a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml @@ -3,7 +3,9 @@ - + + + diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml index a5eaca5..a8015c9 100644 --- a/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml @@ -3,7 +3,9 @@ - + + + diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml index b4dabdc..00bb125 100644 --- a/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml @@ -3,7 +3,9 @@ - + + + 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 25ba040..4984359 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 @@ -1,8 +1,8 @@ - - + + 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 a25cb60..25535c1 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 @@ -1,8 +1,8 @@ - - + + 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 5e60da0..3ca4069 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 @@ -1,8 +1,8 @@ - - + + 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 a0dd572..8aa417a 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 @@ -1,8 +1,8 @@ - - + + 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 dfef706..0a03998 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 @@ -1,8 +1,8 @@ - - + + 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 3768dd6..2e57db6 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 @@ -1,8 +1,8 @@ - - + + 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 001703c..5b2d904 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 @@ -1,8 +1,8 @@ - - + + 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 6b4a059..8583703 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 @@ -1,8 +1,8 @@ - - + + 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 37f5058..c18178a 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 @@ -1,8 +1,8 @@ - - + + 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 f820091..ca50bed 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 @@ -1,8 +1,8 @@ - - + + 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 ece08ac..18b5371 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 @@ -1,8 +1,8 @@ - - + + 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 7f71279..8554b6c 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 @@ -1,8 +1,8 @@ - - + + 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 071ec92..56ad79c 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 @@ -1,8 +1,8 @@ - - + + 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 cad494a..9e5c208 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 @@ -1,8 +1,8 @@ - - + + 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 2de8bf6..0968c6d 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 @@ -1,8 +1,8 @@ - - + + 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 b79da0c..54e97c1 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 @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__org_jetbrains_annotations_16_0_2_jar.xml b/.idea/libraries/Gradle__org_jetbrains_annotations_16_0_2_jar.xml index 39c2558..ffca577 100644 --- a/.idea/libraries/Gradle__org_jetbrains_annotations_16_0_2_jar.xml +++ b/.idea/libraries/Gradle__org_jetbrains_annotations_16_0_2_jar.xml @@ -3,7 +3,9 @@ - + + + diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_android_1_0_0_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_android_1_0_0_jar.xml index 66dccaf..0ea3e78 100644 --- a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_android_1_0_0_jar.xml +++ b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_android_1_0_0_jar.xml @@ -3,7 +3,9 @@ - + + + diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_0_0_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_0_0_jar.xml index 4200a1b..b0ba499 100644 --- a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_0_0_jar.xml +++ b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_0_0_jar.xml @@ -3,7 +3,9 @@ - + + + diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_common_1_0_0_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_common_1_0_0_jar.xml index 4d48228..549386a 100644 --- a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_common_1_0_0_jar.xml +++ b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_common_1_0_0_jar.xml @@ -3,7 +3,9 @@ - + + + diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 32eb68d..a364d89 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,7 @@ + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 3ca1fd7..7639c24 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -108,12 +108,8 @@ - - - - - + @@ -131,6 +127,7 @@ + @@ -152,8 +149,17 @@ - - + + + + + + + + + + + @@ -170,12 +176,27 @@ - + + + + + + + - - - + + + + + + + + + + + + @@ -227,6 +248,10 @@ + + + @@ -240,28 +265,106 @@ - - - + + + - - + + + + + - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +