diff options
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/activity_pgp_handler.xml | 1 | ||||
| -rw-r--r-- | app/src/main/res/layout/autofill_recycler_view.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/decrypt_layout.xml | 26 | ||||
| -rw-r--r-- | app/src/main/res/layout/encrypt_layout.xml | 104 | ||||
| -rw-r--r-- | app/src/main/res/layout/password_recycler_view.xml | 10 | ||||
| -rw-r--r-- | app/src/main/res/layout/password_row_layout.xml | 66 |
6 files changed, 97 insertions, 112 deletions
diff --git a/app/src/main/res/layout/activity_pgp_handler.xml b/app/src/main/res/layout/activity_pgp_handler.xml index b5dfba53..3c79b37d 100644 --- a/app/src/main/res/layout/activity_pgp_handler.xml +++ b/app/src/main/res/layout/activity_pgp_handler.xml @@ -13,7 +13,6 @@ <GridLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/rectangle" android:orientation="horizontal"> <TextView diff --git a/app/src/main/res/layout/autofill_recycler_view.xml b/app/src/main/res/layout/autofill_recycler_view.xml index 7991341d..0b637440 100644 --- a/app/src/main/res/layout/autofill_recycler_view.xml +++ b/app/src/main/res/layout/autofill_recycler_view.xml @@ -21,7 +21,7 @@ <android.support.design.widget.FloatingActionButton android:id="@+id/fab" - android:src="@drawable/ic_action_new" + android:src="@drawable/ic_add_white_48dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom|end" diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml index b86005c2..6c8fc1ff 100644 --- a/app/src/main/res/layout/decrypt_layout.xml +++ b/app/src/main/res/layout/decrypt_layout.xml @@ -10,35 +10,44 @@ <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" + android:padding="16dp" android:orientation="vertical"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/rectangle" android:orientation="vertical"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@android:color/holo_blue_light" + android:textColor="@color/grey_500" android:text="CATEGORY HERE" android:id="@+id/crypto_password_category" android:layout_gravity="center_vertical" - android:layout_marginLeft="@dimen/activity_horizontal_margin"/> + android:textSize="18dp" + android:textIsSelectable="false" + android:layout_marginLeft="16dp" /> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@android:color/holo_orange_dark" + android:textColor="@color/accent" 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="@dimen/activity_horizontal_margin"/> + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:textSize="24dp" /> </LinearLayout> + <ImageView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:src="@drawable/divider" + android:layout_marginTop="16dp" + android:layout_marginBottom="16dp" /> + <ProgressBar style="?android:attr/progressBarStyleLarge" android:layout_width="wrap_content" @@ -61,12 +70,7 @@ android:orientation="vertical" android:layout_width="fill_parent" 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 diff --git a/app/src/main/res/layout/encrypt_layout.xml b/app/src/main/res/layout/encrypt_layout.xml index 84fe99c3..98a6b04d 100644 --- a/app/src/main/res/layout/encrypt_layout.xml +++ b/app/src/main/res/layout/encrypt_layout.xml @@ -5,25 +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:background="@drawable/rectangle" - 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" @@ -31,27 +30,24 @@ 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" android:layout_marginBottom="@dimen/activity_vertical_margin" - android:background="@drawable/rectangle" android:layout_weight="1"> <LinearLayout android:id="@+id/crypto_container" 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"> @@ -59,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" @@ -92,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/layout/password_recycler_view.xml b/app/src/main/res/layout/password_recycler_view.xml index 1b922a17..bef664ba 100644 --- a/app/src/main/res/layout/password_recycler_view.xml +++ b/app/src/main/res/layout/password_recycler_view.xml @@ -11,21 +11,17 @@ android:id="@+id/pass_recycler" android:scrollbars="vertical" 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"/> + android:layout_height="match_parent"/> <android.support.design.widget.FloatingActionButton android:id="@+id/fab" - android:src="@drawable/ic_action_new" + android:src="@drawable/ic_add_white_48dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom|end" app:elevation="6dp" app:pressedTranslationZ="12dp" - app:backgroundTint="@color/blue_grey_500" + app:backgroundTint="@color/accent" app:rippleColor="@color/blue_grey_50" app:borderWidth="0dp" android:layout_margin="@dimen/fab_compat_margin" diff --git a/app/src/main/res/layout/password_row_layout.xml b/app/src/main/res/layout/password_row_layout.xml index 2ad69762..5fd62249 100644 --- a/app/src/main/res/layout/password_row_layout.xml +++ b/app/src/main/res/layout/password_row_layout.xml @@ -1,40 +1,54 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:card_view="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="4dp" - android:layout_marginBottom="4dp"> + android:background="?android:attr/activatedBackgroundIndicator"> - <android.support.v7.widget.CardView - xmlns:card_view="http://schemas.android.com/apk/res-auto" - android:id="@+id/password_card" - android:layout_gravity="center" + <RelativeLayout android:layout_width="match_parent" - android:layout_height="60dp" - card_view:contentPaddingTop="4dp" - card_view:contentPaddingLeft="4dp" - card_view:cardCornerRadius="4dp" - card_view:cardElevation="3dp" - card_view:cardBackgroundColor="@color/light_blue_50"> + android:layout_height="wrap_content" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:gravity="left"> + + <ImageView + android:layout_width="40dp" + android:layout_height="32dp" + android:id="@+id/type_image" + android:src="@drawable/ic_folder_grey600_24dp" + android:alpha="0.5" + android:layout_centerVertical="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:paddingRight="8dp" /> <TextView android:id="@+id/type" - android:text="TYPE" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@android:color/white" - android:textStyle="italic" - android:maxLines="1" /> + android:maxLines="1" + android:ellipsize="start" + android:text="TYPE" + android:textSize="14dp" + android:textColor="@color/grey_500" + android:layout_alignTop="@+id/type_image" + android:layout_toRightOf="@+id/type_image" + android:layout_toEndOf="@+id/type_image" /> + <TextView android:id="@+id/label" - android:text="FILE_NAME" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:padding="8dp" - android:textColor="@android:color/white" - android:textStyle="bold" /> - </android.support.v7.widget.CardView> - </LinearLayout>
\ No newline at end of file + android:text="FILE_NAME" + android:textColor="@android:color/black" + android:textSize="18dp" + android:layout_below="@+id/type" + android:layout_alignLeft="@+id/type" + android:layout_alignStart="@+id/type" /> + </RelativeLayout> + +</LinearLayout>
\ No newline at end of file |