git.iko.soy/annMikh/Socket
on master help sign in
swap
98b62a71 ahead, 2 behind
31 files changed+236−286
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+106−95 app/.DS_Store app/app.iml+23−26 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+32−43 app/src/main/java/com/example/annamihaleva/testparse/Socket.java+51−48 app/src/main/res/layout/activity_main.xml+18−19
.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.xmldeleted−11
@@ -1,11 +0,0 @@
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.xmldeleted−11
@@ -1,11 +0,0 @@
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.xmldeleted−11
@@ -1,11 +0,0 @@
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.xmldeleted−11
@@ -1,11 +0,0 @@
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.xmldeleted−9
@@ -1,9 +0,0 @@
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+106−95
@@ -1,72 +1,25 @@
11<?xml version="1.0" encoding="UTF-8"?>
22<project version="4">
3+ <component name="AndroidLayouts">
4+ <shared>
5+ <config />
6+ </shared>
7+ </component>
38 <component name="CMakeSettings">
49 <configurations>
510 <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
611 </configurations>
712 </component>
813 <component name="ChangeListManager">
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" />
14+ <list default="true" id="25c91079-f069-4c7a-8dfd-433461e78e9a" name="Default" comment="">
15+ <change afterPath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" afterDir="false" />
6616 <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" />
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" />
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" />
7023 </list>
7124 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
7225 <option name="TRACKING_ENABLED" value="true" />
@@ -89,23 +42,20 @@
8942 </component>
9043 <component name="FileEditorManager">
9144 <leaf>
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">
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">
9447 <provider selected="true" editor-type-id="text-editor">
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>
48+ <state relative-caret-position="198">
49+ <caret line="36" selection-start-line="36" selection-end-line="36" />
10050 </state>
10151 </provider>
10252 </entry>
10353 </file>
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">
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">
10656 <provider selected="true" editor-type-id="text-editor">
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" />
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" />
10959 <folding>
11060 <element signature="imports" expanded="true" />
11161 </folding>
@@ -115,6 +65,11 @@
11565 </file>
11666 </leaf>
11767 </component>
68+ <component name="FindInProjectRecents">
69+ <findStrings>
70+ <find>idPos</find>
71+ </findStrings>
72+ </component>
11873 <component name="Git.Settings">
11974 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
12075 </component>
@@ -2377,22 +2332,22 @@
23772332 <component name="IdeDocumentHistory">
23782333 <option name="CHANGED_PATHS">
23792334 <list>
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" />
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" />
23822339 </list>
23832340 </option>
23842341 </component>
2385− <component name="ProjectFrameBounds" fullScreen="true">
2386− <option name="y" value="23" />
2342+ <component name="ProjectFrameBounds" extendedState="6">
23872343 <option name="width" value="1440" />
2388− <option name="height" value="793" />
2344+ <option name="height" value="900" />
23892345 </component>
23902346 <component name="ProjectView">
23912347 <navigator proportions="" version="1">
23922348 <foldersAlwaysOnTop value="true" />
23932349 </navigator>
23942350 <panes>
2395− <pane id="PackagesPane" />
23962351 <pane id="AndroidView">
23972352 <subPane>
23982353 <expand>
@@ -2413,18 +2368,33 @@
24132368 </path>
24142369 <path>
24152370 <item name="Socket" type="1abcf292:AndroidViewProjectNode" />
2416− <item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" />
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" />
24172385 </path>
24182386 </expand>
24192387 <select />
24202388 </subPane>
24212389 </pane>
2422− <pane id="Scope" />
2390+ <pane id="PackagesPane" />
24232391 <pane id="ProjectPane" />
2392+ <pane id="Scope" />
24242393 </panes>
24252394 </component>
24262395 <component name="PropertiesComponent">
24272396 <property name="android.sdk.path" value="$USER_HOME$/Library/Android/sdk" />
2397+ <property name="device.picker.selection" value="014E0F261100C012" />
24282398 <property name="last_opened_file_path" value="$PROJECT_DIR$" />
24292399 </component>
24302400 <component name="RunDashboard">
@@ -2460,7 +2430,7 @@
24602430 <option name="Android.Gradle.BeforeRunTask" enabled="true" />
24612431 </method>
24622432 </configuration>
2463− <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App">
2433+ <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
24642434 <module name="app" />
24652435 <option name="DEPLOY" value="true" />
24662436 <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
@@ -2544,24 +2514,25 @@
25442514 </component>
25452515 <component name="TaskManager">
25462516 <task active="true" id="Default" summary="Default task">
2547− <changelist id="3f7b3900-8289-4aba-9ead-9b382191f8d5" name="Default" comment="" />
2548− <created>1549548608334</created>
2517+ <changelist id="25c91079-f069-4c7a-8dfd-433461e78e9a" name="Default" comment="" />
2518+ <created>1548951806889</created>
25492519 <option name="number" value="Default" />
25502520 <option name="presentableId" value="Default" />
2551− <updated>1549548608334</updated>
2521+ <updated>1548951806889</updated>
25522522 </task>
25532523 <servers />
25542524 </component>
25552525 <component name="ToolWindowManager">
2556− <frame x="0" y="0" width="1440" height="900" extended-state="6" />
2526+ <frame x="0" y="23" width="1440" height="793" extended-state="6" />
25572527 <layout>
25582528 <window_info anchor="bottom" id="TODO" order="6" />
2559− <window_info anchor="bottom" id="Android Profiler" show_stripe_button="false" />
2529+ <window_info anchor="bottom" id="Android Profiler" />
25602530 <window_info anchor="right" id="Palette&#9;" />
25612531 <window_info id="Image Layers" />
25622532 <window_info id="Build Variants" side_tool="true" />
25632533 <window_info anchor="right" id="Capture Analysis" />
25642534 <window_info anchor="bottom" id="Event Log" side_tool="true" />
2535+ <window_info anchor="right" id="Preview" weight="0.3297568" />
25652536 <window_info anchor="bottom" id="Run" order="2" />
25662537 <window_info anchor="bottom" id="Version Control" />
25672538 <window_info anchor="bottom" id="Terminal" />
@@ -2570,7 +2541,7 @@
25702541 <window_info id="Capture Tool" />
25712542 <window_info id="Designer" />
25722543 <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" />
2544+ <window_info anchor="bottom" id="Build" visible="true" weight="0.124814264" />
25742545 <window_info anchor="right" id="Gradle" />
25752546 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
25762547 <window_info anchor="right" id="Theme Preview" />
@@ -2590,30 +2561,70 @@
25902561 <option name="myLimit" value="2678400000" />
25912562 </component>
25922563 <component name="editorHistoryManager">
2593− <entry file="file://$PROJECT_DIR$/app/build.gradle">
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">
25942585 <provider selected="true" editor-type-id="text-editor">
2595− <state relative-caret-position="-237" />
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>
25962589 </provider>
25972590 </entry>
2598− <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Socket.java">
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>
25992595 <provider selected="true" editor-type-id="text-editor">
2600− <state relative-caret-position="120">
2601− <caret line="8" selection-start-line="8" selection-end-line="8" selection-end-column="32" />
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" />
26022598 <folding>
2603− <element signature="imports" expanded="true" />
2599+ <element signature="e#2181#2203#0" expanded="true" />
26042600 </folding>
26052601 </state>
26062602 </provider>
26072603 </entry>
2608− <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Parsing.java">
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">
26092613 <provider selected="true" editor-type-id="text-editor">
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" />
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" />
26122616 <folding>
26132617 <element signature="imports" expanded="true" />
26142618 </folding>
26152619 </state>
26162620 </provider>
26172621 </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>
26182629 </component>
26192630</project>
app/.DS_Storedeleted

