diff options
Diffstat (limited to 'OpenPGP-Keychain/src')
4 files changed, 8 insertions, 13 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java index 8167ff439..84adaef99 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java @@ -44,14 +44,10 @@ import com.actionbarsherlock.app.SherlockFragment; /** * Public key list with sticky list headers. * - * - uses StickyListHeaders library - * - custom adapter: KeyListPublicAdapter + * - uses StickyListHeaders library - custom adapter: KeyListPublicAdapter + * + * TODO: - fix loader with spinning animation - fix design - fix view holder in adapter * - * TODO: - * - fix loader with spinning animation - * - fix design - * - fix view holder in adapter - * */ public class KeyListPublicFragment extends SherlockFragment implements AdapterView.OnItemClickListener, LoaderManager.LoaderCallbacks<Cursor> { @@ -72,15 +68,14 @@ public class KeyListPublicFragment extends SherlockFragment implements mKeyListPublicActivity = (KeyListPublicActivity) getActivity(); - stickyList = (StickyListHeadersListView) getActivity().findViewById( - R.id.key_list_public_fragment_stickylist); + stickyList = (StickyListHeadersListView) getActivity().findViewById(R.id.list); stickyList.setOnItemClickListener(this); // stickyList.setOnHeaderClickListener(this); // stickyList.setOnStickyHeaderOffsetChangedListener(this); // mStickyList.addHeaderView(inflater.inflate(R.layout.list_header, null)); // mStickyList.addFooterView(inflater.inflate(R.layout.list_footer, null)); - // stickyList.setEmptyView(findViewById(R.id.empty)); + stickyList.setEmptyView(getActivity().findViewById(R.id.empty)); stickyList.setAreHeadersSticky(true); stickyList.setDrawingListUnderStickyHeader(true); stickyList.setFastScrollEnabled(true); diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListAdapter.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListAdapter.java index e94934008..4719d1d1c 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListAdapter.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListAdapter.java @@ -61,7 +61,7 @@ public class KeyListAdapter extends CursorTreeAdapter { */ @Override public View newGroupView(Context context, Cursor cursor, boolean isExpanded, ViewGroup parent) { - return mInflater.inflate(R.layout.key_list_group_item, null); + return mInflater.inflate(R.layout.key_list_item, null); } /** diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java index 86a47d4d7..108fad917 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java @@ -81,7 +81,7 @@ public class KeyListPublicAdapter extends CursorAdapter implements StickyListHea @Override public View newView(Context context, Cursor cursor, ViewGroup parent) { - return mInflater.inflate(R.layout.key_list_group_item, null); + return mInflater.inflate(R.layout.key_list_item, null); } @Override diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java index 6f3129e4f..6315f84fb 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java @@ -76,7 +76,7 @@ public class KeyListSecretAdapter extends CursorAdapter { @Override public View newView(Context context, Cursor cursor, ViewGroup parent) { - return mInflater.inflate(R.layout.key_list_group_item, null); + return mInflater.inflate(R.layout.key_list_item, null); } } |