diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/drawable-hdpi/ic_action_save.png | bin | 394 -> 0 bytes | |||
| -rw-r--r-- | app/src/main/res/drawable-mdpi/ic_action_save.png | bin | 362 -> 0 bytes | |||
| -rw-r--r-- | app/src/main/res/drawable-xhdpi/ic_action_save.png | bin | 441 -> 0 bytes | |||
| -rw-r--r-- | app/src/main/res/drawable-xxhdpi/ic_action_save.png | bin | 495 -> 0 bytes | |||
| -rw-r--r-- | app/src/main/res/drawable/selected_rectangle.xml | 21 | ||||
| -rw-r--r-- | app/src/main/res/layout/encrypt_layout.xml | 102 | ||||
| -rw-r--r-- | app/src/main/res/menu/pgp_handler_new_password.xml | 15 |
7 files changed, 53 insertions, 85 deletions
diff --git a/app/src/main/res/drawable-hdpi/ic_action_save.png b/app/src/main/res/drawable-hdpi/ic_action_save.png Binary files differdeleted file mode 100644 index 0fe36a1e..00000000 --- a/app/src/main/res/drawable-hdpi/ic_action_save.png +++ /dev/null diff --git a/app/src/main/res/drawable-mdpi/ic_action_save.png b/app/src/main/res/drawable-mdpi/ic_action_save.png Binary files differdeleted file mode 100644 index 664260d8..00000000 --- a/app/src/main/res/drawable-mdpi/ic_action_save.png +++ /dev/null diff --git a/app/src/main/res/drawable-xhdpi/ic_action_save.png b/app/src/main/res/drawable-xhdpi/ic_action_save.png Binary files differdeleted file mode 100644 index dde278b5..00000000 --- a/app/src/main/res/drawable-xhdpi/ic_action_save.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_save.png b/app/src/main/res/drawable-xxhdpi/ic_action_save.png Binary files differdeleted file mode 100644 index ccf8c82c..00000000 --- a/app/src/main/res/drawable-xxhdpi/ic_action_save.png +++ /dev/null diff --git a/app/src/main/res/drawable/selected_rectangle.xml b/app/src/main/res/drawable/selected_rectangle.xml deleted file mode 100644 index ec8d2ad8..00000000 --- a/app/src/main/res/drawable/selected_rectangle.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item> - <shape android:shape="rectangle" - android:dither="true"> - <corners android:radius="2dp"/> - <solid android:color="@color/blue_grey_200" /> - - </shape> - </item> - - <item android:bottom="2dp" android:left="1dp" android:right="1dp"> - <shape android:shape="rectangle" android:dither="true"> - <corners android:radius="2dp" /> - <solid android:color="@color/blue_grey_100" /> - - <padding android:bottom="2dp" android:left="1dp"/> - </shape> - </item> -</layer-list>
\ No newline at end of file diff --git a/app/src/main/res/layout/encrypt_layout.xml b/app/src/main/res/layout/encrypt_layout.xml index 1ee8e3c9..98a6b04d 100644 --- a/app/src/main/res/layout/encrypt_layout.xml +++ b/app/src/main/res/layout/encrypt_layout.xml @@ -5,24 +5,24 @@ android:layout_height="match_parent" android:orientation="vertical" tools:context="com.zeapo.pwdstore.crypto.PgpHandler" - android:background="#eee"> + android:background="#eee" + android:padding="@dimen/activity_horizontal_margin"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingLeft="@dimen/activity_horizontal_margin" - android:paddingRight="@dimen/activity_horizontal_margin"> + android:orientation="vertical"> <TextView - android:id="@+id/crypto_password_category" - android:layout_gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textStyle="bold" - android:textColor="@android:color/holo_blue_dark" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="CATEGORY/"/> + android:textColor="@color/grey_500" + android:text="CATEGORY HERE" + android:id="@+id/crypto_password_category" + android:layout_gravity="center_vertical" + android:textSize="18dp" + android:textIsSelectable="false" + android:layout_marginLeft="@dimen/activity_horizontal_margin" /> <EditText android:layout_gravity="center_vertical" @@ -30,11 +30,11 @@ android:layout_height="wrap_content" android:id="@+id/crypto_password_file_edit" android:hint="@string/crypto_name_hint" - android:textColor="@android:color/holo_orange_dark"/> - + android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" + android:textSize="24dp" + android:textColor="@color/accent" /> </LinearLayout> - <ScrollView android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="@dimen/activity_vertical_margin" @@ -45,11 +45,9 @@ android:orientation="vertical" android:layout_width="fill_parent" android:layout_marginTop="@dimen/activity_vertical_margin" - android:layout_height="wrap_content" - android:paddingLeft="@dimen/activity_horizontal_margin" - android:paddingRight="@dimen/activity_horizontal_margin"> + android:layout_height="wrap_content"> - <LinearLayout + <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"> @@ -57,20 +55,29 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textStyle="bold" - android:text="@string/crypto_pass_label"/> - <EditText - android:id="@+id/crypto_password_edit" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:typeface="monospace" - android:layout_weight="1"/> - <Button - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:id="@+id/generate_password" - android:text="@string/pwd_generate_button" - android:onClick="handleClick"/> - </LinearLayout> + android:text="@string/crypto_pass_label" + android:id="@+id/textView2" + android:layout_centerVertical="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> + </RelativeLayout> + + <EditText + android:id="@+id/crypto_password_edit" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:typeface="monospace" + android:layout_weight="1" + android:layout_toRightOf="@+id/textView2" + android:layout_toEndOf="@+id/textView2" /> + + <Button + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:id="@+id/generate_password" + android:text="@string/pwd_generate_button" + android:onClick="handleClick" + android:layout_gravity="right" /> <TextView android:layout_width="wrap_content" @@ -90,37 +97,4 @@ </ScrollView> - <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingLeft="@dimen/activity_horizontal_margin" - android:paddingRight="@dimen/activity_horizontal_margin" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:background="@android:color/darker_gray" - android:layout_weight="0"> - <ImageButton - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:src="@drawable/ic_action_save" - android:background="@drawable/blue_rectangle" - android:id="@+id/crypto_confirm_add" - android:onClick="handleClick" - android:layout_alignParentTop="true" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" /> - - <ImageButton - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:src="@drawable/ic_action_cancel" - android:background="@drawable/red_rectangle" - android:id="@+id/crypto_cancel_add" - android:onClick="handleClick" - android:layout_alignParentTop="true" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" /> - </RelativeLayout> - - </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/menu/pgp_handler_new_password.xml b/app/src/main/res/menu/pgp_handler_new_password.xml new file mode 100644 index 00000000..92be4363 --- /dev/null +++ b/app/src/main/res/menu/pgp_handler_new_password.xml @@ -0,0 +1,15 @@ +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + xmlns:pwstore="http://schemas.android.com/apk/res-auto" + tools:context="com.zeapo.pwdstore.crypto.PgpHandler" > + <item android:title="Cancel" + android:icon="@drawable/ic_action_cancel" + pwstore:showAsAction="ifRoom" + android:id="@+id/crypto_cancel_add" + /> + <item android:title="Save" + android:icon="@drawable/ic_action_accept" + pwstore:showAsAction="ifRoom" + android:id="@+id/crypto_confirm_add" + /> +</menu> |
