diff options
Diffstat (limited to 'app/src/main')
16 files changed, 147 insertions, 9 deletions
diff --git a/app/src/main/res/drawable-hdpi/ico_cancel.png b/app/src/main/res/drawable-hdpi/ico_cancel.png Binary files differindex 49215a94..58831148 100644 --- a/app/src/main/res/drawable-hdpi/ico_cancel.png +++ b/app/src/main/res/drawable-hdpi/ico_cancel.png diff --git a/app/src/main/res/drawable-hdpi/ico_confirm_add.png b/app/src/main/res/drawable-hdpi/ico_confirm_add.png Binary files differnew file mode 100644 index 00000000..1d994832 --- /dev/null +++ b/app/src/main/res/drawable-hdpi/ico_confirm_add.png diff --git a/app/src/main/res/drawable-mdpi/ico_cancel.png b/app/src/main/res/drawable-mdpi/ico_cancel.png Binary files differindex 2c6edbcf..926a6692 100644 --- a/app/src/main/res/drawable-mdpi/ico_cancel.png +++ b/app/src/main/res/drawable-mdpi/ico_cancel.png diff --git a/app/src/main/res/drawable-mdpi/ico_confirm_add.png b/app/src/main/res/drawable-mdpi/ico_confirm_add.png Binary files differnew file mode 100644 index 00000000..dc54f8dd --- /dev/null +++ b/app/src/main/res/drawable-mdpi/ico_confirm_add.png diff --git a/app/src/main/res/drawable-xhdpi/ico_cancel.png b/app/src/main/res/drawable-xhdpi/ico_cancel.png Binary files differindex 610d19f6..36f3e0a4 100644 --- a/app/src/main/res/drawable-xhdpi/ico_cancel.png +++ b/app/src/main/res/drawable-xhdpi/ico_cancel.png diff --git a/app/src/main/res/drawable-xhdpi/ico_confirm_add.png b/app/src/main/res/drawable-xhdpi/ico_confirm_add.png Binary files differnew file mode 100644 index 00000000..44e369cc --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/ico_confirm_add.png diff --git a/app/src/main/res/drawable-xxhdpi/ico_cancel.png b/app/src/main/res/drawable-xxhdpi/ico_cancel.png Binary files differindex fb9b3dac..f91e7381 100644 --- a/app/src/main/res/drawable-xxhdpi/ico_cancel.png +++ b/app/src/main/res/drawable-xxhdpi/ico_cancel.png diff --git a/app/src/main/res/drawable-xxhdpi/ico_confirm_add.png b/app/src/main/res/drawable-xxhdpi/ico_confirm_add.png Binary files differnew file mode 100644 index 00000000..cdd7baea --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/ico_confirm_add.png diff --git a/app/src/main/res/drawable/actionbar_background.xml b/app/src/main/res/drawable/actionbar_background.xml new file mode 100644 index 00000000..220eee39 --- /dev/null +++ b/app/src/main/res/drawable/actionbar_background.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> + <solid android:color="@android:color/holo_orange_dark" /> +</shape>
\ No newline at end of file diff --git a/app/src/main/res/drawable/blue_rectangle.xml b/app/src/main/res/drawable/blue_rectangle.xml new file mode 100644 index 00000000..61cb44f5 --- /dev/null +++ b/app/src/main/res/drawable/blue_rectangle.xml @@ -0,0 +1,24 @@ +<?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="#ccc" /> + + </shape> + </item> + + <item> + <shape android:shape="rectangle" android:dither="true"> + <corners android:radius="2dp" /> + <solid android:color="@android:color/holo_blue_light" /> + + <padding android:bottom="8dp" + android:left="8dp" + android:right="8dp" + android:top="8dp" /> + </shape> + </item> +</layer-list>
\ No newline at end of file diff --git a/app/src/main/res/drawable/gray_rectangle.xml b/app/src/main/res/drawable/gray_rectangle.xml new file mode 100644 index 00000000..b1858c80 --- /dev/null +++ b/app/src/main/res/drawable/gray_rectangle.xml @@ -0,0 +1,24 @@ +<?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="#ccc" /> + + </shape> + </item> + + <item android:bottom="2dp"> + <shape android:shape="rectangle" android:dither="true"> + <corners android:radius="2dp" /> + <solid android:color="@android:color/darker_gray" /> + + <padding android:bottom="8dp" + android:left="8dp" + android:right="8dp" + android:top="8dp" /> + </shape> + </item> +</layer-list>
\ No newline at end of file diff --git a/app/src/main/res/drawable/oval.xml b/app/src/main/res/drawable/oval.xml new file mode 100644 index 00000000..d2149d04 --- /dev/null +++ b/app/src/main/res/drawable/oval.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> + +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + + <item> + <shape android:shape="oval" android:dither="true"> + <corners android:radius="2dp"/> + <solid android:color="#eee" /> + <gradient + android:startColor="#aaa" + android:centerColor="#aaa" + android:endColor="@android:color/transparent" + android:gradientRadius="55" + android:type="radial" + /> + + <padding android:bottom="5dp" + android:left="5dp" + android:right="5dp" + android:top="5dp" /> + </shape> + </item> + + <item> + <shape android:shape="oval" android:dither="true"> + <corners android:radius="2dp" /> + <solid android:color="@android:color/white" /> + + <padding android:bottom="8dp" + android:left="8dp" + android:right="8dp" + android:top="8dp" /> + </shape> + </item> + + +</layer-list>
\ No newline at end of file diff --git a/app/src/main/res/drawable/rectangle.xml b/app/src/main/res/drawable/rectangle.xml new file mode 100644 index 00000000..1f88f6df --- /dev/null +++ b/app/src/main/res/drawable/rectangle.xml @@ -0,0 +1,24 @@ +<?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="#ccc" /> + + </shape> + </item> + + <item android:bottom="2dp"> + <shape android:shape="rectangle" android:dither="true"> + <corners android:radius="2dp" /> + <solid android:color="@android:color/white" /> + + <padding android:bottom="8dp" + android:left="8dp" + android:right="8dp" + android:top="8dp" /> + </shape> + </item> +</layer-list>
\ No newline at end of file diff --git a/app/src/main/res/drawable/red_rectangle.xml b/app/src/main/res/drawable/red_rectangle.xml new file mode 100644 index 00000000..a6c48d0f --- /dev/null +++ b/app/src/main/res/drawable/red_rectangle.xml @@ -0,0 +1,24 @@ +<?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="#ccc" /> + + </shape> + </item> + + <item> + <shape android:shape="rectangle" android:dither="true"> + <corners android:radius="2dp" /> + <solid android:color="@android:color/holo_red_light" /> + + <padding android:bottom="8dp" + android:left="8dp" + android:right="8dp" + android:top="8dp" /> + </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 1b89b0df..5f447a9d 100644 --- a/app/src/main/res/layout/encrypt_layout.xml +++ b/app/src/main/res/layout/encrypt_layout.xml @@ -12,8 +12,8 @@ android:layout_height="wrap_content" android:background="@drawable/rectangle" android:orientation="horizontal" - android:layout_row="1" - android:layout_column="0"> + android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingRight="@dimen/activity_horizontal_margin"> <TextView android:id="@+id/crypto_password_category" @@ -88,12 +88,17 @@ <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/ico_check" - android:background="@drawable/oval" + android:src="@drawable/ico_confirm_add" + android:background="@drawable/blue_rectangle" android:id="@+id/crypto_confirm_add" android:onClick="handleClick" android:layout_alignParentTop="true" @@ -104,7 +109,7 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" android:src="@drawable/ico_cancel" - android:background="@drawable/oval" + android:background="@drawable/red_rectangle" android:id="@+id/crypto_cancel_add" android:onClick="handleClick" android:layout_alignParentTop="true" diff --git a/app/src/main/res/menu/pgp_handler.xml b/app/src/main/res/menu/pgp_handler.xml index 26347a3a..f06508f1 100644 --- a/app/src/main/res/menu/pgp_handler.xml +++ b/app/src/main/res/menu/pgp_handler.xml @@ -1,8 +1,4 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:context="com.zeapo.pwdstore.crypto.PgpHandler" > - <item android:id="@+id/action_settings" - android:title="@string/action_settings" - android:orderInCategory="100" - android:showAsAction="never" /> </menu> |
