From faabf8eca264d2fa41d467e66e546f724281c47c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Thu, 2 Jan 2014 22:01:25 +0100 Subject: fixing some layout problems --- .../res/layout/key_list_group_item.xml | 40 ---------------------- OpenPGP-Keychain/res/layout/key_list_item.xml | 24 +++++++++++++ .../res/layout/key_list_public_fragment.xml | 25 +++++++++++--- OpenPGP-Keychain/res/layout/stickylist_header.xml | 6 ++-- .../keychain/ui/KeyListPublicFragment.java | 15 +++----- .../keychain/ui/adapter/KeyListAdapter.java | 2 +- .../keychain/ui/adapter/KeyListPublicAdapter.java | 2 +- .../keychain/ui/adapter/KeyListSecretAdapter.java | 2 +- 8 files changed, 55 insertions(+), 61 deletions(-) delete mode 100644 OpenPGP-Keychain/res/layout/key_list_group_item.xml create mode 100644 OpenPGP-Keychain/res/layout/key_list_item.xml (limited to 'OpenPGP-Keychain') diff --git a/OpenPGP-Keychain/res/layout/key_list_group_item.xml b/OpenPGP-Keychain/res/layout/key_list_group_item.xml deleted file mode 100644 index 240be54b0..000000000 --- a/OpenPGP-Keychain/res/layout/key_list_group_item.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/key_list_item.xml b/OpenPGP-Keychain/res/layout/key_list_item.xml new file mode 100644 index 000000000..2571bb6e7 --- /dev/null +++ b/OpenPGP-Keychain/res/layout/key_list_item.xml @@ -0,0 +1,24 @@ + + + + + + + + \ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml b/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml index 052dd4249..451230a1f 100644 --- a/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml +++ b/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml @@ -2,13 +2,28 @@ + android:orientation="vertical" > + android:layout_height="match_parent" + android:clipToPadding="false" + android:drawSelectorOnTop="true" + android:fastScrollEnabled="true" + android:paddingBottom="16dp" + android:paddingLeft="16dp" + android:paddingRight="32dp" + android:paddingTop="16dp" + android:scrollbarStyle="outsideOverlay" /> + + \ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/stickylist_header.xml b/OpenPGP-Keychain/res/layout/stickylist_header.xml index 475d1c4db..b8906c2db 100644 --- a/OpenPGP-Keychain/res/layout/stickylist_header.xml +++ b/OpenPGP-Keychain/res/layout/stickylist_header.xml @@ -2,15 +2,15 @@ + android:background="@color/abs__background_holo_light" > 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 { @@ -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); } } -- cgit v1.2.3