master...042adaa · annMikh/Socket

git.iko.soy/annMikh/Socket

31 files changed+286−236

since splitsnapshots

unifiedsplit

.DS_Store .gradle/4.6/fileHashes/fileHashes.bin .gradle/4.6/fileHashes/fileHashes.lock .gradle/4.6/fileHashes/resourceHashesCache.bin .gradle/4.6/javaCompile/classAnalysis.bin .gradle/4.6/javaCompile/javaCompile.lock .gradle/4.6/javaCompile/taskHistory.bin .gradle/4.6/taskHistory/taskHistory.bin .gradle/4.6/taskHistory/taskHistory.lock .gradle/buildOutputCleanup/buildOutputCleanup.lock .gradle/buildOutputCleanup/outputFiles.bin .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+95−106 app/.DS_Store app/app.iml+26−23 app/build.gradle+2 app/src/.DS_Store app/src/main/.DS_Store app/src/main/java/.DS_Store app/src/main/java/com/.DS_Store app/src/main/java/com/example/.DS_Store app/src/main/java/com/example/annamihaleva/.DS_Store app/src/main/java/com/example/annamihaleva/testparse/AdapterNews.java−6 app/src/main/java/com/example/annamihaleva/testparse/Parsing.java+43−32 app/src/main/java/com/example/annamihaleva/testparse/Socket.java+48−51 app/src/main/res/layout/activity_main.xml+19−18

.DS_Store

Binary file not shown.

.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/javaCompile/classAnalysis.bin

Binary file not shown.

.gradle/4.6/javaCompile/javaCompile.lock

Binary file not shown.

.gradle/4.6/javaCompile/taskHistory.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.

.gradle/buildOutputCleanup/outputFiles.bin

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+95−106

@@ -1,25 +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="25c91079-f069-4c7a-8dfd-433461e78e9a" name="Default" comment="">

15− <change afterPath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" afterDir="false" />

9+ <list default="true" id="3f7b3900-8289-4aba-9ead-9b382191f8d5" name="Default" comment="">

10+ <change beforePath="$PROJECT_DIR$/.gradle/4.6/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/fileHashes/fileHashes.bin" 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" />

12+ <change beforePath="$PROJECT_DIR$/.gradle/4.6/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/fileHashes/resourceHashesCache.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" />

14+ <change beforePath="$PROJECT_DIR$/.gradle/4.6/taskHistory/taskHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/taskHistory/taskHistory.lock" afterDir="false" />

15+ <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" 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" />

65+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />

1666 <change beforePath="$PROJECT_DIR$/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" afterDir="false" />

17− <change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />

18− <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" />

19− <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/FullPost.java" beforeDir="false" />

20− <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/MainActivity.java" afterDir="false" />

21− <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_full_post.xml" beforeDir="false" />

22− <change beforePath="$PROJECT_DIR$/app/src/main/res/values/dimen.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/dimen.xml" afterDir="false" />

67+ <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" 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" />

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" />

2370 </list>

2471 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />

2572 <option name="TRACKING_ENABLED" value="true" />

@@ -42,20 +89,23 @@

4289 </component>

4390 <component name="FileEditorManager">

4491 <leaf>

45− <file leaf-file-name="AdapterNews.java" pinned="false" current-in-tab="true">

46− <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/AdapterNews.java">

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">

4794 <provider selected="true" editor-type-id="text-editor">

48− <state relative-caret-position="198">

49− <caret line="36" selection-start-line="36" selection-end-line="36" />

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>

50100 </state>

51101 </provider>

52102 </entry>

53103 </file>

54− <file leaf-file-name="MainActivity.java" pinned="false" current-in-tab="false">

55− <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/MainActivity.java">

104+ <file leaf-file-name="Parsing.java" pinned="false" current-in-tab="true">

105+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Parsing.java">

56106 <provider selected="true" editor-type-id="text-editor">

57− <state relative-caret-position="332">

58− <caret line="29" column="51" selection-start-line="29" selection-start-column="51" selection-end-line="29" selection-end-column="51" />

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" />

59109 <folding>

60110 <element signature="imports" expanded="true" />

61111 </folding>

@@ -65,11 +115,6 @@

65115 </file>

66116 </leaf>

67117 </component>

68− <component name="FindInProjectRecents">

69− <findStrings>

70− <find>idPos</find>

71− </findStrings>

72− </component>

73118 <component name="Git.Settings">

74119 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />

75120 </component>

@@ -2332,22 +2377,22 @@

23322377 <component name="IdeDocumentHistory">

23332378 <option name="CHANGED_PATHS">

23342379 <list>

2335− <option value="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/AdapterNews.java" />

2336− <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />

2337− <option value="$PROJECT_DIR$/app/src/main/res/values/dimen.xml" />

2338− <option value="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/MainActivity.java" />

