diff options
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/activity_git_clone.xml | 18 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_git_config.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_pgp_handler.xml | 52 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_pwdstore.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/app_list_item.xml | 23 | ||||
| -rw-r--r-- | app/src/main/res/layout/child_row_layout.xml | 30 | ||||
| -rw-r--r-- | app/src/main/res/layout/decrypt_layout.xml | 23 | ||||
| -rw-r--r-- | app/src/main/res/layout/encrypt_layout.xml | 26 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_autofill.xml | 27 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_pwgen.xml | 7 | ||||
| -rw-r--r-- | app/src/main/res/layout/key_id.xml | 44 | ||||
| -rw-r--r-- | app/src/main/res/layout/openpgp_provider.xml | 158 | ||||
| -rw-r--r-- | app/src/main/res/layout/password_row_layout.xml | 12 |
13 files changed, 63 insertions, 363 deletions
diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml index d923350a..8001f94d 100644 --- a/app/src/main/res/layout/activity_git_clone.xml +++ b/app/src/main/res/layout/activity_git_clone.xml @@ -106,14 +106,16 @@ android:inputType="textWebEmailAddress" /> <TextView + android:id="@+id/label_server_port" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text=":" - android:paddingBottom="8dp" - android:id="@+id/label_server_port" android:layout_centerVertical="true" android:layout_toLeftOf="@+id/server_port" - android:layout_toStartOf="@+id/server_port" /> + android:layout_toStartOf="@+id/server_port" + android:paddingBottom="8dp" + android:text=":" + tools:ignore="HardcodedText" /> + <EditText android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -166,11 +168,11 @@ android:background="@drawable/bottom_line"/> <EditText - android:hint="Repository URI" android:id="@+id/clone_uri" android:layout_width="match_parent" android:layout_height="wrap_content" - android:inputType="textWebEmailAddress"/> + android:hint="@string/repository_uri" + android:inputType="textWebEmailAddress" /> <TextView android:layout_width="match_parent" @@ -206,13 +208,13 @@ <Button android:id="@+id/clone_button" - android:text="Clone!" + android:text="@string/clone_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:onClick="cloneRepository"/> <Button android:id="@+id/save_button" - android:text="Save" + android:text="@string/crypto_save" android:layout_width="match_parent" android:layout_height="wrap_content" android:onClick="saveConfiguration"/> diff --git a/app/src/main/res/layout/activity_git_config.xml b/app/src/main/res/layout/activity_git_config.xml index 2955809b..c03ddc05 100644 --- a/app/src/main/res/layout/activity_git_config.xml +++ b/app/src/main/res/layout/activity_git_config.xml @@ -11,7 +11,7 @@ <LinearLayout android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:orientation="vertical"> <TextView @@ -85,7 +85,7 @@ <Button android:id="@+id/save_button" - android:text="Save" + android:text="@string/crypto_save" android:layout_width="match_parent" android:layout_height="wrap_content" android:onClick="applyGitConfigs"/> diff --git a/app/src/main/res/layout/activity_pgp_handler.xml b/app/src/main/res/layout/activity_pgp_handler.xml deleted file mode 100644 index 71dcff3e..00000000 --- a/app/src/main/res/layout/activity_pgp_handler.xml +++ /dev/null @@ -1,52 +0,0 @@ -<LinearLayout 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="@color/background"> - - <GridLayout - 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:textColor="@android:color/holo_orange_dark" - android:text="Large Text" - android:id="@+id/crypto_password_file" - android:layout_gravity="center_vertical" - android:layout_marginLeft="8dp" - android:layout_column="0" - android:layout_row="0"/> - - <ImageButton - android:id="@+id/crypto_show_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@android:drawable/ic_input_get" - android:background="@android:drawable/screen_background_light_transparent" - android:layout_gravity="center_vertical" - android:visibility="invisible" - android:onClick="decrypt" - android:layout_column="2" - android:layout_row="0"/> - - - <LinearLayout - android:id="@+id/crypto_container" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_column="0" - android:layout_row="2" - android:layout_columnSpan="3" /> - - </GridLayout> -</LinearLayout> diff --git a/app/src/main/res/layout/activity_pwdstore.xml b/app/src/main/res/layout/activity_pwdstore.xml index 84c7af06..dd30d3fc 100644 --- a/app/src/main/res/layout/activity_pwdstore.xml +++ b/app/src/main/res/layout/activity_pwdstore.xml @@ -2,7 +2,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".pwdstore" + tools:context=".PasswordStore" android:orientation="vertical"> <LinearLayout diff --git a/app/src/main/res/layout/app_list_item.xml b/app/src/main/res/layout/app_list_item.xml deleted file mode 100644 index 15758cd5..00000000 --- a/app/src/main/res/layout/app_list_item.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="40dp" - android:gravity="center_vertical" - android:orientation="horizontal" - android:paddingLeft="8dp" - android:paddingRight="8dp"> - - <ImageView - android:id="@android:id/icon1" - android:layout_width="24dp" - android:layout_height="24dp" /> - - <TextView - android:id="@android:id/text1" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:gravity="center_vertical" - android:textAppearance="?android:attr/textAppearanceListItemSmall" /> - -</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/child_row_layout.xml b/app/src/main/res/layout/child_row_layout.xml deleted file mode 100644 index d61586a9..00000000 --- a/app/src/main/res/layout/child_row_layout.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<GridLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent" - android:id="@+id/child_row_layout" - android:layout_marginTop="@dimen/activity_vertical_margin"> - - <ImageButton - android:id="@+id/crypto_delete_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_action_discard" - android:background="@drawable/red_rectangle" - android:layout_gravity="center_vertical" - android:layout_column="1" - android:layout_row="0"/> - - <ImageButton - android:id="@+id/crypto_show_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_action_accounts" - android:background="@drawable/blue_rectangle" - android:layout_gravity="center_vertical" - android:layout_marginLeft="8dp" - android:layout_column="2" - android:layout_row="0"/> - -</GridLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml index 2a94dfee..f076dbad 100644 --- a/app/src/main/res/layout/decrypt_layout.xml +++ b/app/src/main/res/layout/decrypt_layout.xml @@ -19,26 +19,28 @@ android:orientation="vertical"> <TextView + android:id="@+id/crypto_password_category" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/grey_500" - android:text="CATEGORY HERE" - android:id="@+id/crypto_password_category" android:layout_gravity="center_vertical" - android:textSize="18dp" + android:layout_marginLeft="16dp" + android:text="CATEGORY HERE" + android:textColor="@color/grey_500" android:textIsSelectable="false" - android:layout_marginLeft="16dp" /> + android:textSize="18dp" + tools:ignore="HardcodedText" /> <TextView + android:id="@+id/crypto_password_file" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:text="PASSWORD FILE NAME HERE" + android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" android:textColor="@color/accent" + android:textSize="24dp" android:textStyle="bold" - android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" - android:text="PASSWORD FILE NAME HERE" - android:id="@+id/crypto_password_file" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:textSize="24dp" /> + tools:ignore="HardcodedText" /> </LinearLayout> <ImageView @@ -170,5 +172,4 @@ </LinearLayout> - </ScrollView>
\ 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 30ccfba4..ebb5e4dd 100644 --- a/app/src/main/res/layout/encrypt_layout.xml +++ b/app/src/main/res/layout/encrypt_layout.xml @@ -14,29 +14,31 @@ android:orientation="vertical"> <TextView + android:id="@+id/crypto_password_category" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/grey_500" - android:text="CATEGORY HERE" - android:id="@+id/crypto_password_category" android:layout_gravity="center_vertical" - android:textSize="18dp" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:text="CATEGORY HERE" + android:textColor="@color/grey_500" android:textIsSelectable="false" - android:layout_marginLeft="@dimen/activity_horizontal_margin" /> + android:textSize="18dp" + tools:ignore="HardcodedText" /> <EditText - android:layout_gravity="center_vertical" + android:id="@+id/crypto_password_file_edit" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:id="@+id/crypto_password_file_edit" + android:layout_gravity="center_vertical" android:hint="@string/crypto_name_hint" android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" + android:textColor="@color/accent" android:textSize="24dp" - android:textColor="@color/accent" /> + tools:ignore="TextFields" /> </LinearLayout> <ScrollView android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_height="0dp" android:layout_marginTop="@dimen/activity_vertical_margin" android:layout_marginBottom="@dimen/activity_vertical_margin" android:layout_weight="1"> @@ -65,11 +67,9 @@ <EditText android:id="@+id/crypto_password_edit" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="0dp" android:typeface="monospace" - android:layout_weight="1" - android:layout_toRightOf="@+id/textView2" - android:layout_toEndOf="@+id/textView2" /> + android:layout_weight="1" /> <Button android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/fragment_autofill.xml b/app/src/main/res/layout/fragment_autofill.xml index dd9f8419..ef825c4b 100644 --- a/app/src/main/res/layout/fragment_autofill.xml +++ b/app/src/main/res/layout/fragment_autofill.xml @@ -1,25 +1,28 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:paddingBottom="20dp" - android:paddingLeft="24dp" - android:paddingRight="24dp" - android:paddingTop="20dp"> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingBottom="20dp" + android:paddingLeft="24dp" + android:paddingRight="24dp" + android:paddingTop="20dp"> - <android.support.design.widget.TextInputLayout xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="wrap_content" - app:hintTextAppearance="@style/TextAppearance.AppCompat"> + <android.support.design.widget.TextInputLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:hintTextAppearance="@style/TextAppearance.AppCompat"> <EditText android:id="@+id/webURL" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="URL" - android:inputType="textUri"/> + android:inputType="textUri" + tools:ignore="HardcodedText" /> </android.support.design.widget.TextInputLayout> <RadioGroup diff --git a/app/src/main/res/layout/fragment_pwgen.xml b/app/src/main/res/layout/fragment_pwgen.xml index c3dad4bf..4c3812a7 100644 --- a/app/src/main/res/layout/fragment_pwgen.xml +++ b/app/src/main/res/layout/fragment_pwgen.xml @@ -6,7 +6,7 @@ <LinearLayout 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_height="wrap_content" android:orientation="vertical" android:paddingBottom="20dp" android:paddingLeft="24dp" @@ -26,7 +26,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="horizontal" - android:weightSum="2"> + android:weightSum="2" + android:baselineAligned="false"> <LinearLayout android:layout_width="match_parent" @@ -98,8 +99,6 @@ android:text="@string/pwgen_pronounceable" /> </LinearLayout> - - </LinearLayout> </LinearLayout> </ScrollView> diff --git a/app/src/main/res/layout/key_id.xml b/app/src/main/res/layout/key_id.xml deleted file mode 100644 index 2c95ce8d..00000000 --- a/app/src/main/res/layout/key_id.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="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:background="@color/background"> - - <GridLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@drawable/rectangle"> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Key-id: " - android:layout_column="0" - android:layout_gravity="center_vertical"/> - <TextView - android:id="@+id/crypto_key_ids" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="No key selected" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:textStyle="bold" - android:textColor="@android:color/holo_purple" - android:layout_column="1" - android:layout_gravity="center_vertical"/> - <ImageButton - android:id="@+id/crypto_get_key_ids" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_column="3" - android:src="@drawable/ic_action_accounts" - android:background="@android:color/transparent" - android:onClick="handleClick" - android:layout_gravity="center_vertical"/> - </GridLayout> - - -</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/openpgp_provider.xml b/app/src/main/res/layout/openpgp_provider.xml deleted file mode 100644 index f7c46b5f..00000000 --- a/app/src/main/res/layout/openpgp_provider.xml +++ /dev/null @@ -1,158 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" -android:id="@+id/parent_scroll" -android:fillViewport="true" -android:layout_width="match_parent" -android:layout_height="match_parent"> - -<LinearLayout - android:padding="8dp" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="Encrypt UserIds (split with ',')" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - - <EditText - android:id="@+id/crypto_provider_demo_encrypt_user_id" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="dominik@dominikschuermann.de" - android:textAppearance="@android:style/TextAppearance.Small" /> - - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="Message" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - - <ScrollView - android:id="@+id/child_scroll1" - android:fillViewport="true" - android:layout_width="match_parent" - android:layout_height="120dp"> - - <EditText - android:id="@+id/crypto_provider_demo_message" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:scrollHorizontally="true" - android:scrollbars="vertical" - android:text="message" - android:hint="cleartext message" - android:textAppearance="@android:style/TextAppearance.Small" /> - </ScrollView> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="Ciphertext" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <ScrollView - android:id="@+id/child_scroll2" - android:fillViewport="true" - android:layout_width="match_parent" - android:layout_height="120dp"> - - <EditText - android:id="@+id/crypto_provider_demo_ciphertext" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:text="ciphertext" - android:hint="ciphertext" - android:textAppearance="@android:style/TextAppearance.Small" /> - </ScrollView> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <Button - android:id="@+id/crypto_provider_demo_sign" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="Sign" - android:layout_gravity="center_vertical" /> - - <Button - android:id="@+id/crypto_provider_demo_encrypt" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="Encrypt" - android:layout_gravity="center_vertical" /> - - <Button - android:id="@+id/crypto_provider_demo_sign_and_encrypt" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="Sign and Encrypt" - android:layout_gravity="center_vertical" /> - </LinearLayout> - - <Button - android:id="@+id/crypto_provider_demo_decrypt_and_verify" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="Decrypt and Verify" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Account ID:" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <EditText - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="Alice <alice@example.com>" - android:id="@+id/crypto_provider_demo_account" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Get key:" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <EditText - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="0x718c070100012282" - android:id="@+id/crypto_provider_demo_get_key_edit" /> - - <Button - android:id="@+id/crypto_provider_demo_get_key" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="Get key" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Get key ids:" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <EditText - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="dominik@dominikschuermann.de" - android:id="@+id/crypto_provider_demo_get_key_ids_edit" /> - - <Button - android:id="@+id/crypto_provider_demo_get_key_ids" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="Get key ids" /> - -</LinearLayout> -</ScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/password_row_layout.xml b/app/src/main/res/layout/password_row_layout.xml index 5860fe48..43df2ecf 100644 --- a/app/src/main/res/layout/password_row_layout.xml +++ b/app/src/main/res/layout/password_row_layout.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:card_view="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?android:attr/activatedBackgroundIndicator"> @@ -23,20 +23,21 @@ android:layout_centerVertical="true" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:paddingRight="8dp" /> + android:paddingRight="8dp"/> <TextView android:id="@+id/type" android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="start" - android:singleLine="true" 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" /> + android:layout_toEndOf="@+id/type_image" + android:maxLines="1" + tools:ignore="HardcodedText" /> <TextView android:id="@+id/label" @@ -48,7 +49,8 @@ android:textSize="18dp" android:layout_below="@+id/type" android:layout_alignLeft="@+id/type" - android:layout_alignStart="@+id/type" /> + android:layout_alignStart="@+id/type" + tools:ignore="HardcodedText" /> </RelativeLayout> </LinearLayout>
\ No newline at end of file |