From e84aa5a69d0d6f17699ed2af2bcb0561b31ac90d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 24 Jun 2014 13:54:24 +0200
Subject: Rename registered apps to apps

---
 OpenKeychain/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index e24ac6925..a6b16a421 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -10,7 +10,7 @@
     <string name="title_create_key">Create Key</string>
     <string name="title_edit_key">Edit Key</string>
     <string name="title_preferences">Preferences</string>
-    <string name="title_api_registered_apps">Registered Applications</string>
+    <string name="title_api_registered_apps">Apps</string>
     <string name="title_key_server_preference">Keyserver Preference</string>
     <string name="title_change_passphrase">Change Passphrase</string>
     <string name="title_set_passphrase">Set Passphrase</string>
@@ -476,7 +476,7 @@
     <string name="nav_encrypt">Sign and Encrypt</string>
     <string name="nav_decrypt">Decrypt and Verify</string>
     <string name="nav_import">Import Keys</string>
-    <string name="nav_apps">Registered Apps</string>
+    <string name="nav_apps">Apps</string>
     <string name="drawer_open">Open navigation drawer</string>
     <string name="drawer_close">Close navigation drawer</string>
     <string name="edit">Edit</string>
-- 
cgit v1.2.3


From a1bcbe72a3c52d416b3dfe5c0cc96b65739641ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 24 Jun 2014 22:58:28 +0200
Subject: new edit key: first version to add user ids

---
 .../src/main/res/layout/add_user_id_dialog.xml     | 60 ++++++++++++++++++++++
 .../src/main/res/layout/edit_key_fragment.xml      | 10 ++++
 2 files changed, 70 insertions(+)
 create mode 100644 OpenKeychain/src/main/res/layout/add_user_id_dialog.xml

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

diff --git a/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml b/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml
new file mode 100644
index 000000000..502ca1c70
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:stretchColumns="1">
+
+    <TableRow android:layout_marginBottom="5dip">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:padding="4dp"
+            android:text="Name" />
+
+        <EditText
+            android:id="@+id/name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:imeOptions="actionNext"
+            android:padding="4dp" />
+    </TableRow>
+
+    <TableRow android:layout_marginBottom="10dip">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:padding="4dp"
+            android:text="Email" />
+
+        <EditText
+            android:id="@+id/address"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:imeOptions="actionNext"
+            android:padding="4dp" />
+    </TableRow>
+
+    <TableRow android:layout_marginBottom="10dip">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:padding="4dp"
+            android:text="Comment" />
+
+        <EditText
+            android:id="@+id/comment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:imeOptions="actionDone"
+            android:padding="4dp" />
+    </TableRow>
+
+</TableLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml
index f652269e5..7f94cb3cd 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml
@@ -45,6 +45,11 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
         <org.sufficientlysecure.keychain.ui.widget.FixedListView
             android:id="@+id/edit_key_user_ids_added"
             android:layout_width="match_parent"
@@ -82,6 +87,11 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
         <org.sufficientlysecure.keychain.ui.widget.FixedListView
             android:id="@+id/edit_key_keys_added"
             android:layout_width="match_parent"
-- 
cgit v1.2.3


From 607af7bcca09df0e41ffb3b79d6bddc48f07e492 Mon Sep 17 00:00:00 2001
From: Daniel Albert <albert_daniel@t-online.de>
Date: Wed, 25 Jun 2014 19:20:17 +0200
Subject: Temporary fix for #648

---
 OpenKeychain/src/main/res/raw/help_faq.html | 8 ++++++++
 1 file changed, 8 insertions(+)

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

diff --git a/OpenKeychain/src/main/res/raw/help_faq.html b/OpenKeychain/src/main/res/raw/help_faq.html
index e6757d0da..6f8763f36 100644
--- a/OpenKeychain/src/main/res/raw/help_faq.html
+++ b/OpenKeychain/src/main/res/raw/help_faq.html
@@ -12,5 +12,13 @@ And don't add newlines before or after p tags because of transifex -->
 <h2>A wrong primary user id is shown when searching on a Keyserver</h2>
 <p>Unfortunately, this is a bug in the SKS Keyserver software. Its machine-readable output returns the user ids in an arbitrary order. Read the <a href="https://bitbucket.org/skskeyserver/sks-keyserver/issue/28/primary-uid-in-machine-readable-index">related bug report</a> for more information.</p>
 
+<h2>How do I activate OpenKeychain in K9-Mail?</h2>
+<p>To use OpenKeychain with K9-Mail, you want to follow these steps:</p>
+<ol>
+    <li>Open K9-Mail and long-tap on the account you want to use OpenKeychain with.</li>
+    <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
+    <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
+</ol>
+<p>Thats it.</p>
 </body>
 </html>
-- 
cgit v1.2.3


From 1b90b46b00802c07f68843897fb9e7b5afa29460 Mon Sep 17 00:00:00 2001
From: Daniel Albert <albert_daniel@t-online.de>
Date: Thu, 26 Jun 2014 21:33:42 +0200
Subject: Swapped out FontawesomeText with normal ImageView

---
 OpenKeychain/src/main/res/layout/drawer_list_item.xml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/drawer_list_item.xml b/OpenKeychain/src/main/res/layout/drawer_list_item.xml
index 72f4fec50..158e72c01 100644
--- a/OpenKeychain/src/main/res/layout/drawer_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/drawer_list_item.xml
@@ -3,17 +3,14 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <com.beardedhen.androidbootstrap.FontAwesomeText
-        android:id="@+id/drawer_item_icon"
-        android:layout_width="30dp"
+    <ImageView
+        android:layout_width="30 dp"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:textSize="24sp"
+        android:id="@+id/drawer_item_icon"
         android:layout_marginLeft="8dp"
-        fontawesometext:fa_icon="fa-github"
-        android:layout_centerVertical="true"
+        android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true" />
+        android:layout_centerVertical="true" />
 
     <TextView
         android:id="@+id/drawer_item_text"
@@ -27,7 +24,6 @@
         android:paddingTop="16dp"
         android:textAppearance="@android:style/TextAppearance.Medium"
         android:textColor="#111"
-        android:layout_alignParentTop="true"
-        android:layout_toRightOf="@+id/drawer_item_icon" />
+        android:layout_alignParentTop="true" />
 
 </RelativeLayout>
-- 
cgit v1.2.3


From 567e5cc6a52277dce4f3e1214ff3b247ca26f68f Mon Sep 17 00:00:00 2001
From: Daniel Albert <albert_daniel@t-online.de>
Date: Fri, 27 Jun 2014 21:03:19 +0200
Subject: Added unlock icon, fixed drawer items, switched to icons from
 resource in drawer