2380+ <option value="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Socket.java" />

2381+ <option value="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Parsing.java" />

23392382 </list>

23402383 </option>

23412384 </component>

2342− <component name="ProjectFrameBounds" extendedState="6">

2385+ <component name="ProjectFrameBounds" fullScreen="true">

2386+ <option name="y" value="23" />

23432387 <option name="width" value="1440" />

2344− <option name="height" value="900" />

2388+ <option name="height" value="793" />

23452389 </component>

23462390 <component name="ProjectView">

23472391 <navigator proportions="" version="1">

23482392 <foldersAlwaysOnTop value="true" />

23492393 </navigator>

23502394 <panes>

2395+ <pane id="PackagesPane" />

23512396 <pane id="AndroidView">

23522397 <subPane>

23532398 <expand>

@@ -2368,33 +2413,18 @@

23682413 </path>

23692414 <path>

23702415 <item name="Socket" type="1abcf292:AndroidViewProjectNode" />

2371− <item name="app" type="feadf853:AndroidModuleNode" />

2372− <item name="res" type="d4f16f75:AndroidResFolderNode" />

2373− </path>

2374− <path>

2375− <item name="Socket" type="1abcf292:AndroidViewProjectNode" />

2376− <item name="app" type="feadf853:AndroidModuleNode" />

2377− <item name="res" type="d4f16f75:AndroidResFolderNode" />

2378− <item name="layout" type="ddeffd01:AndroidResFolderTypeNode" />

2379− </path>

2380− <path>

2381− <item name="Socket" type="1abcf292:AndroidViewProjectNode" />

2382− <item name="app" type="feadf853:AndroidModuleNode" />

2383− <item name="res" type="d4f16f75:AndroidResFolderNode" />

2384− <item name="values" type="ddeffd01:AndroidResFolderTypeNode" />

2416+ <item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" />

23852417 </path>

23862418 </expand>

23872419 <select />

23882420 </subPane>

23892421 </pane>

2390− <pane id="PackagesPane" />

2391− <pane id="ProjectPane" />

23922422 <pane id="Scope" />

2423+ <pane id="ProjectPane" />

23932424 </panes>

23942425 </component>

23952426 <component name="PropertiesComponent">

23962427 <property name="android.sdk.path" value="$USER_HOME$/Library/Android/sdk" />

2397− <property name="device.picker.selection" value="014E0F261100C012" />

23982428 <property name="last_opened_file_path" value="$PROJECT_DIR$" />

23992429 </component>

24002430 <component name="RunDashboard">

@@ -2430,7 +2460,7 @@

24302460 <option name="Android.Gradle.BeforeRunTask" enabled="true" />

24312461 </method>

24322462 </configuration>

2433− <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">

2463+ <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App">

24342464 <module name="app" />

24352465 <option name="DEPLOY" value="true" />

24362466 <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />

@@ -2514,25 +2544,24 @@

25142544 </component>

25152545 <component name="TaskManager">

25162546 <task active="true" id="Default" summary="Default task">

2517− <changelist id="25c91079-f069-4c7a-8dfd-433461e78e9a" name="Default" comment="" />

2518− <created>1548951806889</created>

2547+ <changelist id="3f7b3900-8289-4aba-9ead-9b382191f8d5" name="Default" comment="" />

2548+ <created>1549548608334</created>

25192549 <option name="number" value="Default" />

25202550 <option name="presentableId" value="Default" />

2521− <updated>1548951806889</updated>

2551+ <updated>1549548608334</updated>

25222552 </task>

25232553 <servers />

25242554 </component>

25252555 <component name="ToolWindowManager">

2526− <frame x="0" y="23" width="1440" height="793" extended-state="6" />

2556+ <frame x="0" y="0" width="1440" height="900" extended-state="6" />

25272557 <layout>

25282558 <window_info anchor="bottom" id="TODO" order="6" />

2529− <window_info anchor="bottom" id="Android Profiler" />

2559+ <window_info anchor="bottom" id="Android Profiler" show_stripe_button="false" />

25302560 <window_info anchor="right" id="Palette	" />

25312561 <window_info id="Image Layers" />

25322562 <window_info id="Build Variants" side_tool="true" />

25332563 <window_info anchor="right" id="Capture Analysis" />

25342564 <window_info anchor="bottom" id="Event Log" side_tool="true" />

2535− <window_info anchor="right" id="Preview" weight="0.3297568" />

25362565 <window_info anchor="bottom" id="Run" order="2" />

25372566 <window_info anchor="bottom" id="Version Control" />

25382567 <window_info anchor="bottom" id="Terminal" />

@@ -2541,7 +2570,7 @@

25412570 <window_info id="Capture Tool" />

25422571 <window_info id="Designer" />

25432572 <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24964234" />

