diff options
Diffstat (limited to 'OpenPGP-Keychain/res')
109 files changed, 1538 insertions, 1468 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-hdpi/dashboard_decrypt_default.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_decrypt_default.png Binary files differdeleted file mode 100644 index 0d51bcb68..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_decrypt_default.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_decrypt_pressed.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_decrypt_pressed.png Binary files differdeleted file mode 100644 index d4cc0f8ea..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_decrypt_pressed.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_encrypt_default.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_encrypt_default.png Binary files differdeleted file mode 100644 index 07617bb9d..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_encrypt_default.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_encrypt_pressed.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_encrypt_pressed.png Binary files differdeleted file mode 100644 index b8fe6e1d6..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_encrypt_pressed.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_help_default.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_help_default.png Binary files differdeleted file mode 100644 index 233fddffc..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_help_default.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_help_pressed.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_help_pressed.png Binary files differdeleted file mode 100644 index dad8694f8..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_help_pressed.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_import_default.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_import_default.png Binary files differdeleted file mode 100644 index 7be4837a0..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_import_default.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_import_pressed.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_import_pressed.png Binary files differdeleted file mode 100644 index a4fe3c903..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_import_pressed.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_manage_keys_default.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_manage_keys_default.png Binary files differdeleted file mode 100644 index de83398c2..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_manage_keys_default.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_manage_keys_pressed.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_manage_keys_pressed.png Binary files differdeleted file mode 100644 index a86bc1bf9..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_manage_keys_pressed.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_my_keys_default.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_my_keys_default.png Binary files differdeleted file mode 100644 index f8b54961e..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_my_keys_default.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_my_keys_pressed.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_my_keys_pressed.png Binary files differdeleted file mode 100644 index 6a5c92138..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi/dashboard_my_keys_pressed.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi/drawer_shadow.9.png b/OpenPGP-Keychain/res/drawable-hdpi/drawer_shadow.9.png Binary files differnew file mode 100644 index 000000000..224cc4ff4 --- /dev/null +++ b/OpenPGP-Keychain/res/drawable-hdpi/drawer_shadow.9.png diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_drawer.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_drawer.png Binary files differnew file mode 100644 index 000000000..ff7b1def9 --- /dev/null +++ b/OpenPGP-Keychain/res/drawable-hdpi/ic_drawer.png diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_filebrowser.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_filebrowser.png Binary files differdeleted file mode 100644 index 3db304fa8..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_filebrowser.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-mdpi/drawer_shadow.9.png b/OpenPGP-Keychain/res/drawable-mdpi/drawer_shadow.9.png Binary files differnew file mode 100644 index 000000000..3797f99c0 --- /dev/null +++ b/OpenPGP-Keychain/res/drawable-mdpi/drawer_shadow.9.png diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_drawer.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_drawer.png Binary files differnew file mode 100644 index 000000000..fb681ba26 --- /dev/null +++ b/OpenPGP-Keychain/res/drawable-mdpi/ic_drawer.png diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_filebrowser.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_filebrowser.png Binary files differdeleted file mode 100644 index fda13f1be..000000000 --- a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_filebrowser.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/drawer_shadow.9.png b/OpenPGP-Keychain/res/drawable-xhdpi/drawer_shadow.9.png Binary files differnew file mode 100644 index 000000000..fa3d853e9 --- /dev/null +++ b/OpenPGP-Keychain/res/drawable-xhdpi/drawer_shadow.9.png diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_drawer.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_drawer.png Binary files differnew file mode 100644 index 000000000..b9bc3d70f --- /dev/null +++ b/OpenPGP-Keychain/res/drawable-xhdpi/ic_drawer.png diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_filebrowser.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_filebrowser.png Binary files differdeleted file mode 100644 index d1324014d..000000000 --- a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_filebrowser.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/drawable/dashboard_decrypt.xml b/OpenPGP-Keychain/res/drawable/dashboard_decrypt.xml deleted file mode 100644 index 981e38a0b..000000000 --- a/OpenPGP-Keychain/res/drawable/dashboard_decrypt.xml +++ /dev/null @@ -1,28 +0,0 @@ -<!-- - Copyright 2011 Google Inc. - - 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:drawable="@drawable/dashboard_decrypt_pressed" - android:state_focused="true" - android:state_pressed="true" /> - <item android:drawable="@drawable/dashboard_decrypt_pressed" - android:state_focused="false" - android:state_pressed="true" /> - <item android:drawable="@drawable/dashboard_decrypt_pressed" - android:state_focused="true" /> - <item android:drawable="@drawable/dashboard_decrypt_default" - android:state_focused="false" - android:state_pressed="false" /> -</selector> diff --git a/OpenPGP-Keychain/res/drawable/dashboard_encrypt.xml b/OpenPGP-Keychain/res/drawable/dashboard_encrypt.xml deleted file mode 100644 index af812dc51..000000000 --- a/OpenPGP-Keychain/res/drawable/dashboard_encrypt.xml +++ /dev/null @@ -1,28 +0,0 @@ -<!-- - Copyright 2011 Google Inc. - - 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:drawable="@drawable/dashboard_encrypt_pressed" - android:state_focused="true" - android:state_pressed="true" /> - <item android:drawable="@drawable/dashboard_encrypt_pressed" - android:state_focused="false" - android:state_pressed="true" /> - <item android:drawable="@drawable/dashboard_encrypt_pressed" - android:state_focused="true" /> - <item android:drawable="@drawable/dashboard_encrypt_default" - android:state_focused="false" - android:state_pressed="false" /> -</selector> diff --git a/OpenPGP-Keychain/res/drawable/dashboard_help.xml b/OpenPGP-Keychain/res/drawable/dashboard_help.xml deleted file mode 100644 index e121ea0d1..000000000 --- a/OpenPGP-Keychain/res/drawable/dashboard_help.xml +++ /dev/null @@ -1,28 +0,0 @@ -<!-- - Copyright 2011 Google Inc. - - 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:drawable="@drawable/dashboard_help_pressed" - android:state_focused="true" - android:state_pressed="true" /> - <item android:drawable="@drawable/dashboard_help_pressed" - android:state_focused="false" - android:state_pressed="true" /> - <item android:drawable="@drawable/dashboard_help_pressed" - android:state_focused="true" /> - <item android:drawable="@drawable/dashboard_help_default" - android:state_focused="false" - android:state_pressed="false" /> -</selector> diff --git a/OpenPGP-Keychain/res/drawable/dashboard_import.xml b/OpenPGP-Keychain/res/drawable/dashboard_import.xml deleted file mode 100644 index e5857dc6c..000000000 --- a/OpenPGP-Keychain/res/drawable/dashboard_import.xml +++ /dev/null @@ -1,28 +0,0 @@ -<!-- - Copyright 2011 Google Inc. - - 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:drawable="@drawable/dashboard_import_pressed" - android:state_focused="true" - android:state_pressed="true" /> - <item android:drawable="@drawable/dashboard_import_pressed" - android:state_focused="false" - android:state_pressed="true" /> - <item android:drawable="@drawable/dashboard_import_pressed" - android:state_focused="true" /> - <item android:drawable="@drawable/dashboard_import_default" - android:state_focused="false" - android:state_pressed="false" /> -</selector> diff --git a/OpenPGP-Keychain/res/drawable/dashboard_manage_keys.xml b/OpenPGP-Keychain/res/drawable/dashboard_manage_keys.xml deleted file mode 100644 index ebc519253..000000000 --- a/OpenPGP-Keychain/res/drawable/dashboard_manage_keys.xml +++ /dev/null @@ -1,28 +0,0 @@ -<!-- - Copyright 2011 Google Inc. - - 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:drawable="@drawable/dashboard_manage_keys_pressed" - android:state_focused="true" - android:state_pressed="true" /> - <item android:drawable="@drawable/dashboard_manage_keys_pressed" - android:state_focused="false" - android:state_pressed="true" /> - <item android:drawable="@drawable/dashboard_manage_keys_pressed" - android:state_focused="true" /> - <item android:drawable="@drawable/dashboard_manage_keys_default" - android:state_focused="false" - android:state_pressed="false" /> -</selector> diff --git a/OpenPGP-Keychain/res/drawable/dashboard_my_keys.xml b/OpenPGP-Keychain/res/drawable/dashboard_my_keys.xml deleted file mode 100644 index d4045db45..000000000 --- a/OpenPGP-Keychain/res/drawable/dashboard_my_keys.xml +++ /dev/null @@ -1,28 +0,0 @@ -<!-- - Copyright 2011 Google Inc. - - 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:drawable="@drawable/dashboard_my_keys_pressed" - android:state_focused="true" - android:state_pressed="true" /> - <item android:drawable="@drawable/dashboard_my_keys_pressed" - android:state_focused="false" - android:state_pressed="true" /> - <item android:drawable="@drawable/dashboard_my_keys_pressed" - android:state_focused="true" /> - <item android:drawable="@drawable/dashboard_my_keys_default" - android:state_focused="false" - android:state_pressed="false" /> -</selector> diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml b/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml index a40444e0f..a88d7afd2 100644 --- a/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml +++ b/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml @@ -1,5 +1,6 @@ <?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="wrap_content" > @@ -41,12 +42,16 @@ android:layout_height="wrap_content" android:orientation="horizontal" > - <Button + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/api_app_settings_select_key_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:text="@string/api_settings_select_key" /> + android:layout_margin="4dp" + android:text="@string/api_settings_select_key" + bootstrapbutton:bb_icon_left="fa-key" + bootstrapbutton:bb_size="default" + bootstrapbutton:bb_type="default" /> <LinearLayout android:layout_width="match_parent" @@ -76,11 +81,16 @@ </LinearLayout> </LinearLayout> - <Button + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/api_app_settings_advanced_button" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/api_settings_show_advanced" /> + android:layout_gravity="center_vertical" + android:layout_margin="4dp" + android:text="@string/api_settings_show_advanced" + bootstrapbutton:bb_icon_left="fa-caret-up" + bootstrapbutton:bb_size="default" + bootstrapbutton:bb_type="default" /> <LinearLayout android:id="@+id/api_app_settings_advanced" diff --git a/OpenPGP-Keychain/res/layout/api_apps_list_activity.xml b/OpenPGP-Keychain/res/layout/api_apps_list_activity.xml index 11f663f7f..71fbcfb12 100644 --- a/OpenPGP-Keychain/res/layout/api_apps_list_activity.xml +++ b/OpenPGP-Keychain/res/layout/api_apps_list_activity.xml @@ -1,12 +1,20 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/drawer_layout" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" > - <fragment - android:id="@+id/crypto_consumers_list_fragment" - android:name="org.sufficientlysecure.keychain.service.remote.RegisteredAppsListFragment" + <FrameLayout android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" > -</LinearLayout>
\ No newline at end of file + <fragment + android:id="@+id/crypto_consumers_list_fragment" + android:name="org.sufficientlysecure.keychain.service.remote.RegisteredAppsListFragment" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + </FrameLayout> + + <include layout="@layout/drawer_list" /> + +</android.support.v4.widget.DrawerLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/create_key.xml b/OpenPGP-Keychain/res/layout/create_key_dialog.xml index 888f9f898..a2e908433 100644 --- a/OpenPGP-Keychain/res/layout/create_key.xml +++ b/OpenPGP-Keychain/res/layout/create_key_dialog.xml @@ -1,26 +1,10 @@ <?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. ---> - <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" > + android:layout_width="match_parent" + android:layout_height="match_parent" > <TableLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingLeft="16dp" android:paddingRight="16dp" @@ -44,7 +28,7 @@ <Spinner android:id="@+id/create_key_algorithm" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="4dp" /> </TableRow> @@ -60,7 +44,7 @@ <Spinner android:id="@+id/create_key_size" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="right" android:padding="4dp" /> diff --git a/OpenPGP-Keychain/res/layout/decrypt.xml b/OpenPGP-Keychain/res/layout/decrypt.xml deleted file mode 100644 index 0533e6d72..000000000 --- a/OpenPGP-Keychain/res/layout/decrypt.xml +++ /dev/null @@ -1,180 +0,0 @@ -<?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" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:fillViewport="true" - android:orientation="vertical" > - - <ScrollView - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:fillViewport="true" > - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingLeft="10dp" - android:paddingRight="10dp" > - - <LinearLayout - android:id="@+id/signature" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:clickable="true" - android:orientation="horizontal" - android:padding="4dp" - android:paddingLeft="10dp" - android:paddingRight="10dp" > - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" > - - <ImageView - android:id="@+id/ic_signature" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/signed_large" /> - - <ImageView - android:id="@+id/ic_signature_status" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/overlay_error" /> - </RelativeLayout> - - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingLeft="5dip" > - - <TextView - android:id="@+id/mainUserId" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:text="Main User Id" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <TextView - android:id="@+id/mainUserIdRest" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:text="Main User Id Rest" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </LinearLayout> - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - - <ImageView - android:id="@+id/sourcePrevious" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_previous" /> - - <TextView - android:id="@+id/sourceLabel" - style="@style/SectionHeader" - android:layout_width="0dip" - android:layout_height="fill_parent" - android:layout_weight="1" - android:gravity="center_horizontal|center_vertical" - android:text="@string/label_message" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <ImageView - android:id="@+id/sourceNext" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_next" /> - </LinearLayout> - - <ViewFlipper - android:id="@+id/source" - android:layout_width="fill_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:orientation="vertical" - android:padding="4dp" > - - <EditText - android:id="@+id/message" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:gravity="top" - android:inputType="text|textCapSentences|textMultiLine|textLongMessage" - android:scrollHorizontally="true" /> - </LinearLayout> - - <LinearLayout - android:id="@+id/sourceFile" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" - android:padding="4dp" > - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - - <EditText - android:id="@+id/filename" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:inputType="textNoSuggestions" /> - - <ImageButton - android:id="@+id/btn_browse" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_menu_filebrowser" /> - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - - <CheckBox - android:id="@+id/deleteAfterDecryption" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/label_delete_after_decryption" /> - </LinearLayout> - </LinearLayout> - </ViewFlipper> - </LinearLayout> - </ScrollView> - -</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/decrypt_activity.xml b/OpenPGP-Keychain/res/layout/decrypt_activity.xml new file mode 100644 index 000000000..9d9e1a1e8 --- /dev/null +++ b/OpenPGP-Keychain/res/layout/decrypt_activity.xml @@ -0,0 +1,177 @@ +<?xml version="1.0" encoding="utf-8"?> +<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + android:id="@+id/drawer_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" > + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true" + android:orientation="vertical" > + + <ScrollView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true" > + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingLeft="10dp" + android:paddingRight="10dp" > + + <LinearLayout + android:id="@+id/signature" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:clickable="true" + android:orientation="horizontal" + android:padding="4dp" + android:paddingLeft="10dp" + android:paddingRight="10dp" > + + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" > + + <ImageView + android:id="@+id/ic_signature" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/signed_large" /> + + <ImageView + android:id="@+id/ic_signature_status" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/overlay_error" /> + </RelativeLayout> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingLeft="5dip" > + + <TextView + android:id="@+id/mainUserId" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:text="Main User Id" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:id="@+id/mainUserIdRest" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:text="Main User Id Rest" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </LinearLayout> + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <ImageView + android:id="@+id/sourcePrevious" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_previous" /> + + <TextView + android:id="@+id/sourceLabel" + style="@style/SectionHeader" + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1" + android:gravity="center_horizontal|center_vertical" + android:text="@string/label_message" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <ImageView + android:id="@+id/sourceNext" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_next" /> + </LinearLayout> + + <ViewFlipper + android:id="@+id/source" + android:layout_width="match_parent" + android:layout_height="0dip" + android:layout_weight="1" > + + <LinearLayout + android:id="@+id/sourceMessage" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="4dp" > + + <EditText + android:id="@+id/message" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="top" + android:inputType="text|textCapSentences|textMultiLine|textLongMessage" + android:scrollHorizontally="true" /> + </LinearLayout> + + <LinearLayout + android:id="@+id/sourceFile" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="4dp" > + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <EditText + android:id="@+id/filename" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:inputType="textNoSuggestions" /> + + <com.beardedhen.androidbootstrap.BootstrapButton + 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" /> + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <CheckBox + android:id="@+id/deleteAfterDecryption" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/label_delete_after_decryption" /> + </LinearLayout> + </LinearLayout> + </ViewFlipper> + </LinearLayout> + </ScrollView> + </LinearLayout> + + <include layout="@layout/drawer_list" /> + +</android.support.v4.widget.DrawerLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/drawer_list.xml b/OpenPGP-Keychain/res/layout/drawer_list.xml new file mode 100644 index 000000000..18210afc5 --- /dev/null +++ b/OpenPGP-Keychain/res/layout/drawer_list.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + android:layout_gravity="start" tells DrawerLayout to treat + this as a sliding drawer on the left side for left-to-right + languages and on the right side for right-to-left languages. + The drawer is given a fixed width in dp and extends the full height of + the container. A solid background is used for contrast + with the content view. +--> +<ListView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/left_drawer" + android:layout_width="240dp" + android:layout_height="match_parent" + android:layout_gravity="start" + android:background="#fff" + android:choiceMode="singleChoice" + android:divider="@color/bg_gray" + android:dividerHeight="1dp" /> diff --git a/OpenPGP-Keychain/res/layout/drawer_list_item.xml b/OpenPGP-Keychain/res/layout/drawer_list_item.xml new file mode 100644 index 000000000..14760e79d --- /dev/null +++ b/OpenPGP-Keychain/res/layout/drawer_list_item.xml @@ -0,0 +1,28 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:fontawesometext="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <com.beardedhen.androidbootstrap.FontAwesomeText + android:id="@+id/drawer_item_icon" + android:layout_width="32dp" + android:layout_height="32dp" + android:layout_margin="10dp" + android:gravity="center_vertical" + android:textSize="24sp" + fontawesometext:fa_icon="fa-github" /> + + <TextView + android:id="@+id/drawer_item_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:paddingBottom="16dp" + android:paddingLeft="4dp" + android:paddingRight="16dp" + android:paddingTop="16dp" + android:textAppearance="@android:style/TextAppearance.Medium" + android:textColor="#111" /> + +</LinearLayout> diff --git a/OpenPGP-Keychain/res/layout/edit_key.xml b/OpenPGP-Keychain/res/layout/edit_key_activity.xml index 20cc9f2ac..f8597b0df 100644 --- a/OpenPGP-Keychain/res/layout/edit_key.xml +++ b/OpenPGP-Keychain/res/layout/edit_key_activity.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..11bce64ee 100644 --- a/OpenPGP-Keychain/res/layout/edit_key_key_item.xml +++ b/OpenPGP-Keychain/res/layout/edit_key_key_item.xml @@ -1,27 +1,12 @@ <?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.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 +65,7 @@ <TextView android:id="@+id/creation" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> </TableRow> @@ -94,10 +79,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 +99,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..663949d8e 100644 --- a/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml +++ b/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml @@ -1,22 +1,7 @@ <?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" - 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" > @@ -27,7 +12,7 @@ android:text="@string/label_main_user_id" /> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" > @@ -48,7 +33,7 @@ <EditText android:id="@+id/name" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:inputType="textPersonName|textCapWords" /> @@ -66,7 +51,7 @@ <EditText android:id="@+id/email" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:inputType="textEmailAddress" /> @@ -84,23 +69,29 @@ <EditText android:id="@+id/comment" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" /> </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 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/encrypt.xml b/OpenPGP-Keychain/res/layout/encrypt.xml deleted file mode 100644 index c9c6be5df..000000000 --- a/OpenPGP-Keychain/res/layout/encrypt.xml +++ /dev/null @@ -1,306 +0,0 @@ -<?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. ---> - -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:fillViewport="true" > - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingLeft="10dp" - android:paddingRight="10dp" > - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:padding="4dp" > - - <ImageView - android:id="@+id/modePrevious" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_previous" /> - - <TextView - android:id="@+id/modeLabel" - style="@style/SectionHeader" - android:layout_width="0dip" - android:layout_height="fill_parent" - android:layout_weight="1" - android:gravity="center_horizontal|center_vertical" - android:text="@string/label_asymmetric" /> - - <ImageView - android:id="@+id/modeNext" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_next" /> - </LinearLayout> - - <ViewFlipper - android:id="@+id/mode" - android:layout_width="fill_parent" - android:layout_height="wrap_content" > - - <LinearLayout - android:id="@+id/modeAsymmetric" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:padding="4dp" > - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - - <CheckBox - android:id="@+id/sign" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/label_sign" /> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingLeft="16dp" > - - <TextView - android:id="@+id/mainUserId" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:ellipsize="end" - android:singleLine="true" - android:text="Sign User Id" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <TextView - android:id="@+id/mainUserIdRest" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:ellipsize="end" - android:singleLine="true" - android:text="Sign email" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </LinearLayout> - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingBottom="3dip" > - - <TextView - android:id="@+id/label_selectPublicKeys" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_weight="1" - android:text="@string/label_select_public_keys" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <Button - 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" /> - </LinearLayout> - </LinearLayout> - - <TableLayout - android:id="@+id/modeSymmetric" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:padding="4dp" - android:stretchColumns="1" > - - <TableRow> - - <TextView - android:id="@+id/label_passPhrase" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:paddingRight="10dip" - android:text="@string/label_passphrase" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <EditText - android:id="@+id/passPhrase" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:inputType="textPassword" /> - </TableRow> - - <TableRow> - - <TextView - android:id="@+id/label_passPhraseAgain" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:paddingRight="10dip" - android:text="@string/label_passphrase_again" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <EditText - android:id="@+id/passPhraseAgain" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:inputType="textPassword" /> - </TableRow> - </TableLayout> - </ViewFlipper> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:padding="4dp" > - - <ImageView - android:id="@+id/sourcePrevious" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_previous" /> - - <TextView - android:id="@+id/sourceLabel" - style="@style/SectionHeader" - android:layout_width="0dip" - android:layout_height="fill_parent" - android:layout_weight="1" - android:gravity="center_horizontal|center_vertical" - android:text="@string/label_message" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <ImageView - android:id="@+id/sourceNext" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_next" /> - </LinearLayout> - - <ViewFlipper - android:id="@+id/source" - android:layout_width="fill_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:orientation="vertical" - android:padding="4dp" > - - <EditText - android:id="@+id/message" - android:layout_width="fill_parent" - android:layout_height="fill_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:orientation="vertical" - android:padding="4dp" > - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - - <EditText - android:id="@+id/filename" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:inputType="textNoSuggestions" /> - - <ImageButton - android:id="@+id/btn_browse" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_menu_filebrowser" /> - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - - <TextView - android:id="@+id/label_fileCompression" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_weight="1" - android:paddingRight="10dip" - android:text="@string/label_file_compression" - android:textAppearance="?android:attr/textAppearanceSmall" /> - - <Spinner - android:id="@+id/fileCompression" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" /> - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - - <CheckBox - android:id="@+id/deleteAfterEncryption" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/label_delete_after_encryption" /> - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - - <CheckBox - android:id="@+id/asciiArmour" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/label_ascii_armor" /> - </LinearLayout> - </LinearLayout> - </ViewFlipper> - </LinearLayout> - -</ScrollView>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/encrypt_activity.xml b/OpenPGP-Keychain/res/layout/encrypt_activity.xml new file mode 100644 index 000000000..eea484df2 --- /dev/null +++ b/OpenPGP-Keychain/res/layout/encrypt_activity.xml @@ -0,0 +1,307 @@ +<?xml version="1.0" encoding="utf-8"?> +<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + android:id="@+id/drawer_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" > + + <ScrollView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true" > + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingLeft="10dp" + android:paddingRight="10dp" > + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:padding="4dp" > + + <ImageView + android:id="@+id/modePrevious" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_previous" /> + + <TextView + android:id="@+id/modeLabel" + style="@style/SectionHeader" + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1" + android:gravity="center_horizontal|center_vertical" + android:text="@string/label_asymmetric" /> + + <ImageView + android:id="@+id/modeNext" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_next" /> + </LinearLayout> + + <ViewFlipper + android:id="@+id/mode" + android:layout_width="match_parent" + android:layout_height="wrap_content" > + + <LinearLayout + android:id="@+id/modeAsymmetric" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:padding="4dp" > + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <CheckBox + android:id="@+id/sign" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/label_sign" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingLeft="16dp" > + + <TextView + android:id="@+id/mainUserId" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:ellipsize="end" + android:singleLine="true" + android:text="Sign User Id" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:id="@+id/mainUserIdRest" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:ellipsize="end" + android:singleLine="true" + android:text="Sign email" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </LinearLayout> + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:paddingBottom="3dip" > + + <TextView + android:id="@+id/label_selectPublicKeys" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:text="@string/label_select_public_keys" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <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:layout_margin="4dp" + android:text="@string/btn_select_encrypt_keys" + bootstrapbutton:bb_icon_left="fa-user" + bootstrapbutton:bb_size="default" + bootstrapbutton:bb_type="default" /> + </LinearLayout> + </LinearLayout> + + <TableLayout + android:id="@+id/modeSymmetric" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="4dp" + android:stretchColumns="1" > + + <TableRow> + + <TextView + android:id="@+id/label_passPhrase" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" + android:text="@string/label_passphrase" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <EditText + android:id="@+id/passPhrase" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textPassword" /> + </TableRow> + + <TableRow> + + <TextView + android:id="@+id/label_passPhraseAgain" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" + android:text="@string/label_passphrase_again" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <EditText + android:id="@+id/passPhraseAgain" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textPassword" /> + </TableRow> + </TableLayout> + </ViewFlipper> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:padding="4dp" > + + <ImageView + android:id="@+id/sourcePrevious" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_previous" /> + + <TextView + android:id="@+id/sourceLabel" + style="@style/SectionHeader" + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1" + android:gravity="center_horizontal|center_vertical" + android:text="@string/label_message" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <ImageView + android:id="@+id/sourceNext" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_next" /> + </LinearLayout> + + <ViewFlipper + android:id="@+id/source" + android:layout_width="match_parent" + android:layout_height="0dip" + android:layout_weight="1" > + + <LinearLayout + android:id="@+id/sourceMessage" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="4dp" > + + <EditText + android:id="@+id/message" + 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="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="4dp" > + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <EditText + android:id="@+id/filename" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:inputType="textNoSuggestions" /> + + <com.beardedhen.androidbootstrap.BootstrapButton + 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" /> + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <TextView + android:id="@+id/label_fileCompression" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:paddingRight="10dip" + android:text="@string/label_file_compression" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + <Spinner + android:id="@+id/fileCompression" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" /> + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <CheckBox + android:id="@+id/deleteAfterEncryption" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/label_delete_after_encryption" /> + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <CheckBox + android:id="@+id/asciiArmour" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/label_ascii_armor" /> + </LinearLayout> + </LinearLayout> + </ViewFlipper> + </LinearLayout> + </ScrollView> + + <include layout="@layout/drawer_list" /> + +</android.support.v4.widget.DrawerLayout>
\ No newline at end of file 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/help_fragment_about.xml b/OpenPGP-Keychain/res/layout/help_about_fragment.xml index 71788e720..71788e720 100644 --- a/OpenPGP-Keychain/res/layout/help_fragment_about.xml +++ b/OpenPGP-Keychain/res/layout/help_about_fragment.xml diff --git a/OpenPGP-Keychain/res/layout/help_activity.xml b/OpenPGP-Keychain/res/layout/help_activity.xml index 89aac6476..77c62e03f 100644 --- a/OpenPGP-Keychain/res/layout/help_activity.xml +++ b/OpenPGP-Keychain/res/layout/help_activity.xml @@ -1,13 +1,20 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > - - <android.support.v4.view.ViewPager - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/pager" +<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/drawer_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" > + + <LinearLayout android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + android:orientation="vertical" > + + <android.support.v4.view.ViewPager + android:id="@+id/pager" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + </LinearLayout> + + <include layout="@layout/drawer_list" /> -</LinearLayout>
\ No newline at end of file +</android.support.v4.widget.DrawerLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/import_keys.xml b/OpenPGP-Keychain/res/layout/import_keys.xml deleted file mode 100644 index ae391e2fd..000000000 --- a/OpenPGP-Keychain/res/layout/import_keys.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" > - - <FrameLayout - android:id="@+id/import_navigation_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:orientation="vertical" - android:paddingLeft="4dp" - android:paddingRight="4dp" /> - - <LinearLayout - android:id="@+id/import_footer" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:orientation="vertical" - android:paddingLeft="10dp" - android:paddingRight="10dp" > - - <Button - android:id="@+id/import_import" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:onClick="importOnClick" - android:text="@string/import_import" /> - - <Button - 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" /> - </LinearLayout> - - <FrameLayout - android:id="@+id/import_keys_list_container" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_above="@+id/import_footer" - android:layout_alignParentLeft="true" - android:layout_below="@+id/import_navigation_fragment" - android:orientation="vertical" - android:paddingLeft="4dp" - android:paddingRight="4dp" /> - -</RelativeLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/import_keys_activity.xml b/OpenPGP-Keychain/res/layout/import_keys_activity.xml new file mode 100644 index 000000000..c2217d2ec --- /dev/null +++ b/OpenPGP-Keychain/res/layout/import_keys_activity.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="utf-8"?> +<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + android:id="@+id/drawer_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" > + + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" > + + <FrameLayout + android:id="@+id/import_navigation_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:orientation="vertical" + android:paddingLeft="4dp" + android:paddingRight="4dp" /> + + <LinearLayout + android:id="@+id/import_footer" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:orientation="vertical" + android:paddingLeft="10dp" + android:paddingRight="10dp" > + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/import_import" + android:layout_width="match_parent" + android:layout_height="60dp" + android:padding="4dp" + android:text="@string/import_import" + bootstrapbutton:bb_icon_left="fa-download" + bootstrapbutton:bb_type="info" /> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/import_sign_and_upload" + android:layout_width="match_parent" + android:layout_height="60dp" + android:padding="4dp" + android:text="@string/import_sign_and_upload" + bootstrapbutton:bb_type="info" /> + </LinearLayout> + + <FrameLayout + android:id="@+id/import_keys_list_container" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_above="@+id/import_footer" + android:layout_alignParentLeft="true" + android:layout_below="@+id/import_navigation_fragment" + android:orientation="vertical" + android:paddingLeft="4dp" + android:paddingRight="4dp" /> + </RelativeLayout> + + <include layout="@layout/drawer_list" /> + +</android.support.v4.widget.DrawerLayout>
\ No newline at end of file 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_child_item.xml b/OpenPGP-Keychain/res/layout/key_list_child_item.xml deleted file mode 100644 index 81d843529..000000000 --- a/OpenPGP-Keychain/res/layout/key_list_child_item.xml +++ /dev/null @@ -1,102 +0,0 @@ -<?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" - android:layout_width="fill_parent" - android:layout_height="?android:attr/listPreferredItemHeight" - android:layout_marginRight="?android:attr/scrollbarSize" - android:orientation="vertical" - android:singleLine="true" > - - <LinearLayout - android:id="@+id/keyLayout" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingLeft="8dip" - android:paddingRight="3dip" > - - <ImageView - android:id="@+id/ic_masterKey" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:paddingRight="6dip" - android:src="@drawable/key_small" /> - - <TextView - android:id="@+id/keyId" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingRight="5dip" - android:text="Key ID" - android:textAppearance="?android:attr/textAppearanceMedium" - android:typeface="monospace" /> - - <TextView - android:id="@+id/keyDetails" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="(RSA, 1024bit)" - android:textAppearance="?android:attr/textAppearanceSmall" /> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_gravity="center_vertical" - android:gravity="right" - android:orientation="horizontal" - android:paddingBottom="2dip" - android:paddingTop="2dip" > - - <ImageView - android:id="@+id/ic_certifyKey" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/certify_small" /> - - <ImageView - android:id="@+id/ic_encryptKey" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/encrypted_small" /> - - <ImageView - android:id="@+id/ic_signKey" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/signed_small" /> - </LinearLayout> - </LinearLayout> - - <LinearLayout - android:id="@+id/userIdLayout" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingLeft="36dip" - android:singleLine="true" > - - <TextView - android:id="@+id/userId" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingRight="3dip" - android:text="User ID" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </LinearLayout> - -</LinearLayout> diff --git a/OpenPGP-Keychain/res/layout/key_list_group_item.xml b/OpenPGP-Keychain/res/layout/key_list_item.xml index 240be54b0..2571bb6e7 100644 --- a/OpenPGP-Keychain/res/layout/key_list_group_item.xml +++ b/OpenPGP-Keychain/res/layout/key_list_item.xml @@ -1,26 +1,10 @@ <?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" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:layout_marginRight="?android:attr/scrollbarSize" android:orientation="vertical" - android:paddingLeft="36dip" + android:paddingLeft="8dp" android:singleLine="true" > <TextView diff --git a/OpenPGP-Keychain/res/layout/key_list_public_activity.xml b/OpenPGP-Keychain/res/layout/key_list_public_activity.xml index a35e23038..f0e843e56 100644 --- a/OpenPGP-Keychain/res/layout/key_list_public_activity.xml +++ b/OpenPGP-Keychain/res/layout/key_list_public_activity.xml @@ -1,25 +1,20 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/drawer_layout" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" > + android:layout_height="match_parent" > - <fragment - android:id="@+id/key_list_public_fragment" - android:name="org.sufficientlysecure.keychain.ui.KeyListPublicFragment" + <FrameLayout android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_weight="1" /> + android:layout_height="match_parent" > - <TextView - android:layout_width="match_parent" - android:layout_height="90dp" - android:layout_weight="1" - android:background="@drawable/abs__ab_bottom_solid_light_holo" - android:paddingBottom="3dp" - android:paddingLeft="10dp" - android:paddingRight="10dp" - android:paddingTop="3dp" - android:text="@string/list_information" /> + <fragment + android:id="@+id/key_list_public_fragment" + android:name="org.sufficientlysecure.keychain.ui.KeyListPublicFragment" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + </FrameLayout> + + <include layout="@layout/drawer_list" /> -</LinearLayout>
\ No newline at end of file +</android.support.v4.widget.DrawerLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml b/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml new file mode 100644 index 000000000..828809601 --- /dev/null +++ b/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml @@ -0,0 +1,75 @@ +<?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" > + + <se.emilsjolander.stickylistheaders.StickyListHeadersListView + android:id="@+id/list" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:clipToPadding="false" + android:drawSelectorOnTop="true" + android:fastScrollEnabled="true" + android:paddingBottom="16dp" + android:paddingLeft="16dp" + android:paddingRight="32dp" + android:scrollbarStyle="outsideOverlay" /> + + <LinearLayout + android:id="@+id/empty" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center" + android:orientation="vertical" + android:visibility="gone" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center" + android:text="@string/key_list_empty_text1" + android:textAppearance="?android:attr/textAppearanceLarge" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center" + android:text="" + android:textAppearance="?android:attr/textAppearanceLarge" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center" + android:text="@string/key_list_empty_text2" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + <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" + bootstrapbutton:bb_icon_left="fa-plus" + bootstrapbutton:bb_type="default" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center" + android:text="@string/key_list_empty_text3" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + <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" + 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_list_public_header.xml b/OpenPGP-Keychain/res/layout/key_list_public_header.xml new file mode 100644 index 000000000..5768e4153 --- /dev/null +++ b/OpenPGP-Keychain/res/layout/key_list_public_header.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" > + + <org.sufficientlysecure.keychain.ui.widget.UnderlineTextView + android:id="@+id/stickylist_header_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="start|left" + android:padding="8dp" + android:textColor="@color/emphasis" + android:textSize="17sp" + android:textStyle="bold" /> + +</RelativeLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/key_list_secret_activity.xml b/OpenPGP-Keychain/res/layout/key_list_secret_activity.xml index d4397c444..13370f2e5 100644 --- a/OpenPGP-Keychain/res/layout/key_list_secret_activity.xml +++ b/OpenPGP-Keychain/res/layout/key_list_secret_activity.xml @@ -1,25 +1,20 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/drawer_layout" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" > + android:layout_height="match_parent" > - <fragment - android:id="@+id/key_list_secret_fragment" - android:name="org.sufficientlysecure.keychain.ui.KeyListSecretFragment" + <FrameLayout android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_weight="1" /> + android:layout_height="match_parent" > - <TextView - android:layout_width="match_parent" - android:layout_height="90dp" - android:layout_weight="1" - android:background="@drawable/abs__ab_bottom_solid_light_holo" - android:paddingBottom="3dp" - android:paddingLeft="10dp" - android:paddingRight="10dp" - android:paddingTop="3dp" - android:text="@string/list_information" /> + <fragment + android:id="@+id/key_list_secret_fragment" + android:name="org.sufficientlysecure.keychain.ui.KeyListSecretFragment" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + </FrameLayout> + + <include layout="@layout/drawer_list" /> -</LinearLayout>
\ No newline at end of file +</android.support.v4.widget.DrawerLayout>
\ 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_export.xml b/OpenPGP-Keychain/res/layout/key_server_export.xml new file mode 100644 index 000000000..30e4e0644 --- /dev/null +++ b/OpenPGP-Keychain/res/layout/key_server_export.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" > + + <Spinner + android:id="@+id/keyServer" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + + <Button + android:id="@+id/btn_export_to_server" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/btn_export_to_server" /> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/key_server_export_layout.xml b/OpenPGP-Keychain/res/layout/key_server_export_layout.xml deleted file mode 100644 index 257f087ee..000000000 --- a/OpenPGP-Keychain/res/layout/key_server_export_layout.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?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" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > - - <Spinner - android:id="@+id/keyServer" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - - <Button - android:id="@+id/btn_export_to_server" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/btn_export_to_server" /> - -</LinearLayout>
\ 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_server_query_layout.xml b/OpenPGP-Keychain/res/layout/key_server_query.xml index 5eca10c45..20f260a95 100644 --- a/OpenPGP-Keychain/res/layout/key_server_query_layout.xml +++ b/OpenPGP-Keychain/res/layout/key_server_query.xml @@ -1,32 +1,16 @@ <?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" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" > <Spinner android:id="@+id/keyServer" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" > @@ -49,7 +33,7 @@ <ListView android:id="@+id/list" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" /> diff --git a/OpenPGP-Keychain/res/layout/key_server_query_result_item.xml b/OpenPGP-Keychain/res/layout/key_server_query_result_item.xml index 29c8b88f4..6d883d26d 100644 --- a/OpenPGP-Keychain/res/layout/key_server_query_result_item.xml +++ b/OpenPGP-Keychain/res/layout/key_server_query_result_item.xml @@ -1,97 +1,77 @@ <?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" - android:singleLine="true" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" android:paddingLeft="3dip" android:paddingRight="?android:attr/scrollbarSize" - android:layout_height="wrap_content" - android:layout_width="fill_parent" - android:orientation="vertical"> + android:singleLine="true" > <LinearLayout - android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="wrap_content"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > <LinearLayout - android:orientation="vertical" - android:paddingLeft="5dip" - android:paddingRight="5dip" android:layout_width="0dip" android:layout_height="wrap_content" - android:layout_weight="1"> + android:layout_weight="1" + android:orientation="vertical" + android:paddingLeft="5dip" + android:paddingRight="5dip" > <TextView android:id="@+id/mainUserId" - android:text="Main User ID" - android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="wrap_content" - android:layout_height="wrap_content"/> + android:layout_height="wrap_content" + android:text="Main User ID" + android:textAppearance="?android:attr/textAppearanceMedium" /> <TextView android:id="@+id/mainUserIdRest" - android:text="<user@somewhere.com>" - android:textAppearance="?android:attr/textAppearanceSmall" android:layout_width="wrap_content" - android:layout_height="wrap_content"/> - + android:layout_height="wrap_content" + android:text="<user@somewhere.com>" + android:textAppearance="?android:attr/textAppearanceSmall" /> </LinearLayout> <LinearLayout - android:orientation="vertical" - android:minWidth="90dip" - android:paddingLeft="3dip" - android:gravity="right" android:layout_width="wrap_content" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:gravity="right" + android:minWidth="90dip" + android:orientation="vertical" + android:paddingLeft="3dip" > <TextView android:id="@+id/keyId" + android:layout_width="wrap_content" + android:layout_height="match_parent" android:text="BBBBBBBB" android:textAppearance="?android:attr/textAppearanceSmall" - android:typeface="monospace" - android:layout_width="wrap_content" - android:layout_height="fill_parent"/> + android:typeface="monospace" /> <TextView android:id="@+id/algorithm" - android:textAppearance="?android:attr/textAppearanceSmall" android:layout_width="wrap_content" - android:layout_height="wrap_content"/> + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceSmall" /> <TextView android:id="@+id/status" - android:textAppearance="?android:attr/textAppearanceSmall" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="#e00"/> - + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="#e00" /> </LinearLayout> - </LinearLayout> <LinearLayout android:id="@+id/list" - android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="30dip"> - + android:layout_marginLeft="30dip" + android:orientation="vertical" > </LinearLayout> -</LinearLayout> +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/key_server_query_result_user_id.xml b/OpenPGP-Keychain/res/layout/key_server_query_result_user_id.xml index 9d3a4a1ab..c69735e67 100644 --- a/OpenPGP-Keychain/res/layout/key_server_query_result_user_id.xml +++ b/OpenPGP-Keychain/res/layout/key_server_query_result_user_id.xml @@ -1,26 +1,10 @@ <?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. ---> - -<TextView - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_marginRight="?android:attr/scrollbarSize" - android:singleLine="true" +<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" - android:paddingRight="3dip"> + android:layout_marginRight="?android:attr/scrollbarSize" + android:paddingRight="3dip" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceSmall" > -</TextView> +</TextView>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/main.xml b/OpenPGP-Keychain/res/layout/main.xml deleted file mode 100644 index 71967271b..000000000 --- a/OpenPGP-Keychain/res/layout/main.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?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" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > - - <org.sufficientlysecure.keychain.ui.widget.DashboardLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" > - - <Button - android:id="@+id/dashboard_manage_keys" - style="@style/DashboardButton" - android:drawableTop="@drawable/dashboard_manage_keys" - android:onClick="manageKeysOnClick" - android:text="@string/dashboard_manage_keys" /> - - <Button - android:id="@+id/dashboard_my_keys" - style="@style/DashboardButton" - android:drawableTop="@drawable/dashboard_my_keys" - android:onClick="myKeysOnClick" - android:text="@string/dashboard_my_keys" /> - - <Button - android:id="@+id/dashboard_encrypt" - style="@style/DashboardButton" - android:drawableTop="@drawable/dashboard_encrypt" - android:onClick="encryptOnClick" - android:text="@string/dashboard_encrypt" /> - - <Button - android:id="@+id/dashboard_decrypt" - style="@style/DashboardButton" - android:drawableTop="@drawable/dashboard_decrypt" - android:onClick="decryptOnClick" - android:text="@string/dashboard_decrypt" /> - - <Button - android:id="@+id/dashboard_scan_qrcode" - style="@style/DashboardButton" - android:drawableTop="@drawable/dashboard_import" - android:onClick="scanQrcodeOnClick" - android:text="@string/dashboard_import_keys" /> - - <Button - android:id="@+id/dashboard_help" - style="@style/DashboardButton" - android:drawableTop="@drawable/dashboard_help" - android:onClick="helpOnClick" - android:text="@string/dashboard_help" /> - </org.sufficientlysecure.keychain.ui.widget.DashboardLayout> - -</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/passphrase.xml b/OpenPGP-Keychain/res/layout/passphrase.xml deleted file mode 100644 index 778ae6b80..000000000 --- a/OpenPGP-Keychain/res/layout/passphrase.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?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" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingLeft="16dp" - android:paddingRight="16dp" > - - <TextView - android:id="@+id/passphrase_label_passphrase" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:padding="4dp" - android:text="@string/label_passphrase" /> - - <EditText - android:id="@+id/passphrase_passphrase" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:imeOptions="actionDone" - android:inputType="textPassword" - android:padding="4dp" /> - -</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/passphrase_dialog.xml b/OpenPGP-Keychain/res/layout/passphrase_dialog.xml new file mode 100644 index 000000000..4b331f0f2 --- /dev/null +++ b/OpenPGP-Keychain/res/layout/passphrase_dialog.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="16dp" + android:paddingRight="16dp" > + + <TextView + android:id="@+id/passphrase_label_passphrase" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:padding="4dp" + android:text="@string/label_passphrase" /> + + <EditText + android:id="@+id/passphrase_passphrase" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:padding="4dp" /> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/passphrase_repeat.xml b/OpenPGP-Keychain/res/layout/passphrase_repeat_dialog.xml index 1eef4eb68..2bdd231ee 100644 --- a/OpenPGP-Keychain/res/layout/passphrase_repeat.xml +++ b/OpenPGP-Keychain/res/layout/passphrase_repeat_dialog.xml @@ -1,22 +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. ---> - <TableLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingLeft="16dp" android:paddingRight="16dp" @@ -34,7 +18,7 @@ <EditText android:id="@+id/passphrase_passphrase" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="textPassword" android:padding="4dp" /> @@ -52,7 +36,7 @@ <EditText android:id="@+id/passphrase_passphrase_again" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:imeOptions="actionDone" android:inputType="textPassword" diff --git a/OpenPGP-Keychain/res/layout/select_key_item.xml b/OpenPGP-Keychain/res/layout/select_key_item.xml index d5b1655ed..bbfe17c44 100644 --- a/OpenPGP-Keychain/res/layout/select_key_item.xml +++ b/OpenPGP-Keychain/res/layout/select_key_item.xml @@ -1,22 +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" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:paddingLeft="3dip" android:paddingRight="?android:attr/scrollbarSize" @@ -63,7 +47,7 @@ <TextView android:id="@+id/keyId" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="match_parent" android:text="BBBBBBBB" android:textAppearance="?android:attr/textAppearanceSmall" android:typeface="monospace" /> diff --git a/OpenPGP-Keychain/res/layout/share_nfc_beam.xml b/OpenPGP-Keychain/res/layout/share_nfc_beam.xml deleted file mode 100644 index 692f53e4e..000000000 --- a/OpenPGP-Keychain/res/layout/share_nfc_beam.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > - - <org.sufficientlysecure.htmltextview.HtmlTextView - android:id="@+id/nfc_beam_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="16dp" - android:text="" /> - -</ScrollView>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/share_qr_code_dialog.xml b/OpenPGP-Keychain/res/layout/share_qr_code_dialog.xml index 88b06b698..66102d3e5 100644 --- a/OpenPGP-Keychain/res/layout/share_qr_code_dialog.xml +++ b/OpenPGP-Keychain/res/layout/share_qr_code_dialog.xml @@ -1,20 +1,4 @@ <?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" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/OpenPGP-Keychain/res/layout/sign_key_activity.xml b/OpenPGP-Keychain/res/layout/sign_key_activity.xml new file mode 100644 index 000000000..b9f66db7f --- /dev/null +++ b/OpenPGP-Keychain/res/layout/sign_key_activity.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" > + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <TextView + android:id="@+id/textView1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/label_send_key" + android:textAppearance="?android:attr/textAppearanceMedium" > + </TextView> + + <CheckBox + android:id="@+id/sendKey" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:checked="true" + android:text="" > + </CheckBox> + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <Spinner + android:id="@+id/keyServer" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" /> + </LinearLayout> + + <Button + android:id="@+id/sign" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/btn_sign" > + </Button> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/sign_key_layout.xml b/OpenPGP-Keychain/res/layout/sign_key_layout.xml deleted file mode 100644 index 4530831ee..000000000 --- a/OpenPGP-Keychain/res/layout/sign_key_layout.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?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" - android:layout_width="fill_parent" android:layout_height="fill_parent" - android:orientation="vertical"> - - <LinearLayout android:layout_width="fill_parent" - android:layout_height="wrap_content" android:orientation="horizontal"> - </LinearLayout> - - <LinearLayout android:layout_width="fill_parent" - android:layout_height="wrap_content" android:orientation="horizontal"> - - <TextView android:id="@+id/textView1" android:layout_height="wrap_content" - android:text="@string/label_send_key" android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="wrap_content"></TextView> - <CheckBox android:text="" android:id="@+id/sendKey" - android:layout_width="wrap_content" android:layout_height="wrap_content" - android:checked="true"></CheckBox> - </LinearLayout> - - <LinearLayout android:layout_width="fill_parent" - android:layout_height="wrap_content" android:orientation="horizontal"> - - <Spinner android:id="@+id/keyServer" android:layout_width="wrap_content" - android:layout_height="wrap_content" android:layout_weight="1" /> - </LinearLayout> - - <Button android:layout_height="wrap_content" - android:layout_width="wrap_content" android:text="@string/btn_sign" - android:id="@+id/sign"></Button> - -</LinearLayout> diff --git a/OpenPGP-Keychain/res/layout/view_key_activity.xml b/OpenPGP-Keychain/res/layout/view_key_activity.xml new file mode 100644 index 000000000..babec70f6 --- /dev/null +++ b/OpenPGP-Keychain/res/layout/view_key_activity.xml @@ -0,0 +1,216 @@ +<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" > + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginRight="?android:attr/scrollbarSize" + android:orientation="vertical" + android:paddingLeft="16dp" + android:paddingRight="16dp" > + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="4dp" + android:text="@string/section_master_user_id" /> + + <TableLayout + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_weight="1" + android:stretchColumns="1" > + + <TableRow> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" + android:text="@string/label_name" /> + + <TextView + android:id="@+id/name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="5dip" + android:text="" /> + </TableRow> + + <TableRow> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" + android:text="@string/label_email" /> + + <TextView + android:id="@+id/email" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="5dip" + android:text="" /> + </TableRow> + + <TableRow> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" + android:text="@string/label_comment" /> + + <TextView + android:id="@+id/comment" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="5dip" + android:text="" /> + </TableRow> + </TableLayout> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="4dp" + android:text="@string/section_master_key" /> + + <TableLayout + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_weight="1" + android:stretchColumns="1" > + + <TableRow> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" + android:text="@string/label_key_id" /> + + <TextView + android:id="@+id/key_id" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="5dip" + android:text="" + android:typeface="monospace" /> + </TableRow> + + <TableRow> + + <TextView + android:id="@+id/label_algorithm" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" + android:text="@string/label_algorithm" /> + + <TextView + android:id="@+id/algorithm" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="5dip" + android:text="" /> + </TableRow> + + <TableRow> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" + android:text="@string/label_creation" /> + + <TextView + android:id="@+id/creation" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + </TableRow> + + <TableRow> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" + android:text="@string/label_expiry" /> + + <TextView + android:id="@+id/expiry" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + </TableRow> + + <TableRow> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" + android:text="@string/label_fingerprint" /> + + <TextView + android:id="@+id/fingerprint" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:typeface="monospace" /> + </TableRow> + </TableLayout> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="4dp" + android:text="@string/section_user_ids" /> + + <org.sufficientlysecure.keychain.ui.widget.FixedListView + android:id="@+id/user_ids" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="4dp" + android:text="@string/section_keys" /> + + <org.sufficientlysecure.keychain.ui.widget.FixedListView + android:id="@+id/keys" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="4dp" + android:text="@string/section_actions" /> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/action_encrypt" + android:layout_width="match_parent" + 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> + +</ScrollView>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/view_key_keys_item.xml b/OpenPGP-Keychain/res/layout/view_key_keys_item.xml new file mode 100644 index 000000000..b50253980 --- /dev/null +++ b/OpenPGP-Keychain/res/layout/view_key_keys_item.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="?android:attr/listPreferredItemHeight" + android:layout_marginRight="?android:attr/scrollbarSize" + android:orientation="horizontal" + android:paddingLeft="8dip" + android:paddingRight="3dip" + android:singleLine="true" > + + <ImageView + android:id="@+id/ic_masterKey" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="6dip" + android:src="@drawable/key_small" /> + + <TextView + android:id="@+id/keyId" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="5dip" + android:text="Key ID" + android:textAppearance="?android:attr/textAppearanceMedium" + android:typeface="monospace" /> + + <TextView + android:id="@+id/keyDetails" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="(RSA, 1024bit)" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center_vertical" + android:gravity="right" + android:orientation="horizontal" + android:paddingBottom="2dip" + android:paddingTop="2dip" > + + <ImageView + android:id="@+id/ic_certifyKey" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/certify_small" /> + + <ImageView + android:id="@+id/ic_encryptKey" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/encrypted_small" /> + + <ImageView + android:id="@+id/ic_signKey" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/signed_small" /> + </LinearLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/view_key_userids_item.xml b/OpenPGP-Keychain/res/layout/view_key_userids_item.xml new file mode 100644 index 000000000..2d022ba13 --- /dev/null +++ b/OpenPGP-Keychain/res/layout/view_key_userids_item.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="?android:attr/listPreferredItemHeight" + android:layout_marginRight="?android:attr/scrollbarSize" + android:orientation="vertical" + android:singleLine="true" > + + <TextView + android:id="@+id/userId" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="3dip" + android:text="User ID" + android:textAppearance="?android:attr/textAppearanceSmall" /> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/menu/key_edit.xml b/OpenPGP-Keychain/res/menu/key_edit.xml new file mode 100644 index 000000000..38c52e7f0 --- /dev/null +++ b/OpenPGP-Keychain/res/menu/key_edit.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" > + + <item + android:id="@+id/menu_key_edit_export_file" + android:showAsAction="never" + android:title="@string/menu_export_key"/> + <item + android:id="@+id/menu_key_edit_delete" + android:showAsAction="never" + android:title="@string/menu_delete_key"/> + <item + android:id="@+id/menu_key_edit_cancel" + android:showAsAction="never" + android:title="@string/menu_key_edit_cancel"/> + +</menu>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/menu/key_list_public.xml b/OpenPGP-Keychain/res/menu/key_list_public.xml new file mode 100644 index 000000000..7b6261558 --- /dev/null +++ b/OpenPGP-Keychain/res/menu/key_list_public.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" > + + <item + android:id="@+id/menu_key_list_public_import" + android:showAsAction="always|withText" + android:title="@string/menu_import"/> + <item + android:id="@+id/menu_key_list_public_export" + android:showAsAction="never" + android:title="@string/menu_export_keys"/> + +</menu>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/menu/key_list_public_multi.xml b/OpenPGP-Keychain/res/menu/key_list_public_multi.xml new file mode 100644 index 000000000..92481e9cb --- /dev/null +++ b/OpenPGP-Keychain/res/menu/key_list_public_multi.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" > + + <item + android:id="@+id/menu_key_list_public_multi_encrypt" + android:title="@string/menu_encrypt_to"/> + <item + android:id="@+id/menu_key_list_public_multi_delete" + android:icon="@android:drawable/ic_menu_delete" + android:title="@string/menu_delete_key"/> + +</menu>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/menu/key_list_secret.xml b/OpenPGP-Keychain/res/menu/key_list_secret.xml new file mode 100644 index 000000000..c610eda35 --- /dev/null +++ b/OpenPGP-Keychain/res/menu/key_list_secret.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" > + + <item + android:id="@+id/menu_key_list_secret_create" + android:showAsAction="always|withText" + android:title="@string/menu_create_key"/> + <item + android:id="@+id/menu_key_list_secret_create_expert" + android:showAsAction="never" + android:title="@string/menu_create_key_expert"/> + <item + android:id="@+id/menu_key_list_secret_import" + android:showAsAction="never" + android:title="@string/menu_import"/> + <item + android:id="@+id/menu_key_list_secret_export" + android:showAsAction="never" + android:title="@string/menu_export_keys"/> + +</menu>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/menu/key_list_secret_multi.xml b/OpenPGP-Keychain/res/menu/key_list_secret_multi.xml new file mode 100644 index 000000000..a10d1e2fa --- /dev/null +++ b/OpenPGP-Keychain/res/menu/key_list_secret_multi.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" > + + <item + android:id="@+id/menu_key_list_public_multi_delete" + android:icon="@android:drawable/ic_menu_delete" + android:title="@string/menu_delete_key"/> + +</menu>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/menu/key_view.xml b/OpenPGP-Keychain/res/menu/key_view.xml new file mode 100644 index 000000000..1078cd937 --- /dev/null +++ b/OpenPGP-Keychain/res/menu/key_view.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" > + + <item + android:id="@+id/menu_key_view_share" + android:icon="@android:drawable/ic_menu_share" + android:showAsAction="always" + android:title="@string/menu_share"> + <menu> + <item + android:id="@+id/menu_key_view_share_default" + android:showAsAction="never" + android:title="@string/menu_share"/> + <item + android:id="@+id/menu_key_view_share_qr_code" + android:showAsAction="never" + android:title="@string/menu_share_qr_code"/> + <item + android:id="@+id/menu_key_view_share_nfc" + android:showAsAction="never" + android:title="@string/menu_share_nfc"/> + <item + android:id="@+id/menu_key_view_share_clipboard" + android:showAsAction="never" + android:title="@string/menu_copy_to_clipboard"/> + </menu> + </item> + <item + android:id="@+id/menu_key_keyserver" + android:icon="@android:drawable/ic_menu_upload" + android:showAsAction="always" + android:title="@string/menu_share"> + <menu> + <item + android:id="@+id/menu_key_view_update" + android:showAsAction="never" + android:title="@string/menu_update_key"/> + <item + android:id="@+id/menu_key_view_export_keyserver" + android:showAsAction="never" + android:title="@string/menu_export_key_to_server"/> + </menu> + </item> + <item + android:id="@+id/menu_key_view_sign" + android:showAsAction="never" + android:title="@string/menu_sign_key"/> + <item + android:id="@+id/menu_key_view_export_file" + android:showAsAction="never" + android:title="@string/menu_export_key"/> + <item + android:id="@+id/menu_key_view_delete" + android:showAsAction="never" + android:title="@string/menu_delete_key"/> + +</menu>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/menu/nfc_beam.xml b/OpenPGP-Keychain/res/menu/nfc_beam.xml deleted file mode 100644 index e1c088b86..000000000 --- a/OpenPGP-Keychain/res/menu/nfc_beam.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > - - <item - android:id="@+id/menu_settings" - android:icon="@drawable/ic_menu_settings" - android:showAsAction="always|withText" - android:title="@string/menu_beam_preferences"/> - -</menu>
\ 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 0ed0d3b05..54af42b16 100644 --- a/OpenPGP-Keychain/res/raw/help_about.html +++ b/OpenPGP-Keychain/res/raw/help_about.html @@ -12,13 +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 (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> @@ -26,7 +28,9 @@ And don't add newlines before or after p tags because of transifex --> <h2>Libraries</h2> <ul> <li><a href="http://actionbarsherlock.com">ActionBarSherlock</a> (Apache License v2)</li> -<li><a href="http://code.google.com/p/zxing/">ZXing QRCode Integration</a> (Apache License v2)</li> +<li><a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li> +<li><a href="https://github.com/Bearded-Hen/Android-Bootstrap">Android-Bootstrap</a> (MIT License)</li> +<li><a href="http://code.google.com/p/zxing/">ZXing</a> (Apache License v2)</li> <li><a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li> <li><a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache License v2)</li> <li>Icons from <a href="http://rrze-icon-set.berlios.de/">RRZE Icon Set</a> (Creative Commons Attribution Share-Alike licence 3.0)</li> diff --git a/OpenPGP-Keychain/res/values-sw600dp/dimens.xml b/OpenPGP-Keychain/res/values-sw600dp/dimens.xml new file mode 100644 index 000000000..1ba777d65 --- /dev/null +++ b/OpenPGP-Keychain/res/values-sw600dp/dimens.xml @@ -0,0 +1,8 @@ +<resources> + + <!-- + Customize dimensions originally defined in res/values/dimens.xml (such as + screen margins) for sw600dp devices (e.g. 7" tablets) here. + --> + +</resources>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/values-sw720dp-land/dimens.xml b/OpenPGP-Keychain/res/values-sw720dp-land/dimens.xml new file mode 100644 index 000000000..eee741a51 --- /dev/null +++ b/OpenPGP-Keychain/res/values-sw720dp-land/dimens.xml @@ -0,0 +1,9 @@ +<resources> + + <!-- + Customize dimensions originally defined in res/values/dimens.xml (such as + screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here. + --> + <dimen name="activity_horizontal_margin">128dp</dimen> + +</resources>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/values/colors.xml b/OpenPGP-Keychain/res/values/colors.xml index d1dc6c1f4..780137181 100644 --- a/OpenPGP-Keychain/res/values/colors.xml +++ b/OpenPGP-Keychain/res/values/colors.xml @@ -3,5 +3,5 @@ <color name="emphasis">#31b6e7</color> <color name="bg_gray">#cecbce</color> - + </resources>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/values/dimens.xml b/OpenPGP-Keychain/res/values/dimens.xml new file mode 100644 index 000000000..a6dd14032 --- /dev/null +++ b/OpenPGP-Keychain/res/values/dimens.xml @@ -0,0 +1,7 @@ +<resources> + + <!-- Default screen margins, per the Android Design guidelines. --> + <dimen name="activity_horizontal_margin">16dp</dimen> + <dimen name="activity_vertical_margin">16dp</dimen> + +</resources>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml index 807daaeb4..87f7c5a8f 100644 --- a/OpenPGP-Keychain/res/values/strings.xml +++ b/OpenPGP-Keychain/res/values/strings.xml @@ -19,8 +19,8 @@ <resources> <!-- title --> - <string name="title_manage_public_keys">Manage Public Keys</string> - <string name="title_manage_secret_keys">Manage Secret Keys</string> + <string name="title_manage_public_keys">Contacts</string> + <string name="title_manage_secret_keys">Secret Keys</string> <string name="title_select_recipients">Select Public Key</string> <string name="title_select_secret_key">Select Secret Key</string> <string name="title_encrypt">Encrypt</string> @@ -44,6 +44,7 @@ <string name="title_send_key">Export to Key Server</string> <string name="title_unknown_signature_key">Unknown Signature Key</string> <string name="title_sign_key">Sign Key</string> + <string name="title_key_details">Key Details</string> <string name="title_help">Help</string> <string name="title_share_by_nfc">Share key with NFC</string> @@ -53,6 +54,9 @@ <string name="section_general">General</string> <string name="section_defaults">Defaults</string> <string name="section_advanced">Advanced</string> + <string name="section_master_key">Master Key</string> + <string name="section_master_user_id">Master User ID</string> + <string name="section_actions">Actions</string> <!-- button --> <string name="btn_sign_to_clipboard">Sign (Clipboard)</string> @@ -78,9 +82,11 @@ <!-- menu --> <string name="menu_preferences">Settings</string> + <string name="menu_help">Help</string> <string name="menu_api_app_settings">Registered Apps</string> <string name="menu_import_from_file">Import from file</string> <string name="menu_import_from_qr_code">Import from QR Code</string> + <string name="menu_import">Import</string> <string name="menu_import_from_nfc">Import from NFC</string> <string name="menu_export_keys">Export all keys</string> <string name="menu_export_key">Export to file</string> @@ -95,8 +101,11 @@ <string name="menu_share">Share with…</string> <string name="menu_share_qr_code">Share with QR Code</string> <string name="menu_share_nfc">Share with NFC</string> + <string name="menu_copy_to_clipboard">Copy to clipboard</string> <string name="menu_sign_key">Sign key</string> <string name="menu_beam_preferences">Beam settings</string> + <string name="menu_key_edit_cancel">Cancel</string> + <string name="menu_encrypt_to">Encrypt to…</string> <!-- label --> <string name="label_sign">Sign</string> @@ -129,6 +138,7 @@ <string name="label_comment">Comment</string> <string name="label_email">Email</string> <string name="label_send_key">Send Key to Server?</string> + <string name="label_fingerprint">Fingerprint</string> <string name="no_keys_selected">Select</string> <string name="one_key_selected">1 Selected</string> <string name="n_keys_selected">Selected</string> @@ -142,6 +152,8 @@ <string name="n_key_servers">%s key server(s)</string> <string name="fingerprint">Fingerprint:</string> <string name="secret_key">Secret Key:</string> + <string name="notValid">not valid</string> + <string name="secretKeyring">Secret Keyring</string> <!-- choice --> <string name="choice_none">None</string> @@ -190,6 +202,7 @@ <string name="specify_file_to_export_to">Please specify which file to export to.\nWARNING! File will be overwritten if it exists.</string> <string name="specify_file_to_export_secret_keys_to">Please specify which file to export to.\nWARNING! You are about to export SECRET keys.\nWARNING! File will be overwritten if it exists.</string> <string name="key_deletion_confirmation">Do you really want to delete the key \'%s\'?\nYou can\'t undo this!</string> + <string name="key_deletion_confirmation_multi">Do you really want to delete all selected keys?\nYou can\'t undo this!</string> <string name="secret_key_deletion_confirmation">Do you really want to delete the SECRET key \'%s\'?\nYou can\'t undo this!</string> <string name="keys_added_and_updated">Successfully added %1$s key(s) and updated %2$s key(s).</string> <string name="keys_added">Successfully added %s key(s).</string> @@ -206,7 +219,6 @@ <string name="lookup_unknown_key">Unknown key %s, do you want to try finding it on a keyserver?</string> <string name="key_send_success">Successfully sent key to server</string> <string name="key_sign_success">Successfully signed key</string> - <string name="list_information">Long press one entry in this list to show more options!</string> <string name="list_empty">This list is empty!</string> <string name="nfc_successfull">Successfully sent key with NFC Beam!</string> @@ -292,7 +304,7 @@ <string name="compression_very_slow">very slow</string> <!-- Dashboard --> - <string name="dashboard_manage_keys">Manage Public Keys</string> + <string name="dashboard_manage_keys">Contacts</string> <string name="dashboard_my_keys">My Secret Keys</string> <string name="dashboard_encrypt">Encrypt</string> <string name="dashboard_decrypt">Decrypt</string> @@ -322,8 +334,8 @@ <!-- Remote API --> <string name="api_no_apps">No registered applications!</string> - <string name="api_settings_show_advanced">Show advanced settings…</string> - <string name="api_settings_hide_advanced">Hide advanced settings…</string> + <string name="api_settings_show_advanced">Show advanced settings</string> + <string name="api_settings_hide_advanced">Hide advanced settings</string> <string name="api_settings_no_key">No key selected</string> <string name="api_settings_select_key">Select key</string> <string name="api_settings_save">Save</string> @@ -343,5 +355,31 @@ <!-- Share --> <string name="share_qr_code_dialog_start">Go through all QR Codes using \'Next\', and scan them one by one.</string> <string name="share_qr_code_dialog_progress">QR Code %1$d of %2$d</string> + <string name="share_nfc_dialog">Share with NFC</string> + + <!-- Key list --> + <plurals name="key_list_selected_keys"> + <item quantity="one">1 key selected.</item> + <item quantity="other">%d keys selected.</item> + </plurals> + + <string name="key_list_empty_text1">No keys available yet…</string> + <string name="key_list_empty_text2">You can start by</string> + <string name="key_list_empty_text3">or</string> + <string name="key_list_empty_button_create">creating your own key pair</string> + <string name="key_list_empty_button_import">importing keys.</string> + + <!-- Key view --> + <string name="key_view_action_encrypt">Encrypt to this contact</string> + + <!-- Navigation Drawer --> + <string name="nav_contacts">Contacts</string> + <string name="nav_encrypt">Encrypt</string> + <string name="nav_decrypt">Decrypt</string> + <string name="nav_import">Import Keys</string> + <string name="nav_secret_keys">My Keys</string> + <string name="nav_apps">Registered Apps</string> + <string name="drawer_open">Open navigation drawer</string> + <string name="drawer_close">Close navigation drawer</string> </resources>
\ No newline at end of file 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> |
