diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
6 files changed, 111 insertions, 80 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml b/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml new file mode 100644 index 000000000..a581caa0e --- /dev/null +++ b/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml @@ -0,0 +1,22 @@ +<?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"> + + <include layout="@layout/notify_area" /> + + <FrameLayout + android:id="@+id/content_frame" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <FrameLayout + android:id="@+id/view_key_advanced_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" /> + + </FrameLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/view_key_advanced_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_advanced_fragment.xml new file mode 100644 index 000000000..9a2190f7e --- /dev/null +++ b/OpenKeychain/src/main/res/layout/view_key_advanced_fragment.xml @@ -0,0 +1,87 @@ +<!--<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"--><!--android:layout_width="match_parent"--><!--android:layout_height="match_parent">--> + +<!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:focusable="true" + android:focusableInTouchMode="true" + android:descendantFocusability="beforeDescendants" + android:orientation="vertical"> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:layout_marginTop="8dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:text="@string/section_keys" /> + + <FrameLayout + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="0.4"> + + <ListView + android:id="@+id/keys" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:scrollbarStyle="outsideOverlay" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:layout_marginBottom="8dp" /> + </FrameLayout> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:text="@string/section_certs" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + 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="0dp" + android:layout_weight="0.6"> + + <se.emilsjolander.stickylistheaders.StickyListHeadersListView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/certs_list" + android:paddingLeft="16dp" + android:paddingRight="16dp" + 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> + + <!--</ScrollView>--> diff --git a/OpenKeychain/src/main/res/layout/view_key_certs_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_certs_fragment.xml deleted file mode 100644 index 1cf826b30..000000000 --- a/OpenKeychain/src/main/res/layout/view_key_certs_fragment.xml +++ /dev/null @@ -1,47 +0,0 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - 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> - diff --git a/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml deleted file mode 100644 index caea22341..000000000 --- a/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml +++ /dev/null @@ -1,32 +0,0 @@ -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331--> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:focusable="true" - android:focusableInTouchMode="true" - android:descendantFocusability="beforeDescendants" - android:orientation="vertical" - android:paddingLeft="16dp" - android:paddingRight="16dp"> - - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:layout_marginTop="8dp" - android:text="@string/section_keys" /> - - <org.sufficientlysecure.keychain.ui.widget.FixedListView - android:id="@+id/keys" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="8dp" /> - - </LinearLayout> - -</ScrollView> diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml index 5a156b5ac..049c7013a 100644 --- a/OpenKeychain/src/main/res/menu/key_view.xml +++ b/OpenKeychain/src/main/res/menu/key_view.xml @@ -17,7 +17,6 @@ <item android:id="@+id/menu_key_view_advanced" app:showAsAction="never" - android:checkable="true" android:title="@string/menu_advanced" /> </menu>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 40f2d56be..48e26ae7f 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -40,6 +40,7 @@ <string name="title_log_display">"Log"</string> <string name="title_create_key">"Create Key"</string> <string name="title_exchange_keys">"Exchange Keys"</string> + <string name="title_advanced_key_info">"Advanced Key Info"</string> <!-- section --> <string name="section_user_ids">"Identities"</string> @@ -59,6 +60,7 @@ <string name="section_key_to_certify">"Key to be certified"</string> <string name="section_decrypt_files">"Files"</string> <string name="section_decrypt_text">"Text"</string> + <string name="section_certs">"Certificates"</string> <!-- button --> <string name="btn_decrypt_verify_file">"Decrypt, verify, and save file"</string> |