2544− <window_info anchor="bottom" id="Build" visible="true" weight="0.124814264" />

2573+ <window_info anchor="bottom" id="Build" visible="true" weight="0.13092269" />

25452574 <window_info anchor="right" id="Gradle" />

25462575 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />

25472576 <window_info anchor="right" id="Theme Preview" />

@@ -2561,70 +2590,30 @@

25612590 <option name="myLimit" value="2678400000" />

25622591 </component>

25632592 <component name="editorHistoryManager">

2564− <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/FullPost.java">

2565− <provider selected="true" editor-type-id="text-editor">

2566− <state relative-caret-position="60">

2567− <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />

2568− </state>

2569− </provider>

2570− </entry>

2571− <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">

2572− <provider editor-type-id="android-manifest">

2573− <state />

2574− </provider>

2575− <provider selected="true" editor-type-id="text-editor">

2576− <state relative-caret-position="195">

2577− <caret line="13" column="46" selection-start-line="13" selection-start-column="46" selection-end-line="13" selection-end-column="46" />

2578− <folding>

2579− <element signature="e#344#362#0" expanded="true" />

2580− </folding>

2581− </state>

2582− </provider>

2583− </entry>

2584− <entry file="file://$PROJECT_DIR$/app/src/main/res/values/dimen.xml">

2593+ <entry file="file://$PROJECT_DIR$/app/build.gradle">

25852594 <provider selected="true" editor-type-id="text-editor">

2586− <state relative-caret-position="30">

2587− <caret line="2" column="34" selection-start-line="2" selection-start-column="34" selection-end-line="2" selection-end-column="34" />

2588− </state>

2595+ <state relative-caret-position="-237" />

25892596 </provider>

25902597 </entry>

2591− <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_post.xml">

2592− <provider editor-type-id="android-designer2">

2593− <state />

2594− </provider>

2598+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Socket.java">

25952599 <provider selected="true" editor-type-id="text-editor">

2596− <state relative-caret-position="303">

2597− <caret line="55" column="35" lean-forward="true" selection-start-line="55" selection-start-column="35" selection-end-line="55" selection-end-column="35" />

2600+ <state relative-caret-position="120">

2601+ <caret line="8" selection-start-line="8" selection-end-line="8" selection-end-column="32" />

25982602 <folding>

2599− <element signature="e#2181#2203#0" expanded="true" />

2603+ <element signature="imports" expanded="true" />

26002604 </folding>

26012605 </state>

26022606 </provider>

26032607 </entry>

2604− <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">

2605− <provider editor-type-id="android-designer2">

2606− <state />

2607− </provider>

2608− <provider selected="true" editor-type-id="text-editor">

2609− <state relative-caret-position="-75" />

2610− </provider>

2611− </entry>

2612− <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/MainActivity.java">

2608+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Parsing.java">

26132609 <provider selected="true" editor-type-id="text-editor">

2614− <state relative-caret-position="332">

2615− <caret line="29" column="51" selection-start-line="29" selection-start-column="51" selection-end-line="29" selection-end-column="51" />

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" />

26162612 <folding>

26172613 <element signature="imports" expanded="true" />

26182614 </folding>

26192615 </state>

26202616 </provider>

26212617 </entry>

2622− <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/AdapterNews.java">

2623− <provider selected="true" editor-type-id="text-editor">

2624− <state relative-caret-position="198">

2625− <caret line="36" selection-start-line="36" selection-end-line="36" />

2626− </state>

2627− </provider>

2628− </entry>

26292618 </component>

26302619</project>

app/.DS_Storenew file

Binary file not shown.

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/.DS_Storenew file

Binary file not shown.

app/src/main/.DS_Storenew file

Binary file not shown.

app/src/main/java/.DS_Storenew file

Binary file not shown.

app/src/main/java/com/.DS_Storenew file

Binary file not shown.

app/src/main/java/com/example/.DS_Storenew file

Binary file not shown.

app/src/main/java/com/example/annamihaleva/.DS_Storenew file

Binary file not shown.

app/src/main/java/com/example/annamihaleva/testparse/AdapterNews.java−6

@@ -132,7 +132,6 @@ public class AdapterNews extends RecyclerView.Adapter<RecyclerView.ViewHolder> {

132132 TextView userName;

133133 TextView date;

134134 TextView postBody;

135− TextView showFull;

136135 ImageView userPhoto;

137136 ConstraintLayout itemNews;

138137

@@ -144,7 +143,6 @@ public class AdapterNews extends RecyclerView.Adapter<RecyclerView.ViewHolder> {

144143 postBody = itemView.findViewById(R.id.post);

145144 userPhoto = itemView.findViewById(R.id.userphotoNews);

146145 itemNews = itemView.findViewById(R.id.itemNews);

147− //showFull = itemView.findViewById(R.id.showPost);

148146 }

149147 }

