git.iko.soy/annMikh/Socket
on master help sign in
last changes
042adaaAnya
.gradle/4.6/fileHashes/fileHashes.bin
compare with master
unifiedsplit

Binary file not shown.

.gradle/4.6/fileHashes/fileHashes.lock

Binary file not shown.

.gradle/4.6/fileHashes/resourceHashesCache.bin

Binary file not shown.

.gradle/4.6/taskHistory/taskHistory.bin

Binary file not shown.

.gradle/4.6/taskHistory/taskHistory.lock

Binary file not shown.

.gradle/buildOutputCleanup/buildOutputCleanup.lock

Binary file not shown.

.idea/caches/build_file_checksums.ser

Binary file not shown.

.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_8_1_jar.xmlnew file+11
@@ -0,0 +1,11 @@
1+<component name="libraryTable">
2+ <library name="Gradle: com.squareup.okhttp3:okhttp:3.8.1@jar">
3+ <CLASSES>
4+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.8.1/4d060ca3190df0eda4dc13415532a12e15ca5f11/okhttp-3.8.1.jar!/" />
5+ </CLASSES>
6+ <JAVADOC />
7+ <SOURCES>
8+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.8.1/fc70ffa234e7e77741867d38b341d162ec1ec01e/okhttp-3.8.1-sources.jar!/" />
9+ </SOURCES>
10+ </library>
11+</component>
.idea/libraries/Gradle__com_squareup_okio_okio_1_13_0_jar.xmlnew file+11
@@ -0,0 +1,11 @@
1+<component name="libraryTable">
2+ <library name="Gradle: com.squareup.okio:okio:1.13.0@jar">
3+ <CLASSES>
4+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar!/" />
5+ </CLASSES>
6+ <JAVADOC />
7+ <SOURCES>
8+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.13.0/f4c91e12121af963e3ef76e81c82aa75ba6e8533/okio-1.13.0-sources.jar!/" />
9+ </SOURCES>
10+ </library>
11+</component>
.idea/libraries/Gradle__io_socket_engine_io_client_1_0_0_jar.xmlnew file+11
@@ -0,0 +1,11 @@
1+<component name="libraryTable">
2+ <library name="Gradle: io.socket:engine.io-client:1.0.0@jar">
3+ <CLASSES>
4+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.socket/engine.io-client/1.0.0/45fc6115750f06a9cd5dd71632cb7fc052cd66de/engine.io-client-1.0.0.jar!/" />
5+ </CLASSES>
6+ <JAVADOC />
7+ <SOURCES>
8+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.socket/engine.io-client/1.0.0/1c1cc12afc81c9d70b3eb436186189b1c56a1fc1/engine.io-client-1.0.0-sources.jar!/" />
9+ </SOURCES>
10+ </library>
11+</component>
.idea/libraries/Gradle__io_socket_socket_io_client_1_0_0_jar.xmlnew file+11
@@ -0,0 +1,11 @@
1+<component name="libraryTable">
2+ <library name="Gradle: io.socket:socket.io-client:1.0.0@jar">
3+ <CLASSES>
4+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.socket/socket.io-client/1.0.0/28dde99672ed62a85e85a7df096c6bec698785b4/socket.io-client-1.0.0.jar!/" />
5+ </CLASSES>
6+ <JAVADOC />
7+ <SOURCES>
8+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.socket/socket.io-client/1.0.0/4b4143f3dd7f109762c43643b9c306bb33f94f5c/socket.io-client-1.0.0-sources.jar!/" />
9+ </SOURCES>
10+ </library>
11+</component>
.idea/libraries/Gradle__org_json_json_20090211_jar.xmlnew file+9
@@ -0,0 +1,9 @@
1+<component name="libraryTable">
2+ <library name="Gradle: org.json:json:20090211@jar">
3+ <CLASSES>
4+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.json/json/20090211/c183aa3a2a6250293808bba12262c8920ce5a51c/json-20090211.jar!/" />
5+ </CLASSES>
6+ <JAVADOC />
7+ <SOURCES />
8+ </library>
9+</component>
.idea/workspace.xml+93−95
@@ -1,31 +1,72 @@
1<?xml version="1.0" encoding="UTF-8"?>
1<?xml version="1.0" encoding="UTF-8"?>
2<project version="4">
2<project version="4">
3− <component name="AndroidLayouts">
4− <shared>
5− <config />
6− </shared>
7− </component>
8 <component name="CMakeSettings">
3 <component name="CMakeSettings">
9 <configurations>
4 <configurations>
10 <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
5 <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
11 </configurations>
6 </configurations>
12 </component>
7 </component>
13 <component name="ChangeListManager">
8 <component name="ChangeListManager">
14− <list default="true" id="6c1ed618-7fec-4785-93fc-5caee38346bd" name="Default" comment="">
9+ <list default="true" id="3f7b3900-8289-4aba-9ead-9b382191f8d5" name="Default" comment="">
15 <change beforePath="$PROJECT_DIR$/.gradle/4.6/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/fileHashes/fileHashes.bin" afterDir="false" />
10 <change beforePath="$PROJECT_DIR$/.gradle/4.6/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/fileHashes/fileHashes.bin" afterDir="false" />
16 <change beforePath="$PROJECT_DIR$/.gradle/4.6/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/fileHashes/fileHashes.lock" afterDir="false" />
11 <change beforePath="$PROJECT_DIR$/.gradle/4.6/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/fileHashes/fileHashes.lock" afterDir="false" />
17− <change beforePath="$PROJECT_DIR$/.gradle/4.6/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/javaCompile/classAnalysis.bin" afterDir="false" />
12+ <change beforePath="$PROJECT_DIR$/.gradle/4.6/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/fileHashes/resourceHashesCache.bin" afterDir="false" />
18− <change beforePath="$PROJECT_DIR$/.gradle/4.6/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/javaCompile/javaCompile.lock" afterDir="false" />
19− <change beforePath="$PROJECT_DIR$/.gradle/4.6/javaCompile/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/javaCompile/taskHistory.bin" afterDir="false" />
20 <change beforePath="$PROJECT_DIR$/.gradle/4.6/taskHistory/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/taskHistory/taskHistory.bin" afterDir="false" />
13 <change beforePath="$PROJECT_DIR$/.gradle/4.6/taskHistory/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/taskHistory/taskHistory.bin" afterDir="false" />
21 <change beforePath="$PROJECT_DIR$/.gradle/4.6/taskHistory/taskHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/taskHistory/taskHistory.lock" afterDir="false" />
14 <change beforePath="$PROJECT_DIR$/.gradle/4.6/taskHistory/taskHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/taskHistory/taskHistory.lock" afterDir="false" />
22 <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
15 <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
23− <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
24 <change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
16 <change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
17+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml" beforeDir="false" />
18+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1.xml" beforeDir="false" />
19+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml" beforeDir="false" />
20+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1.xml" beforeDir="false" />
21+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1.xml" beforeDir="false" />
22+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1.xml" beforeDir="false" />
23+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1.xml" beforeDir="false" />
24+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0.xml" beforeDir="false" />
25+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0.xml" beforeDir="false" />
26+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0.xml" beforeDir="false" />
27+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0.xml" beforeDir="false" />
28+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_collections_28_0_0_jar.xml" beforeDir="false" />
29+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3.xml" beforeDir="false" />
30+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_3_jar.xml" beforeDir="false" />
31+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0.xml" beforeDir="false" />
32+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0.xml" beforeDir="false" />
33+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_customview_28_0_0.xml" beforeDir="false" />
34+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0.xml" beforeDir="false" />
35+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0.xml" beforeDir="false" />
36+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0.xml" beforeDir="false" />
37+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_loader_28_0_0.xml" beforeDir="false" />
38+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0.xml" beforeDir="false" />
39+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_print_28_0_0.xml" beforeDir="false" />
40+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0.xml" beforeDir="false" />
41+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0.xml" beforeDir="false" />
42+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml" beforeDir="false" />
43+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0.xml" beforeDir="false" />
44+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0.xml" beforeDir="false" />
45+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0.xml" beforeDir="false" />
46+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0.xml" beforeDir="false" />
47+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0.xml" beforeDir="false" />
48+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0.xml" beforeDir="false" />
49+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2.xml" beforeDir="false" />
50+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2.xml" beforeDir="false" />
51+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2.xml" beforeDir="false" />
52+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2.xml" beforeDir="false" />
53+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0.xml" beforeDir="false" />
54+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0.xml" beforeDir="false" />
55+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml" beforeDir="false" />
56+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_5_jar.xml" beforeDir="false" />
57+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml" beforeDir="false" />
58+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml" beforeDir="false" />
59+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__junit_junit_4_12_jar.xml" beforeDir="false" />
60+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml" beforeDir="false" />
61+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml" beforeDir="false" />
62+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml" beforeDir="false" />
63+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml" beforeDir="false" />
64+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_java_websocket_Java_WebSocket_1_3_9_jar.xml" beforeDir="false" />
25 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
65 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
26− <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/AdapterNews.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/AdapterNews.java" afterDir="false" />
66+ <change beforePath="$PROJECT_DIR$/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" afterDir="false" />
67+ <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
27 <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Parsing.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Parsing.java" afterDir="false" />
68 <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Parsing.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Parsing.java" afterDir="false" />
28− <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" afterDir="false" />
69+ <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Socket.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Socket.java" afterDir="false" />
29 </list>
70 </list>
30 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
71 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
31 <option name="TRACKING_ENABLED" value="true" />
72 <option name="TRACKING_ENABLED" value="true" />
@@ -48,43 +89,25 @@
48 </component>
89 </component>
49 <component name="FileEditorManager">
90 <component name="FileEditorManager">
50 <leaf>
91 <leaf>
51− <file leaf-file-name="AdapterNews.java" pinned="false" current-in-tab="true">
52− <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/AdapterNews.java">
53− <provider selected="true" editor-type-id="text-editor">
54− <state relative-caret-position="271">
55− <caret line="162" column="31" lean-forward="true" selection-start-line="162" selection-start-column="31" selection-end-line="162" selection-end-column="31" />
56− </state>
57− </provider>
58− </entry>
59− </file>
60− <file leaf-file-name="MainActivity.java" pinned="false" current-in-tab="false">
92+ <file leaf-file-name="Socket.java" pinned="false" current-in-tab="false">
61− <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/MainActivity.java">
93+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Socket.java">
62− <provider selected="true" editor-type-id="text-editor">
63− <state relative-caret-position="360">
64− <caret line="32" column="23" selection-start-line="32" selection-start-column="23" selection-end-line="32" selection-end-column="23" />
65− </state>
66− </provider>
67− </entry>
68− </file>
69− <file leaf-file-name="activity_main.xml" pinned="false" current-in-tab="false">
70− <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
71 <provider selected="true" editor-type-id="text-editor">
94 <provider selected="true" editor-type-id="text-editor">
72− <state relative-caret-position="30">
95+ <state relative-caret-position="120">
73− <caret line="9" column="16" selection-start-line="9" selection-start-column="16" selection-end-line="9" selection-end-column="16" />
96+ <caret line="8" selection-start-line="8" selection-end-line="8" selection-end-column="32" />
97+ <folding>
98+ <element signature="imports" expanded="true" />
99+ </folding>
74 </state>
100 </state>
75 </provider>
101 </provider>
76− <provider editor-type-id="android-designer2">
77− <state />
78− </provider>
79 </entry>
102 </entry>
80 </file>
103 </file>
81− <file leaf-file-name="Parsing.java" pinned="false" current-in-tab="false">
104+ <file leaf-file-name="Parsing.java" pinned="false" current-in-tab="true">
82 <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Parsing.java">
105 <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Parsing.java">
83 <provider selected="true" editor-type-id="text-editor">
106 <provider selected="true" editor-type-id="text-editor">
84− <state relative-caret-position="223">
107+ <state relative-caret-position="263">
85− <caret line="89" column="46" selection-start-line="89" selection-start-column="46" selection-end-line="89" selection-end-column="46" />
108+ <caret line="69" column="45" lean-forward="true" selection-start-line="69" selection-start-column="45" selection-end-line="69" selection-end-column="45" />
86 <folding>
109 <folding>
87− <marker date="1549302605747" expanded="true" signature="1260:1549" ph="..." />
110+ <element signature="imports" expanded="true" />
88 </folding>
111 </folding>
89 </state>
112 </state>
90 </provider>
113 </provider>
@@ -2354,23 +2377,22 @@
2354 <component name="IdeDocumentHistory">
2377 <component name="IdeDocumentHistory">
2355 <option name="CHANGED_PATHS">
2378 <option name="CHANGED_PATHS">
2356 <list>
2379 <list>
2357− <option value="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/AdapterNews.java" />
2380+ <option value="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Socket.java" />
2358− <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
2359 <option value="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Parsing.java" />
2381 <option value="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Parsing.java" />
2360 </list>
2382 </list>
2361 </option>
2383 </option>
2362 </component>
2384 </component>
2363− <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
2385+ <component name="ProjectFrameBounds" fullScreen="true">
2386+ <option name="y" value="23" />
2364 <option name="width" value="1440" />
2387 <option name="width" value="1440" />
2365− <option name="height" value="900" />
2388+ <option name="height" value="793" />
2366 </component>
2389 </component>
2367 <component name="ProjectView">
2390 <component name="ProjectView">
2368 <navigator proportions="" version="1">
2391 <navigator proportions="" version="1">
2369 <foldersAlwaysOnTop value="true" />
2392 <foldersAlwaysOnTop value="true" />
2370 </navigator>
2393 </navigator>
2371 <panes>
2394 <panes>
2372− <pane id="ProjectPane" />
2395+ <pane id="PackagesPane" />
2373− <pane id="Scope" />
2374 <pane id="AndroidView">
2396 <pane id="AndroidView">
2375 <subPane>
2397 <subPane>
2376 <expand>
2398 <expand>
@@ -2391,31 +2413,18 @@
2391 </path>
2413 </path>
2392 <path>
2414 <path>
2393 <item name="Socket" type="1abcf292:AndroidViewProjectNode" />
2415 <item name="Socket" type="1abcf292:AndroidViewProjectNode" />
2394− <item name="app" type="feadf853:AndroidModuleNode" />
2416+ <item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" />
2395− <item name="res" type="d4f16f75:AndroidResFolderNode" />
2396− </path>
2397− <path>
2398− <item name="Socket" type="1abcf292:AndroidViewProjectNode" />
2399− <item name="app" type="feadf853:AndroidModuleNode" />
2400− <item name="res" type="d4f16f75:AndroidResFolderNode" />
2401− <item name="anim" type="ddeffd01:AndroidResFolderTypeNode" />
2402− </path>
2403− <path>
2404− <item name="Socket" type="1abcf292:AndroidViewProjectNode" />
2405− <item name="app" type="feadf853:AndroidModuleNode" />
2406− <item name="res" type="d4f16f75:AndroidResFolderNode" />
2407− <item name="layout" type="ddeffd01:AndroidResFolderTypeNode" />
2408 </path>
2417 </path>
2409 </expand>
2418 </expand>
2410 <select />
2419 <select />
2411 </subPane>
2420 </subPane>
2412 </pane>
2421 </pane>
2413− <pane id="PackagesPane" />
2422+ <pane id="Scope" />
2423+ <pane id="ProjectPane" />
2414 </panes>
2424 </panes>
2415 </component>
2425 </component>
2416 <component name="PropertiesComponent">
2426 <component name="PropertiesComponent">
2417 <property name="android.sdk.path" value="$USER_HOME$/Library/Android/sdk" />
2427 <property name="android.sdk.path" value="$USER_HOME$/Library/Android/sdk" />
2418− <property name="device.picker.selection" value="014E0F261100C012" />
2419 <property name="last_opened_file_path" value="$PROJECT_DIR$" />
2428 <property name="last_opened_file_path" value="$PROJECT_DIR$" />
2420 </component>
2429 </component>
2421 <component name="RunDashboard">
2430 <component name="RunDashboard">
@@ -2451,7 +2460,7 @@
2451 <option name="Android.Gradle.BeforeRunTask" enabled="true" />
2460 <option name="Android.Gradle.BeforeRunTask" enabled="true" />
2452 </method>
2461 </method>
2453 </configuration>
2462 </configuration>
2454− <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
2463+ <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App">
2455 <module name="app" />
2464 <module name="app" />
2456 <option name="DEPLOY" value="true" />
2465 <option name="DEPLOY" value="true" />
2457 <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
2466 <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
@@ -2535,35 +2544,33 @@
2535 </component>
2544 </component>
2536 <component name="TaskManager">
2545 <component name="TaskManager">
2537 <task active="true" id="Default" summary="Default task">
2546 <task active="true" id="Default" summary="Default task">
2538− <changelist id="6c1ed618-7fec-4785-93fc-5caee38346bd" name="Default" comment="" />
2547+ <changelist id="3f7b3900-8289-4aba-9ead-9b382191f8d5" name="Default" comment="" />
2539− <created>1549302242823</created>
2548+ <created>1549548608334</created>
2540 <option name="number" value="Default" />
2549 <option name="number" value="Default" />
2541 <option name="presentableId" value="Default" />
2550 <option name="presentableId" value="Default" />
2542− <updated>1549302242823</updated>
2551+ <updated>1549548608334</updated>
2543 </task>
2552 </task>
2544 <servers />
2553 <servers />
2545 </component>
2554 </component>
2546 <component name="ToolWindowManager">
2555 <component name="ToolWindowManager">
2547 <frame x="0" y="0" width="1440" height="900" extended-state="6" />
2556 <frame x="0" y="0" width="1440" height="900" extended-state="6" />
2548− <editor active="true" />
2549 <layout>
2557 <layout>
2550 <window_info anchor="bottom" id="TODO" order="6" />
2558 <window_info anchor="bottom" id="TODO" order="6" />
2551− <window_info anchor="bottom" id="Android Profiler" />
2559+ <window_info anchor="bottom" id="Android Profiler" show_stripe_button="false" />
2552 <window_info anchor="right" id="Palette&#9;" />
2560 <window_info anchor="right" id="Palette&#9;" />
2553 <window_info id="Image Layers" />
2561 <window_info id="Image Layers" />
2554 <window_info id="Build Variants" side_tool="true" />
2562 <window_info id="Build Variants" side_tool="true" />
2555 <window_info anchor="right" id="Capture Analysis" />
2563 <window_info anchor="right" id="Capture Analysis" />
2556 <window_info anchor="bottom" id="Event Log" side_tool="true" />
2564 <window_info anchor="bottom" id="Event Log" side_tool="true" />
2557− <window_info anchor="right" id="Preview" weight="0.3297568" />
2565+ <window_info anchor="bottom" id="Run" order="2" />
2558− <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.15461347" />
2559 <window_info anchor="bottom" id="Version Control" />
2566 <window_info anchor="bottom" id="Version Control" />
2560 <window_info anchor="bottom" id="Terminal" />
2567 <window_info anchor="bottom" id="Terminal" />
2561 <window_info anchor="bottom" id="Logcat" />
2568 <window_info anchor="bottom" id="Logcat" />
2562 <window_info id="Captures" order="2" weight="0.25" />
2569 <window_info id="Captures" order="2" weight="0.25" />
2563 <window_info id="Capture Tool" />
2570 <window_info id="Capture Tool" />
2564 <window_info id="Designer" />
2571 <window_info id="Designer" />
2565− <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22532189" />
2572+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24964234" />
2566− <window_info anchor="bottom" id="Build" weight="0.4127182" />
2573+ <window_info anchor="bottom" id="Build" visible="true" weight="0.13092269" />
2567 <window_info anchor="right" id="Gradle" />
2574 <window_info anchor="right" id="Gradle" />
2568 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
2575 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
2569 <window_info anchor="right" id="Theme Preview" />
2576 <window_info anchor="right" id="Theme Preview" />
@@ -2572,9 +2579,9 @@
2572 <window_info anchor="right" id="Device File Explorer" side_tool="true" />
2579 <window_info anchor="right" id="Device File Explorer" side_tool="true" />
2573 <window_info anchor="bottom" id="Find" order="1" />
2580 <window_info anchor="bottom" id="Find" order="1" />
2574 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
2581 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
2575− <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
2576− <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
2577 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
2582 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
2583+ <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
2584+ <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
2578 <window_info anchor="bottom" id="Message" order="0" />
2585 <window_info anchor="bottom" id="Message" order="0" />
2579 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
2586 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
2580 </layout>
2587 </layout>
@@ -2583,39 +2590,30 @@
2583 <option name="myLimit" value="2678400000" />
2590 <option name="myLimit" value="2678400000" />
2584 </component>
2591 </component>
2585 <component name="editorHistoryManager">
2592 <component name="editorHistoryManager">
2586− <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
2593+ <entry file="file://$PROJECT_DIR$/app/build.gradle">
2587 <provider selected="true" editor-type-id="text-editor">
2594 <provider selected="true" editor-type-id="text-editor">
2588− <state relative-caret-position="30">
2595+ <state relative-caret-position="-237" />
2589− <caret line="9" column="16" selection-start-line="9" selection-start-column="16" selection-end-line="9" selection-end-column="16" />
2590− </state>
2591− </provider>
2592− <provider editor-type-id="android-designer2">
2593− <state />
2594 </provider>
2596 </provider>
2595 </entry>
2597 </entry>
2596− <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/MainActivity.java">
2598+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Socket.java">
2597 <provider selected="true" editor-type-id="text-editor">
2599 <provider selected="true" editor-type-id="text-editor">
2598− <state relative-caret-position="360">
2600+ <state relative-caret-position="120">
2599− <caret line="32" column="23" selection-start-line="32" selection-start-column="23" selection-end-line="32" selection-end-column="23" />
2601+ <caret line="8" selection-start-line="8" selection-end-line="8" selection-end-column="32" />
2602+ <folding>
2603+ <element signature="imports" expanded="true" />
2604+ </folding>
2600 </state>
2605 </state>
2601 </provider>
2606 </provider>
2602 </entry>
2607 </entry>
2603 <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Parsing.java">
2608 <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Parsing.java">
2604 <provider selected="true" editor-type-id="text-editor">
2609 <provider selected="true" editor-type-id="text-editor">
2605− <state relative-caret-position="223">
2610+ <state relative-caret-position="263">
2606− <caret line="89" column="46" selection-start-line="89" selection-start-column="46" selection-end-line="89" selection-end-column="46" />
2611+ <caret line="69" column="45" lean-forward="true" selection-start-line="69" selection-start-column="45" selection-end-line="69" selection-end-column="45" />
2607 <folding>
2612 <folding>
2608− <marker date="1549302605747" expanded="true" signature="1260:1549" ph="..." />
2613+ <element signature="imports" expanded="true" />
2609 </folding>
2614 </folding>
2610 </state>
2615 </state>
2611 </provider>
2616 </provider>
2612 </entry>
2617 </entry>
2613− <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/AdapterNews.java">
2614− <provider selected="true" editor-type-id="text-editor">
2615− <state relative-caret-position="271">
2616− <caret line="162" column="31" lean-forward="true" selection-start-line="162" selection-start-column="31" selection-end-line="162" selection-end-column="31" />
2617− </state>
2618− </provider>
2619− </entry>
2620 </component>
2618 </component>
2621</project>
2619</project>
app/app.iml+26−23
@@ -88,7 +88,6 @@
88 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
88 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
89 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
89 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
90 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
90 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
91− <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
92 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
91 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
93 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
92 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
94 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
93 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
@@ -103,7 +102,6 @@
103 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
102 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
104 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
103 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
105 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
104 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
106− <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
107 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
105 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
108 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
106 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
109 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
107 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
@@ -124,53 +122,58 @@
124 </content>
122 </content>
125 <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
123 <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
126 <orderEntry type="sourceFolder" forTests="false" />
124 <orderEntry type="sourceFolder" forTests="false" />
127− <orderEntry type="library" name="Gradle: com.android.support:customview-28.0.0" level="project" />
125+ <orderEntry type="library" name="Gradle: io.socket:socket.io-client:1.0.0@jar" level="project" />
128 <orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager-28.0.0" level="project" />
126 <orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager-28.0.0" level="project" />
129− <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner-1.0.2" level="project" />
127+ <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.8.1@jar" level="project" />
130 <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-28.0.0" level="project" />
128 <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-28.0.0" level="project" />
131− <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5@jar" level="project" />
132 <orderEntry type="library" name="Gradle: com.android.support:interpolator-28.0.0" level="project" />
129 <orderEntry type="library" name="Gradle: com.android.support:interpolator-28.0.0" level="project" />
133 <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-28.0.0" level="project" />
130 <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-28.0.0" level="project" />
134− <orderEntry type="library" name="Gradle: com.android.support:support-core-ui-28.0.0" level="project" />
131+ <orderEntry type="library" name="Gradle: io.socket:engine.io-client:1.0.0@jar" level="project" />
135− <orderEntry type="library" name="Gradle: com.android.support:slidingpanelayout-28.0.0" level="project" />
136− <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel-1.1.1" level="project" />
137− <orderEntry type="library" name="Gradle: com.android.support:cardview-v7-28.0.0" level="project" />
138 <orderEntry type="library" name="Gradle: com.android.support:drawerlayout-28.0.0" level="project" />
132 <orderEntry type="library" name="Gradle: com.android.support:drawerlayout-28.0.0" level="project" />
139 <orderEntry type="library" name="Gradle: com.android.support:coordinatorlayout-28.0.0" level="project" />
133 <orderEntry type="library" name="Gradle: com.android.support:coordinatorlayout-28.0.0" level="project" />
140− <orderEntry type="library" name="Gradle: com.android.support:collections:28.0.0@jar" level="project" />
134+ <orderEntry type="library" name="Gradle: com.android.support:cardview-v7-28.0.0" level="project" />
141 <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
135 <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
142− <orderEntry type="library" name="Gradle: com.android.support:documentfile-28.0.0" level="project" />
143 <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-1.1.3" level="project" />
136 <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-1.1.3" level="project" />
144 <orderEntry type="library" name="Gradle: com.android.support:swiperefreshlayout-28.0.0" level="project" />
137 <orderEntry type="library" name="Gradle: com.android.support:swiperefreshlayout-28.0.0" level="project" />
138+ <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-1.1.1" level="project" />
139+ <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
140+ <orderEntry type="library" name="Gradle: com.android.support:versionedparcelable-28.0.0" level="project" />
141+ <orderEntry type="library" name="Gradle: android.arch.core:runtime-1.1.1" level="project" />
142+ <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:monitor-1.0.2" level="project" />
143+ <orderEntry type="library" name="Gradle: com.android.support:loader-28.0.0" level="project" />
144+ <orderEntry type="library" name="Gradle: com.android.support:viewpager-28.0.0" level="project" />
145+ <orderEntry type="library" name="Gradle: org.json:json:20090211@jar" level="project" />
146+ <orderEntry type="library" name="Gradle: com.android.support:support-annotations:28.0.0@jar" level="project" />
147+ <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.3@jar" level="project" />
148+ <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.1" level="project" />
149+ <orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0@jar" level="project" />
150+ <orderEntry type="library" name="Gradle: com.android.support:customview-28.0.0" level="project" />
151+ <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner-1.0.2" level="project" />
152+ <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5@jar" level="project" />
153+ <orderEntry type="library" name="Gradle: com.android.support:support-core-ui-28.0.0" level="project" />
154+ <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.13.0@jar" level="project" />
155+ <orderEntry type="library" name="Gradle: com.android.support:slidingpanelayout-28.0.0" level="project" />
156+ <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel-1.1.1" level="project" />
157+ <orderEntry type="library" name="Gradle: com.android.support:collections:28.0.0@jar" level="project" />
158+ <orderEntry type="library" name="Gradle: com.android.support:documentfile-28.0.0" level="project" />
145 <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-28.0.0" level="project" />
159 <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-28.0.0" level="project" />
146 <orderEntry type="library" name="Gradle: com.android.support:cursoradapter-28.0.0" level="project" />
160 <orderEntry type="library" name="Gradle: com.android.support:cursoradapter-28.0.0" level="project" />
147 <orderEntry type="library" name="Gradle: com.android.support:asynclayoutinflater-28.0.0" level="project" />
161 <orderEntry type="library" name="Gradle: com.android.support:asynclayoutinflater-28.0.0" level="project" />
148− <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-1.1.1" level="project" />
149 <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
162 <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
150 <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core-3.0.2" level="project" />
163 <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core-3.0.2" level="project" />
151− <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
152 <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1@jar" level="project" />
164 <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1@jar" level="project" />
153− <orderEntry type="library" name="Gradle: com.android.support:versionedparcelable-28.0.0" level="project" />
154 <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
165 <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
155 <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
166 <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
156− <orderEntry type="library" name="Gradle: android.arch.core:runtime-1.1.1" level="project" />
157 <orderEntry type="library" name="Gradle: com.android.support:print-28.0.0" level="project" />
167 <orderEntry type="library" name="Gradle: com.android.support:print-28.0.0" level="project" />
158− <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:monitor-1.0.2" level="project" />
159− <orderEntry type="library" name="Gradle: com.android.support:loader-28.0.0" level="project" />
160 <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource-3.0.2" level="project" />
168 <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource-3.0.2" level="project" />
161− <orderEntry type="library" name="Gradle: com.android.support:viewpager-28.0.0" level="project" />
162− <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
163 <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
169 <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
170+ <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
164 <orderEntry type="library" name="Gradle: com.android.support:support-fragment-28.0.0" level="project" />
171 <orderEntry type="library" name="Gradle: com.android.support:support-fragment-28.0.0" level="project" />
165− <orderEntry type="library" name="Gradle: com.android.support:support-annotations:28.0.0@jar" level="project" />
166 <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1@jar" level="project" />
172 <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1@jar" level="project" />
167 <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.1" level="project" />
173 <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.1" level="project" />
168 <orderEntry type="library" name="Gradle: org.java-websocket:Java-WebSocket:1.3.9@jar" level="project" />
174 <orderEntry type="library" name="Gradle: org.java-websocket:Java-WebSocket:1.3.9@jar" level="project" />
169 <orderEntry type="library" name="Gradle: com.android.support:support-compat-28.0.0" level="project" />
175 <orderEntry type="library" name="Gradle: com.android.support:support-compat-28.0.0" level="project" />
170 <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-28.0.0" level="project" />
176 <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-28.0.0" level="project" />
171 <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-28.0.0" level="project" />
177 <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-28.0.0" level="project" />
172− <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.3@jar" level="project" />
173− <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.1" level="project" />
174− <orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0@jar" level="project" />
175 </component>
178 </component>
176</module>
179</module>
app/build.gradle+2
@@ -37,6 +37,8 @@ dependencies {
37 implementation 'com.android.support:recyclerview-v7:28.0.0'
37 implementation 'com.android.support:recyclerview-v7:28.0.0'
38 implementation 'com.android.support:cardview-v7:28.0.0'
38 implementation 'com.android.support:cardview-v7:28.0.0'
39
39
40+ //io socket
41+ implementation 'io.socket:socket.io-client:1.0.0'
40 // floating action button
42 // floating action button
41 // implementation 'com.android.support:design:28.0.0'
43 // implementation 'com.android.support:design:28.0.0'
42
44
app/src/main/java/com/example/annamihaleva/testparse/Parsing.java+32−22
@@ -5,30 +5,32 @@ import android.os.AsyncTask;
5import android.os.Handler;
5import android.os.Handler;
6import android.support.v7.widget.RecyclerView;
6import android.support.v7.widget.RecyclerView;
7import android.util.Log;
7import android.util.Log;
8−import android.view.View;
9import android.view.animation.AnimationUtils;
8import android.view.animation.AnimationUtils;
10import android.view.animation.LayoutAnimationController;
9import android.view.animation.LayoutAnimationController;
11import android.widget.ProgressBar;
10import android.widget.ProgressBar;
12−import android.widget.RelativeLayout;
13import com.google.gson.Gson;
11import com.google.gson.Gson;
14−import org.java_websocket.client.WebSocketClient;
12+
15import java.io.BufferedReader;
13import java.io.BufferedReader;
16import java.io.IOException;
14import java.io.IOException;
17import java.io.InputStream;
15import java.io.InputStream;
18import java.io.InputStreamReader;
16import java.io.InputStreamReader;
19import java.net.HttpURLConnection;
17import java.net.HttpURLConnection;
20−import java.net.URI;
21import java.net.URISyntaxException;
18import java.net.URISyntaxException;
22import java.net.URL;
19import java.net.URL;
23import java.util.ArrayList;
20import java.util.ArrayList;
24import java.util.List;
21import java.util.List;
25
22
23+import io.socket.client.IO;
24+import io.socket.emitter.Emitter;
25+import io.socket.engineio.client.Socket;
26+
26public class Parsing extends AsyncTask<Void, Void, Void> {
27public class Parsing extends AsyncTask<Void, Void, Void> {
27
28
28− private WebSocketClient client = null;
29+
29 private ProgressBar progressBar;
30 private ProgressBar progressBar;
30 private RecyclerView news;
31 private RecyclerView news;
31 Context context;
32 Context context;
33+ MessageSocket mesResponse;
32
34
33 public static Response resp = new Response();
35 public static Response resp = new Response();
34 List<Posts> partOfPosts = new ArrayList<>();
36 List<Posts> partOfPosts = new ArrayList<>();
@@ -39,14 +41,17 @@ public class Parsing extends AsyncTask<Void, Void, Void> {
39 context = c;
41 context = c;
40 }
42 }
41
43
44+ private io.socket.client.Socket socket;
45+ {
46+ try {
47+ socket = IO.socket("https://websuck1t.herokuapp.com");
48+ } catch (URISyntaxException e) {}
49+ }
50+
51+
42 @Override
52 @Override
43 protected void onPreExecute() {
53 protected void onPreExecute() {
44 super.onPreExecute();
54 super.onPreExecute();
45−
46−// progressBar = new ProgressBar(context,null, android.R.attr.progressBarStyleLarge);
47−// RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(100,100);
48−// params.addRule(RelativeLayout.CENTER_IN_PARENT);
49−// progressBar.setVisibility(View.VISIBLE);
50 }
55 }
51
56
52 @Override
57 @Override
@@ -64,27 +69,32 @@ public class Parsing extends AsyncTask<Void, Void, Void> {
64 fillArray(0, 10);
69 fillArray(0, 10);
65 AdapterNews.allPosts = resp.response;
70 AdapterNews.allPosts = resp.response;
66
71
67− try {
68− if (client == null && resp != null)
69− client = new Socket(
70− new URI("ws://websuck1t.herokuapp.com/posts/subscribe/" + resp.token));
71− }
72− catch (URISyntaxException e) {
73− e.printStackTrace();
74− }
75
72
76− if (client != null)
73+ socket.on("postUpdates", args -> {
77− client.connect();
74+ Gson g1 = new Gson();
75+ mesResponse = g1.fromJson(args.toString(), MessageSocket.class);
78
76
79− adapter = new AdapterNews(context, partOfPosts, news);
77+ if (mesResponse != null) {
80− Socket.setAdapter(adapter);
78+ resp.token = mesResponse.token;
81
79
80+ if (mesResponse.response.deleted != null)
81+ for (int i = 0; i < mesResponse.response.deleted.size(); ++i)
82+ adapter.removeAt(mesResponse.response.deleted.get(i));
83+
84+ if (mesResponse.response.added != null)
85+ adapter.addPost(mesResponse.response.added);
86+ }
87+ });
88+
89+ adapter = new AdapterNews(context, partOfPosts, news);
82 return null;
90 return null;
83 }
91 }
84
92
93+
85 @Override
94 @Override
86 protected void onPostExecute(Void result) {
95 protected void onPostExecute(Void result) {
87 super.onPostExecute(result);
96 super.onPostExecute(result);
97+ socket.connect();
88
98
89 MainActivity.adapter = adapter;
99 MainActivity.adapter = adapter;
90 MainActivity.news.setAdapter(adapter);
100 MainActivity.news.setAdapter(adapter);
app/src/main/java/com/example/annamihaleva/testparse/Socket.java+48−51
@@ -1,55 +1,52 @@
1package com.example.annamihaleva.testparse;
1package com.example.annamihaleva.testparse;
2
2
3+import io.socket.client.IO;
3
4
4−import com.google.gson.Gson;
5−import org.java_websocket.client.WebSocketClient;
6−import org.java_websocket.handshake.ServerHandshake;
7−import java.net.URI;
8import static com.example.annamihaleva.testparse.Parsing.resp;
5import static com.example.annamihaleva.testparse.Parsing.resp;
9−
6+//
10−class Socket extends WebSocketClient {
7+//class Socket {
11−
8+//
12− MessageSocket mesResponse;
9+// MessageSocket mesResponse;
13− static AdapterNews adapter;
10+// static AdapterNews adapter;
14−
11+//
15− static void setAdapter(AdapterNews news){
12+// static void setAdapter(AdapterNews news){
16− adapter = news;
13+// adapter = news;
17− }
14+// }
18−
15+//
19− Socket(URI serverUri) {
16+// Socket(URI serverUri) {
20− super(serverUri);
17+// super(serverUri);
21− }
18+// }
22−
19+//
23− @Override
20+// @Override
24− public void onOpen(ServerHandshake handshakedata) {
21+// public void onOpen(ServerHandshake handshakedata) {
25−
22+//
26− }
23+// }
27−
24+//
28− @Override
25+// @Override
29− public void onMessage(String message) {
26+// public void onMessage(String message) {
30− Gson g = new Gson();
27+// Gson g = new Gson();
31− mesResponse = g.fromJson(message, MessageSocket.class);
28+// mesResponse = g.fromJson(message, MessageSocket.class);
32−
29+//
33− if (mesResponse != null) {
30+// if (mesResponse != null) {
34− resp.token = mesResponse.token;
31+// resp.token = mesResponse.token;
35−
32+//
36− if (mesResponse.response.deleted != null)
33+// if (mesResponse.response.deleted != null)
37− for (int i = 0; i < mesResponse.response.deleted.size(); ++i)
34+// for (int i = 0; i < mesResponse.response.deleted.size(); ++i)
38− adapter.removeAt(mesResponse.response.deleted.get(i));
35+// adapter.removeAt(mesResponse.response.deleted.get(i));
39−
36+//
40− if (mesResponse.response.added != null)
37+// if (mesResponse.response.added != null)
41− adapter.addPost(mesResponse.response.added);
38+// adapter.addPost(mesResponse.response.added);
42− }
39+// }
43− }
40+// }
44−
41+//
45− @Override
42+// @Override
46− public void onClose(int code, String reason, boolean remote) {
43+// public void onClose(int code, String reason, boolean remote) {
47− this.close();
44+// this.close();
48− }
45+// }
49−
46+//
50− @Override
47+// @Override
51− public void onError(Exception ex) {
48+// public void onError(Exception ex) {
52−
49+//
53− }
50+// }
54−
51+//
55−}
52+//}