---
 .../src/main/res/drawable-hdpi/ic_action_not_secure.png   | Bin 0 -> 373 bytes
 .../src/main/res/drawable-mdpi/ic_action_not_secure.png   | Bin 0 -> 321 bytes
 .../src/main/res/drawable-xhdpi/ic_action_not_secure.png  | Bin 0 -> 483 bytes
 .../src/main/res/drawable-xxhdpi/ic_action_not_secure.png | Bin 0 -> 619 bytes
 OpenKeychain/src/main/res/layout/drawer_list_item.xml     |   8 +++++---
 5 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_not_secure.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_not_secure.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_not_secure.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_not_secure.png

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_not_secure.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_not_secure.png
new file mode 100644
index 000000000..5ee148080
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_not_secure.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_not_secure.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_not_secure.png
new file mode 100644
index 000000000..dd5289ee4
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_not_secure.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_not_secure.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_not_secure.png
new file mode 100644
index 000000000..312a230e7
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_not_secure.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_not_secure.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_not_secure.png
new file mode 100644
index 000000000..4aa9dc85c
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_not_secure.png differ
diff --git a/OpenKeychain/src/main/res/layout/drawer_list_item.xml b/OpenKeychain/src/main/res/layout/drawer_list_item.xml
index 158e72c01..4719483da 100644
--- a/OpenKeychain/src/main/res/layout/drawer_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/drawer_list_item.xml
@@ -4,9 +4,10 @@
     android:layout_height="wrap_content">
 
     <ImageView
-        android:layout_width="30 dp"
-        android:layout_height="wrap_content"
         android:id="@+id/drawer_item_icon"
+        android:gravity="center_vertical"
+        android:layout_width="30dp"
+        android:layout_height="wrap_content"
         android:layout_marginLeft="8dp"
         android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
@@ -24,6 +25,7 @@
         android:paddingTop="16dp"
         android:textAppearance="@android:style/TextAppearance.Medium"
         android:textColor="#111"
-        android:layout_alignParentTop="true" />
+        android:layout_alignParentTop="true"
+        android:layout_toRightOf="@id/drawer_item_icon"/>
 
 </RelativeLayout>
-- 
cgit v1.2.3


From 9fe07478e7fe683223310d017f162f5bcb467d15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 27 Jun 2014 21:40:18 +0200
Subject: Start work on a first-time wizard

---
 .../src/main/res/layout/wizard_activity.xml        | 98 ++++++++++++++++++++++
 .../main/res/layout/wizard_create_key_fragment.xml | 41 +++++++++
 .../main/res/layout/wizard_generic_fragment.xml    | 15 ++++
 .../src/main/res/layout/wizard_start_fragment.xml  | 63 ++++++++++++++
 OpenKeychain/src/main/res/values/strings.xml       |  1 +
 5 files changed, 218 insertions(+)
 create mode 100644 OpenKeychain/src/main/res/layout/wizard_activity.xml
 create mode 100644 OpenKeychain/src/main/res/layout/wizard_create_key_fragment.xml
 create mode 100644 OpenKeychain/src/main/res/layout/wizard_generic_fragment.xml
 create mode 100644 OpenKeychain/src/main/res/layout/wizard_start_fragment.xml

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

diff --git a/OpenKeychain/src/main/res/layout/wizard_activity.xml b/OpenKeychain/src/main/res/layout/wizard_activity.xml
new file mode 100644
index 000000000..299d07a76
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/wizard_activity.xml
@@ -0,0 +1,98 @@
+<?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">
+
+    <LinearLayout
+        android:id="@+id/wizard_buttons"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/wizard_back"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:onClick="backOnClick"
+            android:text="cancel"
+            style="@style/SelectableItem" />
+
+        <View
+            android:layout_width="1dip"
+            android:layout_height="match_parent"
+            android:layout_marginBottom="4dip"
+            android:layout_marginTop="4dip"
+            android:background="?android:attr/listDivider" />
+
+        <Button
+            android:id="@+id/wizard_next"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:onClick="nextOnClick"
+            android:text="next"
+            style="@style/SelectableItem" />
+    </LinearLayout>
+
+    <View
+        android:id="@+id/wizard_progress_line"
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:layout_above="@+id/wizard_buttons"
+        android:layout_marginLeft="4dip"
+        android:layout_marginRight="4dip"
+        android:background="?android:attr/listDivider"
+        android:visibility="gone" />
+
+    <LinearLayout
+        android:id="@+id/wizard_progress"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/wizard_progress_line"
+        android:visibility="gone">
+
+        <ProgressBar
+            android:id="@+id/wizard_progress_progressbar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <ImageView
+            android:id="@+id/wizard_progress_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/icon_light_refresh" />
+
+        <TextView
+            android:id="@+id/wizard_progress_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:text="asd"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+    </LinearLayout>
+
+    <View
+        android:id="@+id/wizard_line2"
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:layout_above="@+id/wizard_progress"
+        android:layout_marginLeft="4dip"
+        android:layout_marginRight="4dip"
+        android:background="?android:attr/listDivider" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@+id/wizard_line2">
+
+        <LinearLayout
+            android:id="@+id/wizard_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="16dp" />
+    </ScrollView>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/wizard_create_key_fragment.xml b/OpenKeychain/src/main/res/layout/wizard_create_key_fragment.xml
new file mode 100644
index 000000000..213346617
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/wizard_create_key_fragment.xml
@@ -0,0 +1,41 @@
+<?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="vertical">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="4dp"
+        android:text="Enter Full Name, Email and Passphrase!"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="textPersonName"
+        android:hint="Name"
+        android:ems="10"
+        android:id="@+id/name" />
+
+    <AutoCompleteTextView
+        android:id="@+id/email"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="bla@example.com"
+        android:layout_weight="1"
+        android:ems="10"
+        android:inputType="textEmailAddress" />
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="textPassword"
+        android:hint="passphrase"
+        android:ems="10"
+        android:id="@+id/passphrase"
+        android:layout_gravity="center_horizontal" />
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/wizard_generic_fragment.xml b/OpenKeychain/src/main/res/layout/wizard_generic_fragment.xml
new file mode 100644
index 000000000..a55370804
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/wizard_generic_fragment.xml
@@ -0,0 +1,15 @@
+<?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="vertical" >
+
+    <TextView
+        android:id="@+id/fragment_vehicle_reg_generic_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="4dp"
+        android:text="Result text"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/wizard_start_fragment.xml b/OpenKeychain/src/main/res/layout/wizard_start_fragment.xml
new file mode 100644
index 000000000..9e1403f74
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/wizard_start_fragment.xml
@@ -0,0 +1,63 @@
+<?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="vertical">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="4dp"
+        android:text="Welcome to OpenKeychain"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <TextView
+        style="@style/SectionHeader"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_marginTop="14dp"
+        android:text="What you wanna do today?"
+        android:layout_weight="1" />
+
+    <RadioGroup
+        android:id="@+id/wizard_start_radio_group"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <RadioButton
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:checked="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            style="@style/SelectableItem"
+            android:text="new key"
+            android:id="@+id/wizard_start_new_key" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <RadioButton
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            style="@style/SelectableItem"
+            android:text="import existing key"
+            android:id="@+id/wizard_start_import" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <RadioButton
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            style="@style/SelectableItem"
+            android:text="skip wizard"
+            android:id="@+id/wizard_start_skip" />
+    </RadioGroup>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index a6b16a421..2dfa06e21 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -9,6 +9,7 @@
     <string name="title_authentication">Passphrase</string>
     <string name="title_create_key">Create Key</string>
     <string name="title_edit_key">Edit Key</string>
+    <string name="title_wizard">Welcome to OpenKeychain</string>
     <string name="title_preferences">Preferences</string>
     <string name="title_api_registered_apps">Apps</string>
     <string name="title_key_server_preference">Keyserver Preference</string>
-- 
cgit v1.2.3


