work on certification ui

This commit is contained in:
Vincent Breitmoser
2015-03-15 21:41:04 +01:00
parent 4afd6b881e
commit 538be96e61
22 changed files with 205 additions and 56 deletions

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate android:fromYDelta="10" android:toYDelta="0"
android:interpolator="@android:anim/decelerate_interpolator"
android:duration="200"
/>
<alpha android:fromAlpha="0.0" android:toAlpha="1.0"
android:interpolator="@android:anim/accelerate_interpolator"
android:duration="200"
/>
</set>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate android:fromYDelta="0.0" android:toYDelta="10"
android:interpolator="@android:anim/decelerate_interpolator"
android:duration="200"
/>
<alpha android:fromAlpha="1.0" android:toAlpha="0.0"
android:interpolator="@android:anim/decelerate_interpolator"
android:duration="150"
/>
</set>

Binary file not shown.

After

Width:  |  Height:  |  Size: 544 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 429 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 717 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="horizontal"
android:singleLine="true">
android:singleLine="true"
tools:showIn="@layout/linked_id_view_fragment">
<ImageView
android:layout_width="32dp"
@@ -43,22 +45,28 @@
</LinearLayout>
<LinearLayout
android:id="@+id/user_id_item_certified_layout"
<ViewAnimator
android:id="@+id/linked_id_certified"
android:layout_width="22dp"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:outAnimation="@anim/fade_out_down"
android:inAnimation="@anim/fade_in_up"
android:layout_gravity="center_vertical"
android:orientation="vertical">
<ImageView
android:id="@+id/user_id_item_certified"
android:id="@+id/linked_id_certified_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/status_signature_unknown_cutout_24dp"
android:layout_gravity="center_horizontal" />
</LinearLayout>
<Space
android:layout_height="wrap_content"
android:layout_width="wrap_content" />
</ViewAnimator>
</LinearLayout>

View File

@@ -38,6 +38,8 @@
android:id="@+id/linked_verify_container"
android:inAnimation="@anim/fade_in"
android:outAnimation="@anim/fade_out"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
>
<include layout="@layout/cert_list_widget" />
@@ -49,36 +51,6 @@
android:orientation="horizontal"
android:singleLine="true">
<ViewAnimator
android:layout_width="22dp"
android:layout_height="22dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="8dp"
android:layout_gravity="center"
android:id="@+id/linked_cert_progress"
android:inAnimation="@anim/fade_in"
android:outAnimation="@anim/fade_out">
<ProgressBar
android:layout_width="22dp"
android:layout_height="22dp"
android:indeterminate="true"
/>
<ImageView
android:layout_width="22dp"
android:layout_height="wrap_content"
android:src="@drawable/status_signature_verified_cutout_24dp"
/>
<ImageView
android:layout_width="22dp"
android:layout_height="wrap_content"
android:src="@drawable/status_signature_unknown_cutout_24dp"
/>
</ViewAnimator>
<LinearLayout
android:orientation="vertical"
android:layout_gravity="center_vertical"
@@ -98,6 +70,38 @@
</LinearLayout>
<ViewAnimator
android:layout_width="22dp"
android:layout_height="22dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="4dp"
android:layout_gravity="center"
android:id="@+id/linked_cert_progress"
android:inAnimation="@anim/fade_in"
android:outAnimation="@anim/fade_out">
<ProgressBar
android:layout_width="22dp"
android:layout_height="22dp"
android:indeterminate="true"
/>
<ImageView
android:id="@+id/status_icon_verified"
android:layout_width="22dp"
android:layout_height="wrap_content"
android:src="@drawable/status_signature_verified_inner_24dp"
/>
<ImageView
android:id="@+id/status_icon_invalid"
android:layout_width="22dp"
android:layout_height="wrap_content"
android:src="@drawable/status_signature_invalid_cutout_24dp"
/>
</ViewAnimator>
</LinearLayout>
</ViewAnimator>

View File

@@ -1304,6 +1304,16 @@
<string name="linked_create_dns_2_3">"More bla:"</string>
<string name="linked_create_dns_2_4">"After successful verification, press the Finish button to add the Linked Identity to your keyring and finish the process."</string>
<string name="linked_create_verify">"Verify"</string>
<string name="linked_text_clipboard">Text has been copied to clipboard</string>
<string name="linked_verified_https">"The Website has been fetched and verified."</string>
<string name="linked_verified_dns">"The DNS record has been fetched and verified."</string>
<string name="linked_verified_twitter">"The Tweet has been fetched and verified."</string>
<plurals name="linked_id_expand">
<item quantity="one">"There is one more unknown identity type"</item>
<item quantity="other">"There are %d more unknown identity types"</item>
</plurals>
<string name="linked_select_1">"A \'linked identity\' connects your pgp key to a resource on the web."</string>
<string name="linked_select_2">"Please select a type:"</string>
<string name="linked_id_generic_text">"This file claims ownership of the OpenPGP key with long id %2$s.\n\nCookie for proof:\n%1$s"</string>
@@ -1315,11 +1325,5 @@
<string name="menu_linked_add_identity">"Add Linked Identity"</string>
<string name="section_linked_identities">"Linked Identities"</string>
<string name="btn_finish">"Finish"</string>
<string name="linked_create_verify">"Verify"</string>
<string name="linked_text_clipboard">Text has been copied to clipboard</string>
<plurals name="linked_id_expand">
<item quantity="one">"There is one more unknown identity type"</item>
<item quantity="other">"There are %d more unknown identity types"</item>
</plurals>
</resources>