diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-31 21:18:24 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-31 21:18:24 +0200 |
| commit | 138d5a1d9c1bd4b0fa607c8fbbbed988670bd7ca (patch) | |
| tree | 41e6d0a78f975e467d4ab28ab4dd96f7b8ac3f7e /OpenKeychain/src/main/res/layout | |
| parent | 7bbe869c88c445b087e32a75572cf18efa2165b6 (diff) | |
| download | open-keychain-138d5a1d9c1bd4b0fa607c8fbbbed988670bd7ca.tar.gz open-keychain-138d5a1d9c1bd4b0fa607c8fbbbed988670bd7ca.tar.bz2 open-keychain-138d5a1d9c1bd4b0fa607c8fbbbed988670bd7ca.zip | |
Robots like coffee too...
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
4 files changed, 26 insertions, 11 deletions
diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml index cc152a323..74231142a 100644 --- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml @@ -76,15 +76,30 @@ android:layout_height="1dip" android:background="?android:attr/listDivider" /> - <TextView - android:layout_width="wrap_content" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingTop="16dp" - android:paddingBottom="8dp" - android:text="Creating the key can take up to 3 Minutes, be patient!\n(3 subkeys, RSA, 4096 bit)" - android:textColor="@color/result_red" - android:textAppearance="?android:attr/textAppearanceMedium" - android:id="@+id/textView" /> + android:layout_marginTop="16dp" + android:layout_marginBottom="8dp" + android:orientation="horizontal"> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/imageView" + android:src="@drawable/create_key_robot" + android:layout_gravity="center_vertical" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="8dp" + android:text="Creating a key may take a while, have a cup of coffee in the meantime…\n(3 subkeys, RSA, 4096 bit)" + android:textColor="@color/android_green_dark" + android:textAppearance="?android:attr/textAppearanceMedium" + android:id="@+id/textView" /> + + </LinearLayout> </LinearLayout> </ScrollView> diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml index 05877656b..fcad91df3 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml @@ -8,7 +8,7 @@ android:paddingRight="16dp" android:paddingTop="4dp" android:paddingBottom="4dp" - android:background="@color/result_purple"> + android:background="@color/android_purple_light"> <View android:layout_width="match_parent" diff --git a/OpenKeychain/src/main/res/layout/edit_key_subkey_added_item.xml b/OpenKeychain/src/main/res/layout/edit_key_subkey_added_item.xml index 856bef36a..a4258b998 100644 --- a/OpenKeychain/src/main/res/layout/edit_key_subkey_added_item.xml +++ b/OpenKeychain/src/main/res/layout/edit_key_subkey_added_item.xml @@ -9,7 +9,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:minWidth="10dp" - android:background="@color/result_green" /> + android:background="@color/android_green_light" /> <TableLayout android:layout_width="0dp" diff --git a/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml b/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml index e69452db1..ef0e2626e 100644 --- a/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml +++ b/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml @@ -10,7 +10,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:minWidth="10dp" - android:background="@color/result_green" /> + android:background="@color/android_green_light" /> <LinearLayout android:orientation="vertical" |