From 1d5606a1a31d49248d90d0fd6c9734b27cbb1a08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 27 Jun 2014 23:01:11 +0200
Subject: More wizardry

---
 .../main/res/layout/wizard_generic_fragment.xml    | 15 --------
 .../src/main/res/layout/wizard_k9_fragment.xml     | 43 ++++++++++++++++++++++
 2 files changed, 43 insertions(+), 15 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/layout/wizard_generic_fragment.xml
 create mode 100644 OpenKeychain/src/main/res/layout/wizard_k9_fragment.xml

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

diff --git a/OpenKeychain/src/main/res/layout/wizard_generic_fragment.xml b/OpenKeychain/src/main/res/layout/wizard_generic_fragment.xml
deleted file mode 100644
index a55370804..000000000
--- a/OpenKeychain/src/main/res/layout/wizard_generic_fragment.xml
+++ /dev/null
@@ -1,15 +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="vertical" >
-
-    <TextView
-        android:id="@+id/fragment_vehicle_reg_generic_text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="4dp"
-        android:text="Result text"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/wizard_k9_fragment.xml b/OpenKeychain/src/main/res/layout/wizard_k9_fragment.xml
new file mode 100644
index 000000000..342adc37e
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/wizard_k9_fragment.xml
@@ -0,0 +1,43 @@
+<?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="vertical" >
+
+    <org.sufficientlysecure.htmltextview.HtmlTextView
+        android:id="@+id/wizard_k9_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="4dp"
+        android:text="Text..."
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <RadioGroup
+        android:id="@+id/wizard_k9_radio_group"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <RadioButton
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:checked="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            style="@style/SelectableItem"
+            android:text="install K9"
+            android:id="@+id/wizard_k9_install" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <RadioButton
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            style="@style/SelectableItem"
+            android:text="skip install"
+            android:id="@+id/wizard_k9_skip" />
+    </RadioGroup>
+
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 3f3e1cdb05ee0e5ab9a5a4aed8ac3ef4ef581f24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sat, 28 Jun 2014 00:05:12 +0200
Subject: Magic to find possible mails and names of device owner

---
 OpenKeychain/src/main/res/layout/wizard_create_key_fragment.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/OpenKeychain/src/main/res/layout/wizard_create_key_fragment.xml b/OpenKeychain/src/main/res/layout/wizard_create_key_fragment.xml
index 213346617..258ea7223 100644
--- a/OpenKeychain/src/main/res/layout/wizard_create_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/wizard_create_key_fragment.xml
@@ -11,7 +11,7 @@
         android:text="Enter Full Name, Email and Passphrase!"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <EditText
+    <AutoCompleteTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:inputType="textPersonName"
-- 
cgit v1.2.3


From d19c97a714410493fa89166c83aac774b435c866 Mon Sep 17 00:00:00 2001
From: Daniel Albert <albert_daniel@t-online.de>
Date: Sat, 28 Jun 2014 12:25:41 +0200
Subject: Switched to the dark icons

---
 .../main/res/drawable-hdpi/ic_action_view_as_list.png   | Bin 308 -> 309 bytes
 .../main/res/drawable-mdpi/ic_action_view_as_list.png   | Bin 246 -> 245 bytes
 .../main/res/drawable-xhdpi/ic_action_view_as_list.png  | Bin 337 -> 341 bytes
 .../main/res/drawable-xxhdpi/ic_action_view_as_list.png | Bin 431 -> 441 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_view_as_list.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_view_as_list.png
index 86da228e9..e08afae85 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_view_as_list.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_view_as_list.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_view_as_list.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_view_as_list.png
index ccb4c7d7b..4fe0edfa3 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_view_as_list.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_view_as_list.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_view_as_list.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_view_as_list.png
index b9c93c8c2..a38638e4d 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_view_as_list.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_view_as_list.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_view_as_list.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_view_as_list.png
index 460041640..b00a85f6d 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_view_as_list.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_view_as_list.png differ
-- 
cgit v1.2.3


From d6a2875816f6caf1b6ed8cbc69c4779192b54c99 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 28 Jun 2014 19:00:44 +0200
Subject: code cleanup and plurals in import log entries

closes #698
---
 OpenKeychain/src/main/res/values/strings.xml | 33 +++++++++++++++++++---------
 1 file changed, 23 insertions(+), 10 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 2dfa06e21..39b105664 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -388,19 +388,19 @@
 
     <!-- Import result toast -->
     <plurals name="import_keys_added_and_updated_1">
-        <item quantity="one">Successfully added %1$d key</item>
-        <item quantity="other">Successfully added %1$d keys</item>
+        <item quantity="one">Successfully imported key</item>
+        <item quantity="other">Successfully imported %1$d keys</item>
     </plurals>
     <plurals name="import_keys_added_and_updated_2">
-        <item quantity="one"> and updated %1$d key%2$s.</item>
+        <item quantity="one"> and updated key%2$s.</item>
         <item quantity="other"> and updated %1$d keys%2$s.</item>
     </plurals>
     <plurals name="import_keys_added">
-        <item quantity="one">Successfully added %1$d key%2$s.</item>
-        <item quantity="other">Successfully added %1$d keys%2$s.</item>
+        <item quantity="one">Successfully imported key%2$s.</item>
+        <item quantity="other">Successfully imported %1$d keys%2$s.</item>
     </plurals>
     <plurals name="import_keys_updated">
-        <item quantity="one">Successfully updated %1$d key%2$s.</item>
+        <item quantity="one">Successfully updated key%2$s.</item>
         <item quantity="other">Successfully updated %1$d keys%2$s.</item>
     </plurals>
     <string name="import_view_log">View Log</string>
@@ -542,8 +542,15 @@
     <string name="msg_ip_uid_cert_bad">Encountered bad certificate!</string>
     <string name="msg_ip_uid_cert_error">Error processing certificate!</string>
     <string name="msg_ip_uid_cert_good">User id is certified by %1$s (%2$s)</string>
-    <string name="msg_ip_uid_certs_unknown">Ignoring %s certificates from unknown pubkeys</string>
-    <string name="msg_ip_uid_classifying">Classifying user ids, using %s trusted signatures</string>
+    <plurals name="msg_ip_uid_certs_unknown">
+        <item quantity="one">Ignoring one certificate issued by an unknown public key</item>
+        <item quantity="other">Ignoring %s certificates issued by unknown public keys</item>
+    </plurals>
+    <plurals name="msg_ip_uid_classifying">
+        <item quantity="zero">Classifying user ids (no trusted keys available)</item>
+        <item quantity="one">Classifying user ids (using one trusted key)</item>
+        <item quantity="other">Classifying user ids (using %s trusted keys)</item>
+    </plurals>
     <string name="msg_ip_uid_reorder">Re-ordering user ids</string>
     <string name="msg_ip_uid_processing">Processing user id %s</string>
     <string name="msg_ip_uid_revoked">User id is revoked</string>
@@ -588,9 +595,15 @@
     <string name="msg_kc_sub_revoke_bad">Removing bad subkey revocation certificate</string>
     <string name="msg_kc_sub_revoke_dup">Removing redundant subkey revocation certificate</string>
     <string name="msg_kc_success">Keyring canonicalization successful, no changes</string>
