git.iko.soy/annMikh/Socket
on master help sign in
last changes
commit042adaac71f4de731dc68aa81555d7c761b6634b authorAnya <mihalewa2015@yandex.ru> dateWed 13 Feb 2019, 13:07 (8 years ago) parent8e34182
17 files changed+254−191
compare with master
unifiedsplit
.gradle/4.6/fileHashes/fileHashes.bin .gradle/4.6/fileHashes/fileHashes.lock .gradle/4.6/fileHashes/resourceHashesCache.bin .gradle/4.6/taskHistory/taskHistory.bin .gradle/4.6/taskHistory/taskHistory.lock .gradle/buildOutputCleanup/buildOutputCleanup.lock .idea/caches/build_file_checksums.ser .idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_8_1_jar.xml+11 .idea/libraries/Gradle__com_squareup_okio_okio_1_13_0_jar.xml+11 .idea/libraries/Gradle__io_socket_engine_io_client_1_0_0_jar.xml+11 .idea/libraries/Gradle__io_socket_socket_io_client_1_0_0_jar.xml+11 .idea/libraries/Gradle__org_json_json_20090211_jar.xml+9 .idea/workspace.xml+93−95 app/app.iml+26−23 app/build.gradle+2 app/src/main/java/com/example/annamihaleva/testparse/Parsing.java+32−22 app/src/main/java/com/example/annamihaleva/testparse/Socket.java+48−51
.gradle/4.6/fileHashes/fileHashes.bin

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 @@
11<?xml version="1.0" encoding="UTF-8"?>
22<project version="4">
3− <component name="AndroidLayouts">
4− <shared>
5− <config />
6− </shared>
7− </component>
83 <component name="CMakeSettings">
94 <configurations>
105 <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
116 </configurations>
127 </component>
138 <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="">
1510 <change beforePath="$PROJECT_DIR$/.gradle/4.6/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/fileHashes/fileHashes.bin" afterDir="false" />
1611 <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" />
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" />
12+ <change beforePath="$PROJECT_DIR$/.gradle/4.6/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/fileHashes/resourceHashesCache.bin" afterDir="false" />
2013 <change beforePath="$PROJECT_DIR$/.gradle/4.6/taskHistory/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/taskHistory/taskHistory.bin" afterDir="false" />
2114 <change beforePath="$PROJECT_DIR$/.gradle/4.6/taskHistory/taskHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/taskHistory/taskHistory.lock" afterDir="false" />
2215 <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" />
2416 <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" />
2565 <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" />
2768 <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" />
2970 </list>
3071 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
3172 <option name="TRACKING_ENABLED" value="true" />
@@ -48,43 +89,25 @@
4889 </component>
4990 <component name="FileEditorManager">
5091 <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">
61− <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/MainActivity.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">
92+ <file leaf-file-name="Socket.java" pinned="false" current-in-tab="false">
93+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Socket.java">
7194 <provider selected="true" editor-type-id="text-editor">
72− <state relative-caret-position="30">
73− <caret line="9" column="16" selection-start-line="9" selection-start-column="16" selection-end-line="9" selection-end-column="16" />
95+ <state relative-caret-position="120">
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>
74100 </state>
75101 </provider>
76− <provider editor-type-id="android-designer2">
77− <state />
78− </provider>
79102 </entry>
80103 </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">
82105 <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Parsing.java">
83106 <provider selected="true" editor-type-id="text-editor">
84− <state relative-caret-position="223">
85− <caret line="89" column="46" selection-start-line="89" selection-start-column="46" selection-end-line="89" selection-end-column="46" />
107+ <state relative-caret-position="263">
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" />
86109 <folding>
87− <marker date="1549302605747" expanded="true" signature="1260:1549" ph="..." />
110+ <element signature="imports" expanded="true" />
88111 </folding>
89112 </state>
90113 </provider>
@@ -2354,23 +2377,22 @@
23542377 <component name="IdeDocumentHistory">
23552378 <option name="CHANGED_PATHS">
23562379 <list>
2357− <option value="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/AdapterNews.java" />
2358− <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
2380+ <option value="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Socket.java" />
23592381 <option value="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Parsing.java" />
23602382 </list>
23612383 </option>
23622384 </component>
2363− <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
2385+ <component name="ProjectFrameBounds" fullScreen="true">
2386+ <option name="y" value="23" />
23642387 <option name="width" value="1440" />
2365− <option name="height" value="900" />
2388+ <option name="height" value="793" />
23662389 </component>
23672390 <component name="ProjectView">
23682391 <navigator proportions="" version="1">
23692392 <foldersAlwaysOnTop value="true" />
23702393 </navigator>
23712394 <panes>
2372− <pane id="ProjectPane" />
2373− <pane id="Scope" />
2395+ <pane id="PackagesPane" />
23742396 <pane id="AndroidView">
23752397 <subPane>
23762398 <expand>
@@ -2391,31 +2413,18 @@
23912413 </path>
23922414 <path>
23932415 <item name="Socket" type="1abcf292:AndroidViewProjectNode" />
2394− <item name="app" type="feadf853:AndroidModuleNode" />
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" />
2416+ <item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" />
24082417 </path>
24092418 </expand>
24102419 <select />
24112420 </subPane>
24122421 </pane>
2413− <pane id="PackagesPane" />
2422+ <pane id="Scope" />
2423+ <pane id="ProjectPane" />
24142424 </panes>
24152425 </component>
24162426 <component name="PropertiesComponent">
24172427 <property name="android.sdk.path" value="$USER_HOME$/Library/Android/sdk" />
2418− <property name="device.picker.selection" value="014E0F261100C012" />
24192428 <property name="last_opened_file_path" value="$PROJECT_DIR$" />
24202429 </component>
24212430 <component name="RunDashboard">
@@ -2451,7 +2460,7 @@
24512460 <option name="Android.Gradle.BeforeRunTask" enabled="true" />
24522461 </method>
24532462 </configuration>
2454− <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
2463+ <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App">
24552464 <module name="app" />
24562465 <option name="DEPLOY" value="true" />
24572466 <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
@@ -2535,35 +2544,33 @@
25352544 </component>
25362545 <component name="TaskManager">
25372546 <task active="true" id="Default" summary="Default task">
2538− <changelist id="6c1ed618-7fec-4785-93fc-5caee38346bd" name="Default" comment="" />
2539− <created>1549302242823</created>
2547+ <changelist id="3f7b3900-8289-4aba-9ead-9b382191f8d5" name="Default" comment="" />
2548+ <created>1549548608334</created>
25402549 <option name="number" value="Default" />
25412550 <option name="presentableId" value="Default" />
2542− <updated>1549302242823</updated>
2551+ <updated>1549548608334</updated>
25432552 </task>
25442553 <servers />
25452554 </component>
25462555 <component name="ToolWindowManager">
25472556 <frame x="0" y="0" width="1440" height="900" extended-state="6" />
2548− <editor active="true" />
25492557 <layout>
25502558 <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" />
25522560 <window_info anchor="right" id="Palette&#9;" />
25532561 <window_info id="Image Layers" />
25542562 <window_info id="Build Variants" side_tool="true" />
25552563 <window_info anchor="right" id="Capture Analysis" />
25562564 <window_info anchor="bottom" id="Event Log" side_tool="true" />
2557− <window_info anchor="right" id="Preview" weight="0.3297568" />
2558− <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.15461347" />
2565+ <window_info anchor="bottom" id="Run" order="2" />
25592566 <window_info anchor="bottom" id="Version Control" />
25602567 <window_info anchor="bottom" id="Terminal" />
25612568 <window_info anchor="bottom" id="Logcat" />
25622569 <window_info id="Captures" order="2" weight="0.25" />
25632570 <window_info id="Capture Tool" />
25642571 <window_info id="Designer" />
2565− <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22532189" />
2566− <window_info anchor="bottom" id="Build" weight="0.4127182" />
2572+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24964234" />
2573+ <window_info anchor="bottom" id="Build" visible="true" weight="0.13092269" />
25672574 <window_info anchor="right" id="Gradle" />
25682575 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
25692576 <window_info anchor="right" id="Theme Preview" />
@@ -2572,9 +2579,9 @@
25722579 <window_info anchor="right" id="Device File Explorer" side_tool="true" />
25732580 <window_info anchor="bottom" id="Find" order="1" />
25742581 <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" />
25772582 <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" />
25782585 <window_info anchor="bottom" id="Message" order="0" />
25792586 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
25802587 </layout>
@@ -2583,39 +2590,30 @@
25832590 <option name="myLimit" value="2678400000" />
25842591 </component>
25852592 <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">
25872594 <provider selected="true" editor-type-id="text-editor">
2588− <state relative-caret-position="30">
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 />
2595+ <state relative-caret-position="-237" />
25942596 </provider>
25952597 </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">
25972599 <provider selected="true" editor-type-id="text-editor">
2598− <state relative-caret-position="360">
2599− <caret line="32" column="23" selection-start-line="32" selection-start-column="23" selection-end-line="32" selection-end-column="23" />
2600+ <state relative-caret-position="120">
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>
26002605 </state>
26012606 </provider>
26022607 </entry>
26032608 <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Parsing.java">
26042609 <provider selected="true" editor-type-id="text-editor">
2605− <state relative-caret-position="223">
2606− <caret line="89" column="46" selection-start-line="89" selection-start-column="46" selection-end-line="89" selection-end-column="46" />
2610+ <state relative-caret-position="263">
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" />
26072612 <folding>
2608− <marker date="1549302605747" expanded="true" signature="1260:1549" ph="..." />
2613+ <element signature="imports" expanded="true" />
26092614 </folding>
26102615 </state>
26112616 </provider>
26122617 </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>
26202618 </component>
26212619</project>
app/app.iml+26−23
@@ -88,7 +88,6 @@
8888 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
8989 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
9090 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
91− <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
9291 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
9392 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
9493 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
@@ -103,7 +102,6 @@
103102 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
104103 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
105104 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
106− <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
107105 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
108106 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
109107 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
@@ -124,53 +122,58 @@
124122 </content>
125123 <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
126124 <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" />
128126 <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" />
130128 <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" />
132129 <orderEntry type="library" name="Gradle: com.android.support:interpolator-28.0.0" level="project" />
133130 <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" />
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" />
131+ <orderEntry type="library" name="Gradle: io.socket:engine.io-client:1.0.0@jar" level="project" />
138132 <orderEntry type="library" name="Gradle: com.android.support:drawerlayout-28.0.0" level="project" />
139133 <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" />
141135 <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" />
143136 <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-1.1.3" level="project" />
144137 <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" />
145159 <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-28.0.0" level="project" />
146160 <orderEntry type="library" name="Gradle: com.android.support:cursoradapter-28.0.0" level="project" />
147161 <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" />
149162 <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
150163 <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" />
152164 <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" />
154165 <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
155166 <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" />
157167 <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" />
160168 <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" />
163169 <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" />
164171 <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" />
166172 <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1@jar" level="project" />
167173 <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.1" level="project" />
168174 <orderEntry type="library" name="Gradle: org.java-websocket:Java-WebSocket:1.3.9@jar" level="project" />
169175 <orderEntry type="library" name="Gradle: com.android.support:support-compat-28.0.0" level="project" />
170176 <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-28.0.0" level="project" />
171177 <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" />
175178 </component>
176179</module>
app/build.gradle+2
@@ -37,6 +37,8 @@ dependencies {
3737 implementation 'com.android.support:recyclerview-v7:28.0.0'
3838 implementation 'com.android.support:cardview-v7:28.0.0'
3939
40+ //io socket
41+ implementation 'io.socket:socket.io-client:1.0.0'
4042 // floating action button
4143 // implementation 'com.android.support:design:28.0.0'
4244
app/src/main/java/com/example/annamihaleva/testparse/Parsing.java+32−22
@@ -5,30 +5,32 @@ import android.os.AsyncTask;
55import android.os.Handler;
66import android.support.v7.widget.RecyclerView;
77import android.util.Log;
8−import android.view.View;
98import android.view.animation.AnimationUtils;
109import android.view.animation.LayoutAnimationController;
1110import android.widget.ProgressBar;
12−import android.widget.RelativeLayout;
1311import com.google.gson.Gson;
14−import org.java_websocket.client.WebSocketClient;
12+
1513import java.io.BufferedReader;
1614import java.io.IOException;
1715import java.io.InputStream;
1816import java.io.InputStreamReader;
1917import java.net.HttpURLConnection;
20−import java.net.URI;
2118import java.net.URISyntaxException;
2219import java.net.URL;
2320import java.util.ArrayList;
2421import java.util.List;
2522
23+import io.socket.client.IO;
24+import io.socket.emitter.Emitter;
25+import io.socket.engineio.client.Socket;
26+
2627public class Parsing extends AsyncTask<Void, Void, Void> {
2728
28− private WebSocketClient client = null;
29+
2930 private ProgressBar progressBar;
3031 private RecyclerView news;
3132 Context context;
33+ MessageSocket mesResponse;
3234
3335 public static Response resp = new Response();
3436 List<Posts> partOfPosts = new ArrayList<>();
@@ -39,14 +41,17 @@ public class Parsing extends AsyncTask<Void, Void, Void> {
3941 context = c;
4042 }
4143
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+
4252 @Override
4353 protected void onPreExecute() {
4454 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);
5055 }
5156
5257 @Override
@@ -64,27 +69,32 @@ public class Parsing extends AsyncTask<Void, Void, Void> {
6469 fillArray(0, 10);
6570 AdapterNews.allPosts = resp.response;
6671
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− }
7572
76− if (client != null)
77− client.connect();
73+ socket.on("postUpdates", args -> {
74+ Gson g1 = new Gson();
75+ mesResponse = g1.fromJson(args.toString(), MessageSocket.class);
7876
79− adapter = new AdapterNews(context, partOfPosts, news);
80− Socket.setAdapter(adapter);
77+ if (mesResponse != null) {
78+ resp.token = mesResponse.token;
8179
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);
8290 return null;
8391 }
8492
93+
8594 @Override
8695 protected void onPostExecute(Void result) {
8796 super.onPostExecute(result);
97+ socket.connect();
8898
8999 MainActivity.adapter = adapter;
90100 MainActivity.news.setAdapter(adapter);
app/src/main/java/com/example/annamihaleva/testparse/Socket.java+48−51
@@ -1,55 +1,52 @@
11package com.example.annamihaleva.testparse;
22
3+import io.socket.client.IO;
34
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;
85import static com.example.annamihaleva.testparse.Parsing.resp;
9−
10−class Socket extends WebSocketClient {
11−
12− MessageSocket mesResponse;
13− static AdapterNews adapter;
14−
15− static void setAdapter(AdapterNews news){
16− adapter = news;
17− }
18−
19− Socket(URI serverUri) {
20− super(serverUri);
21− }
22−
23− @Override
24− public void onOpen(ServerHandshake handshakedata) {
25−
26− }
27−
28− @Override
29− public void onMessage(String message) {
30− Gson g = new Gson();
31− mesResponse = g.fromJson(message, MessageSocket.class);
32−
33− if (mesResponse != null) {
34− resp.token = mesResponse.token;
35−
36− if (mesResponse.response.deleted != null)
37− for (int i = 0; i < mesResponse.response.deleted.size(); ++i)
38− adapter.removeAt(mesResponse.response.deleted.get(i));
39−
40− if (mesResponse.response.added != null)
41− adapter.addPost(mesResponse.response.added);
42− }
43− }
44−
45− @Override
46− public void onClose(int code, String reason, boolean remote) {
47− this.close();
48− }
49−
50− @Override
51− public void onError(Exception ex) {
52−
53− }
54−
55−}
6+//
7+//class Socket {
8+//
9+// MessageSocket mesResponse;
10+// static AdapterNews adapter;
11+//
12+// static void setAdapter(AdapterNews news){
13+// adapter = news;
14+// }
15+//
16+// Socket(URI serverUri) {
17+// super(serverUri);
18+// }
19+//
20+// @Override
21+// public void onOpen(ServerHandshake handshakedata) {
22+//
23+// }
24+//
25+// @Override
26+// public void onMessage(String message) {
27+// Gson g = new Gson();
28+// mesResponse = g.fromJson(message, MessageSocket.class);
29+//
30+// if (mesResponse != null) {
31+// resp.token = mesResponse.token;
32+//
33+// if (mesResponse.response.deleted != null)
34+// for (int i = 0; i < mesResponse.response.deleted.size(); ++i)
35+// adapter.removeAt(mesResponse.response.deleted.get(i));
36+//
37+// if (mesResponse.response.added != null)
38+// adapter.addPost(mesResponse.response.added);
39+// }
40+// }
41+//
42+// @Override
43+// public void onClose(int code, String reason, boolean remote) {
44+// this.close();
45+// }
46+//
47+// @Override
48+// public void onError(Exception ex) {
49+//
50+// }
51+//
52+//}