diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
16 files changed, 111 insertions, 74 deletions
diff --git a/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml b/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml index e1ccfee1f..7af73be09 100644 --- a/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml +++ b/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml @@ -34,7 +34,7 @@ android:padding="4dp" /> </TableRow> - <TableRow> + <TableRow android:id="@+id/add_subkey_row_size"> <TextView android:layout_width="wrap_content" @@ -50,6 +50,24 @@ android:padding="4dp" /> </TableRow> + <TableRow + android:id="@+id/add_subkey_row_curve" + android:visibility="gone"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/label_ecc_curve"/> + + <Spinner + android:id="@+id/add_subkey_curve" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="right" + android:padding="4dp"/> + </TableRow> + <TextView android:id="@+id/add_subkey_custom_key_size_label" android:layout_width="wrap_content" diff --git a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml index aaeae78e0..d8e1d9ad8 100644 --- a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml +++ b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml @@ -59,9 +59,7 @@ 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"> + custom:unFoldedLabel="@string/api_settings_hide_advanced"> <TextView android:layout_width="match_parent" diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml index ceea1d8a6..6ef31913a 100644 --- a/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml +++ b/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml @@ -40,9 +40,7 @@ android:layout_width="match_parent" 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"> + custom:unFoldedLabel="@string/api_settings_hide_info"> <TextView android:layout_width="match_parent" @@ -67,7 +65,7 @@ android:id="@+id/api_app_settings_package_signature" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="Base64 encoded signature" + android:text="Base64 encoded hash of signature" android:textAppearance="?android:attr/textAppearanceSmall" /> </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout> diff --git a/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml b/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml index a10592607..bf4d0a70d 100644 --- a/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml +++ b/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml @@ -4,13 +4,13 @@ android:layout_height="fill_parent" android:orientation="vertical" > - <org.sufficientlysecure.htmltextview.HtmlTextView + <TextView android:id="@+id/api_select_pub_keys_text" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="8dp" - android:paddingBottom="0dip" - android:text="Set in-code!" + android:paddingTop="8dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" android:textAppearance="?android:attr/textAppearanceSmall" /> <FrameLayout diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml index 34d4dbd57..9796a6ddc 100644 --- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -8,6 +7,7 @@ <include layout="@layout/notify_area" /> <ScrollView + android:id="@+id/certify_scroll_view" android:layout_width="wrap_content" android:layout_height="match_parent"> @@ -26,14 +26,10 @@ android:layout_marginTop="14dp" android:text="@string/section_certification_key" /> - <fragment - android:id="@+id/sign_key_select_key_fragment" - android:name="org.sufficientlysecure.keychain.ui.SelectSecretKeyLayoutFragment" + <org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner + android:id="@+id/certify_key_spinner" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:layout_marginTop="4dp" - tools:layout="@layout/select_secret_key_layout_fragment" /> + android:layout_height="wrap_content" /> <TextView style="@style/SectionHeader" @@ -119,8 +115,7 @@ <org.sufficientlysecure.keychain.ui.widget.FixedListView android:id="@+id/view_key_user_ids" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:descendantFocusability="blocksDescendants" /> + android:layout_height="wrap_content" /> <TextView style="@style/SectionHeader" @@ -184,7 +179,6 @@ </LinearLayout> - </LinearLayout> </ScrollView> diff --git a/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml b/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml index 062f07863..8a713115e 100644 --- a/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml +++ b/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml @@ -4,6 +4,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + <CheckBox + android:id="@+id/edit_subkey_expiry_no_expiry" + android:layout_marginTop="8dp" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:checked="true" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/btn_no_date" /> + <DatePicker android:id="@+id/edit_subkey_expiry_date_picker" android:layout_gravity="center_horizontal" diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml index 4d82477bc..2189a1f34 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml @@ -24,7 +24,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:text="@string/label_asymmetric_from" /> - <Spinner + <org.sufficientlysecure.keychain.ui.widget.SignKeySpinner android:id="@+id/sign" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/OpenKeychain/src/main/res/layout/encrypt_content.xml b/OpenKeychain/src/main/res/layout/encrypt_content.xml index e5edc6657..d029e7b83 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_content.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_content.xml @@ -9,13 +9,11 @@ <include layout="@layout/notify_area"/> - <org.sufficientlysecure.keychain.ui.widget.NoSwipeWrapContentViewPager + <FrameLayout android:id="@+id/encrypt_pager_mode" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - </org.sufficientlysecure.keychain.ui.widget.NoSwipeWrapContentViewPager> + android:layout_height="wrap_content" + android:orientation="vertical" /> <android.support.v4.view.ViewPager android:id="@+id/encrypt_pager_content" diff --git a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml index 3d2fb688b..13cf7c225 100644 --- a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml +++ b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml @@ -11,14 +11,13 @@ android:orientation="horizontal" android:clickable="true"> - <ImageButton + <ImageView android:id="@+id/foldableIcon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_marginRight="10dp" - android:src="@drawable/ic_action_expand" - android:background="@drawable/button_no_style"/> + android:src="@drawable/ic_action_expand"/> <TextView android:id="@+id/foldableText" diff --git a/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml index 062289688..c70236e07 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:gravity="top|left" - android:hint="@string/hint_keybase_search" + android:hint="@string/hint_keybase_search_hint" android:imeOptions="actionSearch" android:inputType="textNoSuggestions" android:singleLine="true" diff --git a/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml index 47c354c53..62e7d740c 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml @@ -10,13 +10,13 @@ android:layout_height="?android:attr/listPreferredItemHeight" android:orientation="horizontal"> - <EditText + <AutoCompleteTextView android:id="@+id/import_server_query" android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="1" android:gravity="top|left" - android:hint="@string/hint_public_keys" + android:hint="@string/hint_keyserver_search_hint" android:imeOptions="actionSearch" android:inputType="textNoSuggestions" android:singleLine="true" diff --git a/OpenKeychain/src/main/res/layout/key_list_activity.xml b/OpenKeychain/src/main/res/layout/key_list_activity.xml index 297fc526e..03ef85381 100644 --- a/OpenKeychain/src/main/res/layout/key_list_activity.xml +++ b/OpenKeychain/src/main/res/layout/key_list_activity.xml @@ -4,16 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <include layout="@layout/notify_area" /> - - <include layout="@layout/key_list_content" /> - - </LinearLayout> + <include layout="@layout/key_list_content" /> <include layout="@layout/drawer_list" /> diff --git a/OpenKeychain/src/main/res/layout/key_list_content.xml b/OpenKeychain/src/main/res/layout/key_list_content.xml index e58e42961..66b009c78 100644 --- a/OpenKeychain/src/main/res/layout/key_list_content.xml +++ b/OpenKeychain/src/main/res/layout/key_list_content.xml @@ -1,14 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <include layout="@layout/notify_area" /> + + <FrameLayout android:id="@+id/content_frame" android:layout_marginLeft="@dimen/drawer_content_padding" android:layout_width="match_parent" android:layout_height="match_parent"> - <fragment + <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 + android:layout_height="match_parent" /> + </FrameLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml b/OpenKeychain/src/main/res/layout/keyspinner_key.xml index 703f9133b..703f9133b 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml +++ b/OpenKeychain/src/main/res/layout/keyspinner_key.xml diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index b15a73c0e..451eb30ee 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - <include layout="@layout/notify_area"/> + <include layout="@layout/notify_area" /> <LinearLayout android:id="@+id/view_key_status_layout" @@ -16,17 +16,17 @@ android:orientation="horizontal"> <ImageView + android:id="@+id/view_key_status_image" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/view_key_status_image" /> + android:layout_height="wrap_content" /> <TextView + android:id="@+id/view_key_status_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:id="@+id/view_key_status_text" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_gravity="center_vertical" - android:layout_marginLeft="8dp"/> + android:layout_marginLeft="8dp" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/view_key_certs_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_certs_fragment.xml index 00b3f85c5..1cf826b30 100644 --- a/OpenKeychain/src/main/res/layout/view_key_certs_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_certs_fragment.xml @@ -1,24 +1,47 @@ -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent"> - - <se.emilsjolander.stickylistheaders.StickyListHeadersListView - android:layout_width="match_parent" - android:layout_height="match_parent" - android:id="@+id/list" - android:fastScrollEnabled="true" - android:paddingBottom="16dp" - android:paddingLeft="16dp" - android:paddingRight="32dp" - android:scrollbarStyle="outsideOverlay" /> + android:layout_height="match_parent" + android:orientation="vertical"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/empty_certs" - android:id="@+id/empty" - android:visibility="gone" - android:layout_gravity="center" /> + android:background="@color/holo_gray_bright" + android:padding="8dp" + android:textAppearance="?android:attr/textAppearanceSmall" + android:text="@string/certs_text" + android:gravity="center_horizontal" /> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" + android:id="@+id/view_key_status_divider" /> + + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <se.emilsjolander.stickylistheaders.StickyListHeadersListView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/list" + android:fastScrollEnabled="true" + android:paddingBottom="16dp" + android:paddingLeft="16dp" + android:paddingRight="32dp" + android:scrollbarStyle="outsideOverlay" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/empty_certs" + android:id="@+id/empty" + android:visibility="gone" + android:layout_gravity="center" /> + + </FrameLayout> + +</LinearLayout> -</FrameLayout> |