-    <string name="msg_kc_success_bad">Keyring canonicalization successful, removed %s erroneous certificates</string>
+    <plurals name="msg_kc_success_bad">
+        <item quantity="one">Keyring canonicalization successful, removed one erroneous certificate</item>
+        <item quantity="other">Keyring canonicalization successful, removed %d erroneous certificates</item>
+    </plurals>
     <string name="msg_kc_success_bad_and_red">Keyring canonicalization successful, removed %1$s erroneous and %2$s redundant certificates</string>
-    <string name="msg_kc_success_redundant">Keyring canonicalization successful, removed %s redundant certificates</string>
+    <plurals name="msg_kc_success_redundant">
+        <item quantity="one">Keyring canonicalization successful, removed one redundant certificate</item>
+        <item quantity="other">Keyring canonicalization successful, removed %d redundant certificates</item>
+    </plurals>
     <string name="msg_kc_uid_bad_err">Removing bad self certificate for user id %s</string>
     <string name="msg_kc_uid_bad_local">Removing user id certificate with "local" flag</string>
     <string name="msg_kc_uid_bad_time">Removing user id with future timestamp</string>
-- 
cgit v1.2.3


From 6d7a9ec48a6517adfe94ed2edfa875def538d088 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 28 Jun 2014 20:53:37 +0200
Subject: pass import results through to viewkeyactivity on update

---
 OpenKeychain/src/main/res/layout/view_key_activity.xml | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 5aa1cd167..481b1ddf5 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -4,6 +4,12 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
+    <LinearLayout
+        android:id="@+id/card_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" />
+
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-- 
cgit v1.2.3


From bd445165766f35561a2b8aeeac2b8a16f0abb6ef Mon Sep 17 00:00:00 2001
From: Daniel Albert <albert_daniel@t-online.de>
Date: Sat, 28 Jun 2014 21:12:56 +0200
Subject: Added button_rounded style converted decrypt_file_fragment to new
 style

---
 .../src/main/res/drawable/button_rounded.xml       | 40 ++++++++++++++++++++++
 .../src/main/res/layout/decrypt_file_fragment.xml  | 12 +++++--
 2 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable/button_rounded.xml

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

diff --git a/OpenKeychain/src/main/res/drawable/button_rounded.xml b/OpenKeychain/src/main/res/drawable/button_rounded.xml
new file mode 100644
index 000000000..501758287
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable/button_rounded.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" >
+        <shape android:shape="rectangle"  >
+            <padding
+                android:bottom="6dip"
+                android:left="6dip"
+                android:right="6dip"
+                android:top="6dip" />
+            <corners android:radius="10dip" />
+            <stroke android:color="#cccccc" android:width="2dip" />
+            <stroke android:color="#ebebeb" />
+        </shape>
+    </item>
+    <item android:state_focused="true">
+        <shape android:shape="rectangle"  >
+            <padding
+                android:bottom="6dip"
+                android:left="6dip"
+                android:right="6dip"
+                android:top="6dip" />
+            <corners android:radius="10dip" />
+            <stroke android:color="#cccccc" android:width="2dip" />
+            <solid android:color="#ebebeb"/>
+        </shape>
+    </item>
+    <item >
+        <shape android:shape="rectangle"  >
+            <padding
+                android:bottom="6dip"
+                android:left="6dip"
+                android:right="6dip"
+                android:top="6dip" />
+            <corners android:radius="10dip" />
+            <stroke android:color="#cccccc" android:width="2dip" />
+            <solid android:color="#ffffff" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
index d1db1c782..45aaee80f 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true">
@@ -43,7 +42,7 @@
                     android:minLines="2"
                     android:scrollbars="vertical" />
 
-                <com.beardedhen.androidbootstrap.BootstrapButton
+                <!--<com.beardedhen.androidbootstrap.BootstrapButton
                     android:id="@+id/decrypt_file_browse"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -51,7 +50,14 @@
                     bootstrapbutton:bb_icon_left="fa-folder-open"
                     bootstrapbutton:bb_roundedCorners="true"
                     bootstrapbutton:bb_size="default"
-                    bootstrapbutton:bb_type="default" />
+                    bootstrapbutton:bb_type="default" />-->
+                <ImageButton
+                    android:id="@+id/decrypt_file_browse"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:src="@drawable/ic_action_collection"
+                    android:background="@drawable/button_rounded"/>
             </LinearLayout>
 
             <CheckBox
-- 
cgit v1.2.3


From e731dc139f71887d00f376ed627b1a155033a493 Mon Sep 17 00:00:00 2001
From: Daniel Albert <albert_daniel@t-online.de>
Date: Sun, 29 Jun 2014 12:33:02 +0200
Subject: Improved button style centered buttons removed commented-out button

---
 OpenKeychain/src/main/res/drawable/button_rounded.xml      | 12 ++++++------
 OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml | 12 ++----------
 OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml |  9 ++++-----
 3 files changed, 12 insertions(+), 21 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/drawable/button_rounded.xml b/OpenKeychain/src/main/res/drawable/button_rounded.xml
index 501758287..f547b8cdb 100644
--- a/OpenKeychain/src/main/res/drawable/button_rounded.xml
+++ b/OpenKeychain/src/main/res/drawable/button_rounded.xml
@@ -8,8 +8,8 @@
                 android:left="6dip"
                 android:right="6dip"
                 android:top="6dip" />
-            <corners android:radius="10dip" />
-            <stroke android:color="#cccccc" android:width="2dip" />
+            <corners android:radius="6dip" />
+            <stroke android:color="#cccccc" android:width="1.5dip" />
             <stroke android:color="#ebebeb" />
         </shape>
     </item>
@@ -20,8 +20,8 @@
                 android:left="6dip"
                 android:right="6dip"
                 android:top="6dip" />
-            <corners android:radius="10dip" />
-            <stroke android:color="#cccccc" android:width="2dip" />
+            <corners android:radius="6dip" />
+            <stroke android:color="#cccccc" android:width="1.5dip" />
             <solid android:color="#ebebeb"/>
         </shape>
     </item>
@@ -32,8 +32,8 @@
                 android:left="6dip"
                 android:right="6dip"
                 android:top="6dip" />
-            <corners android:radius="10dip" />
-            <stroke android:color="#cccccc" android:width="2dip" />
+            <corners android:radius="6dip" />
+            <stroke android:color="#cccccc" android:width="1.5dip" />
             <solid android:color="#ffffff" />
         </shape>
     </item>
diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
index 45aaee80f..098aaaea1 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
@@ -42,22 +42,14 @@
                     android:minLines="2"
                     android:scrollbars="vertical" />
 
-                <!--<com.beardedhen.androidbootstrap.BootstrapButton
-                    android:id="@+id/decrypt_file_browse"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="4dp"
-                    bootstrapbutton:bb_icon_left="fa-folder-open"
-                    bootstrapbutton:bb_roundedCorners="true"
-                    bootstrapbutton:bb_size="default"
-                    bootstrapbutton:bb_type="default" />-->
                 <ImageButton
                     android:id="@+id/decrypt_file_browse"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="4dp"
                     android:src="@drawable/ic_action_collection"
-                    android:background="@drawable/button_rounded"/>
+                    android:background="@drawable/button_rounded"
+                    android:layout_gravity="center_vertical"/>
             </LinearLayout>
 
             <CheckBox
diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml
index c8aaf77b8..4142b3de6 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml
@@ -31,15 +31,14 @@
                 android:minLines="2"
                 android:scrollbars="vertical" />
 
-            <com.beardedhen.androidbootstrap.BootstrapButton
+            <ImageButton
                 android:id="@+id/btn_browse"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
-                bootstrapbutton:bb_icon_left="fa-folder-open"
-                bootstrapbutton:bb_roundedCorners="true"
-                bootstrapbutton:bb_size="default"
-                bootstrapbutton:bb_type="default" />
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/ic_action_collection"
+                android:background="@drawable/button_rounded"/>
         </LinearLayout>
 
         <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
-- 
cgit v1.2.3


From 4beff43a83eafd6f217304a51ec87e2242754f1c Mon Sep 17 00:00:00 2001
From: Daniel Albert <albert_daniel@t-online.de>
Date: Sun, 29 Jun 2014 13:21:33 +0200
Subject: Updated file_dialog to use the new buttons

---
 OpenKeychain/src/main/res/layout/file_dialog.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/file_dialog.xml b/OpenKeychain/src/main/res/layout/file_dialog.xml
index 83d697001..dcf711679 100644
--- a/OpenKeychain/src/main/res/layout/file_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/file_dialog.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -31,17 +30,15 @@
             android:minLines="2"
             android:scrollbars="vertical" />
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
+        <ImageButton
             android:id="@+id/btn_browse"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_margin="4dp"
             android:contentDescription="@string/filemanager_title_open"
-            bootstrapbutton:bb_icon_left="fa-folder-open"
-            bootstrapbutton:bb_roundedCorners="true"
-            bootstrapbutton:bb_size="default"
-            bootstrapbutton:bb_type="default" />
+            android:background="@drawable/button_rounded"
+            android:src="@drawable/ic_action_collection"/>
     </LinearLayout>
 
     <CheckBox
-- 
cgit v1.2.3


From 9091c2224032c07a46988890a2767eecbb794634 Mon Sep 17 00:00:00 2001
From: Daniel Albert <albert_daniel@t-online.de>
Date: Sun, 29 Jun 2014 13:59:51 +0200
Subject: Added new button style and converted account_settings and the
 select_secret_key_layout to use it

---
 .../main/res/drawable-hdpi/ic_action_accounts.png  | Bin 0 -> 641 bytes
 .../main/res/drawable-mdpi/ic_action_accounts.png  | Bin 0 -> 506 bytes
 .../main/res/drawable-xhdpi/ic_action_accounts.png | Bin 0 -> 765 bytes
 .../res/drawable-xxhdpi/ic_action_accounts.png     | Bin 0 -> 1093 bytes
 OpenKeychain/src/main/res/drawable/button_edgy.xml |  37 +++++++++++++++++++++
 .../res/layout/api_account_settings_fragment.xml   |   9 +++--
 .../layout/select_secret_key_layout_fragment.xml   |   9 +++--
 7 files changed, 45 insertions(+), 10 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png
 create mode 100644 OpenKeychain/src/main/res/drawable/button_edgy.xml

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png
new file mode 100644
index 000000000..7cc407315
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png
new file mode 100644
index 000000000..2bf88c183
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png
new file mode 100644
index 000000000..f1ec295d2
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png
new file mode 100644
index 000000000..da24654eb
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png differ
diff --git a/OpenKeychain/src/main/res/drawable/button_edgy.xml b/OpenKeychain/src/main/res/drawable/button_edgy.xml
new file mode 100644
index 000000000..d296642b8
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable/button_edgy.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" >
+        <shape android:shape="rectangle"  >
+            <padding
+                android:bottom="6dip"
+                android:left="6dip"
+                android:right="6dip"
+                android:top="6dip" />
+            <stroke android:color="#cccccc" android:width="1.5dip" />
+            <stroke android:color="#ebebeb" />
+        </shape>
+    </item>
+    <item android:state_focused="true">
+        <shape android:shape="rectangle"  >
+            <padding
+                android:bottom="6dip"
+                android:left="6dip"
+                android:right="6dip"
+                android:top="6dip" />
+            <stroke android:color="#cccccc" android:width="1.5dip" />
+            <solid android:color="#ebebeb"/>
+        </shape>
+    </item>
+    <item >
+        <shape android:shape="rectangle"  >
+            <padding
+                android:bottom="6dip"
+                android:left="6dip"
+                android:right="6dip"
+                android:top="6dip" />
+            <stroke android:color="#cccccc" android:width="1.5dip" />
+            <solid android:color="#ffffff" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
index 32843eb29..7bb861547 100644
--- a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:custom="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -43,7 +42,7 @@
         android:layout_height="wrap_content"
         tools:layout="@layout/select_secret_key_layout_fragment" />
 
-    <com.beardedhen.androidbootstrap.BootstrapButton
+    <Button
         android:id="@+id/api_account_settings_create_key"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -52,9 +51,9 @@
         android:layout_marginRight="4dp"
         android:layout_marginTop="4dp"
         android:text="@string/api_settings_create_key"
-        bootstrapbutton:bb_icon_left="fa-key"
-        bootstrapbutton:bb_size="default"
-        bootstrapbutton:bb_type="default" />
+        android:background="@drawable/button_edgy"
+        android:drawableLeft="@drawable/ic_action_accounts"
+        android:textSize="14dip"/>
 
     <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
         android:layout_width="match_parent"
diff --git a/OpenKeychain/src/main/res/layout/select_secret_key_layout_fragment.xml b/OpenKeychain/src/main/res/layout/select_secret_key_layout_fragment.xml
index cc2ab0cac..63eeb8eaf 100644
--- a/OpenKeychain/src/main/res/layout/select_secret_key_layout_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/select_secret_key_layout_fragment.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal">
 
-    <com.beardedhen.androidbootstrap.BootstrapButton
+    <Button
         android:id="@+id/select_secret_key_select_key_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -14,9 +13,9 @@
         android:layout_marginRight="4dp"
         android:layout_marginTop="4dp"
         android:text="@string/api_settings_select_key"
-        bootstrapbutton:bb_icon_left="fa-key"
-        bootstrapbutton:bb_size="default"
-        bootstrapbutton:bb_type="default" />
+        android:drawableLeft="@drawable/ic_action_accounts"
+        android:background="@drawable/button_edgy"
+        android:textSize="14dp"/>
 
     <LinearLayout
         android:layout_width="match_parent"
-- 
cgit v1.2.3


From e8bb14ca260f230559f2c6ebc898dd498b9a9874 Mon Sep 17 00:00:00 2001
From: Daniel Albert <albert_daniel@t-online.de>
Date: Sun, 29 Jun 2014 15:28:24 +0200
Subject: Converted AsymetricKeyFragment to new button style

---
 OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
index fa1b03889..cde92b477 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -65,15 +64,14 @@
             android:text="@string/label_select_public_keys"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
+        <Button
             android:id="@+id/btn_selectEncryptKeys"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_margin="4dp"
             android:text="@string/select_keys_button_default"
-            bootstrapbutton:bb_icon_left="fa-user"
-            bootstrapbutton:bb_size="default"
-            bootstrapbutton:bb_type="default" />
+            android:background="@drawable/button_edgy"
+            android:drawableLeft="@drawable/ic_action_person" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 24068428471addfe9bad99a96b7fb1acda33018c Mon Sep 17 00:00:00 2001
From: Daniel Albert <albert_daniel@t-online.de>
Date: Sun, 29 Jun 2014 22:31:37 +0200
Subject: Ported even more buttons to use new design (Key and User editor)
 Added drawables for them

