diff options
Diffstat (limited to 'app/src/main/res/layout/encrypt_layout.xml')
| -rw-r--r-- | app/src/main/res/layout/encrypt_layout.xml | 146 |
1 files changed, 72 insertions, 74 deletions
diff --git a/app/src/main/res/layout/encrypt_layout.xml b/app/src/main/res/layout/encrypt_layout.xml index f84792e8..41fa78ee 100644 --- a/app/src/main/res/layout/encrypt_layout.xml +++ b/app/src/main/res/layout/encrypt_layout.xml @@ -1,89 +1,87 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.constraintlayout.widget.ConstraintLayout 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:background="@color/background" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:background="?android:attr/windowBackground" android:orientation="vertical" android:padding="@dimen/activity_horizontal_margin" tools:context="com.zeapo.pwdstore.crypto.PgpActivity"> - <ScrollView - android:id="@+id/crypto_scroll_view" - android:layout_width="fill_parent" - android:layout_height="0dp" - android:layout_marginBottom="@dimen/activity_vertical_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:layout_weight="1"> + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/crypto_password_category" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/activity_horizontal_margin" + android:textColor="?android:attr/textColor" + android:textIsSelectable="false" + android:textSize="18sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="CATEGORY HERE" /> - <LinearLayout + <com.google.android.material.textfield.TextInputLayout + style="@style/TextInputLayoutBase" + android:id="@+id/name_input_layout" + android:layout_gravity="center_vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:hint="@string/crypto_name_hint" + app:hintEnabled="true" + app:layout_constraintTop_toBottomOf="@id/crypto_password_category" + app:layout_constraintStart_toStartOf="parent"> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/crypto_password_file_edit" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> + android:layout_height="wrap_content"/> + </com.google.android.material.textfield.TextInputLayout> - <TextView - android:id="@+id/crypto_password_category" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_marginStart="@dimen/activity_horizontal_margin" - android:textColor="@color/grey_500" - android:textIsSelectable="false" - android:textSize="18sp" - tools:text="CATEGORY HERE" /> - - <EditText - android:id="@+id/crypto_password_file_edit" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:hint="@string/crypto_name_hint" - android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" - android:textColor="@color/accent" - android:textSize="24sp" - tools:ignore="TextFields" /> - - <TextView - android:id="@+id/textView2" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/crypto_pass_label" - android:textStyle="bold" /> - - <EditText - android:id="@+id/crypto_password_edit" - android:layout_width="match_parent" - android:hint="@string/crypto_password_edit_hint" - android:layout_height="0dp" - android:layout_weight="1" - android:inputType="textVisiblePassword" - android:typeface="monospace" /> - - <Button - android:id="@+id/generate_password" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="end" - android:text="@string/pwd_generate_button" /> + <com.google.android.material.textfield.TextInputLayout + style="@style/TextInputLayoutBase" + android:id="@+id/password_input_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:hint="@string/crypto_pass_label" + app:hintEnabled="true" + app:layout_constraintTop_toBottomOf="@id/name_input_layout" + app:layout_constraintStart_toStartOf="parent"> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/crypto_password_edit" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + </com.google.android.material.textfield.TextInputLayout> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:text="@string/crypto_extra_label" - android:textStyle="bold" /> + <com.google.android.material.button.MaterialButton + style="@style/Widget.MaterialComponents.Button" + android:id="@+id/generate_password" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:text="@string/pwd_generate_button" + android:textColor="?android:attr/windowBackground" + app:backgroundTint="?attr/colorSecondary" + app:layout_constraintTop_toBottomOf="@id/password_input_layout" + app:layout_constraintEnd_toEndOf="parent"/> - <EditText - android:id="@+id/crypto_extra_edit" - android:layout_width="match_parent" - android:layout_height="fill_parent" - android:hint="@string/crypto_extra_edit_hint" - android:enabled="true" - android:inputType="textMultiLine|textVisiblePassword" - android:typeface="monospace" - android:visibility="visible" /> - </LinearLayout> + <com.google.android.material.textfield.TextInputLayout + style="@style/TextInputLayoutBase" + android:id="@+id/extra_input_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:hint="@string/crypto_extra_label" + app:hintEnabled="true" + app:layout_constraintTop_toBottomOf="@id/generate_password" + app:layout_constraintStart_toStartOf="parent"> - </ScrollView> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/crypto_extra_edit" + android:inputType="textMultiLine|textVisiblePassword" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> -</LinearLayout>
\ No newline at end of file + </com.google.android.material.textfield.TextInputLayout> +</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file |