diff options
| author | Daniel Albert <albert_daniel@t-online.de> | 2014-06-29 12:33:02 +0200 |
|---|---|---|
| committer | Daniel Albert <albert_daniel@t-online.de> | 2014-06-29 12:33:02 +0200 |
| commit | e731dc139f71887d00f376ed627b1a155033a493 (patch) | |
| tree | 59f21589eedb1e03e5865f9b33951b9e3b2dc7b2 /OpenKeychain/src/main/res | |
| parent | bd445165766f35561a2b8aeeac2b8a16f0abb6ef (diff) | |
| download | open-keychain-e731dc139f71887d00f376ed627b1a155033a493.tar.gz open-keychain-e731dc139f71887d00f376ed627b1a155033a493.tar.bz2 open-keychain-e731dc139f71887d00f376ed627b1a155033a493.zip | |
Improved button style
centered buttons
removed commented-out button
Diffstat (limited to 'OpenKeychain/src/main/res')
3 files changed, 12 insertions, 21 deletions
diff --git a/OpenKeychain/src/main/res/drawable/button_rounded.xml b/OpenKeychain/src/main/res/drawable/button_rounded.xml index 501758287..f547b8cdb 100644 --- a/OpenKeychain/src/main/res/drawable/button_rounded.xml +++ b/OpenKeychain/src/main/res/drawable/button_rounded.xml @@ -8,8 +8,8 @@ android:left="6dip" android:right="6dip" android:top="6dip" /> - <corners android:radius="10dip" /> - <stroke android:color="#cccccc" android:width="2dip" /> + <corners android:radius="6dip" /> + <stroke android:color="#cccccc" android:width="1.5dip" /> <stroke android:color="#ebebeb" /> </shape> </item> @@ -20,8 +20,8 @@ android:left="6dip" android:right="6dip" android:top="6dip" /> - <corners android:radius="10dip" /> - <stroke android:color="#cccccc" android:width="2dip" /> + <corners android:radius="6dip" /> + <stroke android:color="#cccccc" android:width="1.5dip" /> <solid android:color="#ebebeb"/> </shape> </item> @@ -32,8 +32,8 @@ android:left="6dip" android:right="6dip" android:top="6dip" /> - <corners android:radius="10dip" /> - <stroke android:color="#cccccc" android:width="2dip" /> + <corners android:radius="6dip" /> + <stroke android:color="#cccccc" android:width="1.5dip" /> <solid android:color="#ffffff" /> </shape> </item> diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml index 45aaee80f..098aaaea1 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml @@ -42,22 +42,14 @@ android:minLines="2" android:scrollbars="vertical" /> - <!--<com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/decrypt_file_browse" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="4dp" - bootstrapbutton:bb_icon_left="fa-folder-open" - bootstrapbutton:bb_roundedCorners="true" - bootstrapbutton:bb_size="default" - bootstrapbutton:bb_type="default" />--> <ImageButton android:id="@+id/decrypt_file_browse" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="4dp" android:src="@drawable/ic_action_collection" - android:background="@drawable/button_rounded"/> + android:background="@drawable/button_rounded" + android:layout_gravity="center_vertical"/> </LinearLayout> <CheckBox diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml index c8aaf77b8..4142b3de6 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml @@ -31,15 +31,14 @@ android:minLines="2" android:scrollbars="vertical" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <ImageButton android:id="@+id/btn_browse" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="4dp" - bootstrapbutton:bb_icon_left="fa-folder-open" - bootstrapbutton:bb_roundedCorners="true" - bootstrapbutton:bb_size="default" - bootstrapbutton:bb_type="default" /> + android:layout_gravity="center_vertical" + android:src="@drawable/ic_action_collection" + android:background="@drawable/button_rounded"/> </LinearLayout> <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout |