git.iko.soy/annMikh/Socket
on master help sign in
swap
98b62a71 ahead, 1 behind
.DS_Store
since splitsnapshots
unifiedsplit

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/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/workspace.xml+78−69
@@ -11,21 +11,15 @@
11 </configurations>
11 </configurations>
12 </component>
12 </component>
13 <component name="ChangeListManager">
13 <component name="ChangeListManager">
14− <list default="true" id="6c1ed618-7fec-4785-93fc-5caee38346bd" name="Default" comment="">
14+ <list default="true" id="25c91079-f069-4c7a-8dfd-433461e78e9a" name="Default" comment="">
15− <change beforePath="$PROJECT_DIR$/.gradle/4.6/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/fileHashes/fileHashes.bin" afterDir="false" />
15+ <change afterPath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" afterDir="false" />
16− <change beforePath="$PROJECT_DIR$/.gradle/4.6/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/fileHashes/fileHashes.lock" afterDir="false" />
17− <change beforePath="$PROJECT_DIR$/.gradle/4.6/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/javaCompile/classAnalysis.bin" afterDir="false" />
18− <change beforePath="$PROJECT_DIR$/.gradle/4.6/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/javaCompile/javaCompile.lock" afterDir="false" />
19− <change beforePath="$PROJECT_DIR$/.gradle/4.6/javaCompile/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/javaCompile/taskHistory.bin" afterDir="false" />
20− <change beforePath="$PROJECT_DIR$/.gradle/4.6/taskHistory/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/taskHistory/taskHistory.bin" afterDir="false" />
21− <change beforePath="$PROJECT_DIR$/.gradle/4.6/taskHistory/taskHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/taskHistory/taskHistory.lock" afterDir="false" />
16+ <change beforePath="$PROJECT_DIR$/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" afterDir="false" />
22− <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
17+ <change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
23− <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
24− <change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
25− <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
26 <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/AdapterNews.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/AdapterNews.java" afterDir="false" />
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" />
27− <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Parsing.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Parsing.java" afterDir="false" />
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" />
28− <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" afterDir="false" />
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" />
29 </list>
23 </list>
30 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
24 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
31 <option name="TRACKING_ENABLED" value="true" />
25 <option name="TRACKING_ENABLED" value="true" />
@@ -51,8 +45,8 @@
51 <file leaf-file-name="AdapterNews.java" pinned="false" current-in-tab="true">
45 <file leaf-file-name="AdapterNews.java" pinned="false" current-in-tab="true">
52 <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/AdapterNews.java">
46 <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/AdapterNews.java">
53 <provider selected="true" editor-type-id="text-editor">
47 <provider selected="true" editor-type-id="text-editor">
54− <state relative-caret-position="271">
48+ <state relative-caret-position="198">
55− <caret line="162" column="31" lean-forward="true" selection-start-line="162" selection-start-column="31" selection-end-line="162" selection-end-column="31" />
49+ <caret line="36" selection-start-line="36" selection-end-line="36" />
56 </state>
50 </state>
57 </provider>
51 </provider>
58 </entry>
52 </entry>
@@ -60,31 +54,10 @@
60 <file leaf-file-name="MainActivity.java" pinned="false" current-in-tab="false">
54 <file leaf-file-name="MainActivity.java" pinned="false" current-in-tab="false">
61 <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/MainActivity.java">
55 <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/MainActivity.java">
62 <provider selected="true" editor-type-id="text-editor">
56 <provider selected="true" editor-type-id="text-editor">
63− <state relative-caret-position="360">
57+ <state relative-caret-position="332">
64− <caret line="32" column="23" selection-start-line="32" selection-start-column="23" selection-end-line="32" selection-end-column="23" />
58+ <caret line="29" column="51" selection-start-line="29" selection-start-column="51" selection-end-line="29" selection-end-column="51" />
65− </state>
66− </provider>
67− </entry>
68− </file>
69− <file leaf-file-name="activity_main.xml" pinned="false" current-in-tab="false">
70− <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
71− <provider selected="true" editor-type-id="text-editor">
72− <state relative-caret-position="30">
73− <caret line="9" column="16" selection-start-line="9" selection-start-column="16" selection-end-line="9" selection-end-column="16" />
74− </state>
75− </provider>
76− <provider editor-type-id="android-designer2">
77− <state />
78− </provider>
79− </entry>
80− </file>
81− <file leaf-file-name="Parsing.java" pinned="false" current-in-tab="false">
82− <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Parsing.java">
83− <provider selected="true" editor-type-id="text-editor">
84− <state relative-caret-position="223">
85− <caret line="89" column="46" selection-start-line="89" selection-start-column="46" selection-end-line="89" selection-end-column="46" />
86 <folding>
59 <folding>
87− <marker date="1549302605747" expanded="true" signature="1260:1549" ph="..." />
60+ <element signature="imports" expanded="true" />
88 </folding>
61 </folding>
89 </state>
62 </state>
90 </provider>
63 </provider>
@@ -92,6 +65,11 @@
92 </file>
65 </file>
93 </leaf>
66 </leaf>
94 </component>
67 </component>
68+ <component name="FindInProjectRecents">
69+ <findStrings>
70+ <find>idPos</find>
71+ </findStrings>
72+ </component>
95 <component name="Git.Settings">
73 <component name="Git.Settings">
96 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
74 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
97 </component>
75 </component>
@@ -2355,12 +2333,13 @@
2355 <option name="CHANGED_PATHS">
2333 <option name="CHANGED_PATHS">
2356 <list>
2334 <list>
2357 <option value="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/AdapterNews.java" />
2335 <option value="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/AdapterNews.java" />
2358− <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
2336+ <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
2337+ <option value="$PROJECT_DIR$/app/src/main/res/values/dimen.xml" />
2359− <option value="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Parsing.java" />
2338+ <option value="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/MainActivity.java" />
2360 </list>
2339 </list>
2361 </option>
2340 </option>
2362 </component>
2341 </component>
2363− <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
2342+ <component name="ProjectFrameBounds" extendedState="6">
2364 <option name="width" value="1440" />
2343 <option name="width" value="1440" />
2365 <option name="height" value="900" />
2344 <option name="height" value="900" />
2366 </component>
2345 </component>
@@ -2369,8 +2348,6 @@
2369 <foldersAlwaysOnTop value="true" />
2348 <foldersAlwaysOnTop value="true" />
2370 </navigator>
2349 </navigator>
2371 <panes>
2350 <panes>
2372− <pane id="ProjectPane" />
2373− <pane id="Scope" />
2374 <pane id="AndroidView">
2351 <pane id="AndroidView">
2375 <subPane>
2352 <subPane>
2376 <expand>
2353 <expand>
@@ -2398,19 +2375,21 @@
2398 <item name="Socket" type="1abcf292:AndroidViewProjectNode" />
2375 <item name="Socket" type="1abcf292:AndroidViewProjectNode" />
2399 <item name="app" type="feadf853:AndroidModuleNode" />
2376 <item name="app" type="feadf853:AndroidModuleNode" />
2400 <item name="res" type="d4f16f75:AndroidResFolderNode" />
2377 <item name="res" type="d4f16f75:AndroidResFolderNode" />
2401− <item name="anim" type="ddeffd01:AndroidResFolderTypeNode" />
2378+ <item name="layout" type="ddeffd01:AndroidResFolderTypeNode" />
2402 </path>
2379 </path>
2403 <path>
2380 <path>
2404 <item name="Socket" type="1abcf292:AndroidViewProjectNode" />
2381 <item name="Socket" type="1abcf292:AndroidViewProjectNode" />
2405 <item name="app" type="feadf853:AndroidModuleNode" />
2382 <item name="app" type="feadf853:AndroidModuleNode" />
2406 <item name="res" type="d4f16f75:AndroidResFolderNode" />
2383 <item name="res" type="d4f16f75:AndroidResFolderNode" />
2407− <item name="layout" type="ddeffd01:AndroidResFolderTypeNode" />
2384+ <item name="values" type="ddeffd01:AndroidResFolderTypeNode" />
2408 </path>
2385 </path>
2409 </expand>
2386 </expand>
2410 <select />
2387 <select />
2411 </subPane>
2388 </subPane>
2412 </pane>
2389 </pane>
2413 <pane id="PackagesPane" />
2390 <pane id="PackagesPane" />
2391+ <pane id="ProjectPane" />
2392+ <pane id="Scope" />
2414 </panes>
2393 </panes>
2415 </component>
2394 </component>
2416 <component name="PropertiesComponent">
2395 <component name="PropertiesComponent">
@@ -2535,17 +2514,16 @@
2535 </component>
2514 </component>
2536 <component name="TaskManager">
2515 <component name="TaskManager">
2537 <task active="true" id="Default" summary="Default task">
2516 <task active="true" id="Default" summary="Default task">
2538− <changelist id="6c1ed618-7fec-4785-93fc-5caee38346bd" name="Default" comment="" />
2517+ <changelist id="25c91079-f069-4c7a-8dfd-433461e78e9a" name="Default" comment="" />
2539− <created>1549302242823</created>
2518+ <created>1548951806889</created>
2540 <option name="number" value="Default" />
2519 <option name="number" value="Default" />
2541 <option name="presentableId" value="Default" />
2520 <option name="presentableId" value="Default" />
2542− <updated>1549302242823</updated>
2521+ <updated>1548951806889</updated>
2543 </task>
2522 </task>
2544 <servers />
2523 <servers />
2545 </component>
2524 </component>
2546 <component name="ToolWindowManager">
2525 <component name="ToolWindowManager">
2547− <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" />
2548− <editor active="true" />
2549 <layout>
2527 <layout>
2550 <window_info anchor="bottom" id="TODO" order="6" />
2528 <window_info anchor="bottom" id="TODO" order="6" />
2551 <window_info anchor="bottom" id="Android Profiler" />
2529 <window_info anchor="bottom" id="Android Profiler" />
@@ -2555,15 +2533,15 @@
2555 <window_info anchor="right" id="Capture Analysis" />
2533 <window_info anchor="right" id="Capture Analysis" />
2556 <window_info anchor="bottom" id="Event Log" side_tool="true" />
2534 <window_info anchor="bottom" id="Event Log" side_tool="true" />
2557 <window_info anchor="right" id="Preview" weight="0.3297568" />
2535 <window_info anchor="right" id="Preview" weight="0.3297568" />
2558− <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.15461347" />
2536+ <window_info anchor="bottom" id="Run" order="2" />
2559 <window_info anchor="bottom" id="Version Control" />
2537 <window_info anchor="bottom" id="Version Control" />
2560 <window_info anchor="bottom" id="Terminal" />
2538 <window_info anchor="bottom" id="Terminal" />
2561 <window_info anchor="bottom" id="Logcat" />
2539 <window_info anchor="bottom" id="Logcat" />
2562 <window_info id="Captures" order="2" weight="0.25" />
2540 <window_info id="Captures" order="2" weight="0.25" />
2563 <window_info id="Capture Tool" />
2541 <window_info id="Capture Tool" />
2564 <window_info id="Designer" />
2542 <window_info id="Designer" />
2565− <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22532189" />
2543+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24964234" />
2566− <window_info anchor="bottom" id="Build" weight="0.4127182" />
2544+ <window_info anchor="bottom" id="Build" visible="true" weight="0.124814264" />
2567 <window_info anchor="right" id="Gradle" />
2545 <window_info anchor="right" id="Gradle" />
2568 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
2546 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
2569 <window_info anchor="right" id="Theme Preview" />
2547 <window_info anchor="right" id="Theme Preview" />
@@ -2572,9 +2550,9 @@
2572 <window_info anchor="right" id="Device File Explorer" side_tool="true" />
2550 <window_info anchor="right" id="Device File Explorer" side_tool="true" />
2573 <window_info anchor="bottom" id="Find" order="1" />
2551 <window_info anchor="bottom" id="Find" order="1" />
2574 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
2552 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
2575− <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
2576− <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
2577 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
2553 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
2554+ <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
2555+ <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
2578 <window_info anchor="bottom" id="Message" order="0" />
2556 <window_info anchor="bottom" id="Message" order="0" />
2579 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
2557 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
2580 </layout>
2558 </layout>
@@ -2583,37 +2561,68 @@
2583 <option name="myLimit" value="2678400000" />
2561 <option name="myLimit" value="2678400000" />
2584 </component>
2562 </component>
2585 <component name="editorHistoryManager">
2563 <component name="editorHistoryManager">
2586− <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
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">
2587 <provider selected="true" editor-type-id="text-editor">
2585 <provider selected="true" editor-type-id="text-editor">
2588 <state relative-caret-position="30">
2586 <state relative-caret-position="30">
2589− <caret line="9" column="16" selection-start-line="9" selection-start-column="16" selection-end-line="9" selection-end-column="16" />
2587+ <caret line="2" column="34" selection-start-line="2" selection-start-column="34" selection-end-line="2" selection-end-column="34" />
2590 </state>
2588 </state>
2591 </provider>
2589 </provider>
2590+ </entry>
2591+ <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_post.xml">
2592 <provider editor-type-id="android-designer2">
2592 <provider editor-type-id="android-designer2">
2593 <state />
2593 <state />
2594 </provider>
2594 </provider>
2595− </entry>
2596− <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/MainActivity.java">
2597 <provider selected="true" editor-type-id="text-editor">
2595 <provider selected="true" editor-type-id="text-editor">
2598− <state relative-caret-position="360">
2596+ <state relative-caret-position="303">
2599− <caret line="32" column="23" selection-start-line="32" selection-start-column="23" selection-end-line="32" selection-end-column="23" />
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" />
2598+ <folding>
2599+ <element signature="e#2181#2203#0" expanded="true" />
2600+ </folding>
2600 </state>
2601 </state>
2601 </provider>
2602 </provider>
2602 </entry>
2603 </entry>
2603− <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">
2604 <provider selected="true" editor-type-id="text-editor">
2613 <provider selected="true" editor-type-id="text-editor">
2605− <state relative-caret-position="223">
2614+ <state relative-caret-position="332">
2606− <caret line="89" column="46" selection-start-line="89" selection-start-column="46" selection-end-line="89" selection-end-column="46" />
2615+ <caret line="29" column="51" selection-start-line="29" selection-start-column="51" selection-end-line="29" selection-end-column="51" />
2607 <folding>
2616 <folding>
2608− <marker date="1549302605747" expanded="true" signature="1260:1549" ph="..." />
2617+ <element signature="imports" expanded="true" />
2609 </folding>
2618 </folding>
2610 </state>
2619 </state>
2611 </provider>
2620 </provider>
2612 </entry>
2621 </entry>
2613 <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/AdapterNews.java">
2622 <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/AdapterNews.java">
2614 <provider selected="true" editor-type-id="text-editor">
2623 <provider selected="true" editor-type-id="text-editor">
2615− <state relative-caret-position="271">
2624+ <state relative-caret-position="198">
2616− <caret line="162" column="31" lean-forward="true" selection-start-line="162" selection-start-column="31" selection-end-line="162" selection-end-column="31" />
2625+ <caret line="36" selection-start-line="36" selection-end-line="36" />
2617 </state>
2626 </state>
2618 </provider>
2627 </provider>
2619 </entry>
2628 </entry>
app/.DS_Storedeleted

