git.iko.soy/annMikh/Socket
on master help sign in
Исправлены баги в ленте
commit8e341826a02afbc0c49a2ee6b424a9e5ac0e4db9 authorAnya <mihalewa2015@yandex.ru> dateMon 4 Feb 2019, 20:54 (8 years ago) parente2b5734
22 files changed+103−116
compare with master
unifiedsplit
.DS_Store .gradle/4.6/fileHashes/fileHashes.bin .gradle/4.6/fileHashes/fileHashes.lock .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/workspace.xml+69−78 app/.DS_Store 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+15−14 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/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+69−78
@@ -11,15 +11,21 @@
1111 </configurations>
1212 </component>
1313 <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" />
16− <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" />
14+ <list default="true" id="6c1ed618-7fec-4785-93fc-5caee38346bd" 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" />
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" />
22+ <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
23+ <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
24+ <change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
25+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
1826 <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" />
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" />
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" />
2329 </list>
2430 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
2531 <option name="TRACKING_ENABLED" value="true" />
@@ -45,8 +51,8 @@
4551 <file leaf-file-name="AdapterNews.java" pinned="false" current-in-tab="true">
4652 <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/AdapterNews.java">
4753 <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" />
54+ <state relative-caret-position="271">
55+ <caret line="162" column="31" lean-forward="true" selection-start-line="162" selection-start-column="31" selection-end-line="162" selection-end-column="31" />
5056 </state>
5157 </provider>
5258 </entry>
@@ -54,10 +60,31 @@
5460 <file leaf-file-name="MainActivity.java" pinned="false" current-in-tab="false">
5561 <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/MainActivity.java">
5662 <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" />
63+ <state relative-caret-position="360">
64+ <caret line="32" column="23" selection-start-line="32" selection-start-column="23" selection-end-line="32" selection-end-column="23" />
65+ </state>
66+ </provider>
67+ </entry>
68+ </file>
69+ <file leaf-file-name="activity_main.xml" pinned="false" current-in-tab="false">
70+ <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
71+ <provider selected="true" editor-type-id="text-editor">
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" />
5986 <folding>
60− <element signature="imports" expanded="true" />
87+ <marker date="1549302605747" expanded="true" signature="1260:1549" ph="..." />
6188 </folding>
6289 </state>
6390 </provider>
@@ -65,11 +92,6 @@
6592 </file>
6693 </leaf>
6794 </component>
68− <component name="FindInProjectRecents">
69− <findStrings>
70− <find>idPos</find>
71− </findStrings>
72− </component>
7395 <component name="Git.Settings">
7496 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
7597 </component>
@@ -2333,13 +2355,12 @@
23332355 <option name="CHANGED_PATHS">
23342356 <list>
23352357 <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" />
2358+ <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
2359+ <option value="$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Parsing.java" />
23392360 </list>
23402361 </option>
23412362 </component>
2342− <component name="ProjectFrameBounds" extendedState="6">
2363+ <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
23432364 <option name="width" value="1440" />
23442365 <option name="height" value="900" />
23452366 </component>
@@ -2348,6 +2369,8 @@
23482369 <foldersAlwaysOnTop value="true" />
23492370 </navigator>
23502371 <panes>
2372+ <pane id="ProjectPane" />
2373+ <pane id="Scope" />
23512374 <pane id="AndroidView">
23522375 <subPane>
23532376 <expand>
@@ -2375,21 +2398,19 @@
23752398 <item name="Socket" type="1abcf292:AndroidViewProjectNode" />
23762399 <item name="app" type="feadf853:AndroidModuleNode" />
23772400 <item name="res" type="d4f16f75:AndroidResFolderNode" />
2378− <item name="layout" type="ddeffd01:AndroidResFolderTypeNode" />
2401+ <item name="anim" type="ddeffd01:AndroidResFolderTypeNode" />
23792402 </path>
23802403 <path>
23812404 <item name="Socket" type="1abcf292:AndroidViewProjectNode" />
23822405 <item name="app" type="feadf853:AndroidModuleNode" />
23832406 <item name="res" type="d4f16f75:AndroidResFolderNode" />
2384− <item name="values" type="ddeffd01:AndroidResFolderTypeNode" />
2407+ <item name="layout" type="ddeffd01:AndroidResFolderTypeNode" />
23852408 </path>
23862409 </expand>
23872410 <select />
23882411 </subPane>
23892412 </pane>
23902413 <pane id="PackagesPane" />
2391− <pane id="ProjectPane" />
2392− <pane id="Scope" />
23932414 </panes>
23942415 </component>
23952416 <component name="PropertiesComponent">
@@ -2514,16 +2535,17 @@
25142535 </component>
25152536 <component name="TaskManager">
25162537 <task active="true" id="Default" summary="Default task">
2517− <changelist id="25c91079-f069-4c7a-8dfd-433461e78e9a" name="Default" comment="" />
2518− <created>1548951806889</created>
2538+ <changelist id="6c1ed618-7fec-4785-93fc-5caee38346bd" name="Default" comment="" />
2539+ <created>1549302242823</created>
25192540 <option name="number" value="Default" />
25202541 <option name="presentableId" value="Default" />
2521− <updated>1548951806889</updated>
2542+ <updated>1549302242823</updated>
25222543 </task>
25232544 <servers />
25242545 </component>
25252546 <component name="ToolWindowManager">
2526− <frame x="0" y="23" width="1440" height="793" extended-state="6" />
2547+ <frame x="0" y="0" width="1440" height="900" extended-state="6" />
2548+ <editor active="true" />
25272549 <layout>
25282550 <window_info anchor="bottom" id="TODO" order="6" />
25292551 <window_info anchor="bottom" id="Android Profiler" />
@@ -2533,15 +2555,15 @@
25332555 <window_info anchor="right" id="Capture Analysis" />
25342556 <window_info anchor="bottom" id="Event Log" side_tool="true" />
25352557 <window_info anchor="right" id="Preview" weight="0.3297568" />
2536− <window_info anchor="bottom" id="Run" order="2" />
2558+ <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.15461347" />
25372559 <window_info anchor="bottom" id="Version Control" />
25382560 <window_info anchor="bottom" id="Terminal" />
25392561 <window_info anchor="bottom" id="Logcat" />
25402562 <window_info id="Captures" order="2" weight="0.25" />
25412563 <window_info id="Capture Tool" />
25422564 <window_info id="Designer" />
2543− <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" />
2565+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22532189" />
2566+ <window_info anchor="bottom" id="Build" weight="0.4127182" />
25452567 <window_info anchor="right" id="Gradle" />
25462568 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
25472569 <window_info anchor="right" id="Theme Preview" />
@@ -2550,9 +2572,9 @@
25502572 <window_info anchor="right" id="Device File Explorer" side_tool="true" />
25512573 <window_info anchor="bottom" id="Find" order="1" />
25522574 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
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" />
25552575 <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" />
25562578 <window_info anchor="bottom" id="Message" order="0" />
25572579 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
25582580 </layout>
@@ -2561,68 +2583,37 @@
25612583 <option name="myLimit" value="2678400000" />
25622584 </component>
25632585 <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">
2586+ <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
25852587 <provider selected="true" editor-type-id="text-editor">
25862588 <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" />
2589+ <caret line="9" column="16" selection-start-line="9" selection-start-column="16" selection-end-line="9" selection-end-column="16" />
25882590 </state>
25892591 </provider>
2590− </entry>
2591− <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_post.xml">
25922592 <provider editor-type-id="android-designer2">
25932593 <state />
25942594 </provider>
2595− <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" />
2598− <folding>
2599− <element signature="e#2181#2203#0" expanded="true" />
2600− </folding>
2601− </state>
2602− </provider>
26032595 </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>
2596+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/MainActivity.java">
26082597 <provider selected="true" editor-type-id="text-editor">
2609− <state relative-caret-position="-75" />
2598+ <state relative-caret-position="360">
2599+ <caret line="32" column="23" selection-start-line="32" selection-start-column="23" selection-end-line="32" selection-end-column="23" />
2600+ </state>
26102601 </provider>
26112602 </entry>
2612− <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/MainActivity.java">
2603+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/Parsing.java">
26132604 <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" />
2605+ <state relative-caret-position="223">
2606+ <caret line="89" column="46" selection-start-line="89" selection-start-column="46" selection-end-line="89" selection-end-column="46" />
26162607 <folding>
2617− <element signature="imports" expanded="true" />
2608+ <marker date="1549302605747" expanded="true" signature="1260:1549" ph="..." />
26182609 </folding>
26192610 </state>
26202611 </provider>
26212612 </entry>
26222613 <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/annamihaleva/testparse/AdapterNews.java">
26232614 <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" />
2615+ <state relative-caret-position="271">
2616+ <caret line="162" column="31" lean-forward="true" selection-start-line="162" selection-start-column="31" selection-end-line="162" selection-end-column="31" />
26262617 </state>
26272618 </provider>
26282619 </entry>
app/.DS_Storenew file

