diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
9 files changed, 70 insertions, 125 deletions
diff --git a/OpenKeychain/src/main/res/layout/cert_list_widget.xml b/OpenKeychain/src/main/res/layout/cert_list_widget.xml index 715e4bfa5..7052a1901 100644 --- a/OpenKeychain/src/main/res/layout/cert_list_widget.xml +++ b/OpenKeychain/src/main/res/layout/cert_list_widget.xml @@ -12,7 +12,6 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:minHeight="?android:attr/listPreferredItemHeight" > <TextView diff --git a/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step1.xml b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step1.xml index c0a898843..9df381ea0 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step1.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step1.xml @@ -12,30 +12,16 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingLeft="16dp" - android:paddingRight="16dp" + android:padding="16dp" android:orientation="vertical"> - <LinearLayout - android:layout_width="match_parent" + <TextView + android:drawableLeft="@drawable/linked_dns" + android:drawablePadding="8dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:orientation="horizontal"> - - <ImageView - android:layout_width="60dip" - android:layout_height="60dip" - android:padding="8dp" - android:src="@drawable/dns" - android:layout_gravity="center_vertical" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/linked_create_dns_1_1" /> - - </LinearLayout> + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/linked_create_dns_1_1" /> <TextView android:layout_width="wrap_content" 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 index 20c394afa..2b8a810e0 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_github_fragment_step1.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_github_fragment_step1.xml @@ -12,32 +12,17 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingLeft="16dp" - android:paddingRight="16dp" + android:padding="16dp" android:orientation="vertical"> - <LinearLayout - android:layout_marginTop="16dp" - android:layout_width="match_parent" + <TextView + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal"> - - <ImageView - android:id="@+id/certify_key_action_certify_image" - android:layout_width="60dip" - android:layout_height="60dip" - android:padding="8dp" - android:src="@drawable/github" - android:layout_gravity="center_vertical" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/linked_create_github_1_1" /> - - </LinearLayout> + 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" diff --git a/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step1.xml b/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step1.xml index 5dfed35c4..a18c1883a 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step1.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step1.xml @@ -12,31 +12,16 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingLeft="16dp" - android:paddingRight="16dp" + android:padding="16dp" android:orientation="vertical"> - <LinearLayout - android:layout_width="match_parent" + <TextView + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:orientation="horizontal"> - - <ImageView - android:id="@+id/certify_key_action_certify_image" - android:layout_width="60dip" - android:layout_height="60dip" - android:padding="8dp" - android:src="@drawable/ssl_lock" - android:layout_gravity="center_vertical" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/linked_create_https_1_1" /> - - </LinearLayout> + android:drawableLeft="@drawable/linked_https" + android:drawablePadding="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/linked_create_https_1_1" /> <TextView android:layout_width="wrap_content" diff --git a/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml index 76521fa11..129939e5b 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml @@ -12,32 +12,16 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingLeft="16dp" - android:paddingRight="16dp" + android:padding="16dp" android:orientation="vertical"> - <LinearLayout - android:layout_marginTop="16dp" - android:layout_width="match_parent" + <TextView + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal"> - - <ImageView - android:id="@+id/certify_key_action_certify_image" - android:layout_width="60dip" - android:layout_height="60dip" - android:padding="8dp" - android:src="@drawable/twitter" - android:layout_gravity="center_vertical" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/linked_create_twitter_1_1" /> - - </LinearLayout> + android:drawableLeft="@drawable/linked_twitter" + android:drawablePadding="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/linked_create_twitter_1_1" /> <TextView android:layout_width="wrap_content" diff --git a/OpenKeychain/src/main/res/layout/linked_create_verify.xml b/OpenKeychain/src/main/res/layout/linked_create_verify.xml index 837bae09a..234f43334 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_verify.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_verify.xml @@ -58,7 +58,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" style="?android:buttonBarButtonStyle" - android:text="Verify" + android:text="@string/linked_button_verify" android:id="@+id/button_verify" /> @@ -66,7 +66,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" style="?android:buttonBarButtonStyle" - android:text="Retry" + android:text="@string/linked_button_retry" android:id="@+id/button_retry" /> diff --git a/OpenKeychain/src/main/res/layout/linked_id_item.xml b/OpenKeychain/src/main/res/layout/linked_id_item.xml index 900d3a5d5..6b39144a8 100644 --- a/OpenKeychain/src/main/res/layout/linked_id_item.xml +++ b/OpenKeychain/src/main/res/layout/linked_id_item.xml @@ -14,7 +14,7 @@ android:id="@+id/linked_id_type_icon" android:layout_marginLeft="14dp" android:layout_marginStart="14dp" - android:src="@drawable/dns" + tools:src="@drawable/linked_dns" android:layout_gravity="center_vertical" android:scaleType="fitCenter" /> @@ -32,16 +32,18 @@ android:id="@+id/linked_id_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Title" - android:textAppearance="?android:attr/textAppearanceMedium" /> + tools:text="Title" + android:textAppearance="?android:attr/textAppearanceMedium" + /> <TextView android:id="@+id/linked_id_comment" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/tertiary_text_light" - android:text="comment" - android:textAppearance="?android:attr/textAppearanceSmall" /> + tools:text="comment" + android:textAppearance="?android:attr/textAppearanceSmall" + /> </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 2fb79a4bf..e25dfca70 100644 --- a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml +++ b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml @@ -28,7 +28,7 @@ style="@style/CardViewHeader" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Linked Identity" /> + android:text="@string/card_linked_identity" /> <include layout="@layout/linked_id_item" /> @@ -36,10 +36,9 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/linked_verify_container" - android:inAnimation="@anim/fade_in" - android:outAnimation="@anim/fade_out" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" + android:measureAllChildren="false" > <include layout="@layout/cert_list_widget" /> @@ -47,28 +46,33 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:minHeight="?android:attr/listPreferredItemHeight" android:orientation="horizontal" - android:singleLine="true"> + android:baselineAligned="false" + android:animateLayoutChanges="true" + > - <LinearLayout - android:orientation="vertical" - android:layout_gravity="center_vertical" + <TextSwitcher + android:id="@+id/linked_cert_text" + android:layout_height="wrap_content" android:layout_width="0dip" android:layout_marginLeft="8dp" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" - android:layout_height="wrap_content" + android:inAnimation="@anim/fade_in_quick" + android:outAnimation="@anim/fade_out_quick" 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> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + </TextSwitcher> <ViewAnimator android:layout_width="22dp" @@ -137,7 +141,7 @@ android:id="@+id/button_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="View" + android:text="@string/linked_button_view" android:textColor="@color/link_text_material_light" style="?android:attr/borderlessButtonStyle" /> @@ -152,21 +156,21 @@ android:id="@+id/button_verify" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Verify" + android:text="@string/linked_button_verify" android:textColor="@color/link_text_material_light" style="?android:attr/borderlessButtonStyle" /> <Button android:id="@+id/button_retry" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Retry" + android:text="@string/linked_button_retry" android:textColor="@color/link_text_material_light" style="?android:attr/borderlessButtonStyle" /> <Button android:id="@+id/button_confirm" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Confirm" + android:text="@string/linked_button_confirm" android:textColor="@color/link_text_material_light" style="?android:attr/borderlessButtonStyle" /> </ViewAnimator> diff --git a/OpenKeychain/src/main/res/layout/linked_select_fragment.xml b/OpenKeychain/src/main/res/layout/linked_select_fragment.xml index a183cdc93..25b7bd413 100644 --- a/OpenKeychain/src/main/res/layout/linked_select_fragment.xml +++ b/OpenKeychain/src/main/res/layout/linked_select_fragment.xml @@ -48,7 +48,6 @@ android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:clickable="true" - android:paddingRight="4dp" android:background="?android:selectableItemBackground" android:orientation="horizontal"> @@ -58,15 +57,16 @@ android:layout_width="60dip" android:layout_height="60dip" android:padding="8dp" - android:src="@drawable/ssl_lock" + android:src="@drawable/linked_https" android:layout_gravity="center_vertical" /> <TextView android:paddingLeft="8dp" + android:paddingRight="8dp" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="0dip" android:layout_height="match_parent" - android:text="Website (HTTPS)" + android:text="@string/linked_title_https" android:layout_weight="1" android:gravity="center_vertical" /> @@ -83,7 +83,6 @@ android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:clickable="true" - android:paddingRight="4dp" android:background="?android:selectableItemBackground" android:orientation="horizontal"> @@ -92,16 +91,17 @@ android:layout_width="60dip" android:layout_height="60dip" android:padding="8dp" - android:src="@drawable/dns" + android:src="@drawable/linked_dns" android:layout_gravity="center" /> <TextView android:paddingLeft="8dp" + android:paddingRight="8dp" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="0dip" android:layout_height="match_parent" - android:text="Domain Name (DNS)" + android:text="@string/linked_title_dns" android:layout_weight="1" android:gravity="center_vertical" /> @@ -118,7 +118,6 @@ android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:clickable="true" - android:paddingRight="4dp" android:background="?android:selectableItemBackground" android:orientation="horizontal"> @@ -127,16 +126,17 @@ android:layout_width="60dip" android:layout_height="60dip" android:padding="8dp" - android:src="@drawable/twitter" + android:src="@drawable/linked_twitter" android:layout_gravity="center" /> <TextView android:paddingLeft="8dp" + android:paddingRight="8dp" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="0dip" android:layout_height="match_parent" - android:text="Twitter" + android:text="@string/linked_title_twitter" android:layout_weight="1" android:gravity="center_vertical" /> @@ -153,7 +153,6 @@ android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:clickable="true" - android:paddingRight="4dp" android:background="?android:selectableItemBackground" android:orientation="horizontal"> @@ -162,16 +161,17 @@ android:layout_width="60dip" android:layout_height="60dip" android:padding="8dp" - android:src="@drawable/github" + android:src="@drawable/linked_github" android:layout_gravity="center" /> <TextView android:paddingLeft="8dp" + android:paddingRight="8dp" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="0dip" android:layout_height="match_parent" - android:text="Github" + android:text="@string/linked_title_github" android:layout_weight="1" android:gravity="center_vertical" /> |