---
 OpenKeychain/src/main/res/drawable-mdpi/minus.png  | Bin 0 -> 263 bytes
 OpenKeychain/src/main/res/drawable-mdpi/plus.png   | Bin 0 -> 231 bytes
 OpenKeychain/src/main/res/drawable-xhdpi/minus.png | Bin 0 -> 323 bytes
 OpenKeychain/src/main/res/drawable-xhdpi/plus.png  | Bin 0 -> 281 bytes
 .../src/main/res/drawable-xxhdpi/minus.png         | Bin 0 -> 447 bytes
 OpenKeychain/src/main/res/drawable-xxhdpi/plus.png | Bin 0 -> 493 bytes
 OpenKeychain/src/main/res/drawable/button_edgy.xml |   6 ++--
 .../src/main/res/drawable/button_rounded_green.xml |  37 +++++++++++++++++++++
 .../src/main/res/drawable/button_rounded_red.xml   |  37 +++++++++++++++++++++
 .../src/main/res/layout/edit_key_activity.xml      |   6 ++--
 .../src/main/res/layout/edit_key_key_item.xml      |   8 ++---
 .../src/main/res/layout/edit_key_section.xml       |   9 ++---
 .../src/main/res/layout/edit_key_user_id_item.xml  |  11 +++---
 13 files changed, 90 insertions(+), 24 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/minus.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/plus.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/minus.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/plus.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/minus.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/plus.png
 create mode 100644 OpenKeychain/src/main/res/drawable/button_rounded_green.xml
 create mode 100644 OpenKeychain/src/main/res/drawable/button_rounded_red.xml

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

diff --git a/OpenKeychain/src/main/res/drawable-mdpi/minus.png b/OpenKeychain/src/main/res/drawable-mdpi/minus.png
new file mode 100644
index 000000000..d59e4a3e1
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/minus.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/plus.png b/OpenKeychain/src/main/res/drawable-mdpi/plus.png
new file mode 100644
index 000000000..88ee823af
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/plus.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/minus.png b/OpenKeychain/src/main/res/drawable-xhdpi/minus.png
new file mode 100644
index 000000000..8a98ea967
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/minus.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/plus.png b/OpenKeychain/src/main/res/drawable-xhdpi/plus.png
new file mode 100644
index 000000000..def608491
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/plus.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/minus.png b/OpenKeychain/src/main/res/drawable-xxhdpi/minus.png
new file mode 100644
index 000000000..c46bf00de
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/minus.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/plus.png b/OpenKeychain/src/main/res/drawable-xxhdpi/plus.png
new file mode 100644
index 000000000..e1f6e841f
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/plus.png differ
diff --git a/OpenKeychain/src/main/res/drawable/button_edgy.xml b/OpenKeychain/src/main/res/drawable/button_edgy.xml
index d296642b8..fdb94d40e 100644
--- a/OpenKeychain/src/main/res/drawable/button_edgy.xml
+++ b/OpenKeychain/src/main/res/drawable/button_edgy.xml
@@ -8,8 +8,8 @@
                 android:left="6dip"
                 android:right="6dip"
                 android:top="6dip" />
+            <solid android:color="#ebebeb" />
             <stroke android:color="#cccccc" android:width="1.5dip" />
-            <stroke android:color="#ebebeb" />
         </shape>
     </item>
     <item android:state_focused="true">
@@ -19,8 +19,8 @@
                 android:left="6dip"
                 android:right="6dip"
                 android:top="6dip" />
-            <stroke android:color="#cccccc" android:width="1.5dip" />
             <solid android:color="#ebebeb"/>
+            <stroke android:color="#cccccc" android:width="1.5dip" />
         </shape>
     </item>
     <item >
@@ -30,8 +30,8 @@
                 android:left="6dip"
                 android:right="6dip"
                 android:top="6dip" />
-            <stroke android:color="#cccccc" android:width="1.5dip" />
             <solid android:color="#ffffff" />
+            <stroke android:color="#cccccc" android:width="1.5dip" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/drawable/button_rounded_green.xml b/OpenKeychain/src/main/res/drawable/button_rounded_green.xml
new file mode 100644
index 000000000..fc12fdf05
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable/button_rounded_green.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" >
+        <shape android:shape="rectangle"  >
+            <padding
+                android:bottom="6dip"
+                android:left="6dip"
+                android:right="6dip"
+                android:top="6dip" />
+            <corners android:radius="6dip" />
+            <solid android:color="#47a447" />
+        </shape>
+    </item>
+    <item android:state_focused="true">
+        <shape android:shape="rectangle"  >
+            <padding
+                android:bottom="6dip"
+                android:left="6dip"
+                android:right="6dip"
+                android:top="6dip" />
+            <corners android:radius="6dip" />
+            <solid android:color="#47a447"/>
+        </shape>
+    </item>
+    <item >
+        <shape android:shape="rectangle"  >
+            <padding
+                android:bottom="6dip"
+                android:left="6dip"
+                android:right="6dip"
+                android:top="6dip" />
+            <corners android:radius="6dip" />
+            <solid android:color="#5cb85c" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/drawable/button_rounded_red.xml b/OpenKeychain/src/main/res/drawable/button_rounded_red.xml
new file mode 100644
index 000000000..330e83939
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable/button_rounded_red.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" >
+        <shape android:shape="rectangle"  >
+            <padding
+                android:bottom="6dip"
+                android:left="6dip"
+                android:right="6dip"
+                android:top="6dip" />
+            <corners android:radius="6dip" />
+            <solid android:color="#d2322d" />
+        </shape>
+    </item>
+    <item android:state_focused="true">
+        <shape android:shape="rectangle"  >
+            <padding
+                android:bottom="6dip"
+                android:left="6dip"
+                android:right="6dip"
+                android:top="6dip" />
+            <corners android:radius="6dip" />
+            <solid android:color="#d2322d"/>
+        </shape>
+    </item>
+    <item >
+        <shape android:shape="rectangle"  >
+            <padding
+                android:bottom="6dip"
+                android:left="6dip"
+                android:right="6dip"
+                android:top="6dip" />
+            <corners android:radius="6dip" />
+            <solid android:color="#d9534f" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/edit_key_activity.xml b/OpenKeychain/src/main/res/layout/edit_key_activity.xml
index 1ce5c096f..b6c5a1c9a 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_activity.xml
@@ -26,14 +26,14 @@
             android:layout_height="wrap_content"
             android:text="@string/label_no_passphrase" />
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
+        <Button
             android:id="@+id/edit_key_btn_change_passphrase"
             android:layout_width="match_parent"
             android:layout_height="60dp"
             android:padding="4dp"
             android:text="@string/btn_set_passphrase"
-            bootstrapbutton:bb_icon_left="fa-pencil"
-            bootstrapbutton:bb_type="default" />
+            android:drawableLeft="@drawable/ic_action_edit"
+            android:background="@drawable/button_edgy" />
 
         <LinearLayout
             android:id="@+id/edit_key_container"