Binary file not shown.

app/app.iml+23−26
@@ -88,6 +88,7 @@
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" />
9192 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
9293 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
9394 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
@@ -102,6 +103,7 @@
102103 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
103104 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
104105 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
106+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
105107 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
106108 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
107109 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
@@ -122,58 +124,53 @@
122124 </content>
123125 <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
124126 <orderEntry type="sourceFolder" forTests="false" />
125− <orderEntry type="library" name="Gradle: io.socket:socket.io-client:1.0.0@jar" level="project" />
127+ <orderEntry type="library" name="Gradle: com.android.support:customview-28.0.0" level="project" />
126128 <orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager-28.0.0" level="project" />
127− <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.8.1@jar" level="project" />
129+ <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner-1.0.2" level="project" />
128130 <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" />
129132 <orderEntry type="library" name="Gradle: com.android.support:interpolator-28.0.0" level="project" />
130133 <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-28.0.0" level="project" />
131− <orderEntry type="library" name="Gradle: io.socket:engine.io-client:1.0.0@jar" level="project" />
132− <orderEntry type="library" name="Gradle: com.android.support:drawerlayout-28.0.0" level="project" />
133− <orderEntry type="library" name="Gradle: com.android.support:coordinatorlayout-28.0.0" level="project" />
134− <orderEntry type="library" name="Gradle: com.android.support:cardview-v7-28.0.0" level="project" />
135− <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
136− <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-1.1.3" 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" />
153134 <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" />
155135 <orderEntry type="library" name="Gradle: com.android.support:slidingpanelayout-28.0.0" level="project" />
156136 <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" />
139+ <orderEntry type="library" name="Gradle: com.android.support:coordinatorlayout-28.0.0" level="project" />
157140 <orderEntry type="library" name="Gradle: com.android.support:collections:28.0.0@jar" level="project" />
141+ <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
158142 <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" />
144+ <orderEntry type="library" name="Gradle: com.android.support:swiperefreshlayout-28.0.0" level="project" />
159145 <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-28.0.0" level="project" />
160146 <orderEntry type="library" name="Gradle: com.android.support:cursoradapter-28.0.0" level="project" />
161147 <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" />
162149 <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
163150 <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" />
164152 <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" />
165154 <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
166155 <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" />
167157 <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" />
168160 <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource-3.0.2" level="project" />
169− <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
161+ <orderEntry type="library" name="Gradle: com.android.support:viewpager-28.0.0" level="project" />
170162 <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" />
171164 <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" />
172166 <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1@jar" level="project" />
173167 <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.1" level="project" />
174168 <orderEntry type="library" name="Gradle: org.java-websocket:Java-WebSocket:1.3.9@jar" level="project" />
175169 <orderEntry type="library" name="Gradle: com.android.support:support-compat-28.0.0" level="project" />
176170 <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-28.0.0" level="project" />
177171 <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" />
178175 </component>
179176</module>
app/build.gradle−2
@@ -37,8 +37,6 @@ 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'
4240 // floating action button
4341 // implementation 'com.android.support:design:28.0.0'
4442
app/src/.DS_Storedeleted

