work on certification ui

14 files changed, 71 insertions, 33 deletions

diff --git a/OpenKeychain/src/main/res/anim/fade_in_up.xml b/OpenKeychain/src/main/res/anim/fade_in_up.xml
new file mode 100644
index 000000000..c190c0f53
--- /dev/null
+++ b/OpenKeychain/src/main/res/anim/fade_in_up.xml
@@ -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>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/anim/fade_out_down.xml b/OpenKeychain/src/main/res/anim/fade_out_down.xml
new file mode 100644
index 000000000..523b180af
--- /dev/null
+++ b/OpenKeychain/src/main/res/anim/fade_out_down.xml
@@ -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>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_inner_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_inner_24dp.png
new file mode 100644
index 000000000..e9dfc47a4
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_inner_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_inner_96dp.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_inner_96dp.png
new file mode 100644
index 000000000..4a3f2b2b5
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_inner_96dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_inner_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_inner_24dp.png
new file mode 100644
index 000000000..28e37d9f3
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_inner_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_inner_96dp.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_inner_96dp.png
new file mode 100644
index 000000000..cc7091df0
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_inner_96dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_inner_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_inner_24dp.png
new file mode 100644
index 000000000..ea801c45a
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_inner_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_inner_96dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_inner_96dp.png
new file mode 100644
index 000000000..61610df19
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_inner_96dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_inner_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_inner_24dp.png
new file mode 100644
index 000000000..bcd73b09b
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_inner_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_inner_96dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_inner_96dp.png
new file mode 100644
index 000000000..71e563218
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_inner_96dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_verified_inner_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_verified_inner_24dp.png
new file mode 100644
index 000000000..cc7091df0
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_verified_inner_24dp.png
diff --git a/OpenKeychain/src/main/res/layout/linked_id_item.xml b/OpenKeychain/src/main/res/layout/linked_id_item.xml
index 5fc5e78a8..900d3a5d5 100644
--- a/OpenKeychain/src/main/res/layout/linked_id_item.xml
+++ b/OpenKeychain/src/main/res/layout/linked_id_item.xml
@@ -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>
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 106d2343f..2fb79a4bf 100644
--- a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml
@@ -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,11 +51,30 @@
                     android:orientation="horizontal"
                     android:singleLine="true">
 
+                    <LinearLayout
+                        android:orientation="vertical"
+                        android:layout_gravity="center_vertical"
+                        android:layout_width="0dip"
+                        android:layout_marginLeft="8dp"
+                        android:layout_marginTop="4dp"
+                        android:layout_marginBottom="4dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/linked_cert_text"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Verifying…"
+                            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+                    </LinearLayout>
+
                     <ViewAnimator
                         android:layout_width="22dp"
                         android:layout_height="22dp"
                         android:layout_marginLeft="16dp"
-                        android:layout_marginRight="8dp"
+                        android:layout_marginRight="4dp"
                         android:layout_gravity="center"
                         android:id="@+id/linked_cert_progress"
                         android:inAnimation="@anim/fade_in"
@@ -66,38 +87,21 @@
                             />
 
                         <ImageView
+                            android:id="@+id/status_icon_verified"
                             android:layout_width="22dp"
                             android:layout_height="wrap_content"
-                            android:src="@drawable/status_signature_verified_cutout_24dp"
+                            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_unknown_cutout_24dp"
+                            android:src="@drawable/status_signature_invalid_cutout_24dp"
                             />
 
                     </ViewAnimator>
 
-                    <LinearLayout
-                        android:orientation="vertical"
-                        android:layout_gravity="center_vertical"
-                        android:layout_width="0dip"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginTop="4dp"
-                        android:layout_marginBottom="4dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1">
-
-                        <TextView
-                            android:id="@+id/linked_cert_text"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="Verifying…"
-                            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                    </LinearLayout>
-
                 </LinearLayout>
 
             </ViewAnimator>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 3e46a7328..4902485b0 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -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>