diff options
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/decrypt_layout.xml | 82 |
1 files changed, 48 insertions, 34 deletions
diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml index c1ae7c6c..e81f288b 100644 --- a/app/src/main/res/layout/decrypt_layout.xml +++ b/app/src/main/res/layout/decrypt_layout.xml @@ -1,12 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout 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: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"> @@ -19,30 +15,59 @@ <GridLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/rectangle" - android:orientation="horizontal"> + android:background="@drawable/rectangle"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@android:color/holo_blue_light" + android:text="CATEGORY HERE" + android:id="@+id/crypto_password_category" + android:layout_gravity="center_vertical" + android:layout_marginLeft="8dp" + android:layout_column="0" + android:layout_row="0" + android:layout_columnSpan="2"/> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@android:color/holo_orange_dark" - android:text="Large Text" + android:textStyle="bold" + android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" + android:text="PASSWORD FILE NAME HERE" android:id="@+id/crypto_password_file" android:layout_gravity="center_vertical" android:layout_marginLeft="8dp" android:layout_column="0" - android:layout_row="0"/> + android:layout_columnSpan="2" + android:layout_row="1"/> + + + <ImageButton + android:id="@+id/crypto_delete_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ico_del" + android:background="@drawable/red_rectangle" + android:layout_gravity="center_vertical" + android:onClick="handleClick" + android:layout_column="3" + android:layout_row="0" + android:layout_rowSpan="2"/> <ImageButton android:id="@+id/crypto_show_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ico_key" - android:background="@android:drawable/screen_background_light_transparent" + android:background="@drawable/blue_rectangle" android:layout_gravity="center_vertical" + android:layout_marginLeft="8dp" android:onClick="handleClick" - android:layout_column="2" - android:layout_row="0"/> + android:layout_column="4" + android:layout_row="0" + android:layout_rowSpan="2"/> </GridLayout> @@ -53,6 +78,10 @@ android:layout_height="wrap_content" android:background="@drawable/rectangle" android:layout_marginTop="@dimen/activity_vertical_margin" + android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingRight="@dimen/activity_horizontal_margin" + android:paddingTop="@dimen/activity_vertical_margin" + android:paddingBottom="@dimen/activity_vertical_margin" android:visibility="invisible"> <GridLayout @@ -102,16 +131,12 @@ android:textStyle="bold" android:textColor="@android:color/black" android:text="Extra content: "/> - <ScrollView - android:layout_width="wrap_content" - android:layout_height="wrap_content"> - <TextView - android:id="@+id/crypto_extra_show" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textColor="@android:color/black" - android:typeface="monospace"/> - </ScrollView> + <TextView + android:id="@+id/crypto_extra_show" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="@android:color/black" + android:typeface="monospace"/> </LinearLayout> </LinearLayout> @@ -119,15 +144,4 @@ </LinearLayout> - <ImageButton - android:id="@+id/crypto_delete_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ico_del" - android:background="@drawable/oval" - android:layout_gravity="center_vertical" - android:onClick="handleClick" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true"/> - -</RelativeLayout>
\ No newline at end of file +</ScrollView>
\ No newline at end of file |