From dab540e121d622236dd723e31b611624ffb976ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sun, 27 Jul 2014 17:56:52 +0200 Subject: [PATCH] Work on first time wizard design --- OpenKeychain/src/main/AndroidManifest.xml | 6 +- .../keychain/ui/CreateKeyActivity.java | 74 ++++++++++-- .../keychain/ui/EncryptFileFragment.java | 8 +- .../keychain/ui/FirstTimeActivity.java | 16 ++- .../keychain/ui/KeyListActivity.java | 2 + .../keychain/ui/KeyListFragment.java | 12 +- .../main/res/layout/certify_key_activity.xml | 1 - .../main/res/layout/create_key_activity.xml | 114 +++++++++++------- .../main/res/layout/first_time_activity.xml | 84 +++++++------ OpenKeychain/src/main/res/values/strings.xml | 5 + extern/spongycastle | 2 +- 11 files changed, 216 insertions(+), 108 deletions(-) diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index af09019e8..476964e37 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -89,7 +89,11 @@ android:name=".ui.CreateKeyActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_create_key" - android:windowSoftInputMode="stateHidden" /> + android:windowSoftInputMode="stateHidden"> + + diff --git a/OpenKeychain/src/main/res/layout/create_key_activity.xml b/OpenKeychain/src/main/res/layout/create_key_activity.xml index 673f43084..050aa2b23 100644 --- a/OpenKeychain/src/main/res/layout/create_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/create_key_activity.xml @@ -1,54 +1,82 @@ - + - + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="vertical"> - + - + - + + -