moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-05 08:45:08 -05:00
Code Issues Releases Wiki Activity

Create key: design fixes

Browse Source
This commit is contained in:
Dominik Schürmann 2014-07-31 23:13:29 +02:00
parent 50aea621ba
commit db70fcfdbf
9 changed files with 52 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
View File

@ -74,7 +74,7 @@ public class KeyListActivity extends DrawerActivity {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_key_list_import:
case R.id.menu_key_list_add:
importKeys();
return true;
@ -82,6 +82,12 @@ public class KeyListActivity extends DrawerActivity {
createKey();
return true;
case R.id.menu_key_list_import_existing_key:
Intent intentImportExisting = new Intent(this, ImportKeysActivity.class);
intentImportExisting.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_FILE_AND_RETURN);
startActivityForResult(intentImportExisting, 0);
return true;
case R.id.menu_key_list_export:
mExportHelper.showExportKeysDialog(null, Constants.Path.APP_DIR_FILE, true);
return true;

4
OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
View File

@ -37,7 +37,6 @@
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginLeft="8dp"
android:text="Max Mustermann"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
@ -52,7 +51,6 @@
android:id="@+id/email"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="max@musterman.com"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_marginBottom="8dp"
android:layout_marginLeft="8dp" />
@ -131,7 +129,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/title_create_key"
android:text="@string/btn_create_key"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_new_account"
android:drawablePadding="8dp"

29
OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
View File

@ -17,20 +17,28 @@
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="16dp"
android:paddingBottom="8dp"
android:text="@string/create_key_text"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:layout_marginTop="16dp"
android:layout_marginLeft="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/create_key_text" />
<TextView
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/label_user_id" />
<AutoCompleteTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:imeOptions="actionNext"
android:inputType="textPersonName"
android:hint="@string/label_name"
android:hint="@string/create_key_hint_full_name"
android:ems="10"
android:id="@+id/name" />
@ -44,10 +52,17 @@
android:ems="10"
android:inputType="textEmailAddress" />
<TextView
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_passphrase" />
<EditText
android:id="@+id/passphrase"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:inputType="textPassword"
android:hint="@string/label_passphrase"
@ -117,7 +132,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/title_create_key"
android:text="@string/btn_next"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_new_account"
android:drawablePadding="8dp"

4
OpenKeychain/src/main/res/layout/first_time_activity.xml
View File

@ -33,9 +33,10 @@
android:layout_weight="1"
android:text="@string/first_time_import_key"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_download"
android:drawableRight="@drawable/ic_action_collection"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
android:clickable="true"
style="@style/SelectableItem" />
@ -59,6 +60,7 @@
android:drawableRight="@drawable/ic_action_new_account"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
android:clickable="true"
style="@style/SelectableItem" />

4
OpenKeychain/src/main/res/layout/key_list_fragment.xml
View File

@ -56,6 +56,7 @@
android:textSize="14sp"
android:text="@string/key_list_empty_button_create"
android:drawableLeft="@drawable/ic_action_new_account"
android:drawablePadding="8dp"
android:background="@drawable/button_edgy"/>
<TextView
@ -73,7 +74,8 @@
android:layout_margin="4dp"
android:textSize="14sp"
android:text="@string/key_list_empty_button_import"
android:drawableLeft="@drawable/ic_action_download"
android:drawableLeft="@drawable/ic_action_collection"
android:drawablePadding="8dp"
android:background="@drawable/button_edgy" />
</LinearLayout>

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

@ -21,7 +21,7 @@
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_marginRight="8dp"
android:visibility="visible"
android:visibility="gone"
android:textColor="@android:color/darker_gray" />
</RelativeLayout>

1
OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
View File

@ -17,7 +17,6 @@
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginBottom="4dp"
android:layout_marginTop="8dp"
android:text="@string/section_user_ids"
android:layout_weight="1" />

7
OpenKeychain/src/main/res/menu/key_list.xml
View File

@ -10,7 +10,7 @@
app:showAsAction="collapseActionView|ifRoom" />
<item
android:id="@+id/menu_key_list_import"
android:id="@+id/menu_key_list_add"
app:showAsAction="ifRoom|withText"
android:icon="@drawable/ic_action_add_person"
android:title="@string/menu_add_keys" />
@ -26,6 +26,11 @@
app:showAsAction="never"
android:title="@string/menu_create_key" />
<item
android:id="@+id/menu_key_list_import_existing_key"
app:showAsAction="never"
android:title="@string/menu_import_existing_key" />
<item
android:id="@+id/menu_key_list_debug_read"
app:showAsAction="never"

16
OpenKeychain/src/main/res/values/strings.xml
View File

@ -7,7 +7,7 @@
<string name="title_encrypt">Encrypt</string>
<string name="title_decrypt">Decrypt</string>
<string name="title_authentication">Passphrase</string>
<string name="title_create_key">Create Key</string>
<string name="title_create_key">Create My Key</string>
<string name="title_edit_key">Edit Key</string>
<string name="title_preferences">Preferences</string>
<string name="title_api_registered_apps">Apps</string>
@ -71,14 +71,15 @@
<string name="btn_encryption_advanced_settings_hide">Hide advanced settings</string>
<string name="btn_share_encrypted_signed">Share encrypted/signed message…</string>
<string name="btn_view_cert_key">View certification key</string>
<string name="btn_create_key">Create key</string>
<!-- menu -->
<string name="menu_preferences">Settings</string>
<string name="menu_help">Help</string>
<string name="menu_export_key">Export to file</string>
<string name="menu_delete_key">Delete key</string>
<string name="menu_create_key">Create key</string>
<string name="menu_create_key_expert">Create key (expert)</string>
<string name="menu_create_key">Create my key</string>
<string name="menu_import_existing_key">Import existing key</string>
<string name="menu_search">Search</string>
<string name="menu_key_server">Keyserver…</string>
<string name="menu_update_key">Update from keyserver</string>
@ -475,7 +476,7 @@
<string name="key_list_empty_text2">You can start by</string>
<string name="key_list_empty_text3">or</string>
<string name="key_list_empty_button_create">creating your own key</string>
<string name="key_list_empty_button_import">importing keys.</string>
<string name="key_list_empty_button_import">importing an existing key.</string>
<!-- Key view -->
<string name="key_view_action_edit">Edit key</string>
@ -504,12 +505,13 @@
</string-array>
<!-- Create key -->
<string name="create_key_text">Enter Full Name, Email and a Passphrase.</string>
<string name="create_key_upload">Upload key to keyserver</string>
<string name="create_key_empty">This field is required</string>
<string name="create_key_passphrases_not_equal">Passphrases do not match</string>
<string name="create_key_final_text">You entered the following credentials:</string>
<string name="create_key_final_robot_text">Creating a key may take a while, have a cup of coffee in the meantime…\n(3 subkeys, RSA, 4096 bit)</string>
<string name="create_key_text">Enter your full name, email address, and choose a passhrase.</string>
<string name="create_key_hint_full_name">Full Name, e.g. Max Mustermann</string>
<!-- View key -->
<string name="view_key_revoked">This key has been revoked!</string>
@ -740,8 +742,8 @@
<!-- First Time -->
<string name="first_time_text1">Take back your privacy with OpenKeychain!</string>
<string name="first_time_create_key">Create Key</string>
<string name="first_time_import_key">Import Key</string>
<string name="first_time_create_key">Create my key</string>
<string name="first_time_import_key">Import existing key</string>
<string name="first_time_skip">Skip Setup</string>
</resources>