150148

@@ -174,9 +172,7 @@ public class AdapterNews extends RecyclerView.Adapter<RecyclerView.ViewHolder> {

174172 if (partOfPosts.size() > p) {

175173 partOfPosts.remove(map.get(id));

176174 notifyItemRemoved(p);

177− notifyItemChanged(p);

178175 }

179− notifyDataSetChanged();

180176

181177 for(int i = 0; i < allPosts.size(); ++i)

182178 map.put(allPosts.get(i).postId, allPosts.get(i));

@@ -199,10 +195,8 @@ public class AdapterNews extends RecyclerView.Adapter<RecyclerView.ViewHolder> {

199195 partOfPosts.add(0, post);

200196

201197 notifyItemInserted(0);

202− notifyItemChanged(0);

203198 }

204199

205− notifyDataSetChanged();

206200 for(int i = 0; i < allPosts.size(); ++i)

207201 map.put(allPosts.get(i).postId, allPosts.get(i));

208202

app/src/main/java/com/example/annamihaleva/testparse/Parsing.java+43−32

@@ -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,46 +69,51 @@ 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;

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));

8183

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);

88− progressBar.setVisibility(View.GONE);

97+ socket.connect();

8998

9099 MainActivity.adapter = adapter;

91100 MainActivity.news.setAdapter(adapter);

92−

93101 LayoutAnimationController controller = AnimationUtils.loadLayoutAnimation(context, R.anim.layout_down);

102+

94103 MainActivity.news.setLayoutAnimation(controller);

95104 MainActivity.news.getAdapter().notifyDataSetChanged();

96105 MainActivity.news.scheduleLayoutAnimation();

97106

98107 MainActivity.loading = false;

99108

100− MainActivity.adapter.setLoadMore(() -> {

101− if (adapter.getItemCount() < resp.response.size()) {

102− partOfPosts.add(null);

103− adapter.notifyItemInserted(partOfPosts.size() - 1);

109+ if (adapter.getItemCount() < resp.response.size()) {

110+ partOfPosts.add(null);

111+ adapter.notifyItemInserted(partOfPosts.size() - 1);

112+ adapter.setLoadMore(() -> {

113+

104114 new Handler().postDelayed(() -> {

105115 if (partOfPosts.size() > 0)

106− partOfPosts.remove(partOfPosts.size() - 1);

116+ partOfPosts.remove(partOfPosts.size()-1);

107117 adapter.notifyItemRemoved(partOfPosts.size());

108118

109119 int start = partOfPosts.size();

@@ -111,9 +121,10 @@ public class Parsing extends AsyncTask<Void, Void, Void> {

111121 fillArray(start, end);

112122 adapter.notifyDataSetChanged();

113123 adapter.setLoaded();

114− }, 1000);

115− }

116− });

124+ }, 700);

125+

126+ });

127+ }

117128 }

118129

119130 private void fillArray(int start, int end){

app/src/main/java/com/example/annamihaleva/testparse/Socket.java+48−51

@@ -1,55 +1,52 @@

11package com.example.annamihaleva.testparse;

3+import io.socket.client.IO;

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+//}

app/src/main/res/layout/activity_main.xml+19−18

@@ -8,28 +8,29 @@

88 android:layout_height="match_parent">

1010 <FrameLayout

11− android:layout_width="wrap_content"

11+ android:layout_width="match_parent"

1212 android:layout_height="wrap_content">

1313

14− <android.support.v4.widget.SwipeRefreshLayout

15− xmlns:android="http://schemas.android.com/apk/res/android"

16− android:id="@+id/swipeContainer"

17− android:layout_width="match_parent"

18− android:layout_height="match_parent">

14+

15+

16+

17+

18+

1919

2020

21− <android.support.v7.widget.RecyclerView

22− android:id="@+id/recycler_news"

23− android:layout_width="match_parent"

24− android:layout_height="match_parent"

25− android:clipToPadding="false"

26− android:scrollbars="vertical"

27− app:layout_constraintLeft_toLeftOf="parent"

28− app:layout_constraintRight_toRightOf="parent"

29− tools:listitem="@layout/activity_post">

30− </android.support.v7.widget.RecyclerView>

31−

32− </android.support.v4.widget.SwipeRefreshLayout>

21+

22+

23+

24+ <android.support.v7.widget.RecyclerView

25+ android:id="@+id/recycler_news"

26+ android:layout_width="match_parent"

27+ android:layout_height="match_parent"

28+ android:clipToPadding="false"

29+ android:scrollbars="vertical"

30+ app:layout_constraintLeft_toLeftOf="parent"

31+ app:layout_constraintRight_toRightOf="parent"

32+ tools:listitem="@layout/activity_post">

33+ </android.support.v7.widget.RecyclerView>

3334

3435

3536