Binary file not shown.

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+15−14
@@ -43,10 +43,10 @@ public class Parsing extends AsyncTask<Void, Void, Void> {
4343 protected void onPreExecute() {
4444 super.onPreExecute();
4545
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);
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);
5050 }
5151
5252 @Override
@@ -85,25 +85,25 @@ public class Parsing extends AsyncTask<Void, Void, Void> {
8585 @Override
8686 protected void onPostExecute(Void result) {
8787 super.onPostExecute(result);
88− progressBar.setVisibility(View.GONE);
8988
9089 MainActivity.adapter = adapter;
9190 MainActivity.news.setAdapter(adapter);
92−
9391 LayoutAnimationController controller = AnimationUtils.loadLayoutAnimation(context, R.anim.layout_down);
92+
9493 MainActivity.news.setLayoutAnimation(controller);
9594 MainActivity.news.getAdapter().notifyDataSetChanged();
9695 MainActivity.news.scheduleLayoutAnimation();
9796
9897 MainActivity.loading = false;
9998
100− MainActivity.adapter.setLoadMore(() -> {
101− if (adapter.getItemCount() < resp.response.size()) {
102− partOfPosts.add(null);
103− adapter.notifyItemInserted(partOfPosts.size() - 1);
99+ if (adapter.getItemCount() < resp.response.size()) {
100+ partOfPosts.add(null);
101+ adapter.notifyItemInserted(partOfPosts.size() - 1);
102+ adapter.setLoadMore(() -> {
103+
104104 new Handler().postDelayed(() -> {
105105 if (partOfPosts.size() > 0)
106− partOfPosts.remove(partOfPosts.size() - 1);
106+ partOfPosts.remove(partOfPosts.size()-1);
107107 adapter.notifyItemRemoved(partOfPosts.size());
108108
109109 int start = partOfPosts.size();
@@ -111,9 +111,10 @@ public class Parsing extends AsyncTask<Void, Void, Void> {
111111 fillArray(start, end);
112112 adapter.notifyDataSetChanged();
113113 adapter.setLoaded();
114− }, 1000);
115− }
116− });
114+ }, 700);
115+
116+ });
117+ }
117118 }
118119
119120 private void fillArray(int start, int end){
app/src/main/res/layout/activity_main.xml+19−18
@@ -8,28 +8,29 @@
88 android:layout_height="match_parent">
99
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+ <!--<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">-->
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+ <!--</android.support.v4.widget.SwipeRefreshLayout>-->
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 <!--<Button-->
3536 <!--android:id="@+id/butUpdate"-->