diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-13 16:30:49 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-13 16:30:49 +0100 |
commit | 3f844cc70b487507f1f41f50b1d9867463b2161b (patch) | |
tree | 4e0743aadc8db4a2bbf7f88b5988dcffc3a24d14 /OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml | |
parent | 9e3125c15eea3a9df33577ef613086b1f0efea27 (diff) | |
download | open-keychain-3f844cc70b487507f1f41f50b1d9867463b2161b.tar.gz open-keychain-3f844cc70b487507f1f41f50b1d9867463b2161b.tar.bz2 open-keychain-3f844cc70b487507f1f41f50b1d9867463b2161b.zip |
work on second step of identity creation
Diffstat (limited to 'OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml')
-rw-r--r-- | OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml | 83 |
1 files changed, 15 insertions, 68 deletions
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" |