diff options
Diffstat (limited to 'OpenPGP-Keychain/src/main/res/layout')
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/layout/key_list_activity.xml (renamed from OpenPGP-Keychain/src/main/res/layout/key_list_public_activity.xml) | 4 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/layout/key_list_fragment.xml (renamed from OpenPGP-Keychain/src/main/res/layout/key_list_public_fragment.xml) | 10 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/layout/key_list_header.xml | 30 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/layout/key_list_item.xml (renamed from OpenPGP-Keychain/src/main/res/layout/key_list_public_item.xml) | 28 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/layout/key_list_public_header.xml | 16 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/layout/key_list_secret_activity.xml | 24 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml | 32 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml | 32 |
8 files changed, 91 insertions, 85 deletions
diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_public_activity.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_activity.xml index f0e843e56..65d246d7b 100644 --- a/OpenPGP-Keychain/src/main/res/layout/key_list_public_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/key_list_activity.xml @@ -9,8 +9,8 @@ android:layout_height="match_parent" > <fragment - android:id="@+id/key_list_public_fragment" - android:name="org.sufficientlysecure.keychain.ui.KeyListPublicFragment" + android:id="@+id/key_list_fragment" + android:name="org.sufficientlysecure.keychain.ui.KeyListFragment" android:layout_width="match_parent" android:layout_height="match_parent" /> </FrameLayout> diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_public_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_fragment.xml index db82c8771..77bd6f4e9 100644 --- a/OpenPGP-Keychain/src/main/res/layout/key_list_public_fragment.xml +++ b/OpenPGP-Keychain/src/main/res/layout/key_list_fragment.xml @@ -7,7 +7,7 @@ <!--rebuild functionality of ListFragment --> <LinearLayout - android:id="@+id/key_list_public_progress_container" + android:id="@+id/key_list_progress_container" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" @@ -30,12 +30,12 @@ </LinearLayout> <FrameLayout - android:id="@+id/key_list_public_list_container" + android:id="@+id/key_list_list_container" android:layout_width="match_parent" android:layout_height="match_parent"> <se.emilsjolander.stickylistheaders.StickyListHeadersListView - android:id="@+id/key_list_public_list" + android:id="@+id/key_list_list" android:layout_width="match_parent" android:layout_height="match_parent" android:clipToPadding="false" @@ -47,7 +47,7 @@ android:scrollbarStyle="outsideOverlay" /> <LinearLayout - android:id="@+id/key_list_public_empty" + android:id="@+id/key_list_empty" android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" @@ -105,4 +105,4 @@ </FrameLayout> -</FrameLayout>
\ No newline at end of file +</FrameLayout> diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_header.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_header.xml new file mode 100644 index 000000000..09ac1c856 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/key_list_header.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" > + + <org.sufficientlysecure.keychain.ui.widget.UnderlineTextView + android:id="@+id/stickylist_header_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="start|left" + android:padding="8dp" + android:textColor="@color/emphasis" + android:textSize="17sp" + android:textStyle="bold" + android:text="header text" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceSmall" + android:text="contact count" + android:id="@+id/contacts_num" + android:layout_centerVertical="true" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:layout_marginRight="10px" + android:visibility="visible" + android:textColor="@android:color/darker_gray" /> + +</RelativeLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_public_item.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_item.xml index f07d60214..f52693138 100644 --- a/OpenPGP-Keychain/src/main/res/layout/key_list_public_item.xml +++ b/OpenPGP-Keychain/src/main/res/layout/key_list_item.xml @@ -3,13 +3,13 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" - android:layout_marginRight="?android:attr/scrollbarSize" android:gravity="center_vertical" android:paddingLeft="8dp" - android:paddingRight="8dp" android:paddingTop="4dp" android:paddingBottom="4dp" - android:singleLine="true"> + android:singleLine="true" + android:descendantFocusability="blocksDescendants" + android:focusable="false"> <TextView android:id="@+id/mainUserId" @@ -17,6 +17,7 @@ android:layout_height="wrap_content" android:text="@string/label_main_user_id" android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_alignParentTop="true" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" /> @@ -30,6 +31,23 @@ android:layout_alignParentLeft="true" android:layout_alignParentStart="true" /> + <Button + style="@android:style/Widget.DeviceDefault.Button.Borderless.Small" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/edit" + android:focusable="false" + android:layout_alignTop="@+id/mainUserId" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:layout_alignParentBottom="false" + android:layout_alignParentTop="false" + android:layout_alignBottom="@+id/mainUserIdRest" + android:visibility="visible" + android:enabled="true" + android:textColor="@color/black" + android:text="@string/edit" /> + <TextView android:id="@+id/revoked" android:layout_width="wrap_content" @@ -37,9 +55,9 @@ android:textAppearance="?android:attr/textAppearanceSmall" android:text="@string/revoked" android:textColor="#e00" - android:visibility="gone" + android:visibility="visible" android:layout_alignParentTop="true" android:layout_alignParentRight="true" android:layout_alignParentEnd="true" /> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_public_header.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_public_header.xml deleted file mode 100644 index 5768e4153..000000000 --- a/OpenPGP-Keychain/src/main/res/layout/key_list_public_header.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" > - - <org.sufficientlysecure.keychain.ui.widget.UnderlineTextView - android:id="@+id/stickylist_header_text" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="start|left" - android:padding="8dp" - android:textColor="@color/emphasis" - android:textSize="17sp" - android:textStyle="bold" /> - -</RelativeLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_secret_activity.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_secret_activity.xml deleted file mode 100644 index cd208a545..000000000 --- a/OpenPGP-Keychain/src/main/res/layout/key_list_secret_activity.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/drawer_layout" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <fragment - android:id="@+id/key_list_secret_fragment" - android:name="org.sufficientlysecure.keychain.ui.KeyListSecretFragment" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingBottom="16dp" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:scrollbarStyle="outsideOverlay" /> - </FrameLayout> - - <include layout="@layout/drawer_list" /> - -</android.support.v4.widget.DrawerLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml deleted file mode 100644 index 7d5492265..000000000 --- a/OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="?android:attr/listPreferredItemHeight" - android:gravity="center_vertical" - android:paddingLeft="8dp" - android:paddingTop="4dp" - android:paddingBottom="4dp" - android:singleLine="true"> - - <TextView - android:id="@+id/mainUserId" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/label_main_user_id" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_alignParentTop="true" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" /> - - <TextView - android:id="@+id/mainUserIdRest" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="<user@example.com>" - android:textAppearance="?android:attr/textAppearanceSmall" - android:layout_below="@+id/mainUserId" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" /> - -</RelativeLayout>
\ No newline at end of file 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 b44ca82ec..3c8a4270b 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 @@ -160,7 +160,10 @@ android:layout_height="wrap_content" /> </TableRow> - <TableRow> + <TableRow + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:id="@+id/tableRow"> <TextView android:layout_width="wrap_content" @@ -175,6 +178,22 @@ android:layout_height="wrap_content" android:typeface="monospace" /> </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_secret_key" /> + + <TextView + android:id="@+id/secret_key" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:typeface="monospace" /> + </TableRow> </TableLayout> <TextView @@ -212,6 +231,17 @@ 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:text="@string/key_view_action_edit" + bootstrapbutton:bb_icon_left="fa-key" + bootstrapbutton:bb_type="info" + android:visibility="gone" /> + + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/action_encrypt" android:layout_width="match_parent" android:layout_height="60dp" |