cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge user ids in import list for better display

Browse Source
This commit is contained in:
Dominik Schürmann
2014-09-21 17:58:26 +02:00
parent 1d38365a61
commit 9bd3383b49
5 changed files with 98 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenKeychain/src/main/res/layout/import_keys_list_entry_user_id.xml
View File

@@ -1,27 +1,7 @@
<!--
Copyright (C) 2010-2014 Thialfihar <thi@thialfihar.org>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_marginRight="?android:attr/scrollbarSize"
android:singleLine="true"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:paddingRight="3dip">
</TextView>
android:paddingRight="8dp" />

18
OpenKeychain/src/main/res/layout/import_keys_list_entry.xml → OpenKeychain/src/main/res/layout/import_keys_list_item.xml
View File

@@ -11,7 +11,7 @@
android:paddingBottom="4dp">
<CheckBox
android:id="@+id/selected"
android:id="@+id/import_item_selected"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingRight="8dp"
@@ -39,21 +39,21 @@
android:orientation="vertical">
<TextView
android:id="@+id/mainUserId"
android:id="@+id/import_item_user_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Alice"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/mainUserIdRest"
android:id="@+id/import_item_user_id_email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="alice@example.com"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:id="@+id/subkey_item_key_id"
android:id="@+id/import_item_key_id"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Key ID: abcd abcd abcd abcd"
@@ -69,7 +69,7 @@
android:paddingLeft="4dp">
<ImageView
android:id="@+id/status"
android:id="@+id/import_item_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
@@ -77,7 +77,7 @@
android:padding="16dp" />
<TextView
android:id="@+id/algorithm"
android:id="@+id/import_item_algorithm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="RSA"
@@ -87,7 +87,7 @@
</LinearLayout>
<View
android:id="@+id/user_ids_divider"
android:id="@+id/import_item_status_divider"
android:layout_width="match_parent"
android:layout_height="1dip"
android:gravity="right"
@@ -96,13 +96,13 @@
android:background="?android:attr/listDivider" />
<LinearLayout
android:id="@+id/user_ids_list"
android:id="@+id/import_item_user_ids_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" />
<TextView
android:id="@+id/view_key_fingerprint"
android:id="@+id/import_item_fingerprint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="0000 0000 0000 0000 0000\n0000 0000 0000 0000 0000"