diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-13 13:54:52 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-13 14:03:27 +0100 |
commit | 8fcffdd7cd1732b10ed6872fc88aead356fd7dbd (patch) | |
tree | b46be532b0ac47d3e4beae10c434cc81477ac6e5 /OpenKeychain/src/main/res/layout | |
parent | a9a5551d95d964b5037fb2e5308081618a33b802 (diff) | |
download | open-keychain-8fcffdd7cd1732b10ed6872fc88aead356fd7dbd.tar.gz open-keychain-8fcffdd7cd1732b10ed6872fc88aead356fd7dbd.tar.bz2 open-keychain-8fcffdd7cd1732b10ed6872fc88aead356fd7dbd.zip |
use ViewAnimator for progress, streamline text on first step
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
7 files changed, 84 insertions, 65 deletions
diff --git a/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step1.xml b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step1.xml index 98bffe02e..c0a898843 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step1.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step1.xml @@ -68,13 +68,6 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:text="@string/linked_create_dns_1_4" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/linked_create_dns_1_5" /> - </LinearLayout> </ScrollView> diff --git a/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml index 7181089eb..6aed07e83 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml @@ -72,22 +72,30 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp"> - <ImageView - android:id="@+id/verify_image" - android:src="@drawable/status_signature_unverified_cutout_24dp" - android:layout_gravity="center_vertical" + <ViewAnimator + android:id="@+id/verify_progress" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dip" android:layout_marginStart="16dip" - /> - - <ProgressBar - android:id="@+id/verify_progress" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:visibility="gone" - android:indeterminateOnly="true"/> + android:layout_gravity="center_vertical" + android:inAnimation="@anim/fade_in" + android:outAnimation="@anim/fade_out" + > + + <ImageView + android:layout_width="24dp" + android:layout_height="24dp" + android:id="@+id/verify_image" + android:src="@drawable/status_signature_unverified_cutout_24dp" + /> + + <ProgressBar + android:layout_width="24dp" + android:layout_height="24dp" + android:indeterminateOnly="true"/> + + </ViewAnimator> <TextView android:id="@+id/verify_status" diff --git a/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step1.xml b/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step1.xml index 66b8d2c4f..5dfed35c4 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step1.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step1.xml @@ -45,6 +45,13 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:text="@string/linked_create_https_1_2" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/linked_create_https_1_3" /> + <org.sufficientlysecure.keychain.ui.widget.HttpsPrefixedText android:id="@+id/linked_create_https_uri" android:layout_width="match_parent" @@ -61,13 +68,6 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/linked_create_https_1_3" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:textAppearance="?android:attr/textAppearanceMedium" android:text="@string/linked_create_https_1_4" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml b/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml index 2a7088748..b756cbe7a 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml @@ -76,22 +76,30 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp"> - <ImageView - android:id="@+id/verify_image" - android:src="@drawable/status_signature_unverified_cutout_24dp" - android:layout_gravity="center_vertical" + <ViewAnimator + android:id="@+id/verify_progress" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dip" android:layout_marginStart="16dip" - /> - - <ProgressBar - android:id="@+id/verify_progress" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:visibility="gone" - android:indeterminateOnly="true"/> + android:layout_gravity="center_vertical" + android:inAnimation="@anim/fade_in" + android:outAnimation="@anim/fade_out" + > + + <ImageView + android:layout_width="24dp" + android:layout_height="24dp" + android:id="@+id/verify_image" + android:src="@drawable/status_signature_unverified_cutout_24dp" + /> + + <ProgressBar + android:layout_width="24dp" + android:layout_height="24dp" + android:indeterminateOnly="true"/> + + </ViewAnimator> <TextView android:id="@+id/verify_status" diff --git a/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml index d51555ccd..76521fa11 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml @@ -33,21 +33,12 @@ <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" android:text="@string/linked_create_twitter_1_1" /> </LinearLayout> - <EditText - android:id="@+id/linked_create_twitter_handle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:imeOptions="actionNext" - android:layout_marginTop="16dp" - android:ems="10" - android:layout_gravity="center_horizontal" - android:hint="@string/linked_create_twitter_handle"/> - <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -62,6 +53,16 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:text="@string/linked_create_twitter_1_3" /> + <EditText + android:id="@+id/linked_create_twitter_handle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:imeOptions="actionNext" + android:layout_marginTop="16dp" + android:ems="10" + android:layout_gravity="center_horizontal" + android:hint="@string/linked_create_twitter_handle"/> + </LinearLayout> </ScrollView> diff --git a/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml index 0f3bb3985..2ffcd468b 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml @@ -21,7 +21,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/linked_create_twitter_3_1" /> + android:text="@string/linked_create_twitter_2_1" /> <EditText android:id="@+id/linked_create_twitter_preview" @@ -40,7 +40,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/linked_create_twitter_3_2" /> + android:text="@string/linked_create_twitter_2_2" /> <LinearLayout android:layout_width="wrap_content" @@ -73,29 +73,37 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/linked_create_twitter_3_3" /> + android:text="@string/linked_create_twitter_2_3" /> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp"> - <ImageView - android:id="@+id/verify_image" - android:src="@drawable/status_signature_unverified_cutout_24dp" - android:layout_gravity="center_vertical" + <ViewAnimator + android:id="@+id/verify_progress" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dip" android:layout_marginStart="16dip" - /> + android:layout_gravity="center_vertical" + android:inAnimation="@anim/fade_in" + android:outAnimation="@anim/fade_out" + > - <ProgressBar - android:id="@+id/verify_progress" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:visibility="gone" - android:indeterminateOnly="true"/> + <ImageView + android:layout_width="24dp" + android:layout_height="24dp" + android:id="@+id/verify_image" + android:src="@drawable/status_signature_unverified_cutout_24dp" + /> + + <ProgressBar + android:layout_width="24dp" + android:layout_height="24dp" + android:indeterminateOnly="true"/> + + </ViewAnimator> <TextView android:id="@+id/verify_status" @@ -111,7 +119,7 @@ <Button android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Verify" + android:text="@string/linked_create_verify" android:id="@+id/button_verify" android:layout_marginRight="16dp" android:layout_marginEnd="16dip" @@ -124,7 +132,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/linked_create_twitter_3_4" /> + android:text="@string/linked_create_twitter_2_4" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml index e17820ff1..106d2343f 100644 --- a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml +++ b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml @@ -37,7 +37,8 @@ android:layout_height="wrap_content" android:id="@+id/linked_verify_container" android:inAnimation="@anim/fade_in" - android:outAnimation="@anim/fade_out"> + android:outAnimation="@anim/fade_out" + > <include layout="@layout/cert_list_widget" /> |