diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
9 files changed, 265 insertions, 120 deletions
diff --git a/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml b/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml deleted file mode 100644 index 502ca1c70..000000000 --- a/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml +++ /dev/null @@ -1,60 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<TableLayout 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" - android:stretchColumns="1"> - - <TableRow android:layout_marginBottom="5dip"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:padding="4dp" - android:text="Name" /> - - <EditText - android:id="@+id/name" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:imeOptions="actionNext" - android:padding="4dp" /> - </TableRow> - - <TableRow android:layout_marginBottom="10dip"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:padding="4dp" - android:text="Email" /> - - <EditText - android:id="@+id/address" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:imeOptions="actionNext" - android:padding="4dp" /> - </TableRow> - - <TableRow android:layout_marginBottom="10dip"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:padding="4dp" - android:text="Comment" /> - - <EditText - android:id="@+id/comment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:imeOptions="actionDone" - android:padding="4dp" /> - </TableRow> - -</TableLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/decrypt_content.xml b/OpenKeychain/src/main/res/layout/decrypt_content.xml index ff75f20ee..f62cf615c 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_content.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_content.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - <include layout="@layout/notify_area"/> + <include layout="@layout/notify_area" /> <android.support.v4.view.ViewPager android:id="@+id/decrypt_pager" @@ -18,8 +18,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="top" - android:background="@color/emphasis" - android:textColor="#fff" /> + android:textColor="@color/emphasis" /> </android.support.v4.view.ViewPager> </LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml index 7f94cb3cd..2ffbc66f4 100644 --- a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml @@ -14,7 +14,7 @@ android:layout_width="wrap_content" android:layout_height="0dp" android:layout_marginTop="8dp" - android:text="Passphrase" + android:text="@string/label_passphrase" android:layout_weight="1" /> <TextView @@ -24,7 +24,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="match_parent" - android:text="change passphrase" + android:text="@string/edit_key_action_change_passphrase" android:minHeight="?android:attr/listPreferredItemHeight" android:drawableRight="@drawable/ic_action_edit" android:drawablePadding="8dp" @@ -67,7 +67,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="match_parent" - android:text="add identity" + android:text="@string/edit_key_action_add_identity" android:minHeight="?android:attr/listPreferredItemHeight" android:drawableRight="@drawable/ic_action_add_person" android:drawablePadding="8dp" @@ -93,7 +93,7 @@ android:background="?android:attr/listDivider" /> <org.sufficientlysecure.keychain.ui.widget.FixedListView - android:id="@+id/edit_key_keys_added" + android:id="@+id/edit_key_subkeys_added" android:layout_width="match_parent" android:layout_height="wrap_content" /> @@ -109,9 +109,9 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="match_parent" - android:text="add key" + android:text="@string/edit_key_action_add_subkey" android:minHeight="?android:attr/listPreferredItemHeight" - android:drawableRight="@drawable/ic_action_add_person" + android:drawableRight="@drawable/ic_action_new_account" android:drawablePadding="8dp" android:gravity="center_vertical" android:clickable="true" diff --git a/OpenKeychain/src/main/res/layout/edit_key_subkey_added_item.xml b/OpenKeychain/src/main/res/layout/edit_key_subkey_added_item.xml new file mode 100644 index 000000000..856bef36a --- /dev/null +++ b/OpenKeychain/src/main/res/layout/edit_key_subkey_added_item.xml @@ -0,0 +1,179 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="5dp"> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:minWidth="10dp" + android:background="@color/result_green" /> + + <TableLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingLeft="8dp" + android:stretchColumns="1"> + + <TableRow> + + <TextView + android:id="@+id/label_expiry" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" + android:text="@string/label_expiry" /> + + <Button + android:id="@+id/expiry" + android:layout_width="match_parent" + android:layout_height="40dp" + android:text="@string/none" + android:background="@drawable/button_edgy" /> + </TableRow> + + <TableRow + android:id="@+id/row_certify"> + + <TextView + android:id="@+id/label_usage" + 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/chkCertify" + android:enabled = "false" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/flag_certify" /> + </TableRow> + + <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> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:padding="4dp" + android:text="@string/key_creation_el_gamal_info" /> + + <TableRow> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:padding="4dp" + android:text="@string/label_algorithm" /> + + <Spinner + android:id="@+id/create_key_algorithm" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="4dp" /> + </TableRow> + + <TableRow> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:padding="4dp" + android:text="@string/label_key_size" /> + + <Spinner + android:id="@+id/create_key_size" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="right" + android:padding="4dp" /> + </TableRow> + + <TextView + android:id="@+id/custom_key_size_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:padding="4dp" + android:text="@string/key_size_custom_info" + android:visibility="gone" /> + + <EditText + android:id="@+id/custom_key_size_input" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:inputType="number" + android:visibility="gone" /> + + <TextView + android:id="@+id/custom_key_size_info" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:padding="4dp" + android:visibility="gone" /> + + </TableLayout> + + <ImageButton + android:id="@+id/subkey_added_item_delete" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:padding="8dp" + android:src="@drawable/ic_action_cancel" + android:layout_gravity="center_vertical" + style="@style/SelectableItem" /> +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml b/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml new file mode 100644 index 000000000..e69452db1 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml @@ -0,0 +1,58 @@ +<?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:minHeight="?android:attr/listPreferredItemHeight" + android:orientation="horizontal" + android:singleLine="true"> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:minWidth="10dp" + android:background="@color/result_green" /> + + <LinearLayout + android:orientation="vertical" + android:layout_gravity="center_vertical" + android:layout_width="0dip" + android:layout_marginLeft="8dp" + android:layout_height="wrap_content" + android:layout_weight="1"> + + <AutoCompleteTextView + android:id="@+id/user_id_added_item_address" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/label_email" + android:inputType="textEmailAddress" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <AutoCompleteTextView + android:id="@+id/user_id_added_item_name" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textPersonName" + android:hint="@string/label_name" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + <EditText + android:id="@+id/user_id_added_item_comment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="@color/tertiary_text_light" + android:hint="@string/label_comment" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + </LinearLayout> + + <ImageButton + android:id="@+id/user_id_added_item_delete" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:padding="8dp" + android:src="@drawable/ic_action_cancel" + android:layout_gravity="center_vertical" + style="@style/SelectableItem" /> + +</LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml index 73a20bd2e..99e4c0268 100644 --- a/OpenKeychain/src/main/res/layout/key_list_item.xml +++ b/OpenKeychain/src/main/res/layout/key_list_item.xml @@ -38,32 +38,11 @@ android:textAppearance="?android:attr/textAppearanceSmall" /> </LinearLayout> - <View - android:id="@+id/status_divider" - android:layout_width="1dip" - android:layout_height="match_parent" - android:layout_marginBottom="8dp" - android:layout_marginTop="8dp" - android:background="?android:attr/listDivider" /> - <FrameLayout android:id="@+id/status_layout" android:layout_width="wrap_content" android:layout_height="match_parent"> - <ImageButton - android:id="@+id/edit" - style="@style/SelectableItem" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:focusable="false" - android:enabled="true" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="@color/black" - android:src="@drawable/ic_action_edit" - android:text="@string/edit" - android:padding="12dp" /> - <TextView android:id="@+id/revoked" android:layout_width="wrap_content" diff --git a/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml index ae523762c..eb72ada03 100644 --- a/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml +++ b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml @@ -4,11 +4,15 @@ android:layout_height="wrap_content" android:paddingLeft="16dp" android:paddingRight="16dp" - android:stretchColumns="1" > + android:stretchColumns="1"> - <TableRow - android:layout_marginBottom="5dip" - > + <CheckBox + android:id="@+id/passphrase_no_passphrase" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/label_no_passphrase" /> + + <TableRow android:layout_marginBottom="5dip"> <TextView android:id="@+id/passphrase_label_passphrase" @@ -26,9 +30,7 @@ android:padding="4dp" /> </TableRow> - <TableRow - android:layout_marginBottom="10dip" - > + <TableRow android:layout_marginBottom="10dip"> <TextView android:id="@+id/passphrase_label_passphrase_again" diff --git a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml index 96871aacf..d93420a99 100644 --- a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml @@ -74,22 +74,6 @@ android:drawablePadding="8dp" android:gravity="center_vertical" /> - <TextView - android:id="@+id/view_key_action_edit_new" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="?android:attr/listPreferredItemHeight" - android:clickable="true" - style="@style/SelectableItem" - android:text="NEW EDIT" - android:layout_weight="1" - android:drawableRight="@drawable/ic_action_edit" - android:drawablePadding="8dp" - android:gravity="center_vertical" /> - <View android:id="@+id/view_key_action_edit_divider" android:layout_width="match_parent" diff --git a/OpenKeychain/src/main/res/layout/view_key_userids_item.xml b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml index f812127a9..8f036e600 100644 --- a/OpenKeychain/src/main/res/layout/view_key_userids_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml @@ -6,13 +6,6 @@ android:orientation="horizontal" android:singleLine="true"> - <ImageView - android:id="@+id/has_changes" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:minWidth="10dp" - android:background="@color/emphasis" /> - <CheckBox android:id="@+id/checkBox" android:layout_width="wrap_content" @@ -41,6 +34,8 @@ android:layout_gravity="center_vertical" android:layout_width="0dip" android:layout_marginLeft="8dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" android:layout_height="wrap_content" android:layout_weight="1"> @@ -68,4 +63,13 @@ </LinearLayout> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:id="@+id/edit_image" + android:src="@drawable/ic_action_edit" + android:padding="8dp" + android:layout_gravity="center_horizontal" /> + </LinearLayout> |