diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout/security_token_operation_activity.xml')
-rw-r--r-- | OpenKeychain/src/main/res/layout/security_token_operation_activity.xml | 209 |
1 files changed, 9 insertions, 200 deletions
diff --git a/OpenKeychain/src/main/res/layout/security_token_operation_activity.xml b/OpenKeychain/src/main/res/layout/security_token_operation_activity.xml index 1644f6a6f..19f241825 100644 --- a/OpenKeychain/src/main/res/layout/security_token_operation_activity.xml +++ b/OpenKeychain/src/main/res/layout/security_token_operation_activity.xml @@ -3,207 +3,16 @@ xmlns:custom="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:orientation="vertical" + android:padding="24dp"> - <org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator - android:id="@+id/view_animator" + <nordpol.android.NfcGuideView + android:id="@+id/nfc_guide_view" android:layout_width="match_parent" - android:layout_height="match_parent" - android:animateLayoutChanges="true" - android:inAnimation="@anim/fade_in" - android:measureAllChildren="false" - android:minHeight="?listPreferredItemHeightSmall" - android:outAnimation="@anim/fade_out" - custom:initialView="3"> + android:layout_height="wrap_content" + custom:nfc_device="usb_black"/> - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> + <include layout="@layout/security_token_operation_activity_toolable_view_animator" /> - <TextView - android:id="@+id/security_token_activity_0_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="24dp" - android:layout_marginRight="24dp" - android:layout_marginTop="24dp" - android:text="@string/security_token_nfc_text" - android:textAppearance="@android:style/TextAppearance.Medium" /> - - <ImageView - android:id="@+id/security_token_activity_0_image" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_below="@+id/security_token_activity_0_text" - android:layout_margin="24dp" - android:adjustViewBounds="true" - android:background="@android:color/transparent" - android:src="@drawable/yubikey_phone" /> - - <Button - android:id="@+id/security_token_activity_0_cancel" - android:layout_width="wrap_content" - android:layout_height="48dp" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_below="@+id/security_token_activity_0_image" - android:layout_margin="8dp" - android:text="@string/progress_cancel" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <TextView - android:id="@+id/security_token_activity_1_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="24dp" - android:layout_marginRight="24dp" - android:layout_marginTop="24dp" - android:text="@string/security_token_nfc_wait" - android:textAppearance="@android:style/TextAppearance.Medium" /> - - <ProgressBar - style="?android:attr/progressBarStyleLarge" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_centerVertical="true" - android:padding="8dp" /> - - <!-- placeholder to retain dialog size --> - <ImageView - android:id="@+id/security_token_activity_1_placeholder" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_below="@+id/security_token_activity_1_text" - android:layout_margin="24dp" - android:adjustViewBounds="true" - android:background="@android:color/transparent" - android:src="@drawable/yubikey_phone" - android:visibility="invisible" /> - - <Button - android:id="@+id/security_token_activity_1_button_placeholder" - android:layout_width="wrap_content" - android:layout_height="48dp" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_below="@+id/security_token_activity_1_placeholder" - android:layout_margin="8dp" - android:text="" - android:visibility="invisible" /> - - </RelativeLayout> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <TextView - android:id="@+id/security_token_activity_2_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="24dp" - android:layout_marginRight="24dp" - android:layout_marginTop="24dp" - android:text="@string/security_token_nfc_finished" - android:textAppearance="@android:style/TextAppearance.Medium" /> - - <!-- placeholder to retain dialog size --> - <ImageView - android:id="@+id/security_token_activity_2_placeholder" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_below="@+id/security_token_activity_2_text" - android:layout_margin="24dp" - android:adjustViewBounds="true" - android:background="@android:color/transparent" - android:src="@drawable/yubikey_phone" - android:visibility="invisible" /> - - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_centerVertical="true" - android:adjustViewBounds="true" - android:background="@android:color/transparent" - android:src="@drawable/ic_check_circle_black_48dp" /> - - <Button - android:id="@+id/security_token_activity_2_button_placeholder" - android:layout_width="wrap_content" - android:layout_height="48dp" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_below="@+id/security_token_activity_2_placeholder" - android:layout_margin="8dp" - android:text="" - android:visibility="invisible" /> - - </RelativeLayout> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <TextView - android:id="@+id/security_token_activity_3_text_placeholder" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignEnd="@+id/security_token_activity_3_placeholder" - android:layout_alignRight="@+id/security_token_activity_3_placeholder" - android:layout_marginLeft="24dp" - android:layout_marginTop="24dp" - android:text="" - android:textAppearance="@android:style/TextAppearance.Medium" /> - - <!-- placeholder to retain dialog size --> - <ImageView - android:id="@+id/security_token_activity_3_placeholder" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_below="@+id/security_token_activity_3_text_placeholder" - android:layout_margin="24dp" - android:adjustViewBounds="true" - android:background="@android:color/transparent" - android:src="@drawable/yubikey_phone" - android:visibility="invisible" /> - - <TextView - android:id="@+id/security_token_activity_3_error_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_centerVertical="true" - android:layout_margin="24dp" - android:textAppearance="@android:style/TextAppearance.Medium" - android:textColor="@color/android_red_dark" - tools:text="Error text" /> - - <Button - android:id="@+id/security_token_activity_3_error_try_again" - android:layout_width="wrap_content" - android:layout_height="48dp" - android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" - android:layout_below="@+id/security_token_activity_3_placeholder" - android:layout_margin="8dp" - android:text="@string/security_token_error_try_again" /> - - </RelativeLayout> - - </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator> - -</LinearLayout>
\ No newline at end of file +</LinearLayout> |