diff --git a/OpenKeychain/src/main/res/layout/edit_key_key_item.xml b/OpenKeychain/src/main/res/layout/edit_key_key_item.xml
index 090115d62..2d2fe51ab 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_key_item.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_key_item.xml
@@ -155,15 +155,13 @@
             </TableRow>
         </TableLayout>
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
+        <ImageButton
             android:id="@+id/delete"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
-            bootstrapbutton:bb_icon_left="fa-minus"
-            bootstrapbutton:bb_roundedCorners="true"
-            bootstrapbutton:bb_size="small"
-            bootstrapbutton:bb_type="danger" />
+            android:src="@drawable/minus"
+            android:background="@drawable/button_rounded_red"/>
     </LinearLayout>
 
     <View
diff --git a/OpenKeychain/src/main/res/layout/edit_key_section.xml b/OpenKeychain/src/main/res/layout/edit_key_section.xml
index 9f10ff8c1..6cfe18bd6 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_section.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_section.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.sufficientlysecure.keychain.ui.widget.SectionView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical" >
@@ -23,15 +22,13 @@
             android:singleLine="true"
             android:text="Section Name" />
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
+        <ImageButton
             android:id="@+id/plusbutton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
-            bootstrapbutton:bb_icon_left="fa-plus"
-            bootstrapbutton:bb_roundedCorners="true"
-            bootstrapbutton:bb_size="small"
-            bootstrapbutton:bb_type="success" />
+            android:src="@drawable/plus"
+            android:background="@drawable/button_rounded_green"/>
     </LinearLayout>
 
     <LinearLayout
diff --git a/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml b/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml
index a8d1dc674..3454d3668 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.sufficientlysecure.keychain.ui.widget.UserIdEditor xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical" >
@@ -76,18 +75,16 @@
             </TableRow>
         </TableLayout>
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
+        <ImageButton
             android:id="@+id/delete"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_margin="10dp"
+            android:layout_margin="10dip"
             android:layout_marginLeft="4dip"
             android:layout_marginRight="6dip"
-            bootstrapbutton:bb_icon_left="fa-minus"
-            bootstrapbutton:bb_roundedCorners="true"
-            bootstrapbutton:bb_size="small"
-            bootstrapbutton:bb_type="danger" />
+            android:src="@drawable/minus"
+            android:background="@drawable/button_rounded_red" />
     </LinearLayout>
 
     <View
-- 
cgit v1.2.3


From 1e9789f5b4e536f79df0ab948b8618c0d7235ad0 Mon Sep 17 00:00:00 2001
From: Daniel Albert <albert_daniel@t-online.de>
Date: Mon, 30 Jun 2014 19:09:13 +0200
Subject: Converted all other buttons

---
 .../src/main/res/drawable-hdpi/ic_action_collapse.png    | Bin 0 -> 467 bytes
 .../src/main/res/drawable-hdpi/ic_action_expand.png      | Bin 0 -> 415 bytes
 .../src/main/res/drawable-hdpi/ic_action_new_account.png | Bin 0 -> 556 bytes
 .../src/main/res/drawable-mdpi/ic_action_collapse.png    | Bin 0 -> 404 bytes
 .../src/main/res/drawable-mdpi/ic_action_expand.png      | Bin 0 -> 345 bytes
 .../src/main/res/drawable-mdpi/ic_action_new_account.png | Bin 0 -> 424 bytes
 .../src/main/res/drawable-xhdpi/ic_action_collapse.png   | Bin 0 -> 631 bytes
 .../src/main/res/drawable-xhdpi/ic_action_expand.png     | Bin 0 -> 582 bytes
 .../main/res/drawable-xhdpi/ic_action_new_account.png    | Bin 0 -> 701 bytes
 .../src/main/res/drawable-xxhdpi/ic_action_collapse.png  | Bin 0 -> 901 bytes
 .../src/main/res/drawable-xxhdpi/ic_action_expand.png    | Bin 0 -> 974 bytes
 .../main/res/drawable-xxhdpi/ic_action_new_account.png   | Bin 0 -> 855 bytes
 OpenKeychain/src/main/res/drawable/button_no_style.xml   |   5 +++++
 .../src/main/res/layout/decrypt_result_include.xml       |  10 ++++------
 .../src/main/res/layout/foldable_linearlayout.xml        |  10 +++++-----
 OpenKeychain/src/main/res/layout/key_list_fragment.xml   |  15 ++++++++-------
 OpenKeychain/src/main/res/layout/key_server_editor.xml   |   9 +++------
 .../src/main/res/layout/key_server_preference.xml        |   9 +++------
 18 files changed, 28 insertions(+), 30 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_new_account.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_new_account.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_new_account.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_new_account.png
 create mode 100644 OpenKeychain/src/main/res/drawable/button_no_style.xml

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png
new file mode 100644
index 000000000..e9d2dcb46
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png
new file mode 100644
index 000000000..29f4de211
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_new_account.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_new_account.png
new file mode 100644
index 000000000..790af372d
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_new_account.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png
new file mode 100644
index 000000000..4ac28f270
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png
new file mode 100644
index 000000000..bb46bb315
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_new_account.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_new_account.png
new file mode 100644
index 000000000..69c801dcc
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_new_account.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png
new file mode 100644
index 000000000..60ac6b066
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png
new file mode 100644
index 000000000..76937f57a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_new_account.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_new_account.png
new file mode 100644
index 000000000..c6dfd0bcb
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_new_account.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png
new file mode 100644
index 000000000..76ec594dc
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png
new file mode 100644
index 000000000..22003198b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_new_account.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_new_account.png
new file mode 100644
index 000000000..38589ba0e
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_new_account.png differ
diff --git a/OpenKeychain/src/main/res/drawable/button_no_style.xml b/OpenKeychain/src/main/res/drawable/button_no_style.xml
new file mode 100644
index 000000000..e9571c2b0
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable/button_no_style.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+</selector>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
index 3bc78d325..05877656b 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:id="@+id/result"
     android:orientation="vertical"
     android:layout_width="match_parent"
@@ -83,16 +82,15 @@
             android:layout_toRightOf="@+id/result_signature_image"
             android:textColor="@color/white" />
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
+        <Button
             android:id="@+id/lookup_key"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/btn_lookup_key"
-            bootstrapbutton:bb_icon_left="fa-download"
-            bootstrapbutton:bb_type="info"
-            bootstrapbutton:bb_size="small"
+            android:drawableRight="@drawable/ic_action_download"
             android:layout_alignParentRight="true"
-            android:layout_centerVertical="true" />
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_edgy"/>
 
     </RelativeLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml
index 2b863d52b..fa31d4a6c 100644
--- a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml
+++ b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml
@@ -12,21 +12,21 @@
             android:orientation="horizontal"
             android:clickable="true">
 
-        <com.beardedhen.androidbootstrap.FontAwesomeText
+        <ImageButton
                 android:id="@+id/foldableIcon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
                 android:layout_marginRight="10dp"
-                android:textSize="12sp"
-                android:paddingTop="@dimen/padding_medium"
-                android:paddingBottom="@dimen/padding_medium"
-                fontawesometext:fa_icon="fa-chevron-right"/>
+                android:src="@drawable/ic_action_expand"
+                android:background="@drawable/button_no_style"/>
 
         <TextView
                 android:id="@+id/foldableText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/none"
