From 1e5797387ac4d19bc9f3d552bea9414065c3760e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 26 Oct 2014 22:41:40 +0100
Subject: Rename multi certify files to certify

---
 OpenKeychain/src/main/res/layout/certify_item.xml  |  67 ++++++
 .../src/main/res/layout/certify_key_activity.xml   |   2 +-
 .../src/main/res/layout/certify_key_fragment.xml   | 250 +++++++--------------
 .../src/main/res/layout/multi_certify_item.xml     |  67 ------
 .../main/res/layout/multi_certify_key_activity.xml |  21 --
 .../main/res/layout/multi_certify_key_fragment.xml | 111 ---------
 6 files changed, 152 insertions(+), 366 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/layout/certify_item.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/multi_certify_item.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/multi_certify_key_activity.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/certify_item.xml b/OpenKeychain/src/main/res/layout/certify_item.xml
new file mode 100644
index 000000000..71838c2fc
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/certify_item.xml
@@ -0,0 +1,67 @@
+<?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:minHeight="?android:attr/listPreferredItemHeight"
+    android:orientation="vertical"
+    android:singleLine="true">
+
+    <TextView android:id="@+id/user_id_header"
+        style="@style/SectionHeader"
+        android:text="Identities for Key ID: 0123 4567 890a bcde"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:clickable="true"
+        android:layout_marginLeft="8dip"
+        android:layout_marginTop="8dip"/>
+
+    <LinearLayout android:id="@+id/user_id_body"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:singleLine="true"
+        android:layout_marginLeft="8dip"
+        android:layout_marginTop="4dip">
+
+        <CheckBox
+            android:id="@+id/user_id_item_check_box"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:gravity="top|center"
+            android:clickable="false"
+            android:focusable="false" />
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_gravity="center_vertical"
+            android:layout_width="0dip"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="4dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:minHeight="48dip">
+
+            <TextView
+                android:id="@+id/user_id_item_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="alice@example.com"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_weight="1"
+                android:gravity="center_vertical"/>
+
+            <TextView
+                android:id="@+id/user_id_item_addresses"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="alice@example.com\na-lyc@example.com"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_marginLeft="20dip"
+                />
+
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
index 952134838..2bf2c4197 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
@@ -12,7 +12,7 @@
         android:layout_height="match_parent">
 
         <fragment
-            android:id="@+id/certify_key_fragment"
+            android:id="@+id/multi_certify_key_fragment"
             android:name="org.sufficientlysecure.keychain.ui.CertifyKeyFragment"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
diff --git a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml
index 449db4c6a..a55a8ea0c 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml
@@ -1,193 +1,111 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ScrollView
-        android:id="@+id/certify_scroll_view"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:orientation="vertical">
 
-        <LinearLayout
+        <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:orientation="vertical">
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:text="@string/certify_text"
+            android:id="@+id/textView"
+            android:layout_weight="1" />
+
+        <org.sufficientlysecure.keychain.ui.widget.FixedListView
+            android:id="@+id/view_key_user_ids"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="14dp"
+            android:text="@string/section_certify"
+            android:layout_weight="1" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
             <TextView
-                style="@style/SectionHeader"
+                android:paddingLeft="8dp"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_marginTop="14dp"
-                android:text="@string/section_certification_key" />
+                android:layout_height="match_parent"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/add_keys_my_key"
+                android:paddingRight="8dp"
+                android:gravity="center_vertical" />
 
             <org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner
                 android:id="@+id/certify_key_spinner"
+                android:minHeight="56dip"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <TextView
-                style="@style/SectionHeader"
-                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_marginTop="14dp"
-                android:text="@string/section_key_to_certify" />
+                android:layout_gravity="center_vertical" />
 
-            <TableLayout
-                android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:layout_marginLeft="8dp"
-                android:shrinkColumns="1">
-
-                <TableRow
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent">
-
-                    <TextView
-                        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/key_id"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:paddingRight="5dip"
-                        android:text=""
-                        android:typeface="monospace" />
-                </TableRow>
-
-                <TableRow
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:paddingRight="10dip"
-                        android:text="@string/label_main_user_id" />
-
-                    <TextView
-                        android:id="@+id/main_user_id"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
-
-                </TableRow>
-
-                <TableRow
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:paddingRight="10dip"
-                        android:text="@string/label_fingerprint" />
-
-                    <TextView
-                        android:id="@+id/view_key_fingerprint"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:typeface="monospace" />
-
-                </TableRow>
-
-            </TableLayout>
-
-            <TextView
-                style="@style/SectionHeader"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="14dp"
-                android:text="@string/section_uids_to_certify" />
+        </LinearLayout>
 
-            <org.sufficientlysecure.keychain.ui.widget.FixedListView
-                android:id="@+id/view_key_user_ids"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+        <CheckBox
+            android:id="@+id/sign_key_upload_checkbox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:checked="true"
+            android:text="@string/label_send_key"
+            android:paddingTop="12dp"
+            android:paddingBottom="12dp"/>
 
-            <TextView
-                style="@style/SectionHeader"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_marginTop="14dp"
-                android:text="@string/section_upload_key" />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
 
-            <CheckBox
-                android:id="@+id/sign_key_upload_checkbox"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_marginTop="4dp"
-                android:checked="false"
-                android:text="@string/label_send_key" />
+        <LinearLayout
+            android:id="@+id/certify_key_certify_button"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            android:paddingRight="4dp"
+            style="@style/SelectableItem"
+            android:orientation="horizontal">
 
