diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-06-30 22:01:25 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-06-30 22:01:25 +0200 |
commit | 7c84b1fffde87352244bc3ad258652021077fa56 (patch) | |
tree | 3f8cadd83e8f853beb4d1664bedd7b6f82357ef8 /OpenKeychain/src/main/res | |
parent | c2ba7e2420f09e4aa6d604f4af073668520138da (diff) | |
parent | d07dbecef435b255667b9a6d7da493057eb85a60 (diff) | |
download | open-keychain-7c84b1fffde87352244bc3ad258652021077fa56.tar.gz open-keychain-7c84b1fffde87352244bc3ad258652021077fa56.tar.bz2 open-keychain-7c84b1fffde87352244bc3ad258652021077fa56.zip |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res')
42 files changed, 216 insertions, 90 deletions
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png Binary files differnew file mode 100644 index 000000000..7cc407315 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png Binary files differnew file mode 100644 index 000000000..e9d2dcb46 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png Binary files differnew file mode 100644 index 000000000..29f4de211 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_new_account.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_new_account.png Binary files differnew file mode 100644 index 000000000..790af372d --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_new_account.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png Binary files differnew file mode 100644 index 000000000..2bf88c183 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png Binary files differnew file mode 100644 index 000000000..4ac28f270 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png Binary files differnew file mode 100644 index 000000000..bb46bb315 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_new_account.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_new_account.png Binary files differnew file mode 100644 index 000000000..69c801dcc --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_new_account.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/minus.png b/OpenKeychain/src/main/res/drawable-mdpi/minus.png Binary files differnew file mode 100644 index 000000000..d59e4a3e1 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/minus.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/plus.png b/OpenKeychain/src/main/res/drawable-mdpi/plus.png Binary files differnew file mode 100644 index 000000000..88ee823af --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/plus.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png Binary files differnew file mode 100644 index 000000000..f1ec295d2 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png Binary files differnew file mode 100644 index 000000000..60ac6b066 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png Binary files differnew file mode 100644 index 000000000..76937f57a --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_new_account.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_new_account.png Binary files differnew file mode 100644 index 000000000..c6dfd0bcb --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_new_account.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/minus.png b/OpenKeychain/src/main/res/drawable-xhdpi/minus.png Binary files differnew file mode 100644 index 000000000..8a98ea967 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/minus.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/plus.png b/OpenKeychain/src/main/res/drawable-xhdpi/plus.png Binary files differnew file mode 100644 index 000000000..def608491 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/plus.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png Binary files differnew file mode 100644 index 000000000..da24654eb --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png Binary files differnew file mode 100644 index 000000000..76ec594dc --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png Binary files differnew file mode 100644 index 000000000..22003198b --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_new_account.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_new_account.png Binary files differnew file mode 100644 index 000000000..38589ba0e --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_new_account.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/minus.png b/OpenKeychain/src/main/res/drawable-xxhdpi/minus.png Binary files differnew file mode 100644 index 000000000..c46bf00de --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/minus.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/plus.png b/OpenKeychain/src/main/res/drawable-xxhdpi/plus.png Binary files differnew file mode 100644 index 000000000..e1f6e841f --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/plus.png diff --git a/OpenKeychain/src/main/res/drawable/button_edgy.xml b/OpenKeychain/src/main/res/drawable/button_edgy.xml new file mode 100644 index 000000000..fdb94d40e --- /dev/null +++ b/OpenKeychain/src/main/res/drawable/button_edgy.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" > + <shape android:shape="rectangle" > + <padding + android:bottom="6dip" + android:left="6dip" + android:right="6dip" + android:top="6dip" /> + <solid android:color="#ebebeb" /> + <stroke android:color="#cccccc" android:width="1.5dip" /> + </shape> + </item> + <item android:state_focused="true"> + <shape android:shape="rectangle" > + <padding + android:bottom="6dip" + android:left="6dip" + android:right="6dip" + android:top="6dip" /> + <solid android:color="#ebebeb"/> + <stroke android:color="#cccccc" android:width="1.5dip" /> + </shape> + </item> + <item > + <shape android:shape="rectangle" > + <padding + android:bottom="6dip" + android:left="6dip" + android:right="6dip" + android:top="6dip" /> + <solid android:color="#ffffff" /> + <stroke android:color="#cccccc" android:width="1.5dip" /> + </shape> + </item> +</selector>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/drawable/button_no_style.xml b/OpenKeychain/src/main/res/drawable/button_no_style.xml new file mode 100644 index 000000000..e9571c2b0 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable/button_no_style.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + +</selector>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/drawable/button_rounded.xml b/OpenKeychain/src/main/res/drawable/button_rounded.xml new file mode 100644 index 000000000..f547b8cdb --- /dev/null +++ b/OpenKeychain/src/main/res/drawable/button_rounded.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" > + <shape android:shape="rectangle" > + <padding + android:bottom="6dip" + android:left="6dip" + android:right="6dip" + android:top="6dip" /> + <corners android:radius="6dip" /> + <stroke android:color="#cccccc" android:width="1.5dip" /> + <stroke android:color="#ebebeb" /> + </shape> + </item> + <item android:state_focused="true"> + <shape android:shape="rectangle" > + <padding + android:bottom="6dip" + android:left="6dip" + android:right="6dip" + android:top="6dip" /> + <corners android:radius="6dip" /> + <stroke android:color="#cccccc" android:width="1.5dip" /> + <solid android:color="#ebebeb"/> + </shape> + </item> + <item > + <shape android:shape="rectangle" > + <padding + android:bottom="6dip" + android:left="6dip" + android:right="6dip" + android:top="6dip" /> + <corners android:radius="6dip" /> + <stroke android:color="#cccccc" android:width="1.5dip" /> + <solid android:color="#ffffff" /> + </shape> + </item> +</selector>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/drawable/button_rounded_green.xml b/OpenKeychain/src/main/res/drawable/button_rounded_green.xml new file mode 100644 index 000000000..fc12fdf05 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable/button_rounded_green.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" > + <shape android:shape="rectangle" > + <padding + android:bottom="6dip" + android:left="6dip" + android:right="6dip" + android:top="6dip" /> + <corners android:radius="6dip" /> + <solid android:color="#47a447" /> + </shape> + </item> + <item android:state_focused="true"> + <shape android:shape="rectangle" > + <padding + android:bottom="6dip" + android:left="6dip" + android:right="6dip" + android:top="6dip" /> + <corners android:radius="6dip" /> + <solid android:color="#47a447"/> + </shape> + </item> + <item > + <shape android:shape="rectangle" > + <padding + android:bottom="6dip" + android:left="6dip" + android:right="6dip" + android:top="6dip" /> + <corners android:radius="6dip" /> + <solid android:color="#5cb85c" /> + </shape> + </item> +</selector>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/drawable/button_rounded_red.xml b/OpenKeychain/src/main/res/drawable/button_rounded_red.xml new file mode 100644 index 000000000..330e83939 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable/button_rounded_red.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" > + <shape android:shape="rectangle" > + <padding + android:bottom="6dip" + android:left="6dip" + android:right="6dip" + android:top="6dip" /> + <corners android:radius="6dip" /> + <solid android:color="#d2322d" /> + </shape> + </item> + <item android:state_focused="true"> + <shape android:shape="rectangle" > + <padding + android:bottom="6dip" + android:left="6dip" + android:right="6dip" + android:top="6dip" /> + <corners android:radius="6dip" /> + <solid android:color="#d2322d"/> + </shape> + </item> + <item > + <shape android:shape="rectangle" > + <padding + android:bottom="6dip" + android:left="6dip" + android:right="6dip" + android:top="6dip" /> + <corners android:radius="6dip" /> + <solid android:color="#d9534f" /> + </shape> + </item> +</selector>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml index 32843eb29..7bb861547 100644 --- a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml +++ b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" xmlns:custom="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" @@ -43,7 +42,7 @@ android:layout_height="wrap_content" tools:layout="@layout/select_secret_key_layout_fragment" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <Button android:id="@+id/api_account_settings_create_key" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -52,9 +51,9 @@ android:layout_marginRight="4dp" android:layout_marginTop="4dp" android:text="@string/api_settings_create_key" - bootstrapbutton:bb_icon_left="fa-key" - bootstrapbutton:bb_size="default" - bootstrapbutton:bb_type="default" /> + android:background="@drawable/button_edgy" + android:drawableLeft="@drawable/ic_action_accounts" + android:textSize="14dip"/> <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout android:layout_width="match_parent" diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml index d1db1c782..098aaaea1 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_file_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"> @@ -43,15 +42,14 @@ android:minLines="2" android:scrollbars="vertical" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <ImageButton 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" /> + android:src="@drawable/ic_action_collection" + android:background="@drawable/button_rounded" + android:layout_gravity="center_vertical"/> </LinearLayout> <CheckBox diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml index 3bc78d325..05877656b 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:id="@+id/result" android:orientation="vertical" android:layout_width="match_parent" @@ -83,16 +82,15 @@ android:layout_toRightOf="@+id/result_signature_image" android:textColor="@color/white" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <Button android:id="@+id/lookup_key" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/btn_lookup_key" - bootstrapbutton:bb_icon_left="fa-download" - bootstrapbutton:bb_type="info" - bootstrapbutton:bb_size="small" + android:drawableRight="@drawable/ic_action_download" android:layout_alignParentRight="true" - android:layout_centerVertical="true" /> + android:layout_centerVertical="true" + android:background="@drawable/button_edgy"/> </RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/edit_key_activity.xml b/OpenKeychain/src/main/res/layout/edit_key_activity.xml index 1ce5c096f..b6c5a1c9a 100644 --- a/OpenKeychain/src/main/res/layout/edit_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/edit_key_activity.xml @@ -26,14 +26,14 @@ android:layout_height="wrap_content" android:text="@string/label_no_passphrase" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <Button android:id="@+id/edit_key_btn_change_passphrase" android:layout_width="match_parent" android:layout_height="60dp" android:padding="4dp" android:text="@string/btn_set_passphrase" - bootstrapbutton:bb_icon_left="fa-pencil" - bootstrapbutton:bb_type="default" /> + android:drawableLeft="@drawable/ic_action_edit" + android:background="@drawable/button_edgy" /> <LinearLayout android:id="@+id/edit_key_container" diff --git a/OpenKeychain/src/main/res/layout/edit_key_key_item.xml b/OpenKeychain/src/main/res/layout/edit_key_key_item.xml index 090115d62..81fb643ab 100644 --- a/OpenKeychain/src/main/res/layout/edit_key_key_item.xml +++ b/OpenKeychain/src/main/res/layout/edit_key_key_item.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <org.sufficientlysecure.keychain.ui.widget.KeyEditor 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="wrap_content" android:orientation="vertical" > @@ -80,13 +79,12 @@ android:paddingRight="10dip" android:text="@string/label_expiry" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <Button android:id="@+id/expiry" android:layout_width="match_parent" android:layout_height="40dp" android:text="@string/none" - bootstrapbutton:bb_size="small" - bootstrapbutton:bb_type="default" /> + android:background="@drawable/button_edgy" /> </TableRow> <TableRow @@ -155,15 +153,13 @@ </TableRow> </TableLayout> - <com.beardedhen.androidbootstrap.BootstrapButton + <ImageButton android:id="@+id/delete" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="10dp" - bootstrapbutton:bb_icon_left="fa-minus" - bootstrapbutton:bb_roundedCorners="true" - bootstrapbutton:bb_size="small" - bootstrapbutton:bb_type="danger" /> + android:src="@drawable/minus" + android:background="@drawable/button_rounded_red"/> </LinearLayout> <View diff --git a/OpenKeychain/src/main/res/layout/edit_key_section.xml b/OpenKeychain/src/main/res/layout/edit_key_section.xml index 9f10ff8c1..6cfe18bd6 100644 --- a/OpenKeychain/src/main/res/layout/edit_key_section.xml +++ b/OpenKeychain/src/main/res/layout/edit_key_section.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <org.sufficientlysecure.keychain.ui.widget.SectionView 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="wrap_content" android:orientation="vertical" > @@ -23,15 +22,13 @@ android:singleLine="true" android:text="Section Name" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <ImageButton android:id="@+id/plusbutton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="10dp" - bootstrapbutton:bb_icon_left="fa-plus" - bootstrapbutton:bb_roundedCorners="true" - bootstrapbutton:bb_size="small" - bootstrapbutton:bb_type="success" /> + android:src="@drawable/plus" + android:background="@drawable/button_rounded_green"/> </LinearLayout> <LinearLayout diff --git a/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml b/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml index a8d1dc674..3454d3668 100644 --- a/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml +++ b/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <org.sufficientlysecure.keychain.ui.widget.UserIdEditor 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="wrap_content" android:orientation="vertical" > @@ -76,18 +75,16 @@ </TableRow> </TableLayout> - <com.beardedhen.androidbootstrap.BootstrapButton + <ImageButton android:id="@+id/delete" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_margin="10dp" + android:layout_margin="10dip" android:layout_marginLeft="4dip" android:layout_marginRight="6dip" - bootstrapbutton:bb_icon_left="fa-minus" - bootstrapbutton:bb_roundedCorners="true" - bootstrapbutton:bb_size="small" - bootstrapbutton:bb_type="danger" /> + android:src="@drawable/minus" + android:background="@drawable/button_rounded_red" /> </LinearLayout> <View diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml index fa1b03889..cde92b477 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout 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="wrap_content" android:orientation="vertical" @@ -65,15 +64,14 @@ android:text="@string/label_select_public_keys" android:textAppearance="?android:attr/textAppearanceMedium" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <Button android:id="@+id/btn_selectEncryptKeys" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_margin="4dp" android:text="@string/select_keys_button_default" - bootstrapbutton:bb_icon_left="fa-user" - bootstrapbutton:bb_size="default" - bootstrapbutton:bb_type="default" /> + android:background="@drawable/button_edgy" + android:drawableLeft="@drawable/ic_action_person" /> </LinearLayout> </LinearLayout>
\ No newline at end of file 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 diff --git a/OpenKeychain/src/main/res/layout/file_dialog.xml b/OpenKeychain/src/main/res/layout/file_dialog.xml index 83d697001..dcf711679 100644 --- a/OpenKeychain/src/main/res/layout/file_dialog.xml +++ b/OpenKeychain/src/main/res/layout/file_dialog.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" @@ -31,17 +30,15 @@ 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_gravity="center_vertical" android:layout_margin="4dp" android:contentDescription="@string/filemanager_title_open" - bootstrapbutton:bb_icon_left="fa-folder-open" - bootstrapbutton:bb_roundedCorners="true" - bootstrapbutton:bb_size="default" - bootstrapbutton:bb_type="default" /> + android:background="@drawable/button_rounded" + android:src="@drawable/ic_action_collection"/> </LinearLayout> <CheckBox diff --git a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml index 2b863d52b..3d2fb688b 100644 --- a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml +++ b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:fontawesometext="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -12,23 +11,21 @@ android:orientation="horizontal" android:clickable="true"> - <com.beardedhen.androidbootstrap.FontAwesomeText + <ImageButton android:id="@+id/foldableIcon" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:layout_marginRight="10dp" - android:textSize="12sp" - android:paddingTop="@dimen/padding_medium" - android:paddingBottom="@dimen/padding_medium" - fontawesometext:fa_icon="fa-chevron-right"/> + android:src="@drawable/ic_action_expand" + android:background="@drawable/button_no_style"/> <TextView android:id="@+id/foldableText" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/none" - android:paddingTop="@dimen/padding_medium" - android:paddingBottom="@dimen/padding_medium" + android:layout_gravity="center_vertical" android:textColor="@color/emphasis"/> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml index c02854668..32b77baac 100644 --- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml +++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <FrameLayout 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:orientation="vertical"> @@ -49,14 +48,15 @@ android:text="@string/key_list_empty_text2" android:textAppearance="?android:attr/textAppearanceSmall" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <Button android:id="@+id/key_list_empty_button_create" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="4dp" + android:textSize="14sp" android:text="@string/key_list_empty_button_create" - bootstrapbutton:bb_icon_left="fa-plus" - bootstrapbutton:bb_type="default" /> + android:drawableLeft="@drawable/ic_action_new_account" + android:background="@drawable/button_edgy"/> <TextView android:layout_width="wrap_content" @@ -66,14 +66,15 @@ android:text="@string/key_list_empty_text3" android:textAppearance="?android:attr/textAppearanceSmall" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <Button android:id="@+id/key_list_empty_button_import" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="4dp" + android:textSize="14sp" android:text="@string/key_list_empty_button_import" - bootstrapbutton:bb_icon_left="fa-download" - bootstrapbutton:bb_type="default" /> + android:drawableLeft="@drawable/ic_action_download" + android:background="@drawable/button_edgy" /> </LinearLayout> </FrameLayout> diff --git a/OpenKeychain/src/main/res/layout/key_server_editor.xml b/OpenKeychain/src/main/res/layout/key_server_editor.xml index 950978a0e..b07fdc50c 100644 --- a/OpenKeychain/src/main/res/layout/key_server_editor.xml +++ b/OpenKeychain/src/main/res/layout/key_server_editor.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <org.sufficientlysecure.keychain.ui.widget.KeyServerEditor 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="wrap_content" android:orientation="vertical" > @@ -18,17 +17,15 @@ android:layout_weight="1" android:inputType="textUri" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <ImageButton android:id="@+id/delete" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_margin="10dp" android:layout_marginRight="3dip" - bootstrapbutton:bb_icon_left="fa-minus" - bootstrapbutton:bb_roundedCorners="true" - bootstrapbutton:bb_size="small" - bootstrapbutton:bb_type="danger" /> + android:background="@drawable/button_rounded_red" + android:src="@drawable/minus" /> </LinearLayout> <View diff --git a/OpenKeychain/src/main/res/layout/key_server_preference.xml b/OpenKeychain/src/main/res/layout/key_server_preference.xml index b8897a7b3..baf7111af 100644 --- a/OpenKeychain/src/main/res/layout/key_server_preference.xml +++ b/OpenKeychain/src/main/res/layout/key_server_preference.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical" > @@ -42,7 +41,7 @@ android:textAppearance="?android:attr/textAppearanceSmall" /> </RelativeLayout> - <com.beardedhen.androidbootstrap.BootstrapButton + <ImageButton android:id="@+id/add" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -50,10 +49,8 @@ android:layout_margin="10dp" android:layout_marginLeft="4dip" android:layout_marginRight="6dip" - bootstrapbutton:bb_icon_left="fa-plus" - bootstrapbutton:bb_roundedCorners="true" - bootstrapbutton:bb_size="small" - bootstrapbutton:bb_type="success" /> + android:src="@drawable/plus" + android:background="@drawable/button_rounded_green"/> </LinearLayout> <View diff --git a/OpenKeychain/src/main/res/layout/select_secret_key_layout_fragment.xml b/OpenKeychain/src/main/res/layout/select_secret_key_layout_fragment.xml index cc2ab0cac..63eeb8eaf 100644 --- a/OpenKeychain/src/main/res/layout/select_secret_key_layout_fragment.xml +++ b/OpenKeychain/src/main/res/layout/select_secret_key_layout_fragment.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <LinearLayout 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="wrap_content" android:orientation="horizontal"> - <com.beardedhen.androidbootstrap.BootstrapButton + <Button android:id="@+id/select_secret_key_select_key_button" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -14,9 +13,9 @@ android:layout_marginRight="4dp" android:layout_marginTop="4dp" android:text="@string/api_settings_select_key" - bootstrapbutton:bb_icon_left="fa-key" - bootstrapbutton:bb_size="default" - bootstrapbutton:bb_type="default" /> + android:drawableLeft="@drawable/ic_action_accounts" + android:background="@drawable/button_edgy" + android:textSize="14dp"/> <LinearLayout android:layout_width="match_parent" |