linked: basic shared element transition

4 files changed, 3 insertions, 272 deletions

diff --git a/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml b/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml
index e15f29eb8..4c8dc03c5 100644
--- a/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml
@@ -125,6 +125,8 @@
                 android:id="@+id/button_container"
                 android:layout_marginTop="16dp"
                 android:layout_marginBottom="16dp"
+                android:layout_marginRight="4dp"
+                android:layout_marginLeft="4dp"
                 android:inAnimation="@anim/fade_in"
                 android:outAnimation="@anim/fade_out"
                 custom:initialView="2">
diff --git a/OpenKeychain/src/main/res/layout/linked_create_github_fragment_step1.xml b/OpenKeychain/src/main/res/layout/linked_create_github_fragment_step1.xml
deleted file mode 100644
index 2b8a810e0..000000000
--- a/OpenKeychain/src/main/res/layout/linked_create_github_fragment_step1.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent">
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="false"
-        android:layout_above="@+id/create_key_button_divider">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:drawableLeft="@drawable/linked_github"
-                android:drawablePadding="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="@string/linked_create_github_1_1" />
-
-            <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_github_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_github_1_3" />
-
-            <EditText
-                android:id="@+id/linked_create_github_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_github_handle"/>
-
-        </LinearLayout>
-
-    </ScrollView>
-
-    <View
-        android:id="@+id/create_key_button_divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dip"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:background="?android:attr/listDivider"
-        android:layout_alignTop="@+id/create_key_buttons"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:id="@+id/create_key_buttons">
-
-        <TextView
-            android:id="@+id/back_button"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/btn_back"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:textAllCaps="true"
-            style="?android:attr/borderlessButtonStyle"
-            android:drawableLeft="@drawable/ic_chevron_left_grey_24dp"
-            android:drawablePadding="8dp"
-            android:clickable="true"
-            android:gravity="center_vertical"
-            android:layout_gravity="center_vertical" />
-
-        <View
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
-            android:background="?android:attr/listDivider" />
-
-        <TextView
-            android:id="@+id/next_button"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/btn_next"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:textAllCaps="true"
-            style="?android:attr/borderlessButtonStyle"
-            android:drawableRight="@drawable/ic_chevron_right_grey_24dp"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical|right"
-            android:layout_gravity="center_vertical" />
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/linked_create_github_fragment_step2.xml b/OpenKeychain/src/main/res/layout/linked_create_github_fragment_step2.xml
deleted file mode 100644
index 39e32b629..000000000
--- a/OpenKeychain/src/main/res/layout/linked_create_github_fragment_step2.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent">
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="false"
-        android:layout_above="@+id/create_key_button_divider">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:orientation="vertical">
-
-            <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_github_2_1" />
-
-            <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_github_2_2" />
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_gravity="center_horizontal"
-                style="?android:buttonBarStyle">
-
-                <Button
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginRight="8dp"
-                    style="?android:buttonBarButtonStyle"
-                    android:drawableLeft="@android:drawable/ic_menu_send"
-                    android:drawableStart="@android:drawable/ic_menu_send"
-                    android:text="Post Gist"
-                    android:id="@+id/button_send"
-                    />
-
-                <Button
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginRight="8dp"
-                    style="?android:buttonBarButtonStyle"
-                    android:drawableLeft="@android:drawable/ic_menu_share"
-                    android:drawableStart="@android:drawable/ic_menu_share"
-                    android:text="Share"
-                    android:id="@+id/button_share"
-                    />
-
-            </LinearLayout>
-
-            <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_github_2_3" />
-
-            <include layout="@layout/linked_create_verify" />
-
-            <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_github_2_4" />
-
-        </LinearLayout>
-
-    </ScrollView>
-
-    <View
-        android:id="@+id/create_key_button_divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dip"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:background="?android:attr/listDivider"
-        android:layout_alignTop="@+id/create_key_buttons"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:id="@+id/create_key_buttons">
-
-        <TextView
-            android:id="@+id/back_button"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/btn_back"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:textAllCaps="true"
-            style="?android:attr/borderlessButtonStyle"
-            android:drawableLeft="@drawable/ic_chevron_left_grey_24dp"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical"
-            android:clickable="true"
-            android:layout_gravity="center_vertical" />
-
-        <View
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
-            android:background="?android:attr/listDivider" />
-
-        <TextView
-            android:id="@+id/next_button"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/btn_finish"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:textAllCaps="true"
-            android:drawableRight="@drawable/ic_person_add_grey_24dp"
-            android:drawablePadding="8dp"
-            style="?android:attr/borderlessButtonStyle"
-            android:gravity="center_vertical|right"
-            android:layout_gravity="center_vertical" />
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/linked_id_item.xml b/OpenKeychain/src/main/res/layout/linked_id_item.xml
index d6e437dd5..e4fe58551 100644
--- a/OpenKeychain/src/main/res/layout/linked_id_item.xml
+++ b/OpenKeychain/src/main/res/layout/linked_id_item.xml
@@ -6,6 +6,7 @@
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="horizontal"
     android:singleLine="true"
+    android:background="#ffffff"
     tools:showIn="@layout/linked_id_view_fragment">
 
     <ImageView