diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-06 19:18:32 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-06 19:18:32 +0200 |
commit | 0d05ff98cb7ef992a040e7040c4fc534307e51e8 (patch) | |
tree | 8550eb16ce11a86af9a35bbbb22a01c4fe781f37 /OpenKeychain/src/main/res | |
parent | d52d4553177a2c82cefe68fa26fdf8b94628bc93 (diff) | |
download | open-keychain-0d05ff98cb7ef992a040e7040c4fc534307e51e8.tar.gz open-keychain-0d05ff98cb7ef992a040e7040c4fc534307e51e8.tar.bz2 open-keychain-0d05ff98cb7ef992a040e7040c4fc534307e51e8.zip |
ui: use textviews instead of bootstrap buttons in SignEncrypt
Diffstat (limited to 'OpenKeychain/src/main/res')
3 files changed, 42 insertions, 35 deletions
diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml index efc4b4641..c7047b822 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml @@ -68,15 +68,18 @@ android:layout_alignParentLeft="true" android:layout_alignParentStart="true" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <TextView android:id="@+id/action_encrypt_file" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" - android:layout_height="50dp" - android:layout_marginTop="4dp" - android:layout_marginBottom="4dp" + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" android:text="@string/btn_encrypt_file" - bootstrapbutton:bb_icon_left="fa-lock" - bootstrapbutton:bb_type="info" + android:drawableRight="@drawable/ic_action_save" + android:drawablePadding="8dp" + android:gravity="center_vertical" android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" /> diff --git a/OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml index 1fa338426..24e604398 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true"> @@ -22,41 +21,45 @@ android:hint="@string/encrypt_content_edit_text_hint" android:layout_weight="1" /> - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/section_encrypt_and_or_sign" /> - <LinearLayout + android:id="@+id/action_encrypt_share" android:layout_width="match_parent" android:layout_height="wrap_content" + android:clickable="true" + style="@style/SelectableItem" android:orientation="horizontal"> - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/action_encrypt_share" - android:layout_width="match_parent" - android:layout_height="50dp" - android:layout_marginRight="4dp" - android:layout_marginTop="4dp" - android:layout_marginBottom="4dp" - android:layout_weight="1" - android:text="@string/btn_share" - bootstrapbutton:bb_icon_left="fa-share-square" - bootstrapbutton:bb_type="info" /> - - <com.beardedhen.androidbootstrap.BootstrapButton + <TextView + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" + android:text="@string/btn_share_encrypted_signed" + android:drawableRight="@drawable/ic_action_share" + android:drawablePadding="8dp" + android:gravity="center_vertical" + android:layout_weight="1" /> + + <View + android:layout_width="1dip" + android:layout_height="match_parent" + android:gravity="right" + android:layout_marginBottom="8dp" + android:layout_marginTop="8dp" + android:background="?android:attr/listDivider" /> + + <ImageButton android:id="@+id/action_encrypt_clipboard" - android:layout_width="match_parent" - android:layout_height="50dp" - android:layout_marginLeft="4dp" - android:layout_marginTop="4dp" - android:layout_marginBottom="4dp" - android:layout_weight="1" - android:text="@string/btn_clipboard" - bootstrapbutton:bb_icon_left="fa-clipboard" - bootstrapbutton:bb_type="info" /> + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:padding="8dp" + android:src="@drawable/ic_action_copy" + android:layout_gravity="center_vertical" + style="@style/SelectableItem" /> </LinearLayout> + </LinearLayout> </ScrollView> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index ecc8b5a51..29c804fcb 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -66,6 +66,7 @@ <string name="btn_lookup_key">Lookup key</string> <string name="btn_encryption_advanced_settings_show">Show advanced settings</string> <string name="btn_encryption_advanced_settings_hide">Hide advanced settings</string> + <string name="btn_share_encrypted_signed">Share encrypted/signed...</string> <!-- menu --> <string name="menu_preferences">Settings</string> |