aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout/key_list_fragment.xml
diff options
context:
space:
mode:
authorDaniel Albert <albert_daniel@t-online.de>2014-09-12 15:49:29 +0200
committerDaniel Albert <albert_daniel@t-online.de>2014-09-12 22:44:45 +0200
commitfd5e5afc9f43c551d1ac196f47079da3f0ce4500 (patch)
tree888eaa763e30c5897562e68228fc65ff0a74fcc1 /OpenKeychain/src/main/res/layout/key_list_fragment.xml
parent40c81c9429bf65d1e40cdfe745d4ca08d1d620e0 (diff)
downloadopen-keychain-fd5e5afc9f43c551d1ac196f47079da3f0ce4500.tar.gz
open-keychain-fd5e5afc9f43c551d1ac196f47079da3f0ce4500.tar.bz2
open-keychain-fd5e5afc9f43c551d1ac196f47079da3f0ce4500.zip
Implemented Pull2Refresh in the KeyListFragment
Added KeyUpdateHelper and extended ProviderHelper for better fingerprint collection Added a class for handling the list in the swipe2refresh layout that prevents scrolling bugs Added Pull2Refresh to the KeyListFragment
Diffstat (limited to 'OpenKeychain/src/main/res/layout/key_list_fragment.xml')
-rw-r--r--OpenKeychain/src/main/res/layout/key_list_fragment.xml146
1 files changed, 71 insertions, 75 deletions
diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
index f1da19b72..6af40106d 100644
--- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
@@ -1,82 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<org.sufficientlysecure.keychain.ui.widget.ListAwareSwipeRefreshLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/key_list_swipe_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
-
<!--rebuild functionality of ListFragment -->
-
- <se.emilsjolander.stickylistheaders.StickyListHeadersListView
- android:id="@+id/key_list_list"
+ <FrameLayout
android:layout_width="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:scrollbarStyle="outsideOverlay" />
-
- <LinearLayout
- android:id="@+id/key_list_empty"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center"
- android:orientation="vertical"
- android:visibility="visible">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:text="@string/key_list_empty_text1"
- android:textAppearance="?android:attr/textAppearanceLarge" />
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:text=""
- android:textAppearance="?android:attr/textAppearanceLarge" />
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="4dp"
- android:gravity="center"
- android:text="@string/key_list_empty_text2"
- android:textAppearance="?android:attr/textAppearanceSmall" />
-
- <Button
- android:id="@+id/key_list_empty_button_create"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="4dp"
- android:textSize="14sp"
- android:text="@string/key_list_empty_button_create"
- android:drawableLeft="@drawable/ic_action_new_account"
- android:drawablePadding="8dp"
- android:background="@drawable/button_edgy"/>
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="4dp"
+ android:layout_height="match_parent">
+ <se.emilsjolander.stickylistheaders.StickyListHeadersListView
+ android:id="@+id/key_list_list"
+ android:layout_width="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:scrollbarStyle="outsideOverlay" />
+ <LinearLayout
+ android:id="@+id/key_list_empty"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:gravity="center"
- android:text="@string/key_list_empty_text3"
- android:textAppearance="?android:attr/textAppearanceSmall" />
-
- <Button
- android:id="@+id/key_list_empty_button_import"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="4dp"
- android:textSize="14sp"
- android:text="@string/key_list_empty_button_import"
- android:drawableLeft="@drawable/ic_action_collection"
- android:drawablePadding="8dp"
- android:background="@drawable/button_edgy" />
- </LinearLayout>
-
-</FrameLayout>
+ android:orientation="vertical"
+ android:visibility="visible">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:text="@string/key_list_empty_text1"
+ android:textAppearance="?android:attr/textAppearanceLarge" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:text=""
+ android:textAppearance="?android:attr/textAppearanceLarge" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="4dp"
+ android:gravity="center"
+ android:text="@string/key_list_empty_text2"
+ android:textAppearance="?android:attr/textAppearanceSmall" />
+ <Button
+ android:id="@+id/key_list_empty_button_create"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="4dp"
+ android:textSize="14sp"
+ android:text="@string/key_list_empty_button_create"
+ android:drawableLeft="@drawable/ic_action_new_account"
+ android:drawablePadding="8dp"
+ android:background="@drawable/button_edgy"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="4dp"
+ android:gravity="center"
+ android:text="@string/key_list_empty_text3"
+ android:textAppearance="?android:attr/textAppearanceSmall" />
+ <Button
+ android:id="@+id/key_list_empty_button_import"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="4dp"
+ android:textSize="14sp"
+ android:text="@string/key_list_empty_button_import"
+ android:drawableLeft="@drawable/ic_action_collection"
+ android:drawablePadding="8dp"
+ android:background="@drawable/button_edgy" />
+ </LinearLayout>
+ </FrameLayout>
+</org.sufficientlysecure.keychain.ui.widget.ListAwareSwipeRefreshLayout> \ No newline at end of file