moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 11:12:15 -05:00
Code Issues Releases Wiki Activity

fixing some layout problems

Browse Source
This commit is contained in:
Dominik Schürmann 2014-01-02 22:01:25 +01:00
parent 3b5878f86d
commit faabf8eca2
7 changed files with 33 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenPGP-Keychain/res/layout/key_list_group_item.xml → OpenPGP-Keychain/res/layout/key_list_item.xml
View File

@ -1,26 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:layout_marginRight="?android:attr/scrollbarSize"
android:orientation="vertical"
android:paddingLeft="36dip"
android:paddingLeft="8dp"
android:singleLine="true" >
<TextView

25
OpenPGP-Keychain/res/layout/key_list_public_fragment.xml
View File

@ -2,13 +2,28 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="8dp"
android:paddingRight="8dp" >
android:orientation="vertical" >
<se.emilsjolander.stickylistheaders.StickyListHeadersListView
android:id="@+id/key_list_public_fragment_stickylist"
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
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" />
<TextView
android:id="@+id/empty"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/list_empty"
android:textSize="30sp"
android:visibility="gone" />
</LinearLayout>

6
OpenPGP-Keychain/res/layout/stickylist_header.xml
View File

@ -2,15 +2,15 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/header_selector" >
android:background="@color/abs__background_holo_light" >
<se.emilsjolander.stickylistheaders.views.UnderlineTextView
android:id="@+id/stickylist_header_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="start|left"
android:padding="5dp"
android:textColor="@android:color/white"
android:padding="8dp"
android:textColor="@color/emphasis"
android:textSize="17sp"
android:textStyle="bold" />

13
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
View File

@ -44,13 +44,9 @@ 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
@ -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);

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListAdapter.java
View File

@ -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);
}
/**

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java
View File

@ -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

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java
View File

@ -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);
}
}