diff options
Diffstat (limited to 'OpenPGP-Keychain/res')
39 files changed, 214 insertions, 240 deletions
diff --git a/OpenPGP-Keychain/res/drawable-finger/btn_circle.xml b/OpenPGP-Keychain/res/drawable-finger/btn_circle.xml deleted file mode 100644 index 6c3c7fc1a..000000000 --- a/OpenPGP-Keychain/res/drawable-finger/btn_circle.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_window_focused="false" android:state_enabled="true" - android:drawable="@drawable/btn_circle_normal" /> - <item android:state_window_focused="false" android:state_enabled="false" - android:drawable="@drawable/btn_circle_disable" /> - <item android:state_pressed="true" - android:drawable="@drawable/btn_circle_pressed" /> - <item android:state_focused="true" android:state_enabled="true" - android:drawable="@drawable/btn_circle_selected" /> - <item android:state_enabled="true" - android:drawable="@drawable/btn_circle_normal" /> - <item android:state_focused="true" - android:drawable="@drawable/btn_circle_disable_focused" /> - <item - android:drawable="@drawable/btn_circle_disable" /> -</selector> diff --git a/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_disable.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_disable.png Binary files differdeleted file mode 100644 index ae063b545..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_disable.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_disable_focused.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_disable_focused.png Binary files differdeleted file mode 100644 index 7a5d4fe4e..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_disable_focused.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_normal.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_normal.png Binary files differdeleted file mode 100644 index 5eda66883..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_normal.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_pressed.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_pressed.png Binary files differdeleted file mode 100644 index 88848bac2..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_pressed.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_selected.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_selected.png Binary files differdeleted file mode 100644 index 74690705f..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_selected.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi-finger/ic_btn_round_minus.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/ic_btn_round_minus.png Binary files differdeleted file mode 100644 index 27af3faf4..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi-finger/ic_btn_round_minus.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi-finger/ic_btn_round_plus.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/ic_btn_round_plus.png Binary files differdeleted file mode 100644 index b24168c32..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi-finger/ic_btn_round_plus.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_disable.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_disable.png Binary files differdeleted file mode 100644 index 33b74a66c..000000000 --- a/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_disable.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_disable_focused.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_disable_focused.png Binary files differdeleted file mode 100644 index 005ad8dca..000000000 --- a/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_disable_focused.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_normal.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_normal.png Binary files differdeleted file mode 100644 index fc5af1c9f..000000000 --- a/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_normal.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_pressed.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_pressed.png Binary files differdeleted file mode 100644 index 8f40afdfc..000000000 --- a/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_pressed.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_selected.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_selected.png Binary files differdeleted file mode 100644 index c74fac227..000000000 --- a/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_selected.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-mdpi-finger/ic_btn_round_minus.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/ic_btn_round_minus.png Binary files differdeleted file mode 100644 index 96dbb17d2..000000000 --- a/OpenPGP-Keychain/res/drawable-mdpi-finger/ic_btn_round_minus.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-mdpi-finger/ic_btn_round_plus.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/ic_btn_round_plus.png Binary files differdeleted file mode 100644 index 1ec8a956a..000000000 --- a/OpenPGP-Keychain/res/drawable-mdpi-finger/ic_btn_round_plus.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable/btn_circle_disable.png b/OpenPGP-Keychain/res/drawable/btn_circle_disable.png Binary files differdeleted file mode 100644 index 33b74a66c..000000000 --- a/OpenPGP-Keychain/res/drawable/btn_circle_disable.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable/btn_circle_disable_focused.png b/OpenPGP-Keychain/res/drawable/btn_circle_disable_focused.png Binary files differdeleted file mode 100644 index 005ad8dca..000000000 --- a/OpenPGP-Keychain/res/drawable/btn_circle_disable_focused.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable/btn_circle_normal.png b/OpenPGP-Keychain/res/drawable/btn_circle_normal.png Binary files differdeleted file mode 100644 index fc5af1c9f..000000000 --- a/OpenPGP-Keychain/res/drawable/btn_circle_normal.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable/btn_circle_pressed.png b/OpenPGP-Keychain/res/drawable/btn_circle_pressed.png Binary files differdeleted file mode 100644 index 8f40afdfc..000000000 --- a/OpenPGP-Keychain/res/drawable/btn_circle_pressed.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable/btn_circle_selected.png b/OpenPGP-Keychain/res/drawable/btn_circle_selected.png Binary files differdeleted file mode 100644 index c74fac227..000000000 --- a/OpenPGP-Keychain/res/drawable/btn_circle_selected.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/layout/decrypt.xml b/OpenPGP-Keychain/res/layout/decrypt.xml index 0533e6d72..c52d873f1 100644 --- a/OpenPGP-Keychain/res/layout/decrypt.xml +++ b/OpenPGP-Keychain/res/layout/decrypt.xml @@ -16,18 +16,19 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" android:fillViewport="true" android:orientation="vertical" > <ScrollView - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:fillViewport="true" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:paddingLeft="10dp" @@ -35,7 +36,7 @@ <LinearLayout android:id="@+id/signature" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:clickable="true" android:orientation="horizontal" @@ -85,7 +86,7 @@ </LinearLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" > @@ -99,7 +100,7 @@ android:id="@+id/sourceLabel" style="@style/SectionHeader" android:layout_width="0dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:gravity="center_horizontal|center_vertical" android:text="@string/label_message" @@ -114,21 +115,21 @@ <ViewFlipper android:id="@+id/source" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" > <LinearLayout android:id="@+id/sourceMessage" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" android:padding="4dp" > <EditText android:id="@+id/message" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:gravity="top" android:inputType="text|textCapSentences|textMultiLine|textLongMessage" android:scrollHorizontally="true" /> @@ -136,13 +137,13 @@ <LinearLayout android:id="@+id/sourceFile" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" android:padding="4dp" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" > @@ -153,15 +154,19 @@ android:layout_weight="1" android:inputType="textNoSuggestions" /> - <ImageButton + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/btn_browse" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_menu_filebrowser" /> + android:layout_margin="4dp" + bootstrapbutton:bb_icon_left="fa-folder-open" + bootstrapbutton:bb_roundedCorners="true" + bootstrapbutton:bb_size="default" + bootstrapbutton:bb_type="default" /> </LinearLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" > diff --git a/OpenPGP-Keychain/res/layout/edit_key.xml b/OpenPGP-Keychain/res/layout/edit_key.xml index 20cc9f2ac..f8597b0df 100644 --- a/OpenPGP-Keychain/res/layout/edit_key.xml +++ b/OpenPGP-Keychain/res/layout/edit_key.xml @@ -16,6 +16,7 @@ --> <ScrollView 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:fillViewport="true" @@ -41,12 +42,14 @@ android:layout_height="wrap_content" android:text="@string/label_no_passphrase" /> - <Button + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/edit_key_btn_change_pass_phrase" android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="4dp" - android:text="@string/btn_set_passphrase" /> + android:text="@string/btn_set_passphrase" + bootstrapbutton:bb_icon_left="fa-pencil" + bootstrapbutton:bb_type="info" /> <LinearLayout android:id="@+id/edit_key_container" diff --git a/OpenPGP-Keychain/res/layout/edit_key_key_item.xml b/OpenPGP-Keychain/res/layout/edit_key_key_item.xml index 521e8ce2c..06bff2f9e 100644 --- a/OpenPGP-Keychain/res/layout/edit_key_key_item.xml +++ b/OpenPGP-Keychain/res/layout/edit_key_key_item.xml @@ -16,12 +16,13 @@ --> <org.sufficientlysecure.keychain.ui.widget.KeyEditor xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" > @@ -80,7 +81,7 @@ <TextView android:id="@+id/creation" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> </TableRow> @@ -94,10 +95,12 @@ android:paddingRight="10dip" android:text="@string/label_expiry" /> - <Button + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/expiry" - android:layout_width="fill_parent" - android:layout_height="wrap_content" /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/none" + bootstrapbutton:bb_type="default" /> </TableRow> <TableRow> @@ -112,22 +115,25 @@ <Spinner android:id="@+id/usage" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> </TableRow> </TableLayout> - <ImageButton + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/delete" - style="@style/MinusButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" /> + android:layout_margin="10dp" + bootstrapbutton:bb_icon_left="fa-minus" + bootstrapbutton:bb_roundedCorners="true" + bootstrapbutton:bb_size="small" + bootstrapbutton:bb_type="danger" /> </LinearLayout> <View android:id="@+id/separator" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:background="?android:attr/listDivider" /> diff --git a/OpenPGP-Keychain/res/layout/edit_key_section.xml b/OpenPGP-Keychain/res/layout/edit_key_section.xml index dd0a5d4bd..9f10ff8c1 100644 --- a/OpenPGP-Keychain/res/layout/edit_key_section.xml +++ b/OpenPGP-Keychain/res/layout/edit_key_section.xml @@ -1,31 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2010 Thialfihar <thi@thialfihar.org> - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - <org.sufficientlysecure.keychain.ui.widget.SectionView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > <LinearLayout android:id="@+id/header" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:clickable="true" - android:focusable="true" android:gravity="center_vertical" android:orientation="horizontal" > @@ -40,19 +23,22 @@ android:singleLine="true" android:text="Section Name" /> - <ImageView + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/plusbutton" - style="@style/PlusButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:duplicateParentState="true" /> + android:layout_margin="10dp" + bootstrapbutton:bb_icon_left="fa-plus" + bootstrapbutton:bb_roundedCorners="true" + bootstrapbutton:bb_size="small" + bootstrapbutton:bb_type="success" /> </LinearLayout> <LinearLayout android:id="@+id/editors" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:paddingBottom="6dip" /> -</org.sufficientlysecure.keychain.ui.widget.SectionView> +</org.sufficientlysecure.keychain.ui.widget.SectionView>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml b/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml index a3955389f..74f929bf6 100644 --- a/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml +++ b/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml @@ -1,21 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2010 Thialfihar <thi@thialfihar.org> - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - <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="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" > @@ -90,12 +75,18 @@ </TableRow> </TableLayout> - <ImageButton + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/delete" - style="@style/MinusButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" /> + android:layout_gravity="center_vertical" + android:layout_margin="10dp" + 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" /> </LinearLayout> <View diff --git a/OpenPGP-Keychain/res/layout/encrypt.xml b/OpenPGP-Keychain/res/layout/encrypt.xml index c9c6be5df..1fb3bc589 100644 --- a/OpenPGP-Keychain/res/layout/encrypt.xml +++ b/OpenPGP-Keychain/res/layout/encrypt.xml @@ -16,19 +16,20 @@ --> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" android:fillViewport="true" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:paddingLeft="10dp" android:paddingRight="10dp" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:padding="4dp" > @@ -43,7 +44,7 @@ android:id="@+id/modeLabel" style="@style/SectionHeader" android:layout_width="0dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:gravity="center_horizontal|center_vertical" android:text="@string/label_asymmetric" /> @@ -57,18 +58,18 @@ <ViewFlipper android:id="@+id/mode" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" > <LinearLayout android:id="@+id/modeAsymmetric" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="4dp" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" > @@ -80,7 +81,7 @@ android:text="@string/label_sign" /> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:paddingLeft="16dp" > @@ -108,7 +109,7 @@ </LinearLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:paddingBottom="3dip" > @@ -122,18 +123,22 @@ android:text="@string/label_select_public_keys" android:textAppearance="?android:attr/textAppearanceMedium" /> - <Button + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/btn_selectEncryptKeys" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:text="@string/btn_select_encrypt_keys" /> + android:layout_margin="4dp" + android:text="@string/btn_select_encrypt_keys" + bootstrapbutton:bb_icon_left="fa-key" + bootstrapbutton:bb_size="default" + bootstrapbutton:bb_type="default" /> </LinearLayout> </LinearLayout> <TableLayout android:id="@+id/modeSymmetric" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="4dp" android:stretchColumns="1" > @@ -151,7 +156,7 @@ <EditText android:id="@+id/passPhrase" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="textPassword" /> </TableRow> @@ -169,7 +174,7 @@ <EditText android:id="@+id/passPhraseAgain" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="textPassword" /> </TableRow> @@ -177,7 +182,7 @@ </ViewFlipper> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:padding="4dp" > @@ -192,7 +197,7 @@ android:id="@+id/sourceLabel" style="@style/SectionHeader" android:layout_width="0dip" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:layout_weight="1" android:gravity="center_horizontal|center_vertical" android:text="@string/label_message" @@ -207,34 +212,34 @@ <ViewFlipper android:id="@+id/source" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" > <LinearLayout android:id="@+id/sourceMessage" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" android:padding="4dp" > <EditText android:id="@+id/message" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:gravity="top" android:inputType="text|textCapSentences|textMultiLine|textLongMessage" /> </LinearLayout> <LinearLayout android:id="@+id/sourceFile" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" android:padding="4dp" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" > @@ -245,15 +250,19 @@ android:layout_weight="1" android:inputType="textNoSuggestions" /> - <ImageButton + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/btn_browse" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_menu_filebrowser" /> + android:layout_margin="4dp" + bootstrapbutton:bb_icon_left="fa-folder-open" + bootstrapbutton:bb_roundedCorners="true" + bootstrapbutton:bb_size="default" + bootstrapbutton:bb_type="default" /> </LinearLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" > @@ -275,7 +284,7 @@ </LinearLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" > @@ -288,7 +297,7 @@ </LinearLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" > diff --git a/OpenPGP-Keychain/res/layout/file_dialog.xml b/OpenPGP-Keychain/res/layout/file_dialog.xml index ce3b1ea60..87816067f 100644 --- a/OpenPGP-Keychain/res/layout/file_dialog.xml +++ b/OpenPGP-Keychain/res/layout/file_dialog.xml @@ -16,6 +16,7 @@ --> <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" @@ -39,13 +40,17 @@ android:minLines="2" android:scrollbars="vertical" /> - <ImageButton + <com.beardedhen.androidbootstrap.BootstrapButton 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" - android:src="@drawable/ic_menu_filebrowser" /> + bootstrapbutton:bb_icon_left="fa-folder-open" + bootstrapbutton:bb_roundedCorners="true" + bootstrapbutton:bb_size="default" + bootstrapbutton:bb_type="default" /> </LinearLayout> <CheckBox diff --git a/OpenPGP-Keychain/res/layout/import_keys.xml b/OpenPGP-Keychain/res/layout/import_keys.xml index ae391e2fd..1b40bad58 100644 --- a/OpenPGP-Keychain/res/layout/import_keys.xml +++ b/OpenPGP-Keychain/res/layout/import_keys.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerHorizontal="true" > @@ -22,19 +23,22 @@ android:paddingLeft="10dp" android:paddingRight="10dp" > - <Button + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/import_import" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:onClick="importOnClick" - android:text="@string/import_import" /> + android:layout_height="60dp" + android:padding="4dp" + android:text="@string/import_import" + bootstrapbutton:bb_icon_left="fa-download" + bootstrapbutton:bb_type="info" /> - <Button + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/import_sign_and_upload" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:onClick="signAndUploadOnClick" - android:text="@string/import_sign_and_upload" /> + android:layout_height="60dp" + android:padding="4dp" + android:text="@string/import_sign_and_upload" + bootstrapbutton:bb_type="info" /> </LinearLayout> <FrameLayout diff --git a/OpenPGP-Keychain/res/layout/import_keys_clipboard_fragment.xml b/OpenPGP-Keychain/res/layout/import_keys_clipboard_fragment.xml index bb3b8a1cb..961c6523a 100644 --- a/OpenPGP-Keychain/res/layout/import_keys_clipboard_fragment.xml +++ b/OpenPGP-Keychain/res/layout/import_keys_clipboard_fragment.xml @@ -1,13 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" > - <Button + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/import_clipboard_button" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/import_from_clipboard" /> + android:layout_height="60dp" + android:layout_margin="10dp" + android:text="@string/import_from_clipboard" + bootstrapbutton:bb_size="default" + bootstrapbutton:bb_type="default" /> </LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/import_keys_file_fragment.xml b/OpenPGP-Keychain/res/layout/import_keys_file_fragment.xml index 896be3989..126bcd8a6 100644 --- a/OpenPGP-Keychain/res/layout/import_keys_file_fragment.xml +++ b/OpenPGP-Keychain/res/layout/import_keys_file_fragment.xml @@ -1,5 +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="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" > @@ -16,12 +17,16 @@ android:minLines="2" android:scrollbars="vertical" /> - <ImageButton + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/import_keys_file_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" - android:src="@drawable/ic_menu_filebrowser" /> + bootstrapbutton:bb_icon_left="fa-folder-open" + bootstrapbutton:bb_roundedCorners="true" + bootstrapbutton:bb_size="default" + bootstrapbutton:bb_type="default" /> </LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/import_keys_keyserver_fragment.xml b/OpenPGP-Keychain/res/layout/import_keys_keyserver_fragment.xml index 18e87205b..74a2d7853 100644 --- a/OpenPGP-Keychain/res/layout/import_keys_keyserver_fragment.xml +++ b/OpenPGP-Keychain/res/layout/import_keys_keyserver_fragment.xml @@ -1,13 +1,17 @@ <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="match_parent" android:orientation="vertical" > - <Button + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/import_keyserver_button" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/menu_key_server" /> + android:layout_height="60dp" + android:layout_margin="10dp" + android:text="@string/menu_key_server" + bootstrapbutton:bb_size="default" + bootstrapbutton:bb_type="default" /> <!-- <Spinner --> <!-- android:id="@+id/import_keys_server_key_server" --> diff --git a/OpenPGP-Keychain/res/layout/import_keys_nfc_fragment.xml b/OpenPGP-Keychain/res/layout/import_keys_nfc_fragment.xml index b34bb80c3..6d70578af 100644 --- a/OpenPGP-Keychain/res/layout/import_keys_nfc_fragment.xml +++ b/OpenPGP-Keychain/res/layout/import_keys_nfc_fragment.xml @@ -1,13 +1,17 @@ <?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="horizontal" > - <Button + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/import_nfc_button" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/menu_import_from_nfc" /> + android:layout_height="60dp" + android:layout_margin="10dp" + android:text="@string/menu_import_from_nfc" + bootstrapbutton:bb_size="default" + bootstrapbutton:bb_type="default" /> </LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml b/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml index 0a49b014a..f3c09a41d 100644 --- a/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml +++ b/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml @@ -1,14 +1,19 @@ <?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" > - <Button + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/import_qrcode_button" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/menu_import_from_qr_code" /> + android:layout_height="60dp" + android:layout_margin="10dp" + android:text="@string/menu_import_from_qr_code" + bootstrapbutton:bb_icon_left="fa-barcode" + bootstrapbutton:bb_size="default" + bootstrapbutton:bb_type="default" /> <TextView android:id="@+id/import_qrcode_text" diff --git a/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml b/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml index 06719749c..828809601 100644 --- a/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml +++ b/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml @@ -1,5 +1,6 @@ <?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" > @@ -45,12 +46,14 @@ android:text="@string/key_list_empty_text2" android:textAppearance="?android:attr/textAppearanceSmall" /> - <Button + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/key_list_empty_button_create" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_margin="10dp" android:text="@string/key_list_empty_button_create" - android:textAppearance="?android:attr/textAppearanceSmall" /> + bootstrapbutton:bb_icon_left="fa-plus" + bootstrapbutton:bb_type="default" /> <TextView android:layout_width="wrap_content" @@ -59,12 +62,14 @@ android:text="@string/key_list_empty_text3" android:textAppearance="?android:attr/textAppearanceSmall" /> - <Button + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/key_list_empty_button_import" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_margin="10dp" android:text="@string/key_list_empty_button_import" - android:textAppearance="?android:attr/textAppearanceSmall" /> + bootstrapbutton:bb_icon_left="fa-download" + bootstrapbutton:bb_type="default" /> </LinearLayout> </FrameLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/key_server_editor.xml b/OpenPGP-Keychain/res/layout/key_server_editor.xml index 51ff8a663..058a43eaf 100644 --- a/OpenPGP-Keychain/res/layout/key_server_editor.xml +++ b/OpenPGP-Keychain/res/layout/key_server_editor.xml @@ -1,52 +1,40 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org> - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<org.sufficientlysecure.keychain.ui.widget.KeyServerEditor - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" +<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"> + android:orientation="vertical" > <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_width="fill_parent" - android:orientation="horizontal" - android:layout_marginLeft="3dip"> + android:layout_marginLeft="3dip" + android:orientation="horizontal" > <EditText android:id="@+id/server" - android:layout_weight="1" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_width="fill_parent" - android:inputType="textUri"/> - - <ImageButton - android:id="@+id/delete" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - style="@style/MinusButton" - android:layout_gravity="center_vertical" - android:layout_marginRight="3dip"/> + android:layout_weight="1" + android:inputType="textUri" /> + <com.beardedhen.androidbootstrap.BootstrapButton + 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" /> </LinearLayout> <View android:id="@+id/separator" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" - android:background="?android:attr/listDivider"/> + android:background="?android:attr/listDivider" /> -</org.sufficientlysecure.keychain.ui.widget.KeyServerEditor> +</org.sufficientlysecure.keychain.ui.widget.KeyServerEditor>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/key_server_preference.xml b/OpenPGP-Keychain/res/layout/key_server_preference.xml index e9b1d5a95..8b99e5d2f 100644 --- a/OpenPGP-Keychain/res/layout/key_server_preference.xml +++ b/OpenPGP-Keychain/res/layout/key_server_preference.xml @@ -1,21 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2010 Thialfihar <thi@thialfihar.org> - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - <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" > @@ -57,15 +42,18 @@ android:textAppearance="?android:attr/textAppearanceSmall" /> </RelativeLayout> - <ImageView + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/add" - style="@style/PlusButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" + android:layout_margin="10dp" android:layout_marginLeft="4dip" android:layout_marginRight="6dip" - android:clickable="true" /> + bootstrapbutton:bb_icon_left="fa-plus" + bootstrapbutton:bb_roundedCorners="true" + bootstrapbutton:bb_size="small" + bootstrapbutton:bb_type="success" /> </LinearLayout> <View diff --git a/OpenPGP-Keychain/res/layout/key_view_activity.xml b/OpenPGP-Keychain/res/layout/key_view_activity.xml index 8c6281d5b..ffb2400f1 100644 --- a/OpenPGP-Keychain/res/layout/key_view_activity.xml +++ b/OpenPGP-Keychain/res/layout/key_view_activity.xml @@ -1,4 +1,5 @@ <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:layout_marginRight="?android:attr/scrollbarSize" @@ -120,10 +121,13 @@ android:padding="4dp" android:text="@string/section_actions" /> - <Button + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/action_encrypt" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/key_view_action_encrypt" /> + android:layout_height="60dp" + android:padding="4dp" + android:text="@string/key_view_action_encrypt" + bootstrapbutton:bb_icon_left="fa-lock" + bootstrapbutton:bb_type="info" /> </LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/raw/help_about.html b/OpenPGP-Keychain/res/raw/help_about.html index 8b412ded0..54af42b16 100644 --- a/OpenPGP-Keychain/res/raw/help_about.html +++ b/OpenPGP-Keychain/res/raw/help_about.html @@ -12,15 +12,15 @@ And don't add newlines before or after p tags because of transifex --> <h2>Developers OpenPGP Keychain</h2> <ul> <li>Dominik Schürmann (Lead developer)</li> -<li>Ash Hughes</li> +<li>Ash Hughes (crypto patches)</li> <li>Brian C. Barnes</li> -<li>Bahtiar 'kalkin' Gadimov</li> +<li>Bahtiar 'kalkin' Gadimov (UI)</li> </ul> <h2>Developers APG 1.x</h2> <ul> -<li>Thialfihar (Lead developer)</li> -<li>Senecaso (QRCode, sign key, upload key)</li> +<li>'Thialfihar' (Lead developer)</li> +<li>'Senecaso' (QRCode, sign key, upload key)</li> <li>Oliver Runge</li> <li>Markus Doits</li> </ul> diff --git a/OpenPGP-Keychain/res/values/styles.xml b/OpenPGP-Keychain/res/values/styles.xml index ef3ff63f6..15214fa62 100644 --- a/OpenPGP-Keychain/res/values/styles.xml +++ b/OpenPGP-Keychain/res/values/styles.xml @@ -18,16 +18,6 @@ <resources> - <style name="MinusButton"> - <item name="android:background">@drawable/btn_circle</item> - <item name="android:src">@drawable/ic_btn_round_minus</item> - </style> - - <style name="PlusButton"> - <item name="android:background">@drawable/btn_circle</item> - <item name="android:src">@drawable/ic_btn_round_plus</item> - </style> - <style name="DashboardButton"> <item name="android:layout_gravity">center_vertical</item> <item name="android:layout_width">wrap_content</item> @@ -44,7 +34,7 @@ <item name="android:drawablePadding">4dp</item> <item name="android:layout_marginTop">8dp</item> <item name="android:paddingLeft">4dp</item> - <item name="android:textAllCaps">true</item> +<!-- <item name="android:textAllCaps">true</item> --> <item name="android:textColor">@color/emphasis</item> <item name="android:textSize">14sp</item> </style> |
