diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-22 02:36:10 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-22 02:36:10 +0100 |
commit | a7c52a1c9f8bca83b2981347a0eceeec68a92790 (patch) | |
tree | 3e6275123d12251749f8975a241cb6e64799dd49 /OpenKeychain/src/main/res | |
parent | 04c7639a5a9b4f85122b7d5f299ba09131ce3036 (diff) | |
download | open-keychain-a7c52a1c9f8bca83b2981347a0eceeec68a92790.tar.gz open-keychain-a7c52a1c9f8bca83b2981347a0eceeec68a92790.tar.bz2 open-keychain-a7c52a1c9f8bca83b2981347a0eceeec68a92790.zip |
move yubikey import into viewkeyfragment
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml | 87 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_yubikey.xml | 98 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 2 |
3 files changed, 117 insertions, 70 deletions
diff --git a/OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml index 2fb3737ba..0f5e50d42 100644 --- a/OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml @@ -9,83 +9,30 @@ android:fillViewport="true" android:layout_above="@+id/create_key_buttons"> - <ViewAnimator - android:layout_width="fill_parent" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:inAnimation="@anim/abc_fade_in" - android:outAnimation="@anim/abc_fade_out" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:id="@+id/create_yubikey_animator" - > + android:orientation="vertical"> - <ProgressBar + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" - android:indeterminate="true" - /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:layout_marginLeft="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:id="@+id/create_yubikey_unknown_fp" - android:text="(yubikey fingerprint)" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:layout_marginLeft="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="Hit next to import this key" - /> + android:layout_marginTop="16dp" + android:layout_marginLeft="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:id="@+id/create_yubikey_unknown_fp" + android:text="(yubikey fingerprint)" /> - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" + <TextView + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="vertical"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:layout_marginLeft="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:id="@+id/create_yubikey_fingerprint" - android:text="(yubikey fingerprint)" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:layout_marginLeft="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:id="@+id/create_yubikey_user_id" - android:text="(yubikey fingerprint)" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:layout_marginLeft="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="Hit next to add this Yubikey to your own!" - /> - - </LinearLayout> + android:layout_marginTop="16dp" + android:layout_marginLeft="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="Hit next to import this key" + /> - </ViewAnimator> + </LinearLayout> </ScrollView> diff --git a/OpenKeychain/src/main/res/layout/view_key_yubikey.xml b/OpenKeychain/src/main/res/layout/view_key_yubikey.xml new file mode 100644 index 000000000..7da1fc5c4 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/view_key_yubikey.xml @@ -0,0 +1,98 @@ +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:card_view="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingLeft="16dp" + android:paddingRight="16dp"> + + <android.support.v7.widget.CardView + android:id="@+id/card_view" + android:layout_gravity="center" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:transitionName="card" + card_view:cardBackgroundColor="@android:color/white" + card_view:cardElevation="2dp" + card_view:cardUseCompatPadding="true" + card_view:cardCornerRadius="4dp"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <TextView + style="@style/CardViewHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/section_yubikey"/> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <ImageView + android:layout_margin="14dp" + android:layout_width="32dp" + android:layout_height="32dp" + android:scaleType="centerCrop" + android:src="@drawable/yubi_icon"/> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:orientation="vertical"> + + <TextView + android:id="@+id/yubikey_serno" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="Yubikey #" + /> + + <TextView + android:id="@+id/yubikey_userid" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="User ID" + /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="Key matches!" + /> + + </LinearLayout> + + </LinearLayout> + + <Button + android:id="@+id/button_import" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right|end" + android:text="Import" + android:textColor="@color/link_text_material_light" + style="?android:attr/borderlessButtonStyle" + /> + + </LinearLayout> + + </android.support.v7.widget.CardView> + + </LinearLayout> + +</ScrollView> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 6c8ccd340..bcee267fd 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -48,6 +48,7 @@ <!-- section --> <string name="section_user_ids">"Identities"</string> + <string name="section_yubikey">"Yubikey"</string> <string name="section_linked_system_contact">"Linked System Contact"</string> <string name="section_should_you_trust">"Should you trust this key?"</string> <string name="section_proof_details">Proof verification</string> @@ -1267,5 +1268,6 @@ <string name="nfc_write_succesful">Successfully written on NFC tag</string> <string name="unlocked">Unlocked</string> <string name="nfc_settings">Settings</string> + <string name="snack_yubikey_view">View</string> </resources> |