cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inline progress for download and import

Browse Source
This commit is contained in:
Dominik Schürmann
2016-11-30 01:00:48 +01:00
parent 921575ff1e
commit a67e8c6dd6
3 changed files with 70 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
OpenKeychain/src/main/res/layout/import_keys_list_item.xml
View File

@@ -20,22 +20,22 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="8dp">
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="16dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="24dp">
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:orientation="vertical">
android:orientation="vertical"
android:paddingBottom="16dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="16dp">
<TextView
android:layout_width="wrap_content"
@@ -64,23 +64,33 @@
</LinearLayout>
<FrameLayout
android:id="@+id/extra_container"
android:layout_below="@id/container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
android:orientation="vertical"
android:visibility="gone">
<include
android:id="@+id/extra"
layout="@layout/import_keys_list_item_extra"
app:entry="@{entry}" />
</FrameLayout>
<ProgressBar
android:id="@+id/progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" />
</RelativeLayout>
<FrameLayout
android:id="@+id/extra_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
android:orientation="vertical"
android:visibility="gone">
<include
android:id="@+id/extra"
layout="@layout/import_keys_list_item_extra"
app:entry="@{entry}" />
</FrameLayout>
</LinearLayout>
</android.support.v7.widget.CardView>

13
OpenKeychain/src/main/res/layout/import_keys_list_item_extra.xml
View File

@@ -11,17 +11,15 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="8dp"
android:paddingRight="8dp">
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="16dp"
android:paddingLeft="8dp"
android:paddingRight="8dp">
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingBottom="16dp">
<RelativeLayout
android:layout_width="match_parent"
@@ -106,7 +104,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:orientation="horizontal"
android:padding="8dp">
<Button
android:id="@+id/import_key"