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

use status icons in public key selection

Browse Source
This commit is contained in:
Dominik Schürmann
2014-10-05 04:09:55 +02:00
parent d38b200b01
commit 0b9308753d
8 changed files with 45 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/res/layout/key_list_item.xml
View File

@@ -39,7 +39,7 @@
</LinearLayout>
<ImageView
android:id="@+id/status_image"
android:id="@+id/status_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

7
OpenKeychain/src/main/res/layout/keyspinner_item.xml
View File

@@ -17,8 +17,7 @@
android:focusable="true"
android:orientation="vertical"
android:paddingLeft="8dp"
android:paddingRight="4dp"
>
android:paddingRight="4dp">
<TextView
android:id="@+id/keyspinner_key_name"
@@ -43,7 +42,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceSmall"/>
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
<ImageView
@@ -53,6 +52,6 @@
android:layout_gravity="center"
android:src="@drawable/status_signature_revoked_cutout"
android:paddingLeft="16dp"
android:paddingRight="16dp"/>
android:paddingRight="16dp" />
</LinearLayout>

20
OpenKeychain/src/main/res/layout/select_key_item.xml
View File

@@ -42,22 +42,16 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0xBBBBBBBBBBBBBBB"
android:textAppearance="?android:attr/textAppearanceSmall"
android:typeface="monospace" />
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
<TextView
android:gravity="right"
android:paddingLeft="4dp"
android:minWidth="90dip"
android:id="@+id/status"
android:paddingTop="4dp"
<ImageView
android:id="@+id/status_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="expired"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="italic"
android:layout_gravity="right" />
android:layout_gravity="center"
android:src="@drawable/status_signature_revoked_cutout"
android:paddingLeft="16dp"
android:paddingRight="16dp" />
</LinearLayout>

12
OpenKeychain/src/main/res/layout/select_secret_key_activity.xml
View File

@@ -1,12 +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="match_parent"
android:layout_centerHorizontal="true" >
<FrameLayout
android:id="@+id/select_secret_key_fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</RelativeLayout>

75
OpenKeychain/src/main/res/layout/select_secret_key_layout_fragment.xml
View File

@@ -1,75 +0,0 @@
<?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:orientation="horizontal">
<Button
android:id="@+id/select_secret_key_select_key_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginBottom="4dp"
android:layout_marginRight="4dp"
android:layout_marginTop="4dp"
android:text="@string/api_settings_select_key"
android:drawableLeft="@drawable/ic_action_accounts"
android:background="@drawable/button_edgy"
android:textSize="14sp"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginLeft="4dp"
android:layout_marginTop="4dp"
android:orientation="vertical"
android:paddingLeft="4dp">
<!-- Has been made focusable to display error messages with setError -->
<TextView
android:id="@+id/select_secret_key_user_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:focusable="true"
android:focusableInTouchMode="true"
android:singleLine="true"
android:ellipsize="end"
android:visibility="gone"
android:layout_marginRight="5dip"
android:text=""
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:id="@+id/select_secret_key_user_id_rest"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:ellipsize="end"
android:singleLine="true"
android:layout_marginRight="5dip"
android:text=""
android:visibility="gone"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:id="@+id/select_secret_key_master_key_hex"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:visibility="gone"
android:layout_marginRight="15dip" />
<TextView
android:id="@+id/no_key_selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/api_settings_no_key"
android:layout_marginTop="15dp" />
</LinearLayout>
</LinearLayout>