Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 11:49:04 +01:00
Code Issues Projects Releases Wiki Activity

fixed sub-tree duplicate bug and also wrong reply count

Browse Source
This commit is contained in:
Ernir Erlingsson
2016-06-01 14:00:31 +02:00
parent a58fb72ab1
commit e3fc015ec3
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
briar-android/src/org/briarproject/android/forum/ForumActivity.java
View File

@@ -27,10 +27,8 @@ import org.briarproject.R;
import org.briarproject.android.ActivityComponent; import org.briarproject.android.ActivityComponent;
import org.briarproject.android.BriarActivity; import org.briarproject.android.BriarActivity;
import org.briarproject.android.api.AndroidNotificationManager; import org.briarproject.android.api.AndroidNotificationManager;
import org.briarproject.android.controller.handler.ResultHandler;
import org.briarproject.android.controller.handler.UiResultHandler; import org.briarproject.android.controller.handler.UiResultHandler;
import org.briarproject.android.util.BriarRecyclerView; import org.briarproject.android.util.BriarRecyclerView;
import org.briarproject.android.util.CustomAnimations;
import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.GroupId;
import org.briarproject.util.StringUtils; import org.briarproject.util.StringUtils;
@@ -309,7 +307,7 @@ public class ForumActivity extends BriarActivity implements
private final List<ForumEntry> forumEntries; private final List<ForumEntry> forumEntries;
// highlight not depandant on time // highlight not depandant on time
private ForumEntry replyEntry; private ForumEntry replyEntry;
// temporary highlight // temporary highlight
private ForumEntry addedEntry; private ForumEntry addedEntry;
public ForumAdapter(@NonNull List<ForumEntry> forumEntries) { public ForumAdapter(@NonNull List<ForumEntry> forumEntries) {
@@ -336,6 +334,7 @@ public class ForumActivity extends BriarActivity implements
isShowingDescendants = true; isShowingDescendants = true;
showDescendants(higherEntry); showDescendants(higherEntry);
} }
notifyItemChanged(getVisiblePos(higherEntry));
break; break;
} }
} }
@@ -361,8 +360,9 @@ public class ForumActivity extends BriarActivity implements
return false; return false;
} }
private boolean hasVisibleDescendants(int visiblePos) { private boolean hasVisibleDescendants(ForumEntry forumEntry) {
int levelLimit = forumEntries.get(visiblePos).getLevel(); int visiblePos = getVisiblePos(forumEntry);
int levelLimit = forumEntry.getLevel();
for (int i = visiblePos + 1; i < getItemCount(); i++) { for (int i = visiblePos + 1; i < getItemCount(); i++) {
ForumEntry entry = getVisibleEntry(i); ForumEntry entry = getVisibleEntry(i);
if (entry.getLevel() <= levelLimit) if (entry.getLevel() <= levelLimit)
@@ -527,7 +527,7 @@ public class ForumActivity extends BriarActivity implements
if (hasDescendants(data)) { if (hasDescendants(data)) {
ui.chevron.setVisibility(VISIBLE); ui.chevron.setVisibility(VISIBLE);
if (hasVisibleDescendants(position)) { if (hasVisibleDescendants(data)) {
ui.chevron.setSelected(false); ui.chevron.setSelected(false);
} else { } else {
ui.chevron.setSelected(true); ui.chevron.setSelected(true);
@@ -551,17 +551,9 @@ public class ForumActivity extends BriarActivity implements
.getColor(ForumActivity.this, .getColor(ForumActivity.this,
R.color.forum_cell_highlight)); R.color.forum_cell_highlight));
} else if (data.equals(addedEntry)) { } else if (data.equals(addedEntry)) {
CustomAnimations.animateColorTransition(ui.cell, ContextCompat ui.cell.setBackgroundColor(ContextCompat
.getColor(ForumActivity.this, .getColor(ForumActivity.this,
R.color.window_background), 3000, R.color.forum_cell_highlight));
new ResultHandler<Void>() {
@Override
public void onResult(Void result) {
ui.setIsRecyclable(true);
}
});
// don't allow cell recycling until the animation finishes
ui.setIsRecyclable(false);
addedEntry = null; addedEntry = null;
} else { } else {
ui.cell.setBackgroundColor(ContextCompat ui.cell.setBackgroundColor(ContextCompat
@@ -576,7 +568,7 @@ public class ForumActivity extends BriarActivity implements
} }
setReplyEntry(data); setReplyEntry(data);
linearLayoutManager linearLayoutManager
.scrollToPositionWithOffset(position, 0); .scrollToPositionWithOffset(getVisiblePos(data), 0);
} }
}); });
} }