public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed missing root feed workaround. Refactoring FolderListFragment for readability.

Browse source
This commit is contained in:
ojiikun 2013-04-11 06:36:40 +00:00
parent 3ff10b9668
commit 9f9f7c59c7
5 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
media/android/NewsBlur/src/com/newsblur/database/MixedExpandableListAdapter.java
View file

@ -11,6 +11,7 @@ import android.net.Uri;
import android.os.Handler;
import android.support.v4.widget.SimpleCursorAdapter.ViewBinder;
import android.text.TextUtils;
import android.util.Log;
import android.util.SparseArray;
import android.view.LayoutInflater;
import android.view.View;
@ -431,6 +432,7 @@ public class MixedExpandableListAdapter extends BaseExpandableListAdapter{
final Cursor cursor = getChildrenCursor(folderCursorHelper.getCursor());
cursorHelper = new MyCursorHelper(cursor);
//Log.d(this.getClass().getName(), "lazily initing cursor helper for group " + groupPosition + " with rowID " + cursorHelper.mRowIDColumn );
mChildrenCursorHelpers.put(groupPosition, cursorHelper);
}

BIN
media/android/NewsBlur/src/com/newsblur/fragment/.FolderListFragment.java.swp Normal file
View file

Binary file not shown.

2
media/android/NewsBlur/src/com/newsblur/fragment/AddSitesListFragment.java
View file

@ -131,7 +131,7 @@ public class AddSitesListFragment extends Fragment {
for (String feedId : category.feedIds) {
Feed feed = response.feeds.get(feedId);
if (null == feed) {
if (feed == null) {
Log.w(this.getClass().getName(), "Skipping feed ID with no corresponding feed: " + feedId);
continue;
}

25
media/android/NewsBlur/src/com/newsblur/fragment/FolderListFragment.java
View file

@ -49,11 +49,9 @@ import com.newsblur.view.SocialFeedViewBinder;
public class FolderListFragment extends Fragment implements OnGroupClickListener, OnChildClickListener, OnCreateContextMenuListener {
private ExpandableListView list;
private ContentResolver resolver;
private MixedExpandableListAdapter folderAdapter;
private FolderTreeViewBinder groupViewBinder;
private int leftBound, rightBound;
private APIManager apiManager;
private int currentState = AppConstants.STATE_SOME;
private int FEEDCHECK = 0x01;
@ -76,9 +74,6 @@ public class FolderListFragment extends Fragment implements OnGroupClickListener
groupViewBinder = new FolderTreeViewBinder(imageLoader);
blogViewBinder = new SocialFeedViewBinder(getActivity());
leftBound = UIUtils.convertDPsToPixels(getActivity(), 20);
rightBound = UIUtils.convertDPsToPixels(getActivity(), 10);
final String[] groupFrom = new String[] { DatabaseConstants.FOLDER_NAME, DatabaseConstants.SUM_POS, DatabaseConstants.SUM_NEUT };
final int[] groupTo = new int[] { R.id.row_foldername, R.id.row_foldersumpos, R.id.row_foldersumneu };
final String[] childFrom = new String[] { DatabaseConstants.FEED_TITLE, DatabaseConstants.FEED_FAVICON_URL, DatabaseConstants.FEED_NEUTRAL_COUNT, DatabaseConstants.FEED_POSITIVE_COUNT };
@ -110,13 +105,14 @@ public class FolderListFragment extends Fragment implements OnGroupClickListener
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View v = inflater.inflate(R.layout.fragment_folderfeedlist, container);
list = (ExpandableListView) v.findViewById(R.id.folderfeed_list);
ExpandableListView list = (ExpandableListView) v.findViewById(R.id.folderfeed_list);
list.setGroupIndicator(getResources().getDrawable(R.drawable.transparent));
list.setOnCreateContextMenuListener(this);
Display display = getActivity().getWindowManager().getDefaultDisplay();
int width = display.getWidth();
list.setIndicatorBounds(width - leftBound, width - rightBound);
Display display = getActivity().getWindowManager().getDefaultDisplay();
list.setIndicatorBounds(
display.getWidth() - UIUtils.convertDPsToPixels(getActivity(), 20),
display.getWidth() - UIUtils.convertDPsToPixels(getActivity(), 10));
list.setChildDivider(getActivity().getResources().getDrawable(R.drawable.divider_light));
list.setAdapter(folderAdapter);
@ -128,6 +124,10 @@ public class FolderListFragment extends Fragment implements OnGroupClickListener
return v;
}
private ExpandableListView getListView() {
return (ExpandableListView) (this.getView().findViewById(R.id.folderfeed_list));
}
public void checkOpenFolderPreferences() {
if (sharedPreferences == null) {
sharedPreferences = getActivity().getSharedPreferences(PrefConstants.PREFERENCES, 0);
@ -135,9 +135,9 @@ public class FolderListFragment extends Fragment implements OnGroupClickListener
for (int i = 0; i < folderAdapter.getGroupCount(); i++) {
String groupName = folderAdapter.getGroupName(i);
if (sharedPreferences.getBoolean(AppConstants.FOLDER_PRE + "_" + groupName, true)) {
list.expandGroup(i);
this.getListView().expandGroup(i);
} else {
list.collapseGroup(i);
this.getListView().collapseGroup(i);
}
}
}
@ -191,7 +191,8 @@ public class FolderListFragment extends Fragment implements OnGroupClickListener
// all shared stories and regular folders are expandable
// all stories is not expandable
if (folderAdapter.isExpandable(groupPosition)) {
final Cursor folderCursor = ((MixedExpandableListAdapter) list.getExpandableListAdapter()).getGroup(groupPosition);
// TODO: is there a better way to get the folder ID for a group position that asking the list view?
final Cursor folderCursor = ((MixedExpandableListAdapter) this.getListView().getExpandableListAdapter()).getGroup(groupPosition);
String folderId = folderCursor.getString(folderCursor.getColumnIndex(DatabaseConstants.FOLDER_NAME));
new MarkFolderAsReadTask(apiManager, resolver) {
@Override

4
media/android/NewsBlur/src/com/newsblur/network/domain/FeedFolderResponse.java
View file

@ -119,7 +119,7 @@ public class FeedFolderResponse {
}
}
folders.put(fullFolderName, feedIds);
Log.d( this.getClass().getName(), "parsed folder '" + fullFolderName + "' with " + feedIds.size() + " feeds" );
//Log.d( this.getClass().getName(), "parsed folder '" + fullFolderName + "' with " + feedIds.size() + " feeds" );
}
private String getFolderName(String key, List<String> parentFeedNames) {
@ -131,7 +131,7 @@ public class FeedFolderResponse {
if(key != null) {
builder.append(key);
} else {
builder.append(" (no folder)");
//builder.append(" (no folder)");
}
return builder.toString();
}