diff options
Diffstat (limited to 'OpenKeychain/src')
3 files changed, 78 insertions, 222 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep2Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep2Fragment.java index 1074a8e61..262277700 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep2Fragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep2Fragment.java @@ -104,7 +104,7 @@ public class LinkedIdCreateTwitterStep2Fragment extends LinkedIdCreateFinalFragm @Override protected View newView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - return inflater.inflate(R.layout.linked_create_twitter_fragment_step3, container, false); + return inflater.inflate(R.layout.linked_create_twitter_fragment_step2, container, false); } private void proofShare() { 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 fb2f5344f..c5adac4b0 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 @@ -21,60 +21,110 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/linked_create_twitter_2_1" /> + android:text="@string/linked_create_twitter_3_1" /> <EditText - android:id="@+id/linked_create_twitter_custom" + 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:hint="Custom Text" 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" + android:layout_marginTop="16dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/linked_create_twitter_3_2" /> <LinearLayout - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal"> + android:layout_marginTop="8dp" + android:layout_gravity="center_horizontal"> - <TextView + <Button android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:layout_weight="1" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/linked_create_twitter_2_2" /> + 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" /> - <TextView + <Button android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:textAppearance="?android:attr/textAppearanceSmall" - android:id="@+id/linked_create_twitter_textlen" - android:text="0/140" /> + 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> - <EditText - android:id="@+id/linked_create_twitter_preview" + <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_twitter_3_3" /> + + <LinearLayout 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:textAppearance="?android:attr/textAppearanceSmall" /> + android:layout_marginTop="8dp"> + + <ImageView + android:id="@+id/verify_image" + android:src="@drawable/status_signature_unverified_cutout_24dp" + android:layout_gravity="center_vertical" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="16dip" + android:layout_marginStart="16dip" + /> + + <ProgressBar + android:id="@+id/verify_progress" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone" + android:indeterminateOnly="true"/> + + <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> <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_twitter_2_3" /> + android:text="@string/linked_create_twitter_3_4" /> </LinearLayout> @@ -134,7 +184,7 @@ android:layout_weight="1" android:text="@string/btn_next" android:minHeight="?android:attr/listPreferredItemHeight" - android:drawableRight="@drawable/ic_play_arrow_grey_24dp" + android:drawableRight="@drawable/ic_done_grey_24dp" android:drawablePadding="8dp" android:gravity="center_vertical" android:clickable="true" diff --git a/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step3.xml b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step3.xml deleted file mode 100644 index c5adac4b0..000000000 --- a/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step3.xml +++ /dev/null @@ -1,194 +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_twitter_3_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" - android:layout_marginTop="16dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/linked_create_twitter_3_2" /> - - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:layout_gravity="center_horizontal"> - - <Button - android:layout_width="wrap_content" - android:layout_height="wrap_content" - 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: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> - - <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_twitter_3_3" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dp"> - - <ImageView - android:id="@+id/verify_image" - android:src="@drawable/status_signature_unverified_cutout_24dp" - android:layout_gravity="center_vertical" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="16dip" - android:layout_marginStart="16dip" - /> - - <ProgressBar - android:id="@+id/verify_progress" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:visibility="gone" - android:indeterminateOnly="true"/> - - <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> - - <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_twitter_3_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:gravity="center_vertical" - android:clickable="true" - android:background="?android:selectableItemBackground" - 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:drawableRight="@drawable/ic_done_grey_24dp" - android:drawablePadding="8dp" - android:gravity="center_vertical" - android:clickable="true" - android:background="?android:selectableItemBackground" - android:layout_gravity="center_vertical" /> - </LinearLayout> -</RelativeLayout>
\ No newline at end of file |