summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/decrypt_layout.xml2
-rw-r--r--app/src/main/res/layout/encrypt_layout.xml135
2 files changed, 88 insertions, 49 deletions
diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml
index 8612ce3b..b1f97e7d 100644
--- a/app/src/main/res/layout/decrypt_layout.xml
+++ b/app/src/main/res/layout/decrypt_layout.xml
@@ -36,7 +36,7 @@
android:background="@android:drawable/screen_background_light_transparent"
android:layout_gravity="center_vertical"
android:visibility="invisible"
- android:onClick="decrypt"
+ android:onClick="handleClick"
android:layout_column="2"
android:layout_row="0"/>
</GridLayout>
diff --git a/app/src/main/res/layout/encrypt_layout.xml b/app/src/main/res/layout/encrypt_layout.xml
index ca891d31..c4949c9a 100644
--- a/app/src/main/res/layout/encrypt_layout.xml
+++ b/app/src/main/res/layout/encrypt_layout.xml
@@ -1,84 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
- tools:context="com.zeapo.pwdstore.crypto.PgpHandler"
- android:orientation="vertical"
android:background="#eee">
- <LinearLayout
+ <GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/rectangle"
- android:orientation="horizontal">
+ android:layout_height="fill_parent"
+ tools:context="com.zeapo.pwdstore.crypto.PgpHandler">
- <TextView
- android:layout_gravity="center_vertical"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textStyle="bold"
- android:text="Name: "/>
- <EditText
- android:layout_gravity="center_vertical"
- android:layout_width="fill_parent"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textColor="@android:color/holo_orange_dark"/>
+ android:background="@drawable/rectangle"
+ android:orientation="horizontal"
+ android:layout_row="1"
+ android:layout_column="0">
- </LinearLayout>
+ <TextView
+ android:layout_gravity="center_vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ android:text="Name: "/>
+ <EditText
+ android:layout_gravity="center_vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/crypto_password_file_edit"
+ android:textColor="@android:color/holo_orange_dark"/>
+
+ </LinearLayout>
- <LinearLayout
- android:id="@+id/crypto_container"
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_marginTop="@dimen/activity_vertical_margin"
- android:background="@drawable/rectangle"
- android:layout_height="wrap_content">
<LinearLayout
- android:id="@+id/crypto_password_edit_layout"
- android:layout_width="match_parent"
+ android:id="@+id/crypto_container"
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_marginTop="@dimen/activity_vertical_margin"
+ android:background="@drawable/rectangle"
android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:layout_row="2"
+ android:layout_column="0">
<LinearLayout
+ android:id="@+id/crypto_password_edit_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal">
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ android:text="Password: "/>
+ <EditText
+ android:id="@+id/crypto_password_edit"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:typeface="monospace"/>
+ </LinearLayout>
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
android:textStyle="bold"
- android:text="Password: "/>
+ android:text="Extra content: "/>
+
<EditText
- android:id="@+id/crypto_password_edit"
- android:layout_width="fill_parent"
+ android:id="@+id/crypto_extra_edit"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:enabled="true"
+ android:visibility="visible"
android:typeface="monospace"/>
</LinearLayout>
+ </LinearLayout>
- <TextView
- android:layout_width="wrap_content"
+ <RelativeLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_row="3"
+ android:layout_column="0">
+ <ImageButton
android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
- android:textStyle="bold"
- android:text="Extra content: "/>
+ android:layout_width="wrap_content"
+ android:src="@android:drawable/ic_input_add"
+ android:background="@drawable/oval"
+ android:id="@+id/crypto_confirm_add"
+ android:onClick="handleClick"
+ android:layout_alignParentTop="true"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true" />
- <EditText
- android:id="@+id/crypto_edit_show"
- android:layout_width="match_parent"
+ <ImageButton
android:layout_height="wrap_content"
- android:enabled="true"
- android:visibility="visible"
- android:typeface="monospace"/>
- </LinearLayout>
- </LinearLayout>
+ android:layout_width="wrap_content"
+ android:src="@android:drawable/ic_delete"
+ android:background="@drawable/oval"
+ android:id="@+id/crypto_cancel_add"
+ android:onClick="handleClick"
+ android:layout_alignParentTop="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true" />
+ </RelativeLayout>
-</LinearLayout>
+ </GridLayout>
+</ScrollView>
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-27 20:03:30 +0000