diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
4 files changed, 146 insertions, 190 deletions
diff --git a/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml index 6aed07e83..62e267f05 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml @@ -10,7 +10,7 @@ android:layout_above="@+id/create_key_button_divider"> <LinearLayout - android:layout_width="match_parent" + android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingLeft="16dp" android:paddingRight="16dp" @@ -29,7 +29,9 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_gravity="center_horizontal" - android:textIsSelectable="true" /> + android:textIsSelectable="true" + android:textAppearance="?android:attr/textAppearanceSmall" + /> <TextView android:layout_width="wrap_content" @@ -39,24 +41,38 @@ android:text="@string/linked_create_dns_2_2" /> <LinearLayout - android:layout_width="wrap_content" + android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:layout_gravity="center_horizontal"> + android:layout_gravity="center_horizontal" + style="?android:buttonBarStyle" + android:showDividers="middle"> <Button android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Share" - android:id="@+id/button_send" - android:layout_marginRight="8dip"/> + android:layout_weight="1" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + style="?android:buttonBarButtonStyle" + android:drawableLeft="@drawable/ic_content_copy_grey_24dp" + android:drawableStart="@android:drawable/ic_menu_share" + android:text="Copy" + android:id="@+id/button_save" + /> <Button android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Save" - android:id="@+id/button_save" - android:layout_marginLeft="8dip"/> + 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_send" + /> </LinearLayout> @@ -67,57 +83,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:text="@string/linked_create_dns_2_3" /> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dp"> - - <ViewAnimator - android:id="@+id/verify_progress" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="16dip" - android:layout_marginStart="16dip" - android:layout_gravity="center_vertical" - android:inAnimation="@anim/fade_in" - android:outAnimation="@anim/fade_out" - > - - <ImageView - android:layout_width="24dp" - android:layout_height="24dp" - android:id="@+id/verify_image" - android:src="@drawable/status_signature_unverified_cutout_24dp" - /> - - <ProgressBar - android:layout_width="24dp" - android:layout_height="24dp" - android:indeterminateOnly="true"/> - - </ViewAnimator> - - <TextView - android:id="@+id/verify_status" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/linked_verify_pending" - android:layout_marginLeft="16dip" - android:layout_marginStart="16dip" - android:layout_weight="1" - /> - - <Button - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Verify" - android:id="@+id/button_verify" - android:layout_marginRight="16dp" - android:layout_marginEnd="16dip" - /> - - </LinearLayout> + <include layout="@layout/linked_create_verify" /> <TextView android:layout_width="wrap_content" @@ -185,7 +151,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:text="@string/btn_link_identity" + android:text="@string/btn_finish" android:minHeight="?android:attr/listPreferredItemHeight" android:drawableRight="@drawable/ic_person_add_grey_24dp" android:drawablePadding="8dp" diff --git a/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml b/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml index b756cbe7a..dc6895a54 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml @@ -43,24 +43,38 @@ android:text="@string/linked_create_https_2_2" /> <LinearLayout - android:layout_width="wrap_content" + android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:layout_gravity="center_horizontal"> + android:layout_gravity="center_horizontal" + style="?android:buttonBarStyle" + > <Button android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Share" - android:id="@+id/button_send" - android:layout_marginRight="8dip"/> + android:layout_weight="1" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + style="?android:buttonBarButtonStyle" + android:drawableLeft="@android:drawable/ic_menu_save" + android:drawableStart="@android:drawable/ic_menu_save" + android:text="Save" + android:id="@+id/button_save" + /> <Button android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Save" - android:id="@+id/button_save" - android:layout_marginLeft="8dip"/> + 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_send" + /> </LinearLayout> @@ -71,57 +85,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:text="@string/linked_create_https_2_3" /> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dp"> - - <ViewAnimator - android:id="@+id/verify_progress" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="16dip" - android:layout_marginStart="16dip" - android:layout_gravity="center_vertical" - android:inAnimation="@anim/fade_in" - android:outAnimation="@anim/fade_out" - > - - <ImageView - android:layout_width="24dp" - android:layout_height="24dp" - android:id="@+id/verify_image" - android:src="@drawable/status_signature_unverified_cutout_24dp" - /> - - <ProgressBar - android:layout_width="24dp" - android:layout_height="24dp" - android:indeterminateOnly="true"/> - - </ViewAnimator> - - <TextView - android:id="@+id/verify_status" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/linked_verify_pending" - android:layout_marginLeft="16dip" - android:layout_marginStart="16dip" - android:layout_weight="1" - /> - - <Button - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Verify" - android:id="@+id/button_verify" - android:layout_marginRight="16dp" - android:layout_marginEnd="16dip" - /> - - </LinearLayout> + <include layout="@layout/linked_create_verify" /> <TextView android:layout_width="wrap_content" @@ -189,7 +153,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:text="@string/btn_link_identity" + android:text="@string/btn_finish" android:minHeight="?android:attr/listPreferredItemHeight" android:textAllCaps="true" android:drawableRight="@drawable/ic_person_add_grey_24dp" diff --git a/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml index 2ffcd468b..e42c23b51 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml @@ -23,18 +23,6 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:text="@string/linked_create_twitter_2_1" /> - <EditText - android:id="@+id/linked_create_twitter_preview" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:imeOptions="actionNext" - android:layout_marginTop="8dp" - android:ems="10" - android:layout_gravity="center_horizontal" - android:inputType="textMultiLine" - android:enabled="false" - android:textSize="@dimen/abc_text_size_small_material"/> - <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -43,28 +31,37 @@ android:text="@string/linked_create_twitter_2_2" /> <LinearLayout - android:layout_width="wrap_content" + android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:layout_gravity="center_horizontal"> + 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="Tweet" android:id="@+id/button_send" - android:layout_marginRight="8dip" /> + /> <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" - android:layout_marginLeft="8dip" /> + /> </LinearLayout> @@ -75,57 +72,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:text="@string/linked_create_twitter_2_3" /> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dp"> - - <ViewAnimator - android:id="@+id/verify_progress" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="16dip" - android:layout_marginStart="16dip" - android:layout_gravity="center_vertical" - android:inAnimation="@anim/fade_in" - android:outAnimation="@anim/fade_out" - > - - <ImageView - android:layout_width="24dp" - android:layout_height="24dp" - android:id="@+id/verify_image" - android:src="@drawable/status_signature_unverified_cutout_24dp" - /> - - <ProgressBar - android:layout_width="24dp" - android:layout_height="24dp" - android:indeterminateOnly="true"/> - - </ViewAnimator> - - <TextView - android:id="@+id/verify_status" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/linked_verify_pending" - android:layout_marginLeft="16dip" - android:layout_marginStart="16dip" - android:layout_weight="1" - /> - - <Button - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/linked_create_verify" - android:id="@+id/button_verify" - android:layout_marginRight="16dp" - android:layout_marginEnd="16dip" - /> - - </LinearLayout> + <include layout="@layout/linked_create_verify" /> <TextView android:layout_width="wrap_content" @@ -193,7 +140,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:text="@string/btn_link_identity" + android:text="@string/btn_finish" android:minHeight="?android:attr/listPreferredItemHeight" android:textAllCaps="true" android:drawableRight="@drawable/ic_person_add_grey_24dp" diff --git a/OpenKeychain/src/main/res/layout/linked_create_verify.xml b/OpenKeychain/src/main/res/layout/linked_create_verify.xml new file mode 100644 index 000000000..837bae09a --- /dev/null +++ b/OpenKeychain/src/main/res/layout/linked_create_verify.xml @@ -0,0 +1,79 @@ +<?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:layout_marginTop="8dp" + tools:showIn="@layout/linked_create_https_fragment_step2"> + + <ViewAnimator + android:id="@+id/verify_progress" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="16dip" + android:layout_marginStart="16dip" + android:layout_gravity="center_vertical" + android:inAnimation="@anim/fade_in" + android:outAnimation="@anim/fade_out" + > + + <ImageView + android:layout_width="24dp" + android:layout_height="24dp" + android:id="@+id/verify_image" + android:src="@drawable/status_signature_unverified_cutout_24dp" + /> + + <ProgressBar + android:layout_width="24dp" + android:layout_height="24dp" + android:indeterminateOnly="true" /> + + </ViewAnimator> + + <TextView + android:id="@+id/verify_status" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/linked_verify_pending" + android:layout_marginLeft="16dip" + android:layout_marginStart="16dip" + android:layout_weight="1" + /> + + <ViewAnimator + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginRight="16dp" + android:layout_marginEnd="16dip" + android:inAnimation="@anim/fade_in" + android:outAnimation="@anim/fade_out" + android:id="@+id/verify_buttons" + > + + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="?android:buttonBarButtonStyle" + android:text="Verify" + android:id="@+id/button_verify" + /> + + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="?android:buttonBarButtonStyle" + android:text="Retry" + android:id="@+id/button_retry" + /> + + <Space + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + + </ViewAnimator> + +</LinearLayout>
\ No newline at end of file |