+                android:layout_gravity="center_vertical"
                 android:paddingTop="@dimen/padding_medium"
                 android:paddingBottom="@dimen/padding_medium"
                 android:textColor="@color/emphasis"/>
diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
index c02854668..32b77baac 100644
--- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -49,14 +48,15 @@
             android:text="@string/key_list_empty_text2"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
+        <Button
             android:id="@+id/key_list_empty_button_create"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="4dp"
+            android:textSize="14sp"
             android:text="@string/key_list_empty_button_create"
-            bootstrapbutton:bb_icon_left="fa-plus"
-            bootstrapbutton:bb_type="default" />
+            android:drawableLeft="@drawable/ic_action_new_account"
+            android:background="@drawable/button_edgy"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -66,14 +66,15 @@
             android:text="@string/key_list_empty_text3"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
+        <Button
             android:id="@+id/key_list_empty_button_import"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="4dp"
+            android:textSize="14sp"
             android:text="@string/key_list_empty_button_import"
-            bootstrapbutton:bb_icon_left="fa-download"
-            bootstrapbutton:bb_type="default" />
+            android:drawableLeft="@drawable/ic_action_download"
+            android:background="@drawable/button_edgy" />
     </LinearLayout>
 
 </FrameLayout>
diff --git a/OpenKeychain/src/main/res/layout/key_server_editor.xml b/OpenKeychain/src/main/res/layout/key_server_editor.xml
index 950978a0e..b07fdc50c 100644
--- a/OpenKeychain/src/main/res/layout/key_server_editor.xml
+++ b/OpenKeychain/src/main/res/layout/key_server_editor.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.sufficientlysecure.keychain.ui.widget.KeyServerEditor xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical" >
@@ -18,17 +17,15 @@
             android:layout_weight="1"
             android:inputType="textUri" />
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
+        <ImageButton
             android:id="@+id/delete"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_margin="10dp"
             android:layout_marginRight="3dip"
-            bootstrapbutton:bb_icon_left="fa-minus"
-            bootstrapbutton:bb_roundedCorners="true"
-            bootstrapbutton:bb_size="small"
-            bootstrapbutton:bb_type="danger" />
+            android:background="@drawable/button_rounded_red"
+            android:src="@drawable/minus" />
     </LinearLayout>
 
     <View
diff --git a/OpenKeychain/src/main/res/layout/key_server_preference.xml b/OpenKeychain/src/main/res/layout/key_server_preference.xml
index b8897a7b3..baf7111af 100644
--- a/OpenKeychain/src/main/res/layout/key_server_preference.xml
+++ b/OpenKeychain/src/main/res/layout/key_server_preference.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical" >
@@ -42,7 +41,7 @@
                 android:textAppearance="?android:attr/textAppearanceSmall" />
         </RelativeLayout>
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
+        <ImageButton
             android:id="@+id/add"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -50,10 +49,8 @@
             android:layout_margin="10dp"
             android:layout_marginLeft="4dip"
             android:layout_marginRight="6dip"
-            bootstrapbutton:bb_icon_left="fa-plus"
-            bootstrapbutton:bb_roundedCorners="true"
-            bootstrapbutton:bb_size="small"
-            bootstrapbutton:bb_type="success" />
+            android:src="@drawable/plus"
+            android:background="@drawable/button_rounded_green"/>
     </LinearLayout>
 
     <View
-- 
cgit v1.2.3


From cc095a2098fce5477484e6c12a3dfd2d72505a99 Mon Sep 17 00:00:00 2001
From: Daniel Albert <albert_daniel@t-online.de>
Date: Mon, 30 Jun 2014 21:24:31 +0200
Subject: (should have) fixed Travis builds

---
 OpenKeychain/src/main/res/layout/edit_key_key_item.xml     | 6 ++----
 OpenKeychain/src/main/res/layout/foldable_linearlayout.xml | 3 ---
 2 files changed, 2 insertions(+), 7 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/edit_key_key_item.xml b/OpenKeychain/src/main/res/layout/edit_key_key_item.xml
index 2d2fe51ab..81fb643ab 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_key_item.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_key_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.sufficientlysecure.keychain.ui.widget.KeyEditor xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical" >
@@ -80,13 +79,12 @@
                     android:paddingRight="10dip"
                     android:text="@string/label_expiry" />
 
-                <com.beardedhen.androidbootstrap.BootstrapButton
+                <Button
                     android:id="@+id/expiry"
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
                     android:text="@string/none"
-                    bootstrapbutton:bb_size="small"
-                    bootstrapbutton:bb_type="default" />
+                    android:background="@drawable/button_edgy" />
             </TableRow>
 
             <TableRow
diff --git a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml
index fa31d4a6c..3d2fb688b 100644
--- a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml
+++ b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:fontawesometext="http://schemas.android.com/apk/res-auto"
               android:orientation="vertical"
               android:layout_width="match_parent"
               android:layout_height="match_parent">
@@ -27,8 +26,6 @@
                 android:layout_height="wrap_content"
                 android:text="@string/none"
                 android:layout_gravity="center_vertical"
-                android:paddingTop="@dimen/padding_medium"
-                android:paddingBottom="@dimen/padding_medium"
                 android:textColor="@color/emphasis"/>
     </LinearLayout>
 
-- 
cgit v1.2.3


From c2ba7e2420f09e4aa6d604f4af073668520138da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 30 Jun 2014 22:01:17 +0200
Subject: work on edit key

---
 OpenKeychain/src/main/res/layout/decrypt_content.xml      |  2 +-
 OpenKeychain/src/main/res/layout/import_keys_activity.xml |  6 +-----
 OpenKeychain/src/main/res/layout/notification_area.xml    | 12 ------------
 OpenKeychain/src/main/res/layout/notify_area.xml          | 12 ++++++++++++
 4 files changed, 14 insertions(+), 18 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/layout/notification_area.xml
 create mode 100644 OpenKeychain/src/main/res/layout/notify_area.xml

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

diff --git a/OpenKeychain/src/main/res/layout/decrypt_content.xml b/OpenKeychain/src/main/res/layout/decrypt_content.xml
index 866857143..ff75f20ee 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_content.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_content.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <include layout="@layout/notification_area"/>
+    <include layout="@layout/notify_area"/>
 
     <android.support.v4.view.ViewPager
         android:id="@+id/decrypt_pager"
diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
index b076debfe..81aa6d792 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
@@ -4,11 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <LinearLayout
-        android:id="@+id/card_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" />
+    <include layout="@layout/notify_area"/>
 
     <org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout
         android:id="@+id/import_sliding_tab_layout"
diff --git a/OpenKeychain/src/main/res/layout/notification_area.xml b/OpenKeychain/src/main/res/layout/notification_area.xml
deleted file mode 100644
index d1ba265a5..000000000
--- a/OpenKeychain/src/main/res/layout/notification_area.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <LinearLayout
-        android:id="@+id/card_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/emphasis"
-        android:orientation="vertical" />
-
-</merge>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/notify_area.xml b/OpenKeychain/src/main/res/layout/notify_area.xml
new file mode 100644
index 000000000..d1ba265a5
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/notify_area.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:id="@+id/card_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/emphasis"
+        android:orientation="vertical" />
+
+</merge>
\ No newline at end of file
-- 
cgit v1.2.3