Binary file not shown.

app/src/main/.DS_Storedeleted

Binary file not shown.

app/src/main/java/.DS_Storedeleted

Binary file not shown.

app/src/main/java/com/.DS_Storedeleted

Binary file not shown.

app/src/main/java/com/example/.DS_Storedeleted

Binary file not shown.

app/src/main/java/com/example/annamihaleva/.DS_Storedeleted

Binary file not shown.

app/src/main/java/com/example/annamihaleva/testparse/AdapterNews.java+6
@@ -132,6 +132,7 @@ public class AdapterNews extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
132132 TextView userName;
133133 TextView date;
134134 TextView postBody;
135+ TextView showFull;
135136 ImageView userPhoto;
136137 ConstraintLayout itemNews;
137138
@@ -143,6 +144,7 @@ public class AdapterNews extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
143144 postBody = itemView.findViewById(R.id.post);
144145 userPhoto = itemView.findViewById(R.id.userphotoNews);
145146 itemNews = itemView.findViewById(R.id.itemNews);
147+ //showFull = itemView.findViewById(R.id.showPost);
146148 }
147149 }
148150
@@ -172,7 +174,9 @@ public class AdapterNews extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
172174 if (partOfPosts.size() > p) {
173175 partOfPosts.remove(map.get(id));
174176 notifyItemRemoved(p);
177+ notifyItemChanged(p);
175178 }
179+ notifyDataSetChanged();
176180
177181 for(int i = 0; i < allPosts.size(); ++i)
178182 map.put(allPosts.get(i).postId, allPosts.get(i));
@@ -195,8 +199,10 @@ public class AdapterNews extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
195199 partOfPosts.add(0, post);
196200
197201 notifyItemInserted(0);
202+ notifyItemChanged(0);
198203 }
199204
205+ notifyDataSetChanged();
200206 for(int i = 0; i < allPosts.size(); ++i)
201207 map.put(allPosts.get(i).postId, allPosts.get(i));
202208
app/src/main/java/com/example/annamihaleva/testparse/Parsing.java+32−43
@@ -5,32 +5,30 @@ import android.os.AsyncTask;
55import android.os.Handler;
66import android.support.v7.widget.RecyclerView;
77import android.util.Log;
8+import android.view.View;
89import android.view.animation.AnimationUtils;
910import android.view.animation.LayoutAnimationController;
1011import android.widget.ProgressBar;
12+import android.widget.RelativeLayout;
1113import com.google.gson.Gson;
12−
14+import org.java_websocket.client.WebSocketClient;
1315import java.io.BufferedReader;
1416import java.io.IOException;
1517import java.io.InputStream;
1618import java.io.InputStreamReader;
1719import java.net.HttpURLConnection;
20+import java.net.URI;
1821import java.net.URISyntaxException;
1922import java.net.URL;
2023import java.util.ArrayList;
2124import java.util.List;
2225
23−import io.socket.client.IO;
24−import io.socket.emitter.Emitter;
25−import io.socket.engineio.client.Socket;
26−
2726public class Parsing extends AsyncTask<Void, Void, Void> {
2827
29−
28+ private WebSocketClient client = null;
3029 private ProgressBar progressBar;
3130 private RecyclerView news;
3231 Context context;
33− MessageSocket mesResponse;
3432
3533 public static Response resp = new Response();
3634 List<Posts> partOfPosts = new ArrayList<>();
@@ -41,17 +39,14 @@ public class Parsing extends AsyncTask<Void, Void, Void> {
4139 context = c;
4240 }
4341
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−
5242 @Override
5343 protected void onPreExecute() {
5444 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);
5550 }
5651
5752 @Override
@@ -69,51 +64,46 @@ public class Parsing extends AsyncTask<Void, Void, Void> {
6964 fillArray(0, 10);
7065 AdapterNews.allPosts = resp.response;
7166
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+ }
7275
73− socket.on("postUpdates", args -> {
74− Gson g1 = new Gson();
75− mesResponse = g1.fromJson(args.toString(), MessageSocket.class);
76−
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));
83−
84− if (mesResponse.response.added != null)
85− adapter.addPost(mesResponse.response.added);
86− }
87− });
76+ if (client != null)
77+ client.connect();
8878
8979 adapter = new AdapterNews(context, partOfPosts, news);
80+ Socket.setAdapter(adapter);
81+
9082 return null;
9183 }
9284
93−
9485 @Override
9586 protected void onPostExecute(Void result) {
9687 super.onPostExecute(result);
97− socket.connect();
88+ progressBar.setVisibility(View.GONE);
9889
9990 MainActivity.adapter = adapter;
10091 MainActivity.news.setAdapter(adapter);
101− LayoutAnimationController controller = AnimationUtils.loadLayoutAnimation(context, R.anim.layout_down);
10292
93+ LayoutAnimationController controller = AnimationUtils.loadLayoutAnimation(context, R.anim.layout_down);
10394 MainActivity.news.setLayoutAnimation(controller);
10495 MainActivity.news.getAdapter().notifyDataSetChanged();
10596 MainActivity.news.scheduleLayoutAnimation();
10697
10798 MainActivity.loading = false;
10899
109− if (adapter.getItemCount() < resp.response.size()) {
110− partOfPosts.add(null);
111− adapter.notifyItemInserted(partOfPosts.size() - 1);
112− adapter.setLoadMore(() -> {
113−
100+ MainActivity.adapter.setLoadMore(() -> {
101+ if (adapter.getItemCount() < resp.response.size()) {
102+ partOfPosts.add(null);
103+ adapter.notifyItemInserted(partOfPosts.size() - 1);
114104 new Handler().postDelayed(() -> {
115105 if (partOfPosts.size() > 0)
116− partOfPosts.remove(partOfPosts.size()-1);
106+ partOfPosts.remove(partOfPosts.size() - 1);
117107 adapter.notifyItemRemoved(partOfPosts.size());
118108
119109 int start = partOfPosts.size();
@@ -121,10 +111,9 @@ public class Parsing extends AsyncTask<Void, Void, Void> {
121111 fillArray(start, end);
122112 adapter.notifyDataSetChanged();
123113 adapter.setLoaded();
124− }, 700);
125−
126− });
127− }
114+ }, 1000);
115+ }
116+ });
128117 }
129118
130119 private void fillArray(int start, int end){
app/src/main/java/com/example/annamihaleva/testparse/Socket.java+51−48
@@ -1,52 +1,55 @@
11package com.example.annamihaleva.testparse;
22
3−import io.socket.client.IO;
43
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;
58import static com.example.annamihaleva.testparse.Parsing.resp;
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−//}
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+}
app/src/main/res/layout/activity_main.xml+18−19
@@ -8,29 +8,28 @@
88 android:layout_height="match_parent">
99
1010 <FrameLayout
11− android:layout_width="match_parent"
11+ android:layout_width="wrap_content"
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">-->
19−
20−
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">
2119
22− <!--</android.support.v4.widget.SwipeRefreshLayout>-->
2320
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>
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>
3433
3534 <!--<Button-->
3635 <!--android:id="@+id/butUpdate"-->