Binary file not shown.

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> {
132 TextView userName;
132 TextView userName;
133 TextView date;
133 TextView date;
134 TextView postBody;
134 TextView postBody;
135+ TextView showFull;
135 ImageView userPhoto;
136 ImageView userPhoto;
136 ConstraintLayout itemNews;
137 ConstraintLayout itemNews;
137
138
@@ -143,6 +144,7 @@ public class AdapterNews extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
143 postBody = itemView.findViewById(R.id.post);
144 postBody = itemView.findViewById(R.id.post);
144 userPhoto = itemView.findViewById(R.id.userphotoNews);
145 userPhoto = itemView.findViewById(R.id.userphotoNews);
145 itemNews = itemView.findViewById(R.id.itemNews);
146 itemNews = itemView.findViewById(R.id.itemNews);
147+ //showFull = itemView.findViewById(R.id.showPost);
146 }
148 }
147 }
149 }
148
150
@@ -172,7 +174,9 @@ public class AdapterNews extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
172 if (partOfPosts.size() > p) {
174 if (partOfPosts.size() > p) {
173 partOfPosts.remove(map.get(id));
175 partOfPosts.remove(map.get(id));
174 notifyItemRemoved(p);
176 notifyItemRemoved(p);
177+ notifyItemChanged(p);
175 }
178 }
179+ notifyDataSetChanged();
176
180
177 for(int i = 0; i < allPosts.size(); ++i)
181 for(int i = 0; i < allPosts.size(); ++i)
178 map.put(allPosts.get(i).postId, allPosts.get(i));
182 map.put(allPosts.get(i).postId, allPosts.get(i));
@@ -195,8 +199,10 @@ public class AdapterNews extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
195 partOfPosts.add(0, post);
199 partOfPosts.add(0, post);
196
200
197 notifyItemInserted(0);
201 notifyItemInserted(0);
202+ notifyItemChanged(0);
198 }
203 }
199
204
205+ notifyDataSetChanged();
200 for(int i = 0; i < allPosts.size(); ++i)
206 for(int i = 0; i < allPosts.size(); ++i)
201 map.put(allPosts.get(i).postId, allPosts.get(i));
207 map.put(allPosts.get(i).postId, allPosts.get(i));
202
208
app/src/main/java/com/example/annamihaleva/testparse/Parsing.java+14−15
@@ -43,10 +43,10 @@ public class Parsing extends AsyncTask<Void, Void, Void> {
43 protected void onPreExecute() {
43 protected void onPreExecute() {
44 super.onPreExecute();
44 super.onPreExecute();
45
45
46−// progressBar = new ProgressBar(context,null, android.R.attr.progressBarStyleLarge);
46+ progressBar = new ProgressBar(context,null, android.R.attr.progressBarStyleLarge);
47−// RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(100,100);
47+ RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(100,100);
48−// params.addRule(RelativeLayout.CENTER_IN_PARENT);
48+ params.addRule(RelativeLayout.CENTER_IN_PARENT);
49−// progressBar.setVisibility(View.VISIBLE);
49+ progressBar.setVisibility(View.VISIBLE);
50 }
50 }
51
51
52 @Override
52 @Override
@@ -85,25 +85,25 @@ public class Parsing extends AsyncTask<Void, Void, Void> {
85 @Override
85 @Override
86 protected void onPostExecute(Void result) {
86 protected void onPostExecute(Void result) {
87 super.onPostExecute(result);
87 super.onPostExecute(result);
88+ progressBar.setVisibility(View.GONE);
88
89
89 MainActivity.adapter = adapter;
90 MainActivity.adapter = adapter;
90 MainActivity.news.setAdapter(adapter);
91 MainActivity.news.setAdapter(adapter);
91− LayoutAnimationController controller = AnimationUtils.loadLayoutAnimation(context, R.anim.layout_down);
92
92
93+ LayoutAnimationController controller = AnimationUtils.loadLayoutAnimation(context, R.anim.layout_down);
93 MainActivity.news.setLayoutAnimation(controller);
94 MainActivity.news.setLayoutAnimation(controller);
94 MainActivity.news.getAdapter().notifyDataSetChanged();
95 MainActivity.news.getAdapter().notifyDataSetChanged();
95 MainActivity.news.scheduleLayoutAnimation();
96 MainActivity.news.scheduleLayoutAnimation();
96
97
97 MainActivity.loading = false;
98 MainActivity.loading = false;
98
99
100+ MainActivity.adapter.setLoadMore(() -> {
99− if (adapter.getItemCount() < resp.response.size()) {
101+ if (adapter.getItemCount() < resp.response.size()) {
100− partOfPosts.add(null);
102+ partOfPosts.add(null);
101− adapter.notifyItemInserted(partOfPosts.size() - 1);
103+ adapter.notifyItemInserted(partOfPosts.size() - 1);
102− adapter.setLoadMore(() -> {
103−
104 new Handler().postDelayed(() -> {
104 new Handler().postDelayed(() -> {
105 if (partOfPosts.size() > 0)
105 if (partOfPosts.size() > 0)
106− partOfPosts.remove(partOfPosts.size()-1);
106+ partOfPosts.remove(partOfPosts.size() - 1);
107 adapter.notifyItemRemoved(partOfPosts.size());
107 adapter.notifyItemRemoved(partOfPosts.size());
108
108
109 int start = partOfPosts.size();
109 int start = partOfPosts.size();
@@ -111,10 +111,9 @@ public class Parsing extends AsyncTask<Void, Void, Void> {
111 fillArray(start, end);
111 fillArray(start, end);
112 adapter.notifyDataSetChanged();
112 adapter.notifyDataSetChanged();
113 adapter.setLoaded();
113 adapter.setLoaded();
114− }, 700);
114+ }, 1000);
115−
116− });
115+ }
117− }
116+ });
118 }
117 }
119
118
120 private void fillArray(int start, int end){
119 private void fillArray(int start, int end){
app/src/main/res/layout/activity_main.xml+18−19
@@ -8,29 +8,28 @@
8 android:layout_height="match_parent">
8 android:layout_height="match_parent">
9
9
10 <FrameLayout
10 <FrameLayout
11− android:layout_width="match_parent"
11+ android:layout_width="wrap_content"
12 android:layout_height="wrap_content">
12 android:layout_height="wrap_content">
13
13
14− <!--<android.support.v4.widget.SwipeRefreshLayout-->
14+ <android.support.v4.widget.SwipeRefreshLayout
15− <!--xmlns:android="http://schemas.android.com/apk/res/android"-->
15+ xmlns:android="http://schemas.android.com/apk/res/android"
16− <!--android:id="@+id/swipeContainer"-->
16+ android:id="@+id/swipeContainer"
17− <!--android:layout_width="match_parent"-->
17+ android:layout_width="match_parent"
18− <!--android:layout_height="match_parent">-->
18+ android:layout_height="match_parent">
19−
20−
21
19
22− <!--</android.support.v4.widget.SwipeRefreshLayout>-->
23
20
24− <android.support.v7.widget.RecyclerView
21+ <android.support.v7.widget.RecyclerView
25− android:id="@+id/recycler_news"
22+ android:id="@+id/recycler_news"
26− android:layout_width="match_parent"
23+ android:layout_width="match_parent"
27− android:layout_height="match_parent"
24+ android:layout_height="match_parent"
28− android:clipToPadding="false"
25+ android:clipToPadding="false"
29− android:scrollbars="vertical"
26+ android:scrollbars="vertical"
30− app:layout_constraintLeft_toLeftOf="parent"
27+ app:layout_constraintLeft_toLeftOf="parent"
31− app:layout_constraintRight_toRightOf="parent"
28+ app:layout_constraintRight_toRightOf="parent"
32− tools:listitem="@layout/activity_post">
29+ tools:listitem="@layout/activity_post">
33− </android.support.v7.widget.RecyclerView>
30+ </android.support.v7.widget.RecyclerView>
31+
32+ </android.support.v4.widget.SwipeRefreshLayout>
34
33
35 <!--<Button-->
34 <!--<Button-->
36 <!--android:id="@+id/butUpdate"-->
35 <!--android:id="@+id/butUpdate"-->