From 208ea19d5d56fe374bbf26e4ab4cce13dc99656b Mon Sep 17 00:00:00 2001
From: Bahtiar `kalkin-` Gadimov <bahtiar@gadimov.de>
Date: Wed, 25 Dec 2013 18:15:30 +0100
Subject: Added first draft of KeyDetailsActivity

---
 OpenPGP-Keychain/res/layout/key_view.xml | 110 +++++++++++++++++++++++++++++++
 OpenPGP-Keychain/res/values/strings.xml  |   7 +-
 2 files changed, 115 insertions(+), 2 deletions(-)
 create mode 100644 OpenPGP-Keychain/res/layout/key_view.xml

(limited to 'OpenPGP-Keychain/res')

diff --git a/OpenPGP-Keychain/res/layout/key_view.xml b/OpenPGP-Keychain/res/layout/key_view.xml
new file mode 100644
index 000000000..5649fe338
--- /dev/null
+++ b/OpenPGP-Keychain/res/layout/key_view.xml
@@ -0,0 +1,110 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginRight="?android:attr/scrollbarSize"
+    android:orientation="vertical"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp" >
+
+    <TextView
+        style="@style/SectionHeader"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="4dp"
+        android:text="@string/section_master_key" />
+
+    <TableLayout
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:stretchColumns="1" >
+
+        <TableRow>
+
+            <TextView
+                android:id="@+id/label_keyId"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:paddingRight="10dip"
+                android:text="@string/label_key_id" />
+
+            <TextView
+                android:id="@+id/fingerprint"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingRight="5dip"
+                android:text="0000 0000"
+                android:typeface="monospace" />
+        </TableRow>
+
+        <TableRow>
+
+            <TextView
+                android:id="@+id/label_algorithm"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:paddingRight="10dip"
+                android:text="@string/label_algorithm" />
+
+            <TextView
+                android:id="@+id/algorithm"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingRight="5dip"
+                android:text="Name" />
+        </TableRow>
+
+        <TableRow>
+
+            <TextView
+                android:id="@+id/label_creation"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:paddingRight="10dip"
+                android:text="@string/label_creation" />
+
+            <TextView
+                android:id="@+id/creation"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content" />
+        </TableRow>
+
+        <TableRow>
+
+            <TextView
+                android:id="@+id/label_expiry"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:paddingRight="10dip"
+                android:text="@string/label_expiry" />
+
+            <TextView
+                android:id="@+id/expiry"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content" />
+        </TableRow>
+    </TableLayout>
+
+    <TextView
+        style="@style/SectionHeader"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="4dp"
+        android:text="@string/section_user_ids" />
+    
+    <ListView android:id="@+id/user_ids"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"></ListView>
+
+    <TextView
+        style="@style/SectionHeader"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="4dp"
+        android:text="@string/section_keys" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml
index 63f267277..9909292d3 100644
--- a/OpenPGP-Keychain/res/values/strings.xml
+++ b/OpenPGP-Keychain/res/values/strings.xml
@@ -44,6 +44,7 @@
     <string name="title_send_key">Export to Key Server</string>
     <string name="title_unknown_signature_key">Unknown Signature Key</string>
     <string name="title_sign_key">Sign Key</string>
+    <string name="title_keyDetails">Key Details</string>
     <string name="title_help">Help</string>
     <string name="title_share_by_nfc">Share key with NFC</string>
 
@@ -53,6 +54,7 @@
     <string name="section_general">General</string>
     <string name="section_defaults">Defaults</string>
     <string name="section_advanced">Advanced</string>
+    <string name="section_master_key">Master Key</string>
 
     <!-- button -->
     <string name="btn_sign_to_clipboard">Sign (Clipboard)</string>
@@ -142,6 +144,8 @@
     <string name="n_key_servers">%s key server(s)</string>
     <string name="fingerprint">Fingerprint:</string>
     <string name="secret_key">Secret Key:</string>
+    <string name="notValid">not valid</string>
+    <string name="secretKeyring">Secret Keyring</string>
 
     <!-- choice -->
     <string name="choice_none">None</string>
@@ -340,5 +344,4 @@
     <!-- Share -->
     <string name="share_qr_code_dialog_start">Go through all QR Codes using \'Next\', and scan them one by one.</string>
     <string name="share_qr_code_dialog_progress">QR Code %1$d of %2$d</string>
-
-</resources>
\ No newline at end of file
+</resources>
-- 
cgit v1.2.3


From e823ef6efce29fce8a8deb31b22a2d75416702c4 Mon Sep 17 00:00:00 2001
From: Bahtiar `kalkin-` Gadimov <bahtiar@gadimov.de>
Date: Wed, 25 Dec 2013 19:33:47 +0100
Subject: Renamed keyDetails to key_details

---
 OpenPGP-Keychain/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenPGP-Keychain/res')

diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml
index 9909292d3..02e1e5bd1 100644
--- a/OpenPGP-Keychain/res/values/strings.xml
+++ b/OpenPGP-Keychain/res/values/strings.xml
@@ -44,7 +44,7 @@
     <string name="title_send_key">Export to Key Server</string>
     <string name="title_unknown_signature_key">Unknown Signature Key</string>
     <string name="title_sign_key">Sign Key</string>
-    <string name="title_keyDetails">Key Details</string>
+    <string name="title_key_details">Key Details</string>
     <string name="title_help">Help</string>
     <string name="title_share_by_nfc">Share key with NFC</string>
 
-- 
cgit v1.2.3