-            <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
-                android:layout_width="match_parent"
+            <TextView
+                android:paddingLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dip"
                 android:layout_height="match_parent"
-                custom:foldedLabel="@string/api_settings_show_advanced"
-                custom:unFoldedLabel="@string/api_settings_hide_advanced">
-
-                <Spinner
-                    android:id="@+id/upload_key_keyserver"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="4dp"
-                    android:layout_marginTop="4dp"
-                    android:enabled="false" />
-
-            </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout>
+                android:text="@string/key_view_action_certify"
+                android:layout_weight="1"
+                android:gravity="center_vertical" />
 
-            <TextView
-                style="@style/SectionHeader"
+            <!-- separate ImageView required for recoloring -->
+            <ImageView
+                android:id="@+id/certify_key_action_certify_image"
                 android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                android:layout_marginTop="14dp"
-                android:text="@string/section_actions"
-                android:layout_weight="1" />
-
-            <LinearLayout
-                android:id="@+id/certify_key_certify_button"
-                android:layout_width="match_parent"
-                android:layout_height="?android:attr/listPreferredItemHeight"
-                android:clickable="true"
-                android:paddingRight="4dp"
-                android:layout_marginBottom="8dp"
-                style="@style/SelectableItem"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:paddingLeft="8dp"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_width="0dip"
-                    android:layout_height="match_parent"
-                    android:text="@string/key_view_action_certify"
-                    android:layout_weight="1"
-                    android:gravity="center_vertical" />
-
-                <ImageView
-                    android:id="@+id/certify_key_action_certify_image"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:padding="8dp"
-                    android:src="@drawable/status_signature_verified_cutout"
-                    android:layout_gravity="center_vertical" />
-
-            </LinearLayout>
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/status_signature_verified_cutout"
+                android:layout_gravity="center_vertical" />
 
         </LinearLayout>
 
-    </ScrollView>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:layout_marginBottom="4dp"
+            android:background="?android:attr/listDivider" />
+
+    </LinearLayout>
 
-</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/multi_certify_item.xml b/OpenKeychain/src/main/res/layout/multi_certify_item.xml
deleted file mode 100644
index 71838c2fc..000000000
--- a/OpenKeychain/src/main/res/layout/multi_certify_item.xml
+++ /dev/null
@@ -1,67 +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:minHeight="?android:attr/listPreferredItemHeight"
-    android:orientation="vertical"
-    android:singleLine="true">
-
-    <TextView android:id="@+id/user_id_header"
-        style="@style/SectionHeader"
-        android:text="Identities for Key ID: 0123 4567 890a bcde"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:clickable="true"
-        android:layout_marginLeft="8dip"
-        android:layout_marginTop="8dip"/>
-
-    <LinearLayout android:id="@+id/user_id_body"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:singleLine="true"
-        android:layout_marginLeft="8dip"
-        android:layout_marginTop="4dip">
-
-        <CheckBox
-            android:id="@+id/user_id_item_check_box"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="top|center"
-            android:clickable="false"
-            android:focusable="false" />
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_gravity="center_vertical"
-            android:layout_width="0dip"
-            android:layout_marginLeft="8dp"
-            android:layout_marginTop="4dp"
-            android:layout_marginBottom="4dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:minHeight="48dip">
-
-            <TextView
-                android:id="@+id/user_id_item_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="alice@example.com"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_weight="1"
-                android:gravity="center_vertical"/>
-
-            <TextView
-                android:id="@+id/user_id_item_addresses"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="alice@example.com\na-lyc@example.com"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_marginLeft="20dip"
-                />
-
-        </LinearLayout>
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/multi_certify_key_activity.xml b/OpenKeychain/src/main/res/layout/multi_certify_key_activity.xml
deleted file mode 100644
index 1db18ae63..000000000
--- a/OpenKeychain/src/main/res/layout/multi_certify_key_activity.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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">
-
-        <fragment
-            android:id="@+id/multi_certify_key_fragment"
-            android:name="org.sufficientlysecure.keychain.ui.MultiCertifyKeyFragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </FrameLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml b/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml
deleted file mode 100644
index a55a8ea0c..000000000
--- a/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="@string/certify_text"
-            android:id="@+id/textView"
-            android:layout_weight="1" />
-
-        <org.sufficientlysecure.keychain.ui.widget.FixedListView
-            android:id="@+id/view_key_user_ids"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/section_certify"
-            android:layout_weight="1" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:paddingLeft="8dp"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="@string/add_keys_my_key"
-                android:paddingRight="8dp"
-                android:gravity="center_vertical" />
-
-            <org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner
-                android:id="@+id/certify_key_spinner"
-                android:minHeight="56dip"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical" />
-
-        </LinearLayout>
-
-        <CheckBox
-            android:id="@+id/sign_key_upload_checkbox"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:checked="true"
-            android:text="@string/label_send_key"
-            android:paddingTop="12dp"
-            android:paddingBottom="12dp"/>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <LinearLayout
-            android:id="@+id/certify_key_certify_button"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            android:paddingRight="4dp"
-            style="@style/SelectableItem"
-            android:orientation="horizontal">
-
-            <TextView
-                android:paddingLeft="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text="@string/key_view_action_certify"
-                android:layout_weight="1"
-                android:gravity="center_vertical" />
-
-            <!-- separate ImageView required for recoloring -->
-            <ImageView
-                android:id="@+id/certify_key_action_certify_image"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/status_signature_verified_cutout"
-                android:layout_gravity="center_vertical" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:layout_marginBottom="4dp"
-            android:background="?android:attr/listDivider" />
-
-    </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
-- 
cgit v1.2.3