diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-05-08 14:20:07 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-05-08 14:20:07 +0200 |
commit | 5a1120e79113c94bcc8620ba086d6203d62b1b1d (patch) | |
tree | c2cc9c40c416c907c98da305bd4e765953353d3a /OpenKeychain/src/main/res/layout | |
parent | 5c747a747f20fbbfeb31b60ed4d45ea96fa04f41 (diff) | |
parent | 185c4eed4349d7539c2ddcbe696a8c80b523d214 (diff) | |
download | open-keychain-5a1120e79113c94bcc8620ba086d6203d62b1b1d.tar.gz open-keychain-5a1120e79113c94bcc8620ba086d6203d62b1b1d.tar.bz2 open-keychain-5a1120e79113c94bcc8620ba086d6203d62b1b1d.zip |
Merge pull request #619 from Valodim/loader-fragment
Introduce LoaderFragment
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
5 files changed, 96 insertions, 92 deletions
diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml index 951f8d729..c02854668 100644 --- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml +++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml @@ -6,103 +6,74 @@ android:orientation="vertical"> <!--rebuild functionality of ListFragment --> + + <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_progress_container" - android:orientation="vertical" + android:id="@+id/key_list_empty" android:layout_width="match_parent" android:layout_height="match_parent" - android:visibility="visible" - android:gravity="center"> + android:gravity="center" + android:orientation="vertical" + android:visibility="visible"> - <ProgressBar - style="?android:attr/progressBarStyleLarge" + <TextView android:layout_width="wrap_content" - android:layout_height="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:textAppearance="?android:attr/textAppearanceSmall" + android:gravity="center" android:text="" - android:paddingTop="4dip" - android:singleLine="true" /> - - </LinearLayout> + android:textAppearance="?android:attr/textAppearanceLarge" /> - <FrameLayout - android:id="@+id/key_list_list_container" - android:layout_width="match_parent" - 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" + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="4dp" android:gravity="center" - android:orientation="vertical" - android:visibility="gone"> - - <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" /> + android:text="@string/key_list_empty_text2" + android:textAppearance="?android:attr/textAppearanceSmall" /> - <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" /> - - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/key_list_empty_button_create" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="4dp" - android:text="@string/key_list_empty_button_create" - bootstrapbutton:bb_icon_left="fa-plus" - bootstrapbutton:bb_type="default" /> - - <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" /> + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/key_list_empty_button_create" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="4dp" + android:text="@string/key_list_empty_button_create" + bootstrapbutton:bb_icon_left="fa-plus" + bootstrapbutton:bb_type="default" /> - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/key_list_empty_button_import" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="4dp" - android:text="@string/key_list_empty_button_import" - bootstrapbutton:bb_icon_left="fa-download" - bootstrapbutton:bb_type="default" /> - </LinearLayout> + <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" /> - </FrameLayout> + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/key_list_empty_button_import" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="4dp" + android:text="@string/key_list_empty_button_import" + bootstrapbutton:bb_icon_left="fa-download" + bootstrapbutton:bb_type="default" /> + </LinearLayout> </FrameLayout> diff --git a/OpenKeychain/src/main/res/layout/loader_layout.xml b/OpenKeychain/src/main/res/layout/loader_layout.xml new file mode 100644 index 000000000..50252d27c --- /dev/null +++ b/OpenKeychain/src/main/res/layout/loader_layout.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <!--rebuild functionality of ListFragment --> + <LinearLayout + android:id="@+id/loader_progress" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center"> + + <ProgressBar + style="?android:attr/progressBarStyleLarge" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceSmall" + android:text="" + android:paddingTop="4dip" + android:singleLine="true" /> + + </LinearLayout> + + <FrameLayout + android:id="@+id/loader_container" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone"> + + </FrameLayout> + +</FrameLayout> diff --git a/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml index 1b15c7363..caea22341 100644 --- a/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml @@ -11,8 +11,7 @@ android:descendantFocusability="beforeDescendants" android:orientation="vertical" android:paddingLeft="16dp" - android:paddingRight="16dp" - android:id="@+id/container"> + android:paddingRight="16dp"> <TextView style="@style/SectionHeader" diff --git a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml index 1cd0f0214..d93420a99 100644 --- a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml @@ -1,5 +1,4 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -12,9 +11,7 @@ android:descendantFocusability="beforeDescendants" android:orientation="vertical" android:paddingLeft="16dp" - android:paddingRight="16dp" - android:id="@+id/container" - android:visibility="visible"> + android:paddingRight="16dp"> <TextView style="@style/SectionHeader" diff --git a/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml index 48730587d..67c2e241a 100644 --- a/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml @@ -1,5 +1,4 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -12,8 +11,7 @@ android:descendantFocusability="beforeDescendants" android:orientation="vertical" android:paddingLeft="16dp" - android:paddingRight="16dp" - android:id="@+id/container"> + android:paddingRight="16dp"> <TextView style="@style/SectionHeader" |