diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-05 19:30:52 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-05 19:30:52 +0200 |
| commit | aa6f5118f5b88ed40e1318b59d47465bae6067df (patch) | |
| tree | c00db3802cd6258073b16d197b1bd2e8d2d7e975 /OpenPGP-Keychain/src/main/res/layout | |
| parent | 5e4239a7b98a050b4312eee075f2fdac7f2b8af2 (diff) | |
| parent | db25433890cfc5bbf0200eb488076df23cb44866 (diff) | |
| download | open-keychain-aa6f5118f5b88ed40e1318b59d47465bae6067df.tar.gz open-keychain-aa6f5118f5b88ed40e1318b59d47465bae6067df.tar.bz2 open-keychain-aa6f5118f5b88ed40e1318b59d47465bae6067df.zip | |
Merge remote-tracking branch 'origin/master' into certs
A lot of things are completely broken, but it compiles and doesn't crash
right away. Good enough for me.
Conflicts:
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml
Diffstat (limited to 'OpenPGP-Keychain/src/main/res/layout')
39 files changed, 1133 insertions, 802 deletions
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_account_settings_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_account_settings_activity.xml new file mode 100644 index 000000000..3557c1f00 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/api_account_settings_activity.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="16dp" + android:orientation="vertical"> + + <fragment + android:id="@+id/api_account_settings_fragment" + android:name="org.sufficientlysecure.keychain.remote.ui.AccountSettingsFragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + </LinearLayout> +</ScrollView> diff --git a/OpenPGP-Keychain/src/main/res/layout/api_account_settings_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/api_account_settings_fragment.xml new file mode 100644 index 000000000..32843eb29 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/api_account_settings_fragment.xml @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + xmlns:custom="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="?android:attr/listPreferredItemHeight" + android:layout_marginBottom="4dp" + android:layout_marginTop="4dp" + android:gravity="center_horizontal" + android:orientation="horizontal"> + + <ImageView + android:id="@+id/api_account_settings_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentTop="true" + android:layout_marginRight="6dp" + android:src="@drawable/ic_action_person" /> + + <TextView + android:id="@+id/api_account_settings_acc_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toRightOf="@+id/api_account_settings_icon" + android:gravity="center_vertical" + android:orientation="vertical" + android:text="Name (set in-code)" + android:textAppearance="?android:attr/textAppearanceMedium" /> + </RelativeLayout> + + <fragment + android:id="@+id/api_account_settings_select_key_fragment" + android:name="org.sufficientlysecure.keychain.ui.SelectSecretKeyLayoutFragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + tools:layout="@layout/select_secret_key_layout_fragment" /> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/api_account_settings_create_key" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginBottom="4dp" + android:layout_marginRight="4dp" + android:layout_marginTop="4dp" + android:text="@string/api_settings_create_key" + bootstrapbutton:bb_icon_left="fa-key" + bootstrapbutton:bb_size="default" + bootstrapbutton:bb_type="default" /> + + <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + custom:foldedLabel="@string/api_settings_show_advanced" + custom:unFoldedLabel="@string/api_settings_hide_advanced" + custom:foldedIcon="fa-chevron-right" + custom:unFoldedIcon="fa-chevron-down"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/label_encryption_algorithm" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <Spinner + android:id="@+id/api_account_settings_encryption_algorithm" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/label_hash_algorithm" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <Spinner + android:id="@+id/api_account_settings_hash_algorithm" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/label_message_compression" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <Spinner + android:id="@+id/api_account_settings_compression" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/api_accounts_adapter_list_item.xml b/OpenPGP-Keychain/src/main/res/layout/api_accounts_adapter_list_item.xml new file mode 100644 index 000000000..d31ae52d7 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/api_accounts_adapter_list_item.xml @@ -0,0 +1,27 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" + android:gravity="center_vertical" + android:singleLine="true" + android:orientation="horizontal"> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingLeft="8dp" + android:paddingRight="4dp" + android:paddingTop="4dp" + android:paddingBottom="4dp" + android:id="@+id/imageView" + android:src="@drawable/ic_action_person" /> + + <TextView + android:id="@+id/api_accounts_adapter_item_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="8dp" + android:text="Account Name" + android:textAppearance="?android:attr/textAppearanceMedium" /> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml index d83c8e87d..1377acf0e 100644 --- a/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml @@ -6,16 +6,28 @@ <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:padding="16dp" android:orientation="vertical"> <fragment android:id="@+id/api_app_settings_fragment" - android:name="org.sufficientlysecure.keychain.service.remote.AppSettingsFragment" + android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsFragment" android:layout_width="match_parent" android:layout_height="wrap_content" tools:layout="@layout/api_app_settings_fragment" /> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/api_settings_accounts" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <FrameLayout + android:id="@+id/api_accounts_list_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" /> + </LinearLayout> </ScrollView> diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_settings_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/api_app_settings_fragment.xml index a8b68859b..96271d418 100644 --- a/OpenPGP-Keychain/src/main/res/layout/api_app_settings_fragment.xml +++ b/OpenPGP-Keychain/src/main/res/layout/api_app_settings_fragment.xml @@ -2,6 +2,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" + xmlns:custom="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> @@ -35,64 +36,13 @@ android:textAppearance="?android:attr/textAppearanceMedium" /> </RelativeLayout> - <fragment - android:id="@+id/api_app_settings_select_key_fragment" - android:name="org.sufficientlysecure.keychain.ui.SelectSecretKeyLayoutFragment" + <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - tools:layout="@layout/select_secret_key_layout_fragment" /> - - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/api_app_settings_advanced_button" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_marginBottom="4dp" - android:layout_marginTop="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" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/label_encryption_algorithm" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <Spinner - android:id="@+id/api_app_settings_encryption_algorithm" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/label_hash_algorithm" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <Spinner - android:id="@+id/api_app_settings_hash_algorithm" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/label_message_compression" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <Spinner - android:id="@+id/api_app_settings_compression" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="match_parent" + custom:foldedLabel="@string/api_settings_show_info" + custom:unFoldedLabel="@string/api_settings_hide_info" + custom:foldedIcon="fa-chevron-right" + custom:unFoldedIcon="fa-chevron-down"> <TextView android:layout_width="match_parent" @@ -119,5 +69,7 @@ android:layout_height="wrap_content" android:text="Base64 encoded signature" android:textAppearance="?android:attr/textAppearanceSmall" /> - </LinearLayout> + + </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout> + </LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/api_apps_list_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_apps_list_activity.xml index 71fbcfb12..9f95e9f3b 100644 --- a/OpenPGP-Keychain/src/main/res/layout/api_apps_list_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/api_apps_list_activity.xml @@ -4,16 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" > - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <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/api_apps_list_content"/> <include layout="@layout/drawer_list" /> diff --git a/OpenPGP-Keychain/src/main/res/layout/api_apps_list_content.xml b/OpenPGP-Keychain/src/main/res/layout/api_apps_list_content.xml new file mode 100644 index 000000000..9f9b99045 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/api_apps_list_content.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/content_frame" + android:layout_marginLeft="@dimen/drawer_content_padding" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <fragment + android:id="@+id/crypto_consumers_list_fragment" + android:name="org.sufficientlysecure.keychain.remote.ui.AppsListFragment" + android:layout_width="match_parent" + android:layout_height="match_parent"/> +</FrameLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/api_remote_create_account.xml b/OpenPGP-Keychain/src/main/res/layout/api_remote_create_account.xml new file mode 100644 index 000000000..3aee9094f --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/api_remote_create_account.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="16dp" + android:orientation="vertical"> + + <TextView + android:id="@+id/api_remote_create_account_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingBottom="3dip" + android:text="@string/api_create_account_text" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <fragment + android:id="@+id/api_account_settings_fragment" + android:name="org.sufficientlysecure.keychain.remote.ui.AccountSettingsFragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + tools:layout="@layout/api_app_settings_fragment" /> + + </LinearLayout> +</ScrollView> diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_error_message.xml b/OpenPGP-Keychain/src/main/res/layout/api_remote_error_message.xml index 48aa89d4f..48aa89d4f 100644 --- a/OpenPGP-Keychain/src/main/res/layout/api_app_error_message.xml +++ b/OpenPGP-Keychain/src/main/res/layout/api_remote_error_message.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_register_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_remote_register_app.xml index aa9d59004..f85f3b8f7 100644 --- a/OpenPGP-Keychain/src/main/res/layout/api_app_register_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/api_remote_register_app.xml @@ -20,7 +20,7 @@ <fragment android:id="@+id/api_app_settings_fragment" - android:name="org.sufficientlysecure.keychain.service.remote.AppSettingsFragment" + android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsFragment" android:layout_width="match_parent" android:layout_height="wrap_content" tools:layout="@layout/api_app_settings_fragment" /> diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_select_pub_keys_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_remote_select_pub_keys.xml index a10592607..a10592607 100644 --- a/OpenPGP-Keychain/src/main/res/layout/api_app_select_pub_keys_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/api_remote_select_pub_keys.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/create_key_dialog.xml b/OpenPGP-Keychain/src/main/res/layout/create_key_dialog.xml index a2e908433..57a1b865f 100644 --- a/OpenPGP-Keychain/src/main/res/layout/create_key_dialog.xml +++ b/OpenPGP-Keychain/src/main/res/layout/create_key_dialog.xml @@ -17,6 +17,13 @@ android:padding="4dp" android:text="@string/key_creation_el_gamal_info" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:padding="4dp" + android:text="@string/key_creation_weak_rsa_info" /> + <TableRow> <TextView diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml index 25c7c000c..c4709a67e 100644 --- a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml @@ -5,206 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <ScrollView - android:layout_width="match_parent" - android:layout_height="match_parent" - android:fillViewport="true" - android:orientation="vertical"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingTop="4dp" - android:paddingLeft="10dp" - android:paddingRight="10dp"> - - <RelativeLayout - 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" - android:id="@+id/relativeLayout"> - - <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> - - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/lookup_key" - android:visibility="gone" - android:layout_width="wrap_content" - android:layout_height="50dp" - android:padding="4dp" - android:text="@string/btn_lookup_key" - bootstrapbutton:bb_icon_left="fa-download" - bootstrapbutton:bb_type="info" - bootstrapbutton:bb_size="small" - android:layout_alignParentTop="true" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" /> - - <TextView - android:id="@+id/mainUserId" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:text="@string/label_main_user_id" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_toRightOf="@+id/relativeLayout" /> - - <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" - android:layout_below="@+id/mainUserId" - android:layout_toRightOf="@+id/relativeLayout" /> - </RelativeLayout> - - <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:gravity="top|left" - android:inputType="textMultiLine|textUri" - android:lines="4" - android:maxLines="10" - android:minLines="2" - android:scrollbars="vertical" /> - - <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> - - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:text="@string/section_decrypt_verify" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:padding="4dp"> - - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/action_decrypt" - android:layout_width="match_parent" - android:layout_height="60dp" - android:padding="4dp" - android:text="@string/btn_decrypt_verify" - bootstrapbutton:bb_icon_left="fa-unlock" - bootstrapbutton:bb_type="info" /> - </LinearLayout> - </LinearLayout> - </ScrollView> + <include layout="@layout/decrypt_content"/> <include layout="@layout/drawer_list" /> diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_content.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_content.xml new file mode 100644 index 000000000..a496d8b9d --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_content.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/content_frame" + android:layout_marginLeft="@dimen/drawer_content_padding" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <android.support.v4.view.ViewPager + android:id="@+id/decrypt_pager" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <android.support.v4.view.PagerTabStrip + android:id="@+id/decrypt_pager_tab_strip" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="top" + android:background="@color/emphasis" + android:textColor="#fff" /> + </android.support.v4.view.ViewPager> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml new file mode 100644 index 000000000..633c9c832 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="4dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="vertical"> + + <include layout="@layout/decrypt_signature_include" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <EditText + android:id="@+id/decrypt_file_filename" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:gravity="top|left" + android:inputType="textMultiLine|textUri" + android:lines="4" + android:maxLines="10" + android:minLines="2" + android:scrollbars="vertical" /> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/decrypt_file_browse" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="4dp" + bootstrapbutton:bb_icon_left="fa-folder-open" + bootstrapbutton:bb_roundedCorners="true" + bootstrapbutton:bb_size="default" + bootstrapbutton:bb_type="default" /> + </LinearLayout> + + <CheckBox + android:id="@+id/decrypt_file_delete_after_decryption" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/label_delete_after_decryption" /> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="4dp" + android:text="@string/section_decrypt_verify" + android:layout_above="@+id/decrypt_file_action_decrypt" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/decrypt_file_action_decrypt" + android:layout_width="match_parent" + android:layout_height="50dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" + android:text="@string/btn_decrypt_verify" + bootstrapbutton:bb_icon_left="fa-unlock" + bootstrapbutton:bb_type="info" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> + + </RelativeLayout> + </LinearLayout> +</ScrollView>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_message_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_message_fragment.xml new file mode 100644 index 000000000..dfe1bf64a --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_message_fragment.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="4dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="vertical"> + + <include layout="@layout/decrypt_signature_include" /> + + <EditText + android:id="@+id/message" + android:layout_width="match_parent" + android:layout_height="0dip" + android:gravity="top" + android:hint="@string/decrypt_content_edit_text_hint" + android:inputType="text|textCapSentences|textMultiLine|textLongMessage" + android:scrollHorizontally="true" + android:layout_weight="1" /> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/section_decrypt_verify" + android:id="@+id/decrypt_message_section" /> + + <LinearLayout + android:id="@+id/decrypt_buttons" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/action_decrypt" + android:layout_width="match_parent" + android:layout_height="50dp" + android:layout_marginRight="4dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" + android:layout_weight="1" + android:text="@string/btn_decrypt_verify" + bootstrapbutton:bb_icon_left="fa-unlock" + bootstrapbutton:bb_type="info" /> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/action_decrypt_from_clipboard" + android:layout_width="match_parent" + android:layout_height="50dp" + android:layout_marginLeft="4dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" + android:layout_weight="1" + android:text="@string/btn_decrypt_verify_clipboard" + bootstrapbutton:bb_icon_left="fa-clipboard" + bootstrapbutton:bb_type="info" /> + </LinearLayout> + </LinearLayout> +</ScrollView> diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_signature_include.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_signature_include.xml new file mode 100644 index 000000000..3e0d35c9b --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_signature_include.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + android: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" + android:id="@+id/relativeLayout"> + + <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> + + <TextView + android:id="@+id/mainUserId" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:text="@string/label_main_user_id" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_toRightOf="@+id/relativeLayout" /> + + <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" + android:layout_below="@+id/mainUserId" + android:layout_toRightOf="@+id/relativeLayout" /> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/lookup_key" + android:layout_width="wrap_content" + android:layout_height="50dp" + android:padding="4dp" + android:text="@string/btn_lookup_key" + bootstrapbutton:bb_icon_left="fa-download" + bootstrapbutton:bb_type="info" + bootstrapbutton:bb_size="small" + android:layout_alignParentTop="true" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" /> +</RelativeLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml b/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml index 81ceba20c..ab00c0073 100644 --- a/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml +++ b/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml @@ -9,7 +9,7 @@ --> <ListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/left_drawer" - android:layout_width="240dp" + android:layout_width="@dimen/drawer_size" android:layout_height="match_parent" android:layout_gravity="start" android:background="@color/white" diff --git a/OpenPGP-Keychain/src/main/res/layout/edit_key_key_item.xml b/OpenPGP-Keychain/src/main/res/layout/edit_key_key_item.xml index 45b8d6511..090115d62 100644 --- a/OpenPGP-Keychain/src/main/res/layout/edit_key_key_item.xml +++ b/OpenPGP-Keychain/src/main/res/layout/edit_key_key_item.xml @@ -11,6 +11,7 @@ android:orientation="horizontal" > <TableLayout + android:id="@+id/table_keylayout" android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="1" @@ -88,7 +89,8 @@ bootstrapbutton:bb_type="default" /> </TableRow> - <TableRow> + <TableRow + android:id="@+id/row_certify"> <TextView android:id="@+id/label_usage" @@ -97,11 +99,59 @@ android:layout_gravity="center_vertical" android:paddingRight="10dip" android:text="@string/label_usage" /> + <CheckBox + android:id="@+id/chkCertify" + android:enabled = "false" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/flag_certify" /> + </TableRow> - <Spinner - android:id="@+id/usage" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + <TableRow + android:id="@+id/row_sign"> + + <TextView + android:id="@+id/label_usage2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" + android:text="@string/label_usage" /> + <CheckBox + android:id="@+id/chkSign" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/flag_sign" /> + </TableRow> + + <TableRow + android:id="@+id/row_encrypt"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" /> + <CheckBox + android:id="@+id/chkEncrypt" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/flag_encrypt" /> + </TableRow> + + <TableRow + android:id="@+id/row_authenticate"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" /> + <CheckBox + android:id="@+id/chkAuthenticate" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/flag_authenticate" /> </TableRow> </TableLayout> @@ -122,4 +172,5 @@ android:layout_height="1dip" android:background="?android:attr/listDivider" /> -</org.sufficientlysecure.keychain.ui.widget.KeyEditor>
\ No newline at end of file +</org.sufficientlysecure.keychain.ui.widget.KeyEditor> + diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml index 4fe65e341..6484c9b7b 100644 --- a/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml @@ -6,399 +6,7 @@ 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="@string/label_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="@string/label_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:gravity="top|left" - android:inputType="textMultiLine|textUri" - android:lines="4" - android:maxLines="10" - android:minLines="2" - android:scrollbars="vertical" /> - - <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:id="@+id/advancedSettingsControl" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:clickable="true"> - - <com.beardedhen.androidbootstrap.FontAwesomeText - android:id="@+id/advancedSettingsIcon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginRight="10dp" - android:textSize="12sp" - android:paddingTop="@dimen/padding_medium" - android:paddingBottom="@dimen/padding_medium" - fontawesometext:fa_icon="fa-chevron-right" /> - - <TextView - android:id="@+id/advancedSettings" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/btn_encryption_advanced_settings_show" - android:paddingTop="@dimen/padding_medium" - android:paddingBottom="@dimen/padding_medium" - android:textColor="@color/emphasis" /> - </LinearLayout> - - <LinearLayout - android:id="@+id/fileAdvancedSettingsContainer" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone"> - - <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/shareAfterEncryption" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/label_share_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> - </LinearLayout> - </ViewFlipper> - - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:text="@string/section_encrypt_and_or_sign" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:padding="4dp"> - - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/action_encrypt_share" - android:layout_width="match_parent" - android:layout_height="60dp" - android:padding="4dp" - android:layout_weight="1" - android:text="@string/btn_share" - bootstrapbutton:bb_icon_left="fa-lock" - bootstrapbutton:bb_type="info" /> - - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/action_encrypt_clipboard" - android:layout_width="match_parent" - android:layout_height="60dp" - android:padding="4dp" - android:layout_weight="1" - android:text="@string/btn_clipboard" - bootstrapbutton:bb_icon_left="fa-lock" - bootstrapbutton:bb_type="info" /> - - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/action_encrypt_file" - android:layout_width="match_parent" - android:layout_height="60dp" - android:padding="4dp" - android:visibility="gone" - android:text="@string/btn_encrypt_file" - bootstrapbutton:bb_icon_left="fa-lock" - bootstrapbutton:bb_type="info" /> - </LinearLayout> - </LinearLayout> - </ScrollView> + <include layout="@layout/encrypt_content"/> <include layout="@layout/drawer_list" /> diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_asymmetric_fragment.xml new file mode 100644 index 000000000..fa1b03889 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_asymmetric_fragment.xml @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="utf-8"?> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingTop="4dp" + android:paddingBottom="4dp" + android:paddingRight="16dp" + android:paddingLeft="16dp"> + + <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" + android:paddingRight="4dip"> + + <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="" + 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="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </LinearLayout> + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <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/select_keys_button_default" + bootstrapbutton:bb_icon_left="fa-user" + bootstrapbutton:bb_size="default" + bootstrapbutton:bb_type="default" /> + </LinearLayout> +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml new file mode 100644 index 000000000..e719d07e1 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/content_frame" + android:layout_marginLeft="@dimen/drawer_content_padding" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <android.support.v4.view.ViewPager + android:id="@+id/encrypt_pager_mode" + android:layout_width="match_parent" + android:layout_height="150dp"> + + <android.support.v4.view.PagerTabStrip + android:id="@+id/encrypt_pager_tab_strip_mode" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="top" + android:background="@color/emphasis" + android:textColor="#fff" /> + </android.support.v4.view.ViewPager> + + <android.support.v4.view.ViewPager + android:id="@+id/encrypt_pager_content" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <android.support.v4.view.PagerTabStrip + android:id="@+id/encrypt_pager_tab_strip_content" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="top" + android:background="@color/emphasis" + android:textColor="#fff" /> + </android.support.v4.view.ViewPager> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_content_adv_settings.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_content_adv_settings.xml new file mode 100644 index 000000000..ac990653a --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_content_adv_settings.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="utf-8"?> +<merge xmlns:android="http://schemas.android.com/apk/res/android"> + <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/shareAfterEncryption" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/label_share_after_encryption"/> + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <CheckBox + android:id="@+id/asciiArmor" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/label_ascii_armor"/> + </LinearLayout> +</merge> diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_file_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_file_fragment.xml new file mode 100644 index 000000000..efc4b4641 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_file_fragment.xml @@ -0,0 +1,86 @@ +<?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" + xmlns:custom="http://schemas.android.com/apk/res-auto" + 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:paddingTop="4dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="vertical"> + + <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:gravity="top|left" + android:inputType="textMultiLine|textUri" + android:lines="4" + android:maxLines="10" + android:minLines="2" + android:scrollbars="vertical" /> + + <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> + + <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + custom:foldedLabel="@string/btn_encryption_advanced_settings_show" + custom:unFoldedLabel="@string/btn_encryption_advanced_settings_hide" + custom:foldedIcon="fa-chevron-right" + custom:unFoldedIcon="fa-chevron-down"> + + <include layout="@layout/encrypt_content_adv_settings" /> + + </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="4dp" + android:text="@string/section_encrypt_and_or_sign" + android:layout_above="@+id/action_encrypt_file" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/action_encrypt_file" + android:layout_width="match_parent" + android:layout_height="50dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" + android:text="@string/btn_encrypt_file" + bootstrapbutton:bb_icon_left="fa-lock" + bootstrapbutton:bb_type="info" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> + + </RelativeLayout> + </LinearLayout> +</ScrollView>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_message_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_message_fragment.xml new file mode 100644 index 000000000..1fa338426 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_message_fragment.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="4dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="vertical"> + + <EditText + android:id="@+id/message" + android:layout_width="match_parent" + android:layout_height="0dip" + android:gravity="top" + android:inputType="text|textCapSentences|textMultiLine|textLongMessage" + android:hint="@string/encrypt_content_edit_text_hint" + android:layout_weight="1" /> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/section_encrypt_and_or_sign" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/action_encrypt_share" + android:layout_width="match_parent" + android:layout_height="50dp" + android:layout_marginRight="4dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" + android:layout_weight="1" + android:text="@string/btn_share" + bootstrapbutton:bb_icon_left="fa-share-square" + bootstrapbutton:bb_type="info" /> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/action_encrypt_clipboard" + android:layout_width="match_parent" + android:layout_height="50dp" + android:layout_marginLeft="4dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" + android:layout_weight="1" + android:text="@string/btn_clipboard" + bootstrapbutton:bb_icon_left="fa-clipboard" + bootstrapbutton:bb_type="info" /> + + </LinearLayout> + </LinearLayout> +</ScrollView> diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_symmetric_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_symmetric_fragment.xml new file mode 100644 index 000000000..89381e499 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_symmetric_fragment.xml @@ -0,0 +1,52 @@ +<?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="match_parent" + android:paddingTop="4dp" + android:paddingBottom="4dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="vertical"> + + <TableLayout + android:id="@+id/modeSymmetric" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:stretchColumns="1" + android:layout_centerVertical="true"> + + <TableRow> + + <TextView + android:id="@+id/label_passphrase" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="8dp" + 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:paddingRight="8dp" + 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> +</RelativeLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/foldable_linearlayout.xml b/OpenPGP-Keychain/src/main/res/layout/foldable_linearlayout.xml new file mode 100644 index 000000000..2b863d52b --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/foldable_linearlayout.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:fontawesometext="http://schemas.android.com/apk/res-auto" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <LinearLayout + android:id="@+id/foldableControl" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:clickable="true"> + + <com.beardedhen.androidbootstrap.FontAwesomeText + android:id="@+id/foldableIcon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginRight="10dp" + android:textSize="12sp" + android:paddingTop="@dimen/padding_medium" + android:paddingBottom="@dimen/padding_medium" + fontawesometext:fa_icon="fa-chevron-right"/> + + <TextView + android:id="@+id/foldableText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/none" + android:paddingTop="@dimen/padding_medium" + android:paddingBottom="@dimen/padding_medium" + android:textColor="@color/emphasis"/> + </LinearLayout> + + <LinearLayout + android:id="@+id/foldableContainer" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:visibility="gone"/> +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml index d7794ace3..c82607a33 100644 --- a/OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml @@ -1,62 +1,10 @@ <?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/import_keys_content"/> <include layout="@layout/drawer_list" /> diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_content.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_content.xml new file mode 100644 index 000000000..eb1333704 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/import_keys_content.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + android:id="@+id/content_frame" + android:layout_marginLeft="@dimen/drawer_content_padding" + 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="16dp" + android:paddingRight="16dp"> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/import_import" + android:layout_width="match_parent" + android:layout_height="50dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" + android:text="@string/import_import" + bootstrapbutton:bb_icon_left="fa-download" + 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>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry.xml index 3cc0bc6dc..f5a39f115 100644 --- a/OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry.xml +++ b/OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry.xml @@ -15,7 +15,7 @@ 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="wrap_content" android:orientation="vertical" android:paddingLeft="3dip" @@ -23,7 +23,7 @@ android:singleLine="true" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" > @@ -52,13 +52,6 @@ android:textAppearance="?android:attr/textAppearanceMedium" /> <TextView - android:id="@+id/fingerprint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="fingerprint" - android:textAppearance="?android:attr/textAppearanceSmall" /> - - <TextView android:id="@+id/mainUserIdRest" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -77,10 +70,11 @@ <TextView android:id="@+id/keyId" android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:text="BBBBBBBB" + android:layout_height="wrap_content" + android:text="0xBBBBBBBBBBBBBBBB" android:textAppearance="?android:attr/textAppearanceSmall" - android:typeface="monospace" /> + android:typeface="monospace" + android:layout_weight="1" /> <TextView android:id="@+id/algorithm" @@ -89,6 +83,14 @@ android:textAppearance="?android:attr/textAppearanceSmall" /> <TextView + android:id="@+id/fingerprint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="fingerprint" + android:typeface="monospace" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + <TextView android:id="@+id/status" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -99,10 +101,10 @@ <LinearLayout android:id="@+id/list" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="36dip" android:orientation="vertical" > </LinearLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_activity.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_activity.xml index 65d246d7b..fcb376fa8 100644 --- a/OpenPGP-Keychain/src/main/res/layout/key_list_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/key_list_activity.xml @@ -4,16 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" > - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <fragment - android:id="@+id/key_list_fragment" - android:name="org.sufficientlysecure.keychain.ui.KeyListFragment" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - </FrameLayout> + <include layout="@layout/key_list_content"/> <include layout="@layout/drawer_list" /> diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_content.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_content.xml new file mode 100644 index 000000000..e58e42961 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/key_list_content.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/content_frame" + android:layout_marginLeft="@dimen/drawer_content_padding" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <fragment + android:id="@+id/key_list_fragment" + android:name="org.sufficientlysecure.keychain.ui.KeyListFragment" + android:layout_width="match_parent" + android:layout_height="match_parent"/> +</FrameLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_fragment.xml index 77bd6f4e9..f2430f213 100644 --- a/OpenPGP-Keychain/src/main/res/layout/key_list_fragment.xml +++ b/OpenPGP-Keychain/src/main/res/layout/key_list_fragment.xml @@ -11,7 +11,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" - android:visibility="gone" + android:visibility="visible" android:gravity="center"> <ProgressBar @@ -51,7 +51,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" - android:orientation="vertical"> + android:orientation="vertical" + android:visibility="gone"> <TextView android:layout_width="wrap_content" diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_item.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_item.xml index bee56ddfe..0abae8bbb 100644 --- a/OpenPGP-Keychain/src/main/res/layout/key_list_item.xml +++ b/OpenPGP-Keychain/src/main/res/layout/key_list_item.xml @@ -39,6 +39,7 @@ </LinearLayout> <View + android:id="@+id/status_divider" android:layout_width="1dip" android:layout_height="match_parent" android:layout_marginBottom="8dp" @@ -46,6 +47,7 @@ android:background="?android:attr/listDivider" /> <FrameLayout + android:id="@+id/status_layout" android:layout_width="80dp" android:layout_height="match_parent"> @@ -55,7 +57,6 @@ android:layout_height="match_parent" android:id="@+id/edit" android:focusable="false" - android:visibility="visible" android:enabled="true" android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="@color/black" @@ -71,7 +72,6 @@ android:textAppearance="?android:attr/textAppearanceSmall" android:text="@string/revoked" android:textColor="#e00" - android:visibility="visible" android:layout_gravity="center" /> </FrameLayout> diff --git a/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml b/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml index eddbe3cbf..b8897a7b3 100644 --- a/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml +++ b/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml @@ -6,7 +6,7 @@ android:orientation="vertical" > <LinearLayout - android:id="@+android:id/text_layout" + android:id="@+id/text_layout" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center_vertical" diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml index b2bfe1700..032b9eee6 100644 --- a/OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml +++ b/OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml @@ -42,4 +42,4 @@ </RelativeLayout> -</ScrollView>
\ No newline at end of file +</ScrollView> diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_delete_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_delete_fragment.xml new file mode 100644 index 000000000..ef31f7690 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/view_key_delete_fragment.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/mainMessage" + android:layout_margin="4dp" + android:textAppearance="?android:textAppearanceMedium" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:weightSum="1" + android:id="@+id/deleteSecretKeyView"> + + <CheckBox + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="0.1" + android:layout_margin="4dp" + android:id="@+id/checkDeleteSecret" /> + + <TextView + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_margin="4dp" + android:textAppearance="?android:textAppearanceMedium" + android:layout_weight="0.9" + android:text="@string/secret_key_delete_text" /> + + </LinearLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml index 9e4bc70eb..aecedc39b 100644 --- a/OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml +++ b/OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml @@ -4,8 +4,7 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:paddingLeft="8dip" - android:paddingRight="3dip" - android:singleLine="true" > + android:paddingRight="3dip" > <ImageView android:id="@+id/ic_masterKey" @@ -15,31 +14,54 @@ 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="@string/label_key_id" - android:textAppearance="?android:attr/textAppearanceMedium" - android:typeface="monospace" /> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingBottom="2dip" + android:paddingTop="2dip" > + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal"> + <TextView + android:id="@+id/keyId" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="2dip" + android:text="@string/label_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" /> + <TextView + android:id="@+id/keyDetails" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="5dip" + android:text="(RSA, 1024bit)" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </LinearLayout> + <TextView + android:id="@+id/keyExpiry" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:text="@string/label_expiry" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </LinearLayout> <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center_vertical" - android:gravity="right" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:orientation="horizontal" + android:gravity="right" android:paddingBottom="2dip" android:paddingTop="2dip" > + <ImageView android:id="@+id/ic_revokedKey" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/revoked_key_small"/> <ImageView android:id="@+id/ic_certifyKey" android:layout_width="wrap_content" @@ -59,4 +81,4 @@ android:src="@drawable/signed_small" /> </LinearLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml index 6ef3f3072..aa48252ce 100644 --- a/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml +++ b/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml @@ -12,7 +12,8 @@ android:descendantFocusability="beforeDescendants" android:orientation="vertical" android:paddingLeft="16dp" - android:paddingRight="16dp"> + android:paddingRight="16dp" + android:id="@+id/container"> <TextView style="@style/SectionHeader" @@ -130,19 +131,23 @@ android:text="" /> </TableRow> - <TableRow> + <TableRow + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:id="@+id/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" /> + android:text="@string/label_fingerprint" /> <TextView - android:id="@+id/creation" + android:id="@+id/fingerprint" android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:typeface="monospace" /> </TableRow> <TableRow> @@ -152,31 +157,27 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:paddingRight="10dip" - android:text="@string/label_expiry" /> + android:text="@string/label_creation" /> <TextView - android:id="@+id/expiry" + android:id="@+id/creation" android:layout_width="match_parent" android:layout_height="wrap_content" /> </TableRow> - <TableRow - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:id="@+id/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" /> + android:text="@string/label_expiry" /> <TextView - android:id="@+id/fingerprint" + android:id="@+id/expiry" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:typeface="monospace" /> + android:layout_height="wrap_content" /> </TableRow> <TableRow> @@ -226,16 +227,15 @@ style="@style/SectionHeader" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="4dp" android:layout_marginTop="14dp" android:text="@string/section_actions" /> <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/action_edit" android:layout_width="match_parent" - android:layout_height="60dp" - android:padding="4dp" - android:layout_marginBottom="10dp" + android:layout_height="50dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" android:text="@string/key_view_action_edit" bootstrapbutton:bb_icon_left="fa-key" bootstrapbutton:bb_type="info" @@ -244,24 +244,23 @@ <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/action_encrypt" android:layout_width="match_parent" - android:layout_height="60dp" - android:padding="4dp" - android:layout_marginBottom="10dp" + android:layout_height="50dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" android:text="@string/key_view_action_encrypt" bootstrapbutton:bb_icon_left="fa-lock" bootstrapbutton:bb_type="info" /> - <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/action_certify" android:layout_width="match_parent" - android:layout_height="60dp" - android:padding="4dp" - android:layout_marginBottom="10dp" + android:layout_height="50dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" android:text="@string/key_view_action_certify" bootstrapbutton:bb_icon_left="fa-pencil" bootstrapbutton:bb_type="info" /> </LinearLayout> -</ScrollView>
\ No newline at